diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index 1aa4f0e6..45f7acad 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -77,6 +77,7 @@ export class SubmitAbsenceComponent implements OnInit { /*****for resubmit******* */ getPassNotificationDetails: any; getPassdirfromNotifiPage: boolean = false; + direction: string; functionName: string = ""; private submitAbsObjList: any = []; @ViewChild(IonSelect) select: IonSelect; @@ -93,6 +94,7 @@ export class SubmitAbsenceComponent implements OnInit { private changeDetectorRef: ChangeDetectorRef ) { + this.direction = TranslatorService.getCurrentLanguageName(); ////*new add*///// /**********resubmit************ */ this.getPassNotificationDetails = this.common.sharedService.getSharedData(AbsenceNotificatonBodyResponse.NOT_WORKLIST, true); @@ -344,7 +346,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } else { this.dateInput = new DateInput( @@ -354,7 +357,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } } else if (feildsList[i].FORMAT_TYPE == "Y") { @@ -372,7 +376,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } else { this.datetimeInput = new DateTimeInput( @@ -382,7 +387,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } const elem = document.getElementById( @@ -411,7 +417,8 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } else { this.timeInput = new TimeInput( @@ -421,20 +428,10 @@ export class SubmitAbsenceComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } - const elem = document.getElementById( - feildsList[i].APPLICATION_COLUMN_NAME - ); - elem.addEventListener("click", e => { - if (feildsList[i].MOBILE_ENABLED != "Y") return false; - this.showTimePicker( - feildsList[i].APPLICATION_COLUMN_NAME, - feildsList[i].MAXIMUM_SIZE - ); - e.stopImmediatePropagation(); - }); } } else { if (feildsList[i].READ_ONLY == "Y") { diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index a4de9bc2..48ab9c4d 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -23,7 +23,6 @@ import { AddEitResponse } from "../models/add.eit.response"; import { element } from '@angular/core/src/render3'; // import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes'; import { EITNotificatonBodyResponse } from "../models/EITNotificationBodyRes"; - @Component({ selector: "app-add-eit", templateUrl: "./add-eit.component.html", @@ -67,6 +66,7 @@ export class AddEitComponent implements OnInit { //private updatedNotObject:any=[]; private updatedValues: any = []; addEITData: any; + direction:string; constructor( public modalController: ModalController, @@ -75,6 +75,7 @@ export class AddEitComponent implements OnInit { private eitService: EitService, public datePicker: DatePicker ) { + this.direction = TranslatorService.getCurrentLanguageName(); this.selEmp = this.cs.sharedService.getSharedData( MenuResponse.SHARED_SEL_EMP, false @@ -216,7 +217,8 @@ export class AddEitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } else { this.dateInput = new DateInput( @@ -226,7 +228,8 @@ export class AddEitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date @@ -251,7 +254,8 @@ export class AddEitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } else { this.datetimeInput = new DateTimeInput( @@ -261,7 +265,8 @@ export class AddEitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } const elem = document.getElementById( @@ -291,11 +296,12 @@ export class AddEitComponent implements OnInit { this.timeInput = new TimeInput( feildsList[i].SEGMENT_PROMPT, feildsList[i].APPLICATION_COLUMN_NAME, - defaultVal, + "", containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } else { this.timeInput = new TimeInput( @@ -305,25 +311,10 @@ export class AddEitComponent implements OnInit { containerId, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, - feildsList[i].REQUIRED_FLAG + feildsList[i].REQUIRED_FLAG, + this.direction ); } - const elem = document.getElementById( - feildsList[i].APPLICATION_COLUMN_NAME - ); - // elem.addEventListener("click", e => { - // if (feildsList[i].MOBILE_ENABLED != "Y") return false; - // this.showTimePicker( - // feildsList[i].APPLICATION_COLUMN_NAME, - // feildsList[i].MAXIMUM_SIZE - // ); - // e.stopImmediatePropagation(); - // }); - // else if(feildsList[i].DEFAULT_TYPE=="T"){ - // this.timeInput = new TimeInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"currentTime",containerId,feildsList[i].MOBILE_ENABLED); - // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){ - // this.timeInput = new TimeInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED); - // } } } else { if (feildsList[i].READ_ONLY == "Y") { @@ -1225,7 +1216,7 @@ export class AddEitComponent implements OnInit { this.eitResponse[i].DISPLAY_FLAG != "N" ) { //time - elemVal = elem.dataset.dtvalue; + elemVal = elemVal.substring(11, 16); } if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { elem.classList.add("requiredClassElm"); diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 711a8ec5..42d94901 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -116,58 +116,58 @@ export class CommonService { public getMonthName(value: number): string { switch (value) { case 1: - return "January"; + return 'January'; case 2: - return "February"; + return 'February'; case 3: - return "March"; + return 'March'; case 4: - return "April"; + return 'April'; case 5: - return "May"; + return 'May'; case 6: - return "June"; + return 'June'; case 7: - return "July"; + return 'July'; case 8: - return "August"; + return 'August'; case 9: - return "September"; + return 'September'; case 10: - return "October"; + return 'October'; case 11: - return "November"; + return 'November'; case 12: - return "December"; + return 'December'; } } public getMonthNameAr(value: number): string { switch (value) { case 1: - return "يناير"; + return 'يناير'; case 2: - return " فبراير"; + return ' فبراير'; case 3: - return "مارس"; + return 'مارس'; case 4: - return "أبريل"; + return 'أبريل'; case 5: - return "مايو"; + return 'مايو'; case 6: - return "يونيو"; + return 'يونيو'; case 7: - return "يوليو"; + return 'يوليو'; case 8: - return "أغسطس"; + return 'أغسطس'; case 9: - return "سبتمبر"; + return 'سبتمبر'; case 10: - return " اكتوبر"; + return ' اكتوبر'; case 11: - return " نوفمبر"; + return ' نوفمبر'; case 12: - return "ديسمبر"; + return 'ديسمبر'; } } @@ -482,8 +482,8 @@ public getMonthNameAr(value: number): string { buttons: [ { text: cancelLabel, - role: "cancel", - cssClass: "checkOutCancelBtn", + role: 'cancel', + cssClass: 'checkOutCancelBtn', handler: () => { if (onCancel) { onCancel(); @@ -495,7 +495,7 @@ public getMonthNameAr(value: number): string { text: acceptLabel, role: 'Confirm', - cssClass: "checkOutOkBtn", + cssClass: 'checkOutOkBtn', handler: () => { @@ -522,13 +522,13 @@ public getMonthNameAr(value: number): string { ) { this.clearAllAlerts(); const alert = await this.alertControllerIonic.create({ - header: this.ts.trPK("general", "confirm"), + header: this.ts.trPK('general', 'confirm'), message: message, buttons: [ { text: cancelLabel, - role: "cancel", - cssClass: "checkOutCancelBtn", + role: 'cancel', + cssClass: 'checkOutCancelBtn', handler: () => { if (onCancel) { onCancel(); @@ -538,9 +538,9 @@ public getMonthNameAr(value: number): string { }, { text: acceptLabel, - role: "Confirm", + role: 'Confirm', - cssClass: "checkOutOkBtn", + cssClass: 'checkOutOkBtn', handler: () => { @@ -1074,7 +1074,7 @@ public getMonthNameAr(value: number): string { open calls */ public openAttenTrackingpage(){ - this.nav.navigateForward(["/attendance-tracking/home"]); + this.nav.navigateForward(['/attendance-tracking/home']); } public openEitListPage() { @@ -1099,7 +1099,7 @@ public getMonthNameAr(value: number): string { this.nav.navigateForward(['/profile/home']); } public openEditProfile() { - this.nav.navigateForward(["/profile/editprofile"]); + this.nav.navigateForward(['/profile/editprofile']); } public openAccuralPage() { this.nav.navigateForward(['/accrual-balances/home']); @@ -1173,7 +1173,7 @@ public getMonthNameAr(value: number): string { } public openMOItemHistoryPage(){ - this.nav.navigateForward(["/notification/item-history-MO"]); + this.nav.navigateForward(['/notification/item-history-MO']); } public openQutationAnalysisPage() { @@ -1199,7 +1199,7 @@ public getMonthNameAr(value: number): string { this.nav.navigateForward(['/payslip/home']); } public openTimeCardPage() { - this.nav.navigateForward(["/time-card/time-card-details"]); + this.nav.navigateForward(['/time-card/time-card-details']); } public openEarningsPage() { this.nav.navigateForward(['/payslip/Earnings']); @@ -1211,13 +1211,13 @@ public getMonthNameAr(value: number): string { this.nav.navigateForward(['/authentication/confirmLogin']); } public openEditprofile() { - this.nav.navigateForward(["/profile/editProfile"]); + this.nav.navigateForward(['/profile/editProfile']); } public openPerformanceevaluation() { - this.nav.navigateForward(["/profile/performanceevaluation"]); + this.nav.navigateForward(['/profile/performanceevaluation']); } public eitUpdate() { - this.nav.navigateForward(["/eit/eit-update-list"]); + this.nav.navigateForward(['/eit/eit-update-list']); } diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html index ab15461a..ae22d581 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html @@ -4,6 +4,7 @@ [calendarMode]="calendar.mode" [currentDate]="currentDateParent" [lockSwipes]="true" + [dateFormatter]="calendar.dateFormatter" (onTimeSelected)="onDayClicked($event)"> diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts index 03f29490..4fdee44e 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts @@ -4,12 +4,10 @@ import { SharedDataService } from '../../services/shared-data-service/shared-dat import { ModalController } from '@ionic/angular'; import { DateInfoModalComponent } from './date-info-modal/date-info-modal.component'; import { MenuResponse } from '../../services/menu/models/menu-response'; -import * as moment from 'moment'; import { CommonService } from '../../services/common/common.service'; -import { GetDayAndHoursDetailsRequest } from 'src/app/time-card/service/models/get-day-hours-type-details.request'; import { TimeCardService } from 'src/app/time-card/service/time-card.service'; import { GetShiftDetailRequest } from 'src/app/time-card/service/models/get-shift-detail.request'; -import { GetSwipesRequest } from 'src/app/time-card/service/models/get-swipes-request'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @Component({ selector: 'app-circle-calendar', @@ -41,7 +39,13 @@ export class CircleCalendarComponent implements OnInit { eventsdata: any = []; public calendar = { - mode: 'month' + mode: 'month', + dateFormatter: { + formatMonthViewDayHeader: (date: Date) => { + return this.getHeaderDay(date); + } + + } }; public currentAvailableAppoDate: any; @@ -51,6 +55,7 @@ export class CircleCalendarComponent implements OnInit { public selectedDate: string; public weekDaysEn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; public weekDaysEnSort = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']; + public weekDaysAr = ['الاحد', 'الاثنين', 'الثلاثاء', 'الاربعاء', 'الخميس', 'الجمعه', 'السبت']; public lockSwipeToPrev: any = true; public currentDate: any; public selectedDateObject: any; @@ -61,15 +66,18 @@ export class CircleCalendarComponent implements OnInit { arrFutrueDays: any; eventsdateFutrue: any; detailData: any; + direction: string; constructor( public sharedData: SharedDataService, public mod: ModalController, public common: CommonService, - public timeCardService: TimeCardService) { } + public timeCardService: TimeCardService, + public ts: TranslatorService) { } @ViewChild('slider') slides: ElementRef; ngOnInit() { // this.reRenderCalendar(); + this.direction = TranslatorService.getCurrentLanguageName(); } // tslint:disable-next-line: use-life-cycle-interface @@ -79,6 +87,14 @@ export class CircleCalendarComponent implements OnInit { }, 1000); } + getHeaderDay(date: any) { + if (this.direction === 'en') { + return this.weekDaysEnSort[date.getDay()]; + } else { + return this.weekDaysAr[date.getDay()]; + } + } + reRenderCalendar() { this.renderDate(this.dayHoursTypeDetailsList); } 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 a33eed5b..26f5e38c 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 @@ -6,7 +6,7 @@
-
+

{{percentage}}

{{ts.trPK('attendance','completed')}}



@@ -80,7 +80,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 ca98d91b..585627d0 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 @@ -71,8 +71,7 @@ display: block; height: 127px; width: 270px; - /* margin-left: -61px; */ - margin-right: -18px; + margin-right: -70px; } .amountlabel{ color: black !important; @@ -210,15 +209,9 @@ height: 360px !important; .col{ border-bottom: 1px solid rgb(204, 204, 204); border-right: 1px solid rgb(204, 204, 204); - flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); } .col-ar{ border-bottom: 1px solid rgb(204, 204, 204); border-left: 1px solid rgb(204, 204, 204); - flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); - max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); } 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 f40342f9..dbed1746 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 @@ -2,6 +2,7 @@ import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { ModalController, NavParams, IonInfiniteScroll } from '@ionic/angular'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { IonSlides } from '@ionic/angular'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; @Component({ selector: 'app-date-info-modal', @@ -31,11 +32,11 @@ export class DateInfoModalComponent implements OnInit { percentage: any; data: any; scheduleDate: any; - tests: any; year: any; nameMonth: any; nameDay: any; public weekDaysEn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + public weekDaysAr = ['الاحد', 'الاثنين', 'الثلاثاء', 'الاربعاء', 'الخميس', 'الجمعه', 'السبت']; public direction: string; public options = { cutoutPercentage: 85, @@ -51,7 +52,8 @@ export class DateInfoModalComponent implements OnInit { constructor( public modalController: ModalController, public navParams: NavParams, - public ts: TranslatorService + public ts: TranslatorService, + public common: CommonService ) { this.direction = TranslatorService.getCurrentDirection(); } @@ -73,16 +75,15 @@ export class DateInfoModalComponent implements OnInit { this.endDate = shiftDetails.SHT_ACTUAL_END_TIME; this.percentage = shiftDetails.PERCENTAGE; this.percChart = this.percentage.substring(0, this.percentage.indexOf('%')); - const test = this.scheduleDate; - const splitdate = test.split(' '); + // const test = this.scheduleDate; + const splitdate = this.scheduleDate.split(' '); const date = splitdate[0]; - const test1 = date.split('/'); - this.day = test1[1]; - this.year = test1[2]; - this.month = test1[0]; - + const localDate = date.split('/'); + this.day = localDate[1]; + this.year = localDate[2]; // tslint:disable-next-line: radix - this.nameMonth = this.getMonthName(parseInt(this.month)); + this.month = parseInt(localDate[0]) + 1; + this.nameMonth = this.direction === 'ltr' ? this.common.getMonthName(this.month) : this.common.getMonthNameAr(this.month); this.nameDay = this.getHeaderDay(new Date(date)); const d = new Date(date); this.data = { @@ -105,36 +106,11 @@ slideChanged(ev) { }); } - public getMonthName(value: number): string { - switch (value) { - case 1: - return 'Jan'; - case 2: - return 'Feb'; - case 3: - return 'Mar'; - case 4: - return 'Apr'; - case 5: - return 'May'; - case 6: - return 'Jun'; - case 7: - return 'Jul'; - case 8: - return 'Aug'; - case 9: - return 'Sep'; - case 10: - return 'Oct'; - case 11: - return 'Nov'; - case 12: - return 'Dec'; - } - } - getHeaderDay(date: any) { - return this.weekDaysEn[date.getDay()]; + if (this.direction === 'ltr') { + return this.weekDaysEn[date.getDay()]; + } else { + return this.weekDaysAr[date.getDay()]; + } } } diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 081b6b44..f2837622 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -60,7 +60,7 @@ + [ngClass]="[activeSegment == 'Team Members' ? 'active-Segment' : 'normal-Segment', empSubordinate.length === 0 ? 'disable-phone': '']"> {{ts.trPK('myTeam','team-members')}}
- - + - + {{month}} {{year}} @@ -114,12 +113,24 @@ + + + + + + + {{year}} {{month}} + + + + +
-
- {{ts.trPK('myTeam','attendance-statistics')}} +
+ {{ts.trPK('myTeam','attendance-statistics')}}
@@ -172,7 +183,7 @@ -
+
{{ts.trPK('attendance','monthly-attendance-calendar')}} - +

{{ts.trPK('userProfile','empNo')}}

{{employee.EMPLOYEE_NUMBER}}

@@ -240,7 +251,7 @@

{{employee.EMPLOYMENT_CATEGORY_MEANING}}

-

{{ts.trPK('userProfile','Address')}}

+

{{ts.trPK('userProfile','address')}}

{{employee.LOCATION_NAME}}

diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 026d61dc..08556352 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -112,6 +112,7 @@ ion-title{ font-size: 13px; font-family: WorkSans-Bold; margin: 0; + font-weight: bold; } p{ font-size: 13px; @@ -252,15 +253,22 @@ ion-title{ z-index: 1; margin-bottom: 10px; } + .request-heading { - span { - text-align: left; - display: block; - padding-top: 8px; - margin-bottom: 10px; - margin-left: 10px; - } + text-align: left; + display: block; + padding-top: 8px; + margin-bottom: 10px; + margin-left: 10px; +} +.request-heading-ar{ + text-align: right; + display: block; + padding-top: 8px; + margin-bottom: 10px; + margin-right: 12px; } + .result-text-container { padding: 0; margin: 0; @@ -347,6 +355,7 @@ ion-title{ height: 321px !important; border: 1px solid #d6d4d4 !important; } + .attendance-information{ background: white; border-radius: 20px; @@ -354,12 +363,12 @@ ion-title{ h2{ padding: 0; margin: 0; - font-size: 22px; + font-size: 18px; } span{ font-size: 11px; } -} + } .month-year-span{ font-size: 20px; @@ -411,6 +420,7 @@ ion-title{ } } + .calendar-container{ background: white; margin-bottom: 100px; @@ -423,7 +433,20 @@ ion-title{ margin-bottom: 10px; margin-left: 10px; } -} + } + .calendar-container-ar{ + background: white; + margin-bottom: 100px; + margin-top: 20px; + border-radius: 20px; + span{ + text-align: right; + display: block; + padding-top: 8px; + margin-bottom: 6px; + margin-right: 12px; + } + } diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 6de1e116..89434b9b 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Location } from '@angular/common'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; @@ -57,7 +56,7 @@ export class DetailsComponent implements OnInit { public monthTitle: string = moment().format('MMMM'); public yearTitle: string; public activeMonth: any; - public currentMonthName = this.getMonthName(new Date().getMonth() + 1); + public currentMonthName = ''; public showData = false; public currentYear = new Date().getFullYear(); @@ -83,6 +82,9 @@ export class DetailsComponent implements OnInit { public searchEmail = ''; public showEmailInput = false; public showUserNameOrNameInput = true; + // tslint:disable-next-line: max-line-length + public monthsNameArray = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; + public monthIndex = new Date().getMonth() + 1; constructor( @@ -92,7 +94,6 @@ export class DetailsComponent implements OnInit { public myTeamService: MyTeamService, public ts: TranslatorService, public modalController: ModalController, - private location: Location, public authService: AuthenticationService, public dashboardService: DashboredService, ) { @@ -103,6 +104,8 @@ export class DetailsComponent implements OnInit { this.common.startLoading(); this.intializeMemberDetail(); this.showAttendanceTracking(); + // tslint:disable-next-line: max-line-length + this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex); } showAttendanceTracking() { @@ -129,22 +132,19 @@ export class DetailsComponent implements OnInit { initAttendance() { this.data = {}; - this.currentMonthName = this.getMonthName(new Date().getMonth() + 1); + // tslint:disable-next-line: max-line-length + this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex); this.currentYear = new Date().getFullYear(); this.currentDate = new Date(); this.showData = false; this.nextMonth = new Date().getMonth() + 2; this.preMonth = new Date().getMonth(); - if (this.direction === 'en') { - this.currentMonthName = this.getMonthName(new Date().getMonth() + 1); - } else { - this.currentMonthName = this.getMonthNameAr(new Date().getMonth() + 1); - } - this.calendarConfig(this.currentMonthName, new Date().getFullYear()); + this.calendarConfig(this.common.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); } calendarConfig(month?, year?) { - this.month = month; + const index = this.monthsNameArray.indexOf(month); + this.month = this.direction === 'en' ? month : this.common.getMonthNameAr(index + 1); this.year = year; this.getTimeCardSummaryDetails(month, year); this.getDayHoursTypeDetails(month, year); @@ -178,8 +178,8 @@ export class DetailsComponent implements OnInit { nextSlide() { - this.common.startLoading(); if (this.currentMonthName !== this.month) { + this.common.startLoading(); this.showData = false; if (this.nextMonth > 12) { this.currentYear = this.currentYear + 1; diff --git a/Mohem/src/app/my-team/home/home.component.ts b/Mohem/src/app/my-team/home/home.component.ts index 46d4048a..262d9ead 100644 --- a/Mohem/src/app/my-team/home/home.component.ts +++ b/Mohem/src/app/my-team/home/home.component.ts @@ -27,6 +27,7 @@ export class HomeComponent implements OnInit { public selMenu: any; public selEmpNo: any; public totalEmployees = 0; + public pageFirstVisit = false; public options = { cutoutPercentage: 80, @@ -146,7 +147,10 @@ export class HomeComponent implements OnInit { this.getEmployeeSubordinatesRequestObject = body; this.myTeamService.getEmployeeSubordinates(body).subscribe((result: any) => { if (this.common.validResponse(result)) { - this.totalEmployees = result.P_NUM_OF_SUBORDINATES; + if (!this.pageFirstVisit) { + this.pageFirstVisit = true; + this.totalEmployees = result.P_NUM_OF_SUBORDINATES; + } this.handleEmpResult(result.GetEmployeeSubordinatesList); } }); diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html index 0ee3c5c0..0ac19449 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html @@ -21,13 +21,13 @@
- + - {{month}} {{year}} + {{year}} {{month}} - + @@ -36,7 +36,7 @@
- {{ts.trPK('myTeam','attendance-statistics')}} + {{ts.trPK('myTeam','attendance-statistics')}}
diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index b56654f8..6eb7fc02 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -730,20 +730,18 @@ $actionBtnSize : 36px; margin-bottom: 10px; } .request-heading { - // span { text-align: left; display: block; padding-top: 8px; margin-bottom: 10px; margin-left: 10px; - // } } .request-heading-ar{ - text-align: left; + text-align: right; display: block; padding-top: 8px; margin-bottom: 10px; - margin-left: 215px; + margin-right: 12px; } .result-text-container { @@ -839,7 +837,7 @@ $actionBtnSize : 36px; h2{ padding: 0; margin: 0; - font-size: 22px; + font-size: 18px; } span{ font-size: 11px; @@ -916,11 +914,11 @@ $actionBtnSize : 36px; margin-top: 20px; border-radius: 20px; span{ - text-align: left; - display: block; - padding-top: 8px; - margin-bottom: 10px; - margin-left: 196px; + text-align: right; + display: block; + padding-top: 8px; + margin-bottom: 6px; + margin-right: 12px; } } diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 1bb869c7..18765a80 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -30,7 +30,6 @@ export class TimeCardDetailsComponent implements OnInit { public ts: TranslatorService ) { this.direction = TranslatorService.getCurrentDirection(); - console.log(this.direction); } public showMore: any = true; @@ -60,7 +59,7 @@ export class TimeCardDetailsComponent implements OnInit { public yearTitle: string; public isChange = false; public activeMonth: any; - public currentMonthName = this.getMonthName(new Date().getMonth() + 1); + public currentMonthName = ''; public showData = false; public currentYear = new Date().getFullYear(); public dayHoursTypeDetailsList = []; @@ -72,24 +71,29 @@ export class TimeCardDetailsComponent implements OnInit { legend: { display: false } }; public data = {}; + // tslint:disable-next-line: max-line-length + public monthsNameArray = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; + ngOnInit() { this.common.startLoading(); this.showData = false; this.nextMonth = new Date().getMonth() + 2; this.preMonth = new Date().getMonth(); - this.calendarConfig(this.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); + const monthIndex = new Date().getMonth() + 1; + this.currentMonthName = this.direction === 'ltr' ? this.common.getMonthName(monthIndex) : this.common.getMonthNameAr(monthIndex); + this.calendarConfig(this.common.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); } calendarConfig(month?, year?) { - this.month = month; + const index = this.monthsNameArray.indexOf(month); + this.month = this.direction === 'ltr' ? month : this.common.getMonthNameAr(index + 1); this.year = year; this.getTimeCardSummaryDetails(month, year); this.getDayHoursTypeDetails(month, year); } public getDayHoursTypeDetails(month?, year?) { - console.log('getDayHoursTypeDetails'); const dayAndHoursReqObj = new GetDayAndHoursDetailsRequest(); this.monthName = month; this.yearDate = year; @@ -108,7 +112,6 @@ export class TimeCardDetailsComponent implements OnInit { this.timeCardService.getDayHoursTypeDetails(dayAndHoursReqObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { - console.log(result.GetDayHoursTypeDetailsList); this.common.sharedService.setSharedData(result.GetDayHoursTypeDetailsList, 'RTP_IDs'); this.countAllAttendDays(result.GetDayHoursTypeDetailsList); } @@ -192,15 +195,15 @@ export class TimeCardDetailsComponent implements OnInit { } nextSlide() { - this.common.startLoading(); if (this.currentMonthName !== this.month) { + this.common.startLoading(); this.showData = false; if (this.nextMonth > 12) { this.currentYear = this.currentYear + 1; this.nextMonth = 1; } this.currentDate = new Date(this.currentYear, (this.nextMonth - 1), 1); - this.calendarConfig(this.getMonthName(this.nextMonth) , this.currentYear); + this.calendarConfig(this.common.getMonthName(this.nextMonth) , this.currentYear); this.nextMonth = this.nextMonth + 1; this.preMonth = this.nextMonth - 2; } @@ -214,8 +217,7 @@ export class TimeCardDetailsComponent implements OnInit { this.preMonth = 12; } this.currentDate = new Date(this.currentYear, (this.preMonth - 1), 1); - console.log(this.currentDate); - this.calendarConfig(this.getMonthName(this.preMonth) , this.currentYear); + this.calendarConfig(this.common.getMonthName(this.preMonth) , this.currentYear); this.preMonth = this.preMonth - 1; this.nextMonth = this.preMonth + 2; } @@ -228,34 +230,4 @@ export class TimeCardDetailsComponent implements OnInit { changeYear(year) { this.yearTitle = year; } - - public getMonthName(value: any): any { - switch (value) { - case 1: - return 'January'; - case 2: - return 'February'; - case 3: - return 'March'; - case 4: - return 'April'; - case 5: - return 'May'; - case 6: - return 'June'; - case 7: - return 'July'; - case 8: - return 'August'; - case 9 : - return 'September'; - case 10: - return 'October'; - case 11: - return 'November'; - case 12: - return 'December'; - - } - } } diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts index 9225c9fc..05e63bad 100644 --- a/Mohem/src/app/uI-elements/date-time.input.ts +++ b/Mohem/src/app/uI-elements/date-time.input.ts @@ -8,7 +8,8 @@ export class DateTimeInput extends UiElement { private containerId: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private language: string = 'en') { super(elementId, containerId, ''); this.createElement(this.getTemplate()); @@ -20,6 +21,8 @@ export class DateTimeInput extends UiElement { } public getTemplate() { let requiredClass: string = ""; + const doneText = this.language === 'en' ? 'Done' : 'تم'; + const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; let disaledClass = ""; //let timeValue=null; //let dateValue=null; @@ -45,7 +48,7 @@ export class DateTimeInput extends UiElement { "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts index a813416e..c0f7b0a6 100644 --- a/Mohem/src/app/uI-elements/date.input.ts +++ b/Mohem/src/app/uI-elements/date.input.ts @@ -1,7 +1,6 @@ -import { UiElement } from "./ui-element"; - +import { UiElement } from './ui-element'; export class DateInput extends UiElement { - private currentDate: any = "" + private currentDate: any = ''; constructor( private label: string, private elementId: string, @@ -9,10 +8,10 @@ export class DateInput extends UiElement { private containerId: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private language: string = 'en') { super(elementId, containerId, ''); this.createElement(this.getTemplate()); - } formatDate() { @@ -24,6 +23,8 @@ export class DateInput extends UiElement { } public getTemplate() { let requiredClass: string = ""; + const doneText = this.language === 'en' ? 'Done' : 'تم'; + const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } if (this.value == "currentDate") { @@ -44,7 +45,7 @@ export class DateInput extends UiElement { "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index 84da28a6..2c7d5591 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -1,5 +1,4 @@ import { UiElement } from './ui-element'; -// import { TranslatorService } from '../hmg-common/services/translator/translator.service'; export class TimeInput extends UiElement { // public direction: string; @@ -10,9 +9,9 @@ export class TimeInput extends UiElement { private containerId: string, private disabled: string, private hidden: string, - private required: string) { + private required: string, + private language: string = 'en') { super(elementId, containerId, ''); - // this.direction = TranslatorService.getCurrentLanguageName(); this.createElement(this.getTemplate()); } @@ -22,11 +21,16 @@ export class TimeInput extends UiElement { this.value = date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds(); } + setDate() { + console.log('umar'); + } public getTemplate() { let requiredClass = ''; let disaledClass = ''; + const doneText = this.language === 'en' ? 'Done' : 'تم'; + const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء'; // tslint:disable-next-line: triple-equals if (this.required == 'Y') { requiredClass = 'requiredClass'; @@ -37,29 +41,12 @@ export class TimeInput extends UiElement { if (this.value === 'currentTime') { this.formatDate(); } - const template = - '
' + - ' ' + - // tslint:disable-next-line: max-line-length - // " "+ - // tslint:disable-next-line: max-line-length - '
' + this.value + '
' + - '
'; - - // "" + - // " " + this.label + "" + - // tslint:disable-next-line: max-line-length - // // "
" + this.value + "
" + - // tslint:disable-next-line: max-line-length - // "" + - // tslint:disable-next-line: max-line-length - // // " "+ - // // " "+ - // tslint:disable-next-line: max-line-length - // // " "+ - // "
" + const template = + "" + + " " + this.label + "" + + "" + + "" return template; } - } diff --git a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts index 238f5e77..0e844ddc 100644 --- a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts +++ b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts @@ -60,10 +60,12 @@ export class CreateVacationRuleComponent implements OnInit { private textInput: TextInput; private selectInput: SelectInput; private dateInput: DateInput; - + direction:string; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, private elementRef: ElementRef, public navCtrl: NavController, public router: Router, public modalController: ModalController, private route: ActivatedRoute) { + this.direction = TranslatorService.getCurrentLanguageName(); + this.Sdate = moment().format('YYYY-MM-DDTHH:mm:ssZ'); this.isUpdate = this.cs.sharedService.getSharedData('isUpdate'); @@ -512,7 +514,7 @@ export class CreateVacationRuleComponent implements OnInit { } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") { console.log("3"); - this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") { console.log("4"); diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts index 4a3cc594..eeef7508 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts @@ -66,15 +66,14 @@ export class VacationTypeComponent implements OnInit { P_RESPOND_ATTRIBUTES_TBL: any=[]; vacationRuleRequest: createVacationRequest; confirmMsg: string; + direction: string; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController, private elementRef: ElementRef) { - - - + this.direction = TranslatorService.getCurrentLanguageName(); } ngOnInit() { @@ -433,7 +432,7 @@ createVacationDynamicFields(RespondAttributesList) { } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") { console.log("3"); - this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction); } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") { console.log("4"); diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 8977dc37..f6790ae5 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1561,6 +1561,14 @@ } }, "eit": { + "done-text": { + "en": "Done", + "ar": "تم" + }, + "cancel-text": { + "en": "Cancel", + "ar": "إلغاء" + }, "my-requests": { "en": "My Requests", "ar": "طلباتي" diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 66492f00..f9d46c41 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1376,7 +1376,7 @@ border:0px .monthview-datetable { *{ - font-size: 12px !important; + font-size: 11px !important; font-weight: normal !important; }