Skip to content

Commit 7196326

Browse files
committed
Approve Activity
#12 - posted by in WievHolders from model attendance.usname
1 parent 56eb97e commit 7196326

File tree

5 files changed

+14
-31
lines changed

5 files changed

+14
-31
lines changed

app/src/main/java/com/eusecom/attendance/AbsServerAsAdapter.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void onBindViewHolder(AbsServerAsViewHolder holder, int position) {
109109

110110
holder.hodxb.setText(mListabsserver.get(position).hodxb);
111111

112-
holder.datm.setText(mListabsserver.get(position).lati + " " + mListabsserver.get(position).datm);
112+
holder.datm.setText(mListabsserver.get(position).usname + " " + mListabsserver.get(position).datm);
113113

114114

115115

@@ -155,9 +155,6 @@ public static class AbsServerAsViewHolder extends RecyclerView.ViewHolder implem
155155
public TextView datm;
156156
private ClickListener clickListener;
157157
Context mContext;
158-
FirebaseUser user;
159-
private FirebaseAuth mAuth;
160-
String usemail = "";
161158

162159
public AbsServerAsViewHolder(View itemView) {
163160
super(itemView);
@@ -174,11 +171,7 @@ public AbsServerAsViewHolder(View itemView) {
174171
itemView.setOnClickListener(this);
175172
itemView.setOnLongClickListener(this);
176173

177-
mAuth = FirebaseAuth.getInstance();
178-
user = mAuth.getCurrentUser();
179-
if (user != null) {
180-
usemail = user.getEmail();
181-
}
174+
182175
}
183176
/* Interface for handling clicks - both normal and long ones. */
184177
public interface ClickListener {
@@ -252,7 +245,7 @@ private void getDialog(String postkey, Attendance model, Context mContext) {
252245
dialog.setContentView(R.layout.absserver_dialog);
253246
dialog.setTitle(R.string.item);
254247
// set the custom dialog components - text, image and button
255-
String textx = mContext.getString(R.string.item) + " " + postkey + ". " + model.lati + ". " + model.dmna + " " + model.daod + " / " + model.dado;
248+
String textx = mContext.getString(R.string.item) + " " + postkey + ". " + model.usname + ". " + model.dmna + " " + model.daod + " / " + model.dado;
256249
TextView text = (TextView) dialog.findViewById(R.id.text);
257250
text.setText(textx);
258251
ImageView image = (ImageView) dialog.findViewById(R.id.image);

app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,13 @@ private void getApproveDialog(String postkey, Attendance model) {
330330
dialog.setContentView(R.layout.approve_dialog);
331331
dialog.setTitle(R.string.item);
332332
// set the custom dialog components - text, image and button
333-
String textx = getString(R.string.item) + " " + postkey;
333+
long timestampod = Long.parseLong(model.daod) * 1000L;
334+
String dateods = getDate(timestampod );
335+
336+
long timestampdo = Long.parseLong(model.dado) * 1000L;
337+
String datedos = getDate(timestampdo );
338+
339+
String textx = model.usname + " " + model.dmxa + " " + model.dmna + " " + dateods + " / " + datedos;
334340
TextView text = (TextView) dialog.findViewById(R.id.text);
335341
text.setText(textx);
336342
ImageView image = (ImageView) dialog.findViewById(R.id.image);

app/src/main/java/com/eusecom/attendance/fragment/ApproveRxViewHolder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class ApproveRxViewHolder extends RecyclerView.ViewHolder implements View
2828
public TextView datm;
2929
private ClickListener clickListener;
3030
Context mContext;
31-
String usemail = "";
31+
3232

3333
public ApproveRxViewHolder(View itemView) {
3434
super(itemView);
@@ -88,7 +88,7 @@ public void bindModel(Attendance attendance) {
8888

8989
//long timestampm = Long.parseLong(attendance.datm) * 1000L;
9090
long timestampm = attendance.getDatsLong();
91-
datm.setText(usemail + " " + getDateTime(timestampm ));
91+
datm.setText(attendance.usname + " " + getDateTime(timestampm ));
9292
}
9393

9494
/* Interface for handling clicks - both normal and long ones. */

app/src/main/java/com/eusecom/attendance/viewholder/AbsenceViewHolder.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ public class AbsenceViewHolder extends RecyclerView.ViewHolder {
2727
public TextView dateto;
2828
public TextView hodxb;
2929
public TextView datm;
30-
FirebaseUser user;
31-
private FirebaseAuth mAuth;
32-
String usemail = "";
3330
Context mContext;
3431

3532
public AbsenceViewHolder(View itemView) {
@@ -45,11 +42,6 @@ public AbsenceViewHolder(View itemView) {
4542
datm = (TextView) itemView.findViewById(R.id.datm);
4643
mContext = itemView.getContext();
4744

48-
mAuth = FirebaseAuth.getInstance();
49-
user = mAuth.getCurrentUser();
50-
if (user != null) {
51-
usemail = user.getEmail();
52-
}
5345

5446
}
5547

@@ -91,7 +83,7 @@ public void bindToAbsence(com.eusecom.attendance.models.Attendance attendance, V
9183

9284
//long timestampm = Long.parseLong(attendance.datm) * 1000L;
9385
long timestampm = attendance.getDatsLong();
94-
datm.setText(usemail + " " + getDateTime(timestampm ));
86+
datm.setText(attendance.usname + " " + getDateTime(timestampm ));
9587

9688
starView.setOnClickListener(starClickListener);
9789

app/src/main/java/com/eusecom/attendance/viewholder/AttendanceViewHolder.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ public class AttendanceViewHolder extends RecyclerView.ViewHolder {
2525
public ImageView starView;
2626
public TextView numStarsView;
2727
public TextView datm;
28-
FirebaseUser user;
29-
private FirebaseAuth mAuth;
30-
String usemail = "";
3128
Context mContext;
3229

3330
public AttendanceViewHolder(View itemView) {
@@ -40,11 +37,6 @@ public AttendanceViewHolder(View itemView) {
4037
datm = (TextView) itemView.findViewById(R.id.datm);
4138
mContext = itemView.getContext();
4239

43-
mAuth = FirebaseAuth.getInstance();
44-
user = mAuth.getCurrentUser();
45-
if (user != null) {
46-
usemail = user.getEmail();
47-
}
4840
}
4941

5042
public void bindToAttendance(com.eusecom.attendance.models.Attendance attendance, View.OnClickListener starClickListener) {
@@ -59,7 +51,7 @@ public void bindToAttendance(com.eusecom.attendance.models.Attendance attendance
5951

6052
//long timestampm = Long.parseLong(attendance.datm) * 1000L;
6153
long timestampm = attendance.getDatsLong();
62-
datm.setText(usemail + " " + getDateTime(timestampm ));
54+
datm.setText(attendance.usname + " " + getDateTime(timestampm ));
6355

6456
starView.setOnClickListener(starClickListener);
6557

0 commit comments

Comments
 (0)