From 7e9e1209eafedd0e3c00feafb305e7406f2aa7c5 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 5 Apr 2020 17:54:43 +0300 Subject: [PATCH] fixed shift details --- .../date-info-modal.component.html | 25 +++++++++++++++---- .../date-info-modal.component.ts | 8 +++--- Mohem/src/assets/localization/i18n.json | 20 +++++++++++++++ 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 26f5e38c..2973dc20 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -47,23 +47,38 @@

{{scheduled}}

-

{{ts.trPK('attendance-tracking','regular')}}

+

{{ts.trPK('attendance-tracking','shift-type')}}

-

{{startDate}}

+

{{actualCheckIn}}

-

{{ts.trPK('attendance-tracking','check-in')}}

+

{{ts.trPK('attendance-tracking','actual-check-in')}}

-

{{endDate}}

+

{{actualCheckOut}}

-

{{ts.trPK('attendance-tracking','check-out')}}

+

{{ts.trPK('attendance-tracking','actual-check-out')}}

+
+
+ + +

{{approvedCheckIn}}

+ +

{{ts.trPK('attendance-tracking','approved-check-in')}}

+
+
+ + + +

{{approvedCheckOut}}

+ +

{{ts.trPK('attendance-tracking','approved-check-out')}}

diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts index dbed1746..ecf0bdef 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts +++ b/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; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 08576fb4..7daf4137 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/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": {