diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 86fd1dcc..7e438e1c 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -55,26 +55,20 @@
{{nameDay}}
{{shiftTime}}
{{ts.trPK('attendance-tracking','shift-time')}}
@@ -54,7 +54,7 @@{{startDate}}
{{ts.trPK('attendance-tracking','check-in')}}
@@ -68,7 +68,7 @@{{lateIn}}
{{ts.trPK('attendance-tracking','late-in')}}
@@ -82,7 +82,7 @@{{shortage}}
{{ts.trPK('attendance-tracking','shortage')}}
diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 53ea08a2..dd3a9524 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -54,11 +54,56 @@ } } +.result-text-container-ar { + padding: 0; + margin: 0; + position: absolute; + left: 38%; + top: 67%; + display: block; + text-align: center; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + + h2 { + + font-size: 25px; + + // font-family: WorkSans-Bold; + font-weight: bold; + + margin: 0 auto; + + line-height: 36px; + + } + + span { + + width: 125px; + + display: block; + + margin: 0 auto; + + font-size: 12px; + + font-family: workSans-Regular; + color: rgb(163, 163, 163) !important; + } +} .today-graph{ display: block; height: 127px; width: 288px; } +.today-graph-ar{ + + display: block; + height: 134px; + width: 285px; + margin-left: -18px; +} .amountlabel{ color: black !important; font-weight: bold !important; @@ -79,10 +124,13 @@ height: 360px !important; } .liftcol{ - // padding-top: 1px !important; - // padding-bottom: 1px !important; border-right: 1px solid rgb(163, 163, 163) !important; } + .liftcol-ar{ + + border-left: 1px solid rgb(163, 163, 163) !important; + } + .rightcol{ @@ -107,6 +155,12 @@ height: 360px !important; margin-right: -226px; + } + .div-ar{ + border: 1px solid #a3a3a3 !important; + border-radius: 9px; + width: 264%; + margin-right: -302px; } .p0{ margin-bottom: -13px !important; 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 001b4b25..85305ec8 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 @@ -36,7 +36,7 @@ export class DateInfoModalComponent implements OnInit { nameMonth: any; nameDay: any; public weekDaysEn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; - + public direction: string; public options = { cutoutPercentage: 85, tooltips: { enabled: false }, @@ -52,7 +52,9 @@ export class DateInfoModalComponent implements OnInit { public modalController: ModalController, public navParams: NavParams, public ts: TranslatorService - ) { } + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { console.log(this.TODAYDATE); diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index f5f2bc46..49645159 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -23,8 +23,8 @@ ion-title{ position: absolute; top: 0; text-align: center; - // left: 15%; - // right: 15%; + left: 4%; + right: 4%; font-size: 0.42cm; font-weight: bold; height: 100%; diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index 804efc72..e9b398a2 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -3,8 +3,8 @@ ion-title{ position: absolute; top: 0; text-align: center; - // left: 15%; - // right: 15%; + left: 4%; + right: 4%; font-size: 0.42cm; font-weight: bold; height: 100%; diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 142a36a5..8735a9c2 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -38,7 +38,7 @@{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}
- - - - -{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}
+