Approve Activity

#12 - icon for refused absence at AbsenceViewHolder - delete refused absence - if fir equals 0 do not call approvePost only call approveFBPost
eurosecom · Apr 13, 2017 · 615d78e · 615d78e
1 parent a95e504
commit 615d78e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 2 deletions.
diff --git a/app/src/main/java/com/eusecom/attendance/fragment/AbsenceListFragment.java b/app/src/main/java/com/eusecom/attendance/fragment/AbsenceListFragment.java
@@ -186,6 +186,9 @@ public boolean onLongClick(View v) {
                         Toast.makeText(getActivity(), "Longclick " + absKey,Toast.LENGTH_SHORT).show();
 
                         abskeydel = absKey;
+                        if( model.aprv.equals("2")) {
+                            rozdiel=1;
+                        }
 
                         if( rozdiel < 180000 ) {
                             getDialog(abskeydel);

diff --git a/app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java b/app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java
@@ -406,7 +406,7 @@ public void onClick(View v) {
                 if(savetofiri>0){
                     approvePost(abskeydel, 1, model);
                 }else{
-                    approvePost(abskeydel, 1, model);
+                    approveFBPost(abskeydel, 1, model);
                 }
             }
         });
@@ -419,7 +419,7 @@ public void onClick(View v) {
                 if(savetofiri>0){
                     approvePost(abskeydel, 0, model);
                 }else{
-                    approvePost(abskeydel, 0, model);
+                    approveFBPost(abskeydel, 0, model);
                 }
 
 

diff --git a/app/src/main/java/com/eusecom/attendance/viewholder/AbsenceViewHolder.java b/app/src/main/java/com/eusecom/attendance/viewholder/AbsenceViewHolder.java
@@ -75,6 +75,9 @@ public void bindToAbsence(com.eusecom.attendance.models.Attendance attendance, V
         if( attendance.aprv.equals("1")) {
             Picasso.with(mContext).load(R.drawable.ic_check_circle_black_24dp).resize(120, 120).into(starView);
         }
+        if( attendance.aprv.equals("2")) {
+            Picasso.with(mContext).load(R.drawable.ic_remove_circle_black_24dp).resize(120, 120).into(starView);
+        }
 
         //convert unix epoch timestamp (seconds) to milliseconds
         long timestampod = Long.parseLong(attendance.daod) * 1000L;

diff --git a/app/src/main/java/com/eusecom/attendance/viewholder/ApproveViewHolder.java b/app/src/main/java/com/eusecom/attendance/viewholder/ApproveViewHolder.java
@@ -75,6 +75,10 @@ public void bindToApprove(com.eusecom.attendance.models.Attendance attendance, V
         if( attendance.aprv.equals("1")) {
             Picasso.with(mContext).load(R.drawable.ic_check_circle_black_24dp).resize(120, 120).into(starView);
         }
+        if( attendance.aprv.equals("2")) {
+            Picasso.with(mContext).load(R.drawable.ic_remove_circle_black_24dp).resize(120, 120).into(starView);
+        }
+
 
         //convert unix epoch timestamp (seconds) to milliseconds
         long timestampod = Long.parseLong(attendance.daod) * 1000L;

diff --git a/app/src/main/res/drawable-hdpi/ic_remove_circle_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_remove_circle_black_24dp.png
diff --git a/app/src/main/res/drawable-mdpi/ic_remove_circle_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_remove_circle_black_24dp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_remove_circle_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_remove_circle_black_24dp.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_remove_circle_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_remove_circle_black_24dp.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_remove_circle_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_remove_circle_black_24dp.png