Merge remote-tracking branch 'origin/master'

JapneetRajput · May 2, 2022 · ae4c16d · ae4c16d
2 parents d9b0762 + 8ca0231
commit ae4c16d
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 28 deletions.
diff --git a/app/src/main/java/com/example/workflow/LeaveActivity.java b/app/src/main/java/com/example/workflow/LeaveActivity.java
@@ -185,9 +185,10 @@ public void onClick(View v) {
                 leave.put("Type", l_type);
                 leave.put("description", des);
                 leave.put("department", dept);
+                leave.put("approved",0);
                 count++;
+                leave.put("count",count);
                 String Count = count.toString();
-
                 Map<String, Object> LCount = new HashMap<>();
                 LCount.put("LeaveCount", count);
                 db1.updateChildren(LCount);

diff --git a/app/src/main/java/com/example/workflow/LeaveList.java b/app/src/main/java/com/example/workflow/LeaveList.java
@@ -3,14 +3,16 @@
 public class LeaveList {
     String Type;
     String to_date,from_date,email;
+    Integer count;
 
     public LeaveList(){}
 
-    public LeaveList(String Type, String to_date, String from_date, String email) {
+    public LeaveList(String Type, String to_date, String from_date, String email, Integer count) {
         this.Type = Type;
         this.to_date = to_date;
         this.from_date = from_date;
         this.email = email;
+        this.count = count;
     }
 
     public void setType(String type) {
@@ -29,6 +31,14 @@ public void setEmail(String email) {
         this.email = email;
     }
 
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
     public String getType() {
         return Type;
     }

diff --git a/app/src/main/java/com/example/workflow/LeaveRequests.java b/app/src/main/java/com/example/workflow/LeaveRequests.java
@@ -10,7 +10,9 @@
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.nfc.Tag;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
@@ -37,12 +39,14 @@
 import java.util.Objects;
 
 public class LeaveRequests extends AppCompatActivity {
+
     String pos,department;
     RecyclerView recyclerView;
     AdapterLeave.RecyclerViewClickListener listener;
     AdapterLeave adapterLeave;
     ArrayList<LeaveList> list;
     FirebaseFirestore db;
+    Integer count;
     String uid = Objects.requireNonNull(FirebaseAuth.getInstance().getCurrentUser()).getUid();
     ProgressDialog progressDialog;
     DatabaseReference noticeCounT= FirebaseDatabase.getInstance().getReference();
@@ -89,31 +93,6 @@ public void onCancelled(@NonNull DatabaseError error) {
         db=FirebaseFirestore.getInstance();
         recyclerView.setAdapter(adapterLeave);
     }
-    private void EventChangeListener() {
-
-        db.collection("Leave")
-                .whereEqualTo("department",department)
-                .addSnapshotListener(new EventListener<QuerySnapshot>() {
-                    @Override
-                    public void onEvent(@Nullable QuerySnapshot value, @Nullable FirebaseFirestoreException error) {
-                        if (error != null) {
-                            if (progressDialog.isShowing())
-                                progressDialog.dismiss();
-                            Toast.makeText(LeaveRequests.this, "Snapshot error", Toast.LENGTH_SHORT).show();
-                        } else {
-                            for (DocumentChange dc : value.getDocumentChanges()) {
-                                if (progressDialog.isShowing())
-                                    progressDialog.dismiss();
-
-                                if (dc.getType() == DocumentChange.Type.ADDED) {
-                                    list.add(dc.getDocument().toObject(LeaveList.class));
-                                }
-                                adapterLeave.notifyDataSetChanged();
-                            }
-                        }
-                    }
-                });
-    }
     private void setOnClickListener() {
         listener=new AdapterLeave.RecyclerViewClickListener() {
             @Override
@@ -163,24 +142,68 @@ public void onClick(View v, int position){
 //                });
 //                String Position = (position+1) + "";
 //                Toast.makeText(LeaveRequests.this, Position, Toast.LENGTH_SHORT).show();
+                count = list.get(position).getCount();
+                String Position = (count) + "";
                 new AlertDialog.Builder(LeaveRequests.this)
                         .setMessage("Do you wish to approve this request?")
                         .setCancelable(true)
                         .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
+                                db.collection("Leave").document(Position)
+                                        .update("approved", 1);
                                 Toast.makeText(getApplicationContext(), "Leave Approved!", Toast.LENGTH_SHORT).show();
+                                startActivity(new Intent(LeaveRequests.this, LeaveRequests.class));
+                                finish();
                             }
                         })
                         .setNegativeButton("No", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
+                                db.collection("Leave").document(Position)
+                                        .update("approved", -1);
                                 Toast.makeText(getApplicationContext(), "Leave Denied!", Toast.LENGTH_SHORT).show();
+                                startActivity(new Intent(LeaveRequests.this, LeaveRequests.class));
+                                finish();
                             }
                         })
                         .show();
             }
         };
     }
+    private void EventChangeListener() {
+
+        db.collection("Leave")
+                .whereEqualTo("department",department)
+                .whereEqualTo("approved",0)
+                .addSnapshotListener(new EventListener<QuerySnapshot>() {
+                    @Override
+                    public void onEvent(@Nullable QuerySnapshot value, @Nullable FirebaseFirestoreException error) {
+                        if (error != null) {
+                            if (progressDialog.isShowing())
+                                progressDialog.dismiss();
+                            Toast.makeText(LeaveRequests.this, "Snapshot error", Toast.LENGTH_SHORT).show();
+                        } else {
+                            for (DocumentChange dc : value.getDocumentChanges()) {
+                                if (progressDialog.isShowing())
+                                    progressDialog.dismiss();
+
+                                if (dc.getType() == DocumentChange.Type.ADDED) {
+                                    list.add(dc.getDocument().toObject(LeaveList.class));
+                                }
+                                adapterLeave.notifyDataSetChanged();
+                            }
+                        }
+                    }
+                });
+    }
+
+
+}
 
-}
+//db.collection("users")
+//        .document("frank")
+//        .update({
+//        "age": 13,
+//        "favorites.color": "Red"
+//        });