diff --git a/Mohem/src/app/attendance-tracking/home/home.component.html b/Mohem/src/app/attendance-tracking/home/home.component.html index 1a28a602..48d2c99c 100644 --- a/Mohem/src/app/attendance-tracking/home/home.component.html +++ b/Mohem/src/app/attendance-tracking/home/home.component.html @@ -1,16 +1,29 @@ - + + + + +
+ +
- {{curentDate}}
+ {{curentDate}}
{{ts.trPK('attendance-tracking','today-time-left')}}
@@ -46,32 +59,29 @@
- {{ts.trPK('attendance-tracking','shift-time')}} -

- {{attendanceTrackingList.P_SHT_NAME}} + + {{ts.trPK('attendance-tracking','shift-time')}} + {{attendanceTrackingList.P_SHT_NAME}} +
- + {{ts.trPK('attendance-tracking','check-in')}} -

08:00
- + {{ts.trPK('attendance-tracking','check-out')}} -

08:00
- + {{ts.trPK('attendance-tracking','late-in')}} -

08:00
- + {{ts.trPK('attendance-tracking','regular')}} -

- {{attendanceTrackingList.P_SCHEDULED_HOURS}} + {{attendanceTrackingList.P_SCHEDULED_HOURS | slice:0:-3}}
diff --git a/Mohem/src/app/attendance-tracking/home/home.component.scss b/Mohem/src/app/attendance-tracking/home/home.component.scss index f09a8a87..f92e8d05 100644 --- a/Mohem/src/app/attendance-tracking/home/home.component.scss +++ b/Mohem/src/app/attendance-tracking/home/home.component.scss @@ -1,26 +1,29 @@ +ion-content { + font-family: WorkSans-Regular; +} +ion-grid { + padding:30px 15px; +} .timer-chart{ -padding-top:18px; -background: #094773; -// height: 50%; -text-align: center; + background: #094773; + text-align: center; + line-height: .7cm; } .tracking-content{ -background: #053c63; -height: 50%; + background: #053c63; + min-height: 50%; } + .rowBorder{ text-align: center; border-bottom: var(--lightblue) solid 1px; } .shift-text{ - // text-align: center; - // width: 100%; - // color: white !important; - margin-bottom: 12px; - margin-top: -9px; - font-size: 30px; + font-size: 36px; + line-height: 36px; + display: block; } .shift-title{ width: 100%; @@ -34,24 +37,32 @@ height: 50%; } .divstopBtn{ -text-align: center; + text-align: center; } .stopBtn{ - height: 70px; - width: 70px; + height: 89px; + width: 89px; background-color: var(--lightblue) !important; border-radius: 50%; display: inline-block; - margin-top: -24px; - border: solid 3px #053c63; + margin-top: -40px; + border: solid 5px #053c63; } .colBorder{ + padding: 20px 0px; + text-align: center; +} + +.colBorder:nth-child(1){ border-right: var(--lightblue) solid 1px; } .fixed-shift-timer{ margin-top: -50px; - margin-bottom: -30px; + margin-bottom: -10px; +} +.back-button-container{ + background: #094773; } diff --git a/Mohem/src/app/attendance-tracking/home/home.component.ts b/Mohem/src/app/attendance-tracking/home/home.component.ts index a872b22a..d2070095 100644 --- a/Mohem/src/app/attendance-tracking/home/home.component.ts +++ b/Mohem/src/app/attendance-tracking/home/home.component.ts @@ -22,7 +22,6 @@ export class HomeComponent implements OnInit { public isCheckedIn = undefined; public displayTime: any; public percent: any; - constructor( public cs: CommonService, public db: DashboredService, @@ -90,14 +89,10 @@ export class HomeComponent implements OnInit { } convertAndAssignTime(data) { - console.log(data); this.remainingTime = this.convertInSeconds(data.P_REMAINING_HOURS.split(':')); this.scheduledTime = this.convertInSeconds(data.P_SCHEDULED_HOURS.split(':')); this.isCheckedIn = this.remainingTime === this.scheduledTime ? false : true; this.initTimer(); - console.log('remainingTime: ' + this.remainingTime); - console.log('scheduledTime: ' + this.scheduledTime); - console.log('isCheckedIn: ' + this.isCheckedIn); } showAttendanceTracking() { diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index aa52e5a3..90f243d4 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -152,7 +152,7 @@ export class HomePage implements OnInit { } ngOnInit() { - this.getUserDetails(); + // this.getUserDetails(); // this.getCount(); // this.events.subscribe('getNotCount', badge => { @@ -160,6 +160,13 @@ export class HomePage implements OnInit { // }); } + ionViewWillEnter() { + this.remainingTime = 0; + this.displayTime = '00:00:00'; + this.runTimer = false; + this.getUserDetails(); + } + initTimer() { this.runTimer = false; this.hasStarted = false; @@ -255,7 +262,7 @@ export class HomePage implements OnInit { // }); // } - ionViewDidLoad() { + ionViewDidEnter() { this.geolocation .getCurrentPosition() .then(resp => { @@ -494,9 +501,6 @@ export class HomePage implements OnInit { this.scheduledTime = this.convertInSeconds(data.P_SCHEDULED_HOURS.split(':')); this.isCheckedIn = this.remainingTime === this.scheduledTime ? false : true; this.initTimer(); - console.log('remainingTime: ' + this.remainingTime); - console.log('scheduledTime: ' + this.scheduledTime); - console.log('isCheckedIn: ' + this.isCheckedIn); } showAttendanceTracking() { diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 9d52c4fd..09780300 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2137,24 +2137,24 @@ "ar":"Mark Attendance " }, "check-in":{ - "en": "Check In", - "ar":"Check In" + "en": "CHECK IN", + "ar":"CHECK IN" }, "check-out":{ - "en": "Check Out", - "ar":"Check Out" + "en": "CHECK OUT", + "ar":"CHECK OUT" }, "regular":{ - "en": "Regular", - "ar":"Regular" + "en": "REGULAR", + "ar":"REGULAR" }, "late-in":{ - "en": "Late In", - "ar":"Late In" + "en": "LATE IN", + "ar":"LATE IN" }, "today-time-left":{ - "en": "TODAY TIME LEFT", - "ar":"TODAY TIME LEFT" + "en": "TODAY'S TIME LEFT", + "ar":"TODAY'S TIME LEFT" }, diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index efa3a30c..bc7eb10a 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1001,3 +1001,6 @@ border:0px height: 0px !important; display: none !important; } +.header-toolbar-new{ + --background: #22c6b3; +}