fixed shift details

Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html

@@ -47,23 +47,38 @@
               <ion-col [size]="6" style="border-bottom: 1px solid #ccc;">
                 <ion-row class="amountlabel"><p >{{scheduled}}</p> </ion-row>
                 <ion-row class="rowlabel"> 
-                  <p >{{ts.trPK('attendance-tracking','regular')}}</p>
+                  <p >{{ts.trPK('attendance-tracking','shift-type')}}</p>
                 </ion-row>
               </ion-col>
 
 
               <ion-col [size]="6" [ngClass]="direction == 'ltr'? 'col':'col-ar'">
-                <ion-row class="amountlabel"><p >{{startDate}}</p> </ion-row>
+                <ion-row class="amountlabel"><p >{{actualCheckIn}}</p> </ion-row>
                 <ion-row class="rowlabel"> 
-                  <p >{{ts.trPK('attendance-tracking','check-in')}}</p>
+                  <p >{{ts.trPK('attendance-tracking','actual-check-in')}}</p>
                 </ion-row>
               </ion-col>
 
 
               <ion-col [size]="6" style="border-bottom: 1px solid #ccc;">
-                <ion-row class="amountlabel"> <p >{{endDate}}</p> </ion-row>
+                <ion-row class="amountlabel"> <p >{{actualCheckOut}}</p> </ion-row>
                 <ion-row class="rowlabel"> 
-                  <p >{{ts.trPK('attendance-tracking','check-out')}} </p>
+                  <p >{{ts.trPK('attendance-tracking','actual-check-out')}} </p>
+                </ion-row>
+              </ion-col>
+
+              <ion-col [size]="6" [ngClass]="direction == 'ltr'? 'col':'col-ar'">
+                <ion-row class="amountlabel"><p >{{approvedCheckIn}}</p> </ion-row>
+                <ion-row class="rowlabel"> 
+                  <p >{{ts.trPK('attendance-tracking','approved-check-in')}}</p>
+                </ion-row>
+              </ion-col>
+
+
+              <ion-col [size]="6" style="border-bottom: 1px solid #ccc;">
+                <ion-row class="amountlabel"> <p >{{approvedCheckOut}}</p> </ion-row>
+                <ion-row class="rowlabel"> 
+                  <p >{{ts.trPK('attendance-tracking','approved-check-out')}} </p>
                 </ion-row>
               </ion-col>
 

Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts

@@ -63,16 +63,18 @@ export class DateInfoModalComponent implements OnInit {
     this.excess = this.TODAYDATE.EXCESS_HRS;
     this.lateIn = this.TODAYDATE.LATE_IN_HRS;
     this.shortage = this.TODAYDATE.SHORTAGE_HRS;
-    this.scheduled = this.TODAYDATE.SCHEDULED_HRS;
     this.earlyOut = this.TODAYDATE.EARLY_OUT_HRS ;
     this.scheduleDate = this.TODAYDATE.SCHEDULE_DATE;
     this.assignData(this.SHIFTDETAILS.GetScheduleShiftsDetailsList[0]);
   }
 
   assignData(shiftDetails) {
+    this.scheduled = shiftDetails.SHT_TYPE_DESC;
     this.shiftTime = shiftDetails.SHT_NAME;
-    this.startDate = shiftDetails.SHT_ACTUAL_START_TIME;
-    this.endDate = shiftDetails.SHT_ACTUAL_END_TIME;
+    this.actualCheckIn = shiftDetails.SHT_ACTUAL_START_TIME;
+    this.actualCheckOut = shiftDetails.SHT_ACTUAL_END_TIME;
+    this.approvedCheckIn = shiftDetails.APPROVED_START_TIME;
+    this.approvedCheckOut = shiftDetails.APPROVED_END_TIME;
     this.percentage = shiftDetails.PERCENTAGE;
     this.percChart = this.percentage.substring(0, this.percentage.indexOf('%'));
     // const test = this.scheduleDate;

Mohem/src/assets/localization/i18n.json

@@ -2506,6 +2506,22 @@
             "en": "Check Out",
             "ar":"وقت الخروج"
         },
+        "actual-check-in":{
+            "en": "Actual Check In",
+            "ar":"وقت الدخول"
+        },
+        "actual-check-out":{
+            "en": "Actual Check Out",
+            "ar":"وقت الخروج"
+        },
+        "approved-check-in":{
+            "en": "Approved Check In",
+            "ar":"اعتماد وقت الدخول"
+        },
+        "approved-check-out":{
+            "en": "Approved Check Out",
+            "ar":"اعتماد وقت الخروج"
+        },
         "regular":{
             "en": "Regular",
             "ar":"المنتظم"
@@ -2565,6 +2581,10 @@
     "shift-time":{
         "en":"Shift Time",
         "ar":"وقت التناوب"
+    },
+    "shift-type":{
+        "en":"Shift Type",
+        "ar":"وقت التناوب"
     }
 },
     "sms": {