diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss index bdae8c76..269ef263 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss @@ -88,9 +88,9 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding-left: 10px !important; border: solid var(--gray) 1px; border-radius: 21px; - padding-left: 145px !important; + // padding-left: 145px !important; margin-left: 86px; - padding-right: 129px; + // padding-right: 129px; margin-right: -143px; } // {padding-left: unset; diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 39a21384..19cd5470 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -61,10 +61,7 @@
- - -
@@ -76,7 +73,7 @@
- + @@ -86,7 +83,7 @@
- + @@ -94,17 +91,17 @@
-
+
@@ -112,25 +113,53 @@ - - - - - {{ts.trPK('login','changepassword')}} - {{notBadge}} - - - + + + + + {{ts.trPK('login','changepassword')}} -
- -

{{companyDesc}}

-
- - - + {{notBadge}} +
+ + + + + + + + +
+ + +
+ + + diff --git a/Mohem/src/app/app.scss b/Mohem/src/app/app.scss index 49bf94d3..2dd0d349 100644 --- a/Mohem/src/app/app.scss +++ b/Mohem/src/app/app.scss @@ -7,12 +7,12 @@ .alert-radio-label.sc-ion-alert-md, .alert-radio-label.sc-ion-alert-ios { - white-space: normal; + white-space: normal; } .alert-tappable.sc-ion-alert-md, .alert-tappable.sc-ion-alert-ios { - height: 50px; + height: 70px; } .main-badge{ position: absolute; diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index f5eef814..6141871e 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -34,7 +34,9 @@ -

{{ts.trPK('login','verify-fingerprint')}}

+ +

{{ts.trPK('login','verify-fingerprint')}}

+

{{ts.trPK('login','verify-faceId')}}

diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index a7f708bf..6cc023cc 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -73,6 +73,7 @@ export class ConfirmLoginComponent implements OnInit { empname: string; lastLoginDate: string; user_name: string; + FFloginType: any; constructor( @@ -515,8 +516,8 @@ export class ConfirmLoginComponent implements OnInit { loginWithFingurePrint(el: any) { - if (!el.disabled) { + this.FFloginType=el.value; this.startBiometricLoginIfAvailable(); @@ -527,7 +528,7 @@ export class ConfirmLoginComponent implements OnInit { faceReconization(el: any) { if (!el.disabled) { - + this.FFloginType=el.value; this.startBiometricLoginIfAvailable(); } @@ -700,7 +701,6 @@ export class ConfirmLoginComponent implements OnInit { } }else { - this.onlySMSBox = false; this.button(); 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 384143a2..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,20 +265,21 @@ 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.showDateTimePicker( - feildsList[i].APPLICATION_COLUMN_NAME, - feildsList[i].MAXIMUM_SIZE - ); - e.stopImmediatePropagation(); - }); + // elem.addEventListener("click", e => { + // if (feildsList[i].MOBILE_ENABLED != "Y") return false; + // this.showDateTimePicker( + // feildsList[i].APPLICATION_COLUMN_NAME, + // feildsList[i].MAXIMUM_SIZE + // ); + // e.stopImmediatePropagation(); + // }); // else if(feildsList[i].DEFAULT_TYPE=="D"){ // this.datetimeInput = new DateTimeInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"currentDateTime",containerId,feildsList[i].MOBILE_ENABLED); // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){ @@ -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") { @@ -532,7 +523,7 @@ export class AddEitComponent implements OnInit { select.value = select.dataset.hiddenval; //select.dataset.hiddenval=""; } else { - select.value = DV.P_VALUE_COLUMN_NAME; + select.value = DV.P_ID_COLUMN_NAME; } select.disabled = false; } @@ -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/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 8855aa28..64c9c34f 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -3,8 +3,6 @@ [headerText]="headerTitle"> - -
@@ -16,6 +14,17 @@
+ +
+ + +
+
+ + diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index 2dfdf5be..25220405 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -4,6 +4,26 @@ min-height: 45px; min-width: 200px; } + +.datetime{ + // text-align: center; + // font-family: WorkSans-Bold; + // margin-left: 111px; + text-align: center; + font-family: WorkSans-Bold; + margin-left: 47px; + margin-top: -19px; + + } +.iconCalendar{ + // margin-left: -241px; + // margin-top: 5px; + margin-left: 30px !important; + width: 22% !important; + height: 26px !important; + margin-top: -69px !important; + margin-bottom: 20px !important; + } h4 { font-size: 2.2rem; text-align: center; diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 5b43290c..346c46ab 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -9,6 +9,9 @@ import { EitService } from '../services/eit.service'; import { EIT_ACTION } from '../models/submit.eit.action'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { AddEitResponse } from '../models/add.eit.response'; +import { AccrualService } from 'src/app/accrual-balances/services/accrual.service'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; @Component({ selector: 'app-eit-list', @@ -16,7 +19,10 @@ import { AddEitResponse } from '../models/add.eit.response'; styleUrls: ['./eit-list.component.scss'], }) export class EitListComponent implements OnInit { - + Sdate: any; + emp_no: any; + balance:any; + //////////////up P_PAGE_NUM: number; P_PAGE_LIMIT: number; IsReachEnd = false; @@ -56,7 +62,8 @@ export class EitListComponent implements OnInit { // gaugeLabel = ""; // tslint:disable-next-line: max-line-length - constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, private modalCtrl: ModalController) { + constructor(private cs: CommonService, private EITService: EitService, public ts: TranslatorService, + private modalCtrl: ModalController, public accrualService: AccrualService, public authService:AuthenticationService,) { this.direction = TranslatorService.getCurrentLanguageName(); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); @@ -72,6 +79,10 @@ export class EitListComponent implements OnInit { } ngOnInit() { + ///////////// + this.Sdate = new Date().toISOString(); + this.getUserDetails(); + ////////////////up this.getEITTransactions(); this.accrualBalancesList = this.cs.sharedService.getSharedData('tickitsbalance', false); @@ -96,8 +107,44 @@ export class EitListComponent implements OnInit { }; } + getUserDetails(){ + this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { + if (user) { + // this.emp_no=user.EMPLOYEE_NUMBER; + + } + }); + } + public getAccrualBalance() { + if (this.Sdate) { + let today = new Date(this.Sdate); + let day = today.getDate(); + let month = today.getMonth() + 1; + let year = today.getFullYear(); + let todayDate = month + '/' + day + '/' + year; + let effectiveDate = todayDate; + const request = { + P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, + P_EFFECTIVE_DATE: effectiveDate + }; + this.accrualService + .getAccrualBalances(request) + .subscribe((result: any) => { + this.handleAccrualResult(result); + }); + } + } + handleAccrualResult(result) { + if (this.cs.validResponse(result)) { + this.balance=result.GetAccrualBalancesList; + this.accrualNetAdult = this.balance[1].ACCRUAL_NET_ENTITLEMENT; + this.accrualUNetChild = this.balance[2].ACCRUAL_NET_ENTITLEMENT; + this. accrualNetInfants = this.balance[3].ACCRUAL_NET_ENTITLEMENT; + } + } + /////////////////////////////////// + getEITTransactions() { - console.log('jkfdjkdfsffjhfsdahffg'); this.IsReachEnd = false; this.EITTransactionsListObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; @@ -520,5 +567,42 @@ export class EitListComponent implements OnInit { this.removeItems(item.Collection_Transaction[0].TRANSACTION_NUMBER); } - + +////////////////////////// +// getUserDetails(){ +// this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { +// if (user) { +// this.emp_no=user.EMPLOYEE_NUMBER; + +// } +// }); +// } +// public getAccrualBalance() { +// if (this.Sdate) { +// let today = new Date(this.Sdate); +// let day = today.getDate(); +// let month = today.getMonth() + 1; +// let year = today.getFullYear(); +// let todayDate = month + '/' + day + '/' + year; +// let effectiveDate = todayDate; +// const request = { +// P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, +// P_EFFECTIVE_DATE: effectiveDate +// }; +// this.accrualService +// .getAccrualBalances(request) +// .subscribe((result: any) => { +// this.handleAccrualResult(result); +// }); +// } +// } +// handleAccrualResult(result) { +// if (this.cs.validResponse(result)) { +// this.balance=result.GetAccrualBalancesList; +// } +// } } +////////////////////////////////up + + + 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/hmg-common/ui/fab-button/fab-button.component.html b/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html index 18d70a13..0cd4bf1f 100644 --- a/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html +++ b/Mohem/src/app/hmg-common/ui/fab-button/fab-button.component.html @@ -2,7 +2,6 @@
-
@@ -14,7 +13,6 @@
-
\ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts index 13d24628..39703cbe 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts @@ -109,7 +109,9 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { // let todayDate = month + '/' + day + '/' + year; // this.lastLoginTime = moment(this.cs.evaluteDateAsObject(this.lastLoginDate)).format("HH:mm"); - this.logintype = parseInt(this.logintype) + // this.logintype = parseInt(this.user.LoginType) + this.logintype = this.user.LoginType; + console.log(" this.lastLoginTime" + this.lastLoginTime); console.log(" this.lastLoginDate" + this.lastLoginDate); diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 80949b95..dc681d97 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -22,7 +22,6 @@ -

{{'home,monthly-attendance' | translate}}

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/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 83571b02..ebd99437 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -12,7 +12,7 @@
{{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} - {{newWorkListResponse.length}} of + {{newWorkListResponse.length}} {{ts.trPK('work-list','of')}}

{{totalRequestCount}}

{{newWorkListResponse[0].NO_OF_ROWS + ITGCount}}

{{newWorkListResponse[0].NO_OF_ROWS}}

@@ -69,7 +69,7 @@
-
+
@@ -90,7 +90,10 @@
-
+
+ {{ts.trPK('work-list','No-data-available')}} +
+
{{ts.trPK('work-list','No-data-available')}}
diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 49f737a1..c21a2830 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -214,10 +214,8 @@ export class HomeComponent implements OnInit { } else if (notification.ITEM_TYPE === 'INVMOA') { this.filters[4].value = this.totalMR; this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER; - } else if (notification.ITEM_TYPE === 'ITG') { - this.filters[5].value = notification.OPEN_NTF_NUMBER; - this.data.datasets[0].data[4] = notification.OPEN_NTF_NUMBER; } + this.data.datasets[0].data[4] = this.ITGCount; } this.showChart = true; this.common.stopLoading(); @@ -433,6 +431,9 @@ export class HomeComponent implements OnInit { } } else { this.newWorkListResponse = []; + this.data.datasets[0].data[4] = this.ITGCount; + this.showChart = true; + this.common.stopLoading(); } } @@ -530,21 +531,12 @@ export class HomeComponent implements OnInit { Details() { this.workListService.getITGDetails('', '', this.isPostNoLoad) .subscribe((result: any) => { + this.ITGCount = result.TotalCount; this.totalRequestCount = this.totalRequestCount + result.TotalCount; this.filters[5].value = result.TotalCount; }); } - ITGNotification() { - // this.Details(); - this.isAll = false; - this.isPR = false; - this.isPO = false; - this.isMR = false; - this.isHR = false; - this.isITG = true; - } - searchBtn() { this.isSearch = !this.isSearch; } diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index 5bcfe464..8266747c 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -87,7 +87,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { // padding-left: 10px !important; border: solid var(--gray) 1px; border-radius: 21px; - padding-left: 145px !important; + // padding-left: 145px !important; margin-left: 86px; padding-right: 129px; margin-right: -143px; diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index 81a2ea80..e456a8b8 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -42,16 +42,21 @@ export class WorkListReplacementRollComponent implements OnInit { searchKeyEnter: boolean = false; messageSuccess: boolean =false; public direction: string; + P_RESPOND_ATTRIBUTES_TBL: any[]; constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) { this.P_PAGE_NUM = 1; this.P_PAGE_LIMIT = 50; this.getPassActionMode = this.cs.sharedService.getSharedData('passActionMode', false); + console.log(this.getPassActionMode); + this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo', false); this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr', false); + console.log(this.getpassResAttr); this.pQuestion = this.cs.sharedService.getSharedData('pQuestion', false); if (this.getPassActionMode == "ANSWER_INFO") { this.isAnswer = true; } + this.WorkListReplacmentEmployeeObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListReplacmentEmployeeObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; @@ -210,17 +215,42 @@ export class WorkListReplacementRollComponent implements OnInit { console.log("selEmp "+ this.selEmp.USER_NAME); if (this.selectedUserInf && this.selectedUserInf.USER_NAME) { + console.log("userInfo "+this.selectedUserInf.USER_NAME); if (this.userNote) { + + if(this.getPassActionMode == "APPROVE_AND_FORWARD" || this.getPassActionMode == "FORWARD"){ + + let index_FORWARD = this.getpassResAttr.findIndex(x => x.ATTRIBUTE_NAME === "FORWARD_TO_USERNAME_RESPONSE"); + this.getpassResAttr[index_FORWARD].ATTRIBUTE_TEXT_VALUE = this.selectedUserInf.USER_NAME; + // this.userNote; + let index_Note = this.getpassResAttr.findIndex(x => x.ATTRIBUTE_NAME === "NOTE"); + this.getpassResAttr[index_Note].ATTRIBUTE_TEXT_VALUE = this.userNote; + + this.P_RESPOND_ATTRIBUTES_TBL= this.getpassResAttr; + console.log(this.P_RESPOND_ATTRIBUTES_TBL); + this.WorkListActionObj.P_FORWARD_TO_USER_NAME = this.selectedUserInf.USER_NAME; + this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode; + this.WorkListActionObj.P_COMMENTS =""// response Attr + this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; + + }else{ + + + + + this.WorkListActionObj.P_FORWARD_TO_USER_NAME = this.selectedUserInf.USER_NAME; this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr // this.modalCtrl.dismiss(); + } this.workListMainService.actionButton(this.WorkListActionObj). subscribe((result: any) => { this.handleApplayActionResult(result); }); + } else { let msg: string = this.ts.trPK("replacementRoll", "enterNote"); this.cs.showErrorMessageDialog(() => { @@ -237,12 +267,13 @@ export class WorkListReplacementRollComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = null; this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr + // here must send response attr // this.modalCtrl.dismiss(); - this.workListMainService.actionButton(this.WorkListActionObj). - subscribe((result: any) => { - this.handleApplayActionResult(result); - }); + // this.workListMainService.actionButton(this.WorkListActionObj). + // subscribe((result: any) => { + // this.handleApplayActionResult(result); + // }); } else { let msg: string = this.ts.trPK("replacementRoll", "enterNote"); this.cs.showErrorMessageDialog(() => { @@ -275,7 +306,7 @@ export class WorkListReplacementRollComponent implements OnInit { }); }, 5000); - + this.cs.openNotificationPage(); } } // not valid it diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index 50b4a5ee..bf04ab9d 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -141,6 +141,7 @@ export class WorkListRfcComponent implements OnInit { }); }, 5000); + this.cs.openNotificationPage(); } } // valid it diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 576f9d2b..7c7095f6 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -185,24 +185,7 @@ - -
- -
-
- -
- - -
+ @@ -509,8 +492,8 @@ {{actionHistory.ACTION}} + [ngClass]="{'bg-blue-txt' : actionHistory.ACTION_CODE === 'SUBMIT' ,'bg-orange-txt' : actionHistory.ACTION_CODE === 'PENDING' ,'bg-red-txt' : actionHistory.ACTION_CODE === 'REJECT','bg-green-txt' : actionHistory.ACTION_CODE != 'PENDING' && actionHistory.ACTION_CODE != 'REJECT' && actionHistory.ACTION_CODE != 'SUBMIT'}" + class=""> {{actionHistory.ACTION}} @@ -530,14 +513,15 @@ - + +

{{ 'general, notAttch' | translate}}

- + - - {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} + + {{i+1 }}. {{attachList.FILE_NAME}}
+
+
- + -
+
@@ -590,19 +575,14 @@ -
Transaction Successful
+
{{'worklistMain, Tran_Succ' | translate}}
- + - - {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} + + {{i+1}}. {{attachList.FILE_NAME}}
- + + -
+
@@ -698,7 +692,7 @@ -
Transaction Successful
+
{{'worklistMain, Tran_Succ' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index e877615c..2cd68a18 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -35,6 +35,8 @@ import { QuotationAnalysisRequest } from '../models/quotationAnalysisReq'; import { MoreActionModalComponent } from '../more-action-modal/more-action-modal.component' import { WorkListReplacementRollComponent } from '../work-list-replacement-roll/work-list-replacement-roll.component'; import { WorkListRfcComponent } from '../work-list-rfc/work-list-rfc.component'; +import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; +import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; @Component({ selector: 'app-worklist-main-po', @@ -54,7 +56,9 @@ export class WorklistMainPoComponent implements OnInit { public static PASS_PO_HEADER_ID = "passPOHeader"; public static PASS_ACTION_MODE = "passActionMode"; public static PASS_ACTION_MORE = "passActioMore"; - + public isPostNoLoad = true; + public worklistNotifications: any; + public totalRequestCount = 0; getPassNotificationDetails: any; public static PASS_RES_ATTR = "passResAttr"; TransactionID: number = -999; @@ -129,6 +133,8 @@ export class WorklistMainPoComponent implements OnInit { public worklistAttachService: WorklistAttachService, private modalCtrl: ModalController, public worklistService: WorklistService, + public dashboredService: DashboredService, + ) { this.direction = TranslatorService.getCurrentLanguageName() this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); @@ -147,7 +153,7 @@ export class WorklistMainPoComponent implements OnInit { }//ngOn intializeNotificationDetail() { if (this.messageSuccess) { - document.getElementById("notificationDynamicFields").innerHTML = ""; + document.getElementById("notificationDynamicFieldsPO").innerHTML = ""; } console.log("intializeNotificationDetail"); this.getPassNotificationDetails = this.common.sharedService.getSharedData( @@ -340,7 +346,7 @@ export class WorklistMainPoComponent implements OnInit { setTimeout(() => { this.messageSuccess = false; - this.getNotificationCountAfterSubmit(); + this.openNotificationsDashboard(); this.nextNotfification(); }, 5000); @@ -349,24 +355,59 @@ export class WorklistMainPoComponent implements OnInit { } // valid it } + // public nextNotfification() { + // //let itemExist = false; + // let itemNo = this.getPassNotificationDetails.ROW_NUM; + // itemNo += 1; + // if (itemNo > this.notificationArray.length) { + // this.common.openNotificationPage(); + // } else { + // for (let i = 0; i < this.notificationArray.length; i++) { + // if (this.notificationArray[i].ROW_NUM == itemNo) { + // this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA); + // // itemExist = true; + // this.intializeNotificationDetail(); + // break; + // } + // } + // // if(itemExist==false){ + // // this.nextNotfification(); + // // } + // } + // } + public nextNotfification() { //let itemExist = false; + if( document.getElementById("notificationDynamicFieldsPO") != null){ + + document.getElementById("notificationDynamicFieldsPO").innerHTML = ""; + + } let itemNo = this.getPassNotificationDetails.ROW_NUM; - itemNo += 1; - if (itemNo > this.notificationArray.length) { - this.common.openNotificationPage(); - } else { - for (let i = 0; i < this.notificationArray.length; i++) { - if (this.notificationArray[i].ROW_NUM == itemNo) { - this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA); - // itemExist = true; - this.intializeNotificationDetail(); - break; - } + console.log(itemNo); + let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo); + console.log(index); + console.log(this.notificationArray); + index += 1; + + if (index < this.notificationArray.length) { + this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA); + if(this.notificationArray[index].REQUEST_TYPE == "PO" ){ + this.intializeNotificationDetail(); + }else + if(this.notificationArray[index].REQUEST_TYPE == "PR" ){ + this.common.openWorklistMainPRPage() + } + else + if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + this.common.openWorklistMainMRPage() + }else{ + this.common.openWorklistMainPage(); } - // if(itemExist==false){ - // this.nextNotfification(); - // } + + } + else{ + this.common.openNotificationPage(); } } @@ -393,14 +434,17 @@ export class WorklistMainPoComponent implements OnInit { } this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } + console.log("a"+ this.P_RESPOND_ATTRIBUTES_TBL); + let repUserName = this.selEmployeeID; - if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) { - let obj: any = {}; - repUserName = ""; - obj.ATTRIBUTE_NAME = this.hideForwordEmployee.ATTRIBUTE_NAME; - obj.ATTRIBUTE_TEXT_VALUE = this.selEmployeeID; - this.P_RESPOND_ATTRIBUTES_TBL.push(obj); - } + // if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) { + // let obj: any = {}; + // repUserName = ""; + // obj.ATTRIBUTE_NAME = this.hideForwordEmployee.ATTRIBUTE_NAME; + // obj.ATTRIBUTE_TEXT_VALUE = this.selEmployeeID; + // this.P_RESPOND_ATTRIBUTES_TBL.push(obj); + // } + if ( ButtonAction == "APPROVE" || ButtonAction == "REJECT" || @@ -411,6 +455,7 @@ export class WorklistMainPoComponent implements OnInit { this.WorkListActionObj.P_ACTION_MODE = ButtonAction; this.WorkListActionObj.P_COMMENTS = ""; this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; + //sheardData // this.common.sharedService.setSharedData( @@ -435,7 +480,7 @@ export class WorklistMainPoComponent implements OnInit { this.common.confirmAlertDialogAction( () => { - this.applyAction(this.WorkListActionObj); + // this.applyAction(this.WorkListActionObj); }, this.ts.trPK('general', 'ok'), () => { }, this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), @@ -500,6 +545,8 @@ export class WorklistMainPoComponent implements OnInit { this.P_RESPOND_ATTRIBUTES_TBL, WorklistMainPoComponent.PASS_RES_ATTR ); + console.log("c"+ this.P_RESPOND_ATTRIBUTES_TBL); + // this.common.openWorklistRollReplacement(); this.openRepRolModal(); } else if ( @@ -603,6 +650,8 @@ export class WorklistMainPoComponent implements OnInit { } getNotificationResAttr(notificationButtonsObj) { + console.log("getNotificationResAttr"); + this.worklistMainService .notificationResponseAttr(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -637,10 +686,12 @@ export class WorklistMainPoComponent implements OnInit { } // End handleWorkListButtonsResult notificationDynamicFields(notificationAttr) { - const containerId = 'notificationDynamicFields'; + const containerId = 'notificationDynamicFieldsPO'; for (let i = 0; i < notificationAttr.length; i++) { if (notificationAttr[i].ATTRIBUTE_TYPE == "VARCHAR2") { this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + console.log(this.textArea ); + } else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") { } else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") { @@ -679,19 +730,19 @@ export class WorklistMainPoComponent implements OnInit { } } - getNotificationCountAfterSubmit() { - const req: any = {}; - this.menuService.getNotificationCount(req).subscribe((result: any) => { - if (this.common.validResponse(result)) { - this.notificationCount = - result.GetOpenNotificationsNumList.P_OPEN_NOTIFICATIONS_NUM; - if (this.notificationCount <= 0) { - this.notificationCount = null; - } - this.events.publish("getNotCount", this.notificationCount); - } - }); - } + // getNotificationCountAfterSubmit() { + // const req: any = {}; + // this.menuService.getNotificationCount(req).subscribe((result: any) => { + // if (this.common.validResponse(result)) { + // this.notificationCount = + // result.GetOpenNotificationsNumList.P_OPEN_NOTIFICATIONS_NUM; + // if (this.notificationCount <= 0) { + // this.notificationCount = null; + // } + // this.events.publish("getNotCount", this.notificationCount); + // } + // }); + // } @@ -1068,7 +1119,7 @@ export class WorklistMainPoComponent implements OnInit { if (data.data == "cancel" || data.data == undefined) { return; } else if (data.data == "Success") { - this.getNotificationCountAfterSubmit(); + this.openNotificationsDashboard(); this.nextNotfification(); } @@ -1112,4 +1163,15 @@ export class WorklistMainPoComponent implements OnInit { } + openNotificationsDashboard() { + this.dashboredService.getOpenNotifications('', '', this.isPostNoLoad).subscribe((result: GetOpenNotificationsResponse) => { + if (this.common.validResponse(result)) { + this.worklistNotifications = result; + this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; + this.common.sharedService.setSharedData(result, 'worklistNotifications'); + } + }); + } + + } diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index eb59b682..045344e2 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -171,23 +171,7 @@ - -
- -
-
- -
- -
+ @@ -359,7 +343,7 @@ {{actionHistory.ACTION}} @@ -378,8 +362,8 @@ - + +

{{ 'general, notAttch' | translate}}

@@ -387,7 +371,7 @@
- + - - {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} + + {{i+1}}. {{attachList.FILE_NAME}}
- +
+
-
+
@@ -431,7 +415,7 @@ -
Transaction Successful
+
{{'worklistMain, Tran_Succ' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index 6b436ab0..d581b7e7 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -31,6 +31,8 @@ import { ApplyActionModalComponent } from '../apply-action-modal/apply-action-mo import { MoreActionModalComponent } from '../more-action-modal/more-action-modal.component'; import { WorkListReplacementRollComponent } from '../work-list-replacement-roll/work-list-replacement-roll.component'; import { WorkListRfcComponent } from '../work-list-rfc/work-list-rfc.component'; +import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; +import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; @Component({ selector: 'app-worklist-main-pr', @@ -38,7 +40,9 @@ import { WorkListRfcComponent } from '../work-list-rfc/work-list-rfc.component'; styleUrls: ['./worklist-main-pr.component.scss'], }) export class WorklistMainPRComponent implements OnInit { - + public isPostNoLoad = true; + public worklistNotifications: any; + public totalRequestCount = 0; private WorkListBodyObj: WorkListBodyRequest; private WorkListButtonsObj: WorkListButtonRequest; private WorkListActionObj: WorkListActionRequest; @@ -106,6 +110,7 @@ export class WorklistMainPRComponent implements OnInit { constructor( + public dashboredService: DashboredService, public common: CommonService, public ts: TranslatorService, public worklistMainService: WorklistMainService, @@ -139,7 +144,7 @@ export class WorklistMainPRComponent implements OnInit { intializeNotificationDetail() { if (this.messageSuccess) { - document.getElementById('notificationDynamicFields').innerHTML = ''; + document.getElementById('notificationDynamicFieldsPR').innerHTML = ''; } console.log('intializeNotificationDetail'); @@ -340,30 +345,66 @@ export class WorklistMainPRComponent implements OnInit { this.messageSuccess = false; }, 5000); - this.getNotificationCountAfterSubmit(); + this.openNotificationsDashboard(); this.nextNotfification(); } } // valid it } + // public nextNotfification() { + // //let itemExist = false; + // let itemNo = this.getPassNotificationDetails.ROW_NUM; + // itemNo += 1; + // if (itemNo > this.notificationArray.length) { + // this.common.openNotificationPage(); + // } else { + // for (let i = 0; i <= this.notificationArray.length; i++) { + // if (this.notificationArray[i].ROW_NUM == itemNo) { + // this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA); + // // itemExist = true; + // this.intializeNotificationDetail(); + // break; + // } + // } + // // if(itemExist==false){ + // // this.nextNotfification(); + // // } + // } + // } + + public nextNotfification() { //let itemExist = false; + if( document.getElementById("notificationDynamicFieldsPR") != null){ + + document.getElementById("notificationDynamicFieldsPR").innerHTML = ""; + + } let itemNo = this.getPassNotificationDetails.ROW_NUM; - itemNo += 1; - if (itemNo > this.notificationArray.length) { - this.common.openNotificationPage(); - } else { - for (let i = 0; i <= this.notificationArray.length; i++) { - if (this.notificationArray[i].ROW_NUM == itemNo) { - this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA); - // itemExist = true; - this.intializeNotificationDetail(); - break; - } + console.log(itemNo); + let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo); + console.log(index); + console.log(this.notificationArray); + index += 1; + + if (index < this.notificationArray.length) { + this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA); + if(this.notificationArray[index].REQUEST_TYPE == "PO" ){ + this.common.openWorklistMainPOPage() + }else + if(this.notificationArray[index].REQUEST_TYPE == "PR" ){ + this.intializeNotificationDetail(); + } + else + if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + this.common.openWorklistMainMRPage() + }else{ + this.common.openWorklistMainPage(); } - // if(itemExist==false){ - // this.nextNotfification(); - // } + + } + else{ + this.common.openNotificationPage(); } } @@ -601,6 +642,8 @@ export class WorklistMainPRComponent implements OnInit { } getNotificationResAttr(notificationButtonsObj) { + console.log("getNotificationResAttr"); + this.worklistMainService .notificationResponseAttr(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -635,10 +678,12 @@ export class WorklistMainPRComponent implements OnInit { } // End handleWorkListButtonsResult notificationDynamicFields(notificationAttr) { - const containerId = 'notificationDynamicFields'; + const containerId = 'notificationDynamicFieldsPR'; for (let i = 0; i < notificationAttr.length; i++) { if (notificationAttr[i].ATTRIBUTE_TYPE == 'VARCHAR2') { this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, '', containerId, '', '', ''); + console.log(this.textArea ); + } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'ROLE') { } else if (notificationAttr[i].ATTRIBUTE_TYPE == 'DATE') { @@ -677,19 +722,19 @@ export class WorklistMainPRComponent implements OnInit { } } - getNotificationCountAfterSubmit() { - const req: any = {}; - this.menuService.getNotificationCount(req).subscribe((result: any) => { - if (this.common.validResponse(result)) { - this.notificationCount = - result.GetOpenNotificationsNumList.P_OPEN_NOTIFICATIONS_NUM; - if (this.notificationCount <= 0) { - this.notificationCount = null; - } - this.events.publish('getNotCount', this.notificationCount); - } - }); - } + // getNotificationCountAfterSubmit() { + // const req: any = {}; + // this.menuService.getNotificationCount(req).subscribe((result: any) => { + // if (this.common.validResponse(result)) { + // this.notificationCount = + // result.GetOpenNotificationsNumList.P_OPEN_NOTIFICATIONS_NUM; + // if (this.notificationCount <= 0) { + // this.notificationCount = null; + // } + // this.events.publish('getNotCount', this.notificationCount); + // } + // }); + // } @@ -1000,7 +1045,7 @@ export class WorklistMainPRComponent implements OnInit { if (data.data == 'cancel' || data.data == undefined) { return; } else if (data.data == 'Success') { - this.getNotificationCountAfterSubmit(); + this.openNotificationsDashboard(); this.nextNotfification(); } @@ -1043,4 +1088,14 @@ export class WorklistMainPRComponent implements OnInit { } + openNotificationsDashboard() { + this.dashboredService.getOpenNotifications('', '', this.isPostNoLoad).subscribe((result: GetOpenNotificationsResponse) => { + if (this.common.validResponse(result)) { + this.worklistNotifications = result; + this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; + this.common.sharedService.setSharedData(result, 'worklistNotifications'); + } + }); + } + } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index c3187c88..fd34b96c 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -40,7 +40,7 @@
- + + @@ -368,7 +369,7 @@
{{actionHistory.ACTION}} @@ -390,14 +391,19 @@ + +

{{ 'general, notAttch' | translate}}

+ + +
- + - - {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} + + {{i+1 }}. {{attachList.FILE_NAME}}
+
+
-
- - -
-
- -
- + @@ -457,12 +446,13 @@
+ +
- -
Transaction Successful
+
{{'worklistMain, Tran_Succ' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 972712cd..44c227a5 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -35,6 +35,7 @@ import { WorkListSubmitterInfoRequest } from '../models/WorklistsubmitterInfoReq import { WorkListReplacementRollComponent } from '../work-list-replacement-roll/work-list-replacement-roll.component'; import { WorkListRfcComponent } from '../work-list-rfc/work-list-rfc.component'; import { ApplyActionModalComponent } from '../apply-action-modal/apply-action-modal.component'; +import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; @@ -97,6 +98,9 @@ export class WorklistMainComponent implements OnInit { dirfromNotificationPage: boolean = false; direction: string; defaultSegment = ''; + public isPostNoLoad = true; + public worklistNotifications: any; + public totalRequestCount = 0; constructor( public worklistService: WorklistService, @@ -134,6 +138,14 @@ export class WorklistMainComponent implements OnInit { }); } + //name=document.getElementById('notificationDynamicFields').value; + //removeElement('parentDiv', name);" + + + //var navbar = document.getElementById("notificationDynamicFields").value; + // document.querySelector('svg .gauge.chart > text').remove(); + // var inputValue = (document.getElementById("notificationDynamicFields")).value; + console.log(" this.selEmp" + this.selEmp); this.intializeNotificationDetail(); @@ -145,15 +157,17 @@ export class WorklistMainComponent implements OnInit { } intializeNotificationDetail() { + if (this.messageSuccess) { document.getElementById("notificationDynamicFields").innerHTML = ""; } + this.getPassNotificationDetails = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_DATA, false ); - - console.log(this.getPassNotificationDetails.ROW_NUM); + + console.log("for next()"+ this.getPassNotificationDetails.ROW_NUM); this.notificationArray = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_ARR, false @@ -350,7 +364,8 @@ export class WorklistMainComponent implements OnInit { setTimeout(() => { this.messageSuccess = false; - this.getNotificationCountAfterSubmit(); + this.openNotificationsDashboard(); + this.nextNotfification(); }, 5000); @@ -359,27 +374,74 @@ export class WorklistMainComponent implements OnInit { } // valid it } + // public nextNotfification() { + // //let itemExist = false; + + + // let itemNo = this.getPassNotificationDetails.ROW_NUM; + // itemNo += 1; + + // if (itemNo > this.notificationArray.length) { + // this.common.openNotificationPage(); + // } else { + // for (let i = 0; i < this.notificationArray.length; i++) { + // if (this.notificationArray[i].ROW_NUM == itemNo) { + // this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA); + // // itemExist = true; + // this.intializeNotificationDetail(); + // break; + // } + // } + // // if(itemExist==false){ + // // this.nextNotfification(); + // // } + // } + // } + + public nextNotfification() { //let itemExist = false; + if( document.getElementById("notificationDynamicFields") != null){ + + document.getElementById("notificationDynamicFields").innerHTML = ""; + + } let itemNo = this.getPassNotificationDetails.ROW_NUM; - itemNo += 1; - if (itemNo > this.notificationArray.length) { - this.common.openNotificationPage(); - } else { - for (let i = 0; i < this.notificationArray.length; i++) { - if (this.notificationArray[i].ROW_NUM == itemNo) { - this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA); - // itemExist = true; - this.intializeNotificationDetail(); - break; - } + console.log(itemNo); + let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo); + console.log(index); + console.log(this.notificationArray); + index += 1; + + if (index < this.notificationArray.length) { + this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA); + if(this.notificationArray[index].REQUEST_TYPE == "PO" ){ + this.common.openWorklistMainPOPage() + }else + if(this.notificationArray[index].REQUEST_TYPE == "PR" ){ + this.common.openWorklistMainPRPage() + } + else + if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + this.common.openWorklistMainMRPage() + }else{ + + this.intializeNotificationDetail(); } - // if(itemExist==false){ - // this.nextNotfification(); - // } + + } + else{ + this.common.openNotificationPage(); } } + + sortArray(arrayToSort: any) { + return arrayToSort.sort((a: any, b: any) => + new Date(b.BEGIN_DATE).getTime() - new Date(a.BEGIN_DATE).getTime() + ); + } + actionButton(action) { //let ButtonAction: string = this.actionType; let ButtonAction: string = action; @@ -399,6 +461,8 @@ export class WorklistMainComponent implements OnInit { } this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } + console.log("a"+ this.P_RESPOND_ATTRIBUTES_TBL); + let repUserName = this.selEmployeeID; if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) { let obj: any = {}; @@ -407,6 +471,8 @@ export class WorklistMainComponent implements OnInit { obj.ATTRIBUTE_TEXT_VALUE = this.selEmployeeID; this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } + + console.log( "b"+ this.P_RESPOND_ATTRIBUTES_TBL); if ( ButtonAction == "APPROVED" || @@ -531,6 +597,8 @@ export class WorklistMainComponent implements OnInit { this.P_RESPOND_ATTRIBUTES_TBL, WorklistMainComponent.PASS_RES_ATTR ); + console.log("c"+ this.P_RESPOND_ATTRIBUTES_TBL); + // this.common.openWorklistRollReplacement(); this.openRepRolModal(); } else if ( @@ -615,6 +683,7 @@ export class WorklistMainComponent implements OnInit { } getNotificationResAttr(notificationButtonsObj) { + console.log("getNotificationResAttr"); this.worklistMainService .notificationResponseAttr(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -625,7 +694,8 @@ export class WorklistMainComponent implements OnInit { handleNotificationResAttrResult(result) { if (this.common.validResponse(result)) { // this.sharedData.setSharedData(result, WorKListResponse.SHARED_DATA); - this.NotRespondAttributeList = + + this.NotRespondAttributeList = []; result.NotificationGetRespondAttributesList; if ( result.NotificationRespondRolesList != "" && @@ -650,6 +720,7 @@ export class WorklistMainComponent implements OnInit { for (let i = 0; i < notificationAttr.length; i++) { if (notificationAttr[i].ATTRIBUTE_TYPE == "VARCHAR2") { this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); + console.log(this.textArea ); } else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") { } else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") { @@ -687,19 +758,19 @@ export class WorklistMainComponent implements OnInit { } } - getNotificationCountAfterSubmit() { - const req: any = {}; - this.menuService.getNotificationCount(req).subscribe((result: any) => { - if (this.common.validResponse(result)) { - this.notificationCount = - result.GetOpenNotificationsNumList.P_OPEN_NOTIFICATIONS_NUM; - if (this.notificationCount <= 0) { - this.notificationCount = null; - } - this.events.publish("getNotCount", this.notificationCount); - } - }); - } + // getNotificationCountAfterSubmit() { + // const req: any = {}; + // this.menuService.getNotificationCount(req).subscribe((result: any) => { + // if (this.common.validResponse(result)) { + // this.notificationCount = + // result.GetOpenNotificationsNumList.P_OPEN_NOTIFICATIONS_NUM; + // if (this.notificationCount <= 0) { + // this.notificationCount = null; + // } + // this.events.publish("getNotCount", this.notificationCount); + // } + // }); + // } getAttachmentNotification(WorkListAttachObj) { @@ -904,7 +975,7 @@ export class WorklistMainComponent implements OnInit { if (data.data == "cancel" || data.data == undefined) { return; } else if (data.data == "Success") { - this.getNotificationCountAfterSubmit(); + this.openNotificationsDashboard(); this.nextNotfification(); } @@ -936,7 +1007,7 @@ export class WorklistMainComponent implements OnInit { if (data.data == "cancel" || data.data == undefined) { return; } else if (data.data == "Success") { - this.getNotificationCountAfterSubmit(); + this.openNotificationsDashboard(); this.nextNotfification(); } @@ -1017,4 +1088,15 @@ export class WorklistMainComponent implements OnInit { } }//end infiniteScroll + + openNotificationsDashboard() { + this.dashboredService.getOpenNotifications('', '', this.isPostNoLoad).subscribe((result: GetOpenNotificationsResponse) => { + if (this.common.validResponse(result)) { + this.worklistNotifications = result; + this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; + this.common.sharedService.setSharedData(result, 'worklistNotifications'); + } + }); + } + } diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 20d46def..d32e9a56 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -48,7 +48,8 @@ -

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}

+

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}

+

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(23,17) }}

@@ -120,7 +121,7 @@ {{ts.trPK('payslip','total')}}
{{ts.trPK('payslip','salary')}}
- +
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 46a732d0..4d072688 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -159,6 +159,21 @@ -o-transform: scaleX(-1); transform: scaleX(-1); } + .today-graph{ + display: block !important; + height: 162px; + width: 335px; + /* padding-left: 51px; */ + margin-left: 3px !important; + } + + .today-graph-ar{ + display: block !important; + height: 162px; + width: 335px; + margin-right: 45px; + margin-left: -25px !important; +} .result-graph{ font-size: 14px; @@ -191,7 +206,8 @@ padding: 0; margin: 0; position: absolute; - left: 54%; + // left: 54%; + left: 45%; top: 50%; display: block; text-align: center; @@ -199,7 +215,7 @@ h2 { - font-size: 25px; + font-size: 23px; font-family: WorkSans-Bold; margin: 0 auto; line-height: 36px; @@ -211,7 +227,7 @@ width: 125px; display: block; margin: 0 auto; - font-size: 15px; + font-size: 14px; font-family: workSans-Regular; } } @@ -221,7 +237,7 @@ padding: 0; margin: 0; position: absolute; - left: 42%; + left: 40%; top: 50%; display: block; text-align: center; @@ -251,7 +267,7 @@ } .green-amount{ - font-size: 14px; + font-size: 13px; font-family: WorkSans-Bold; margin-top: -3px; } @@ -262,7 +278,7 @@ } .blue-amount{ - font-size: 14px; + font-size: 13px; font-family: WorkSans-Bold; margin-top: -4px; } diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index b43a3bc6..9943440a 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -54,7 +54,7 @@ export class HomeComponent implements OnInit { @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; public options = { - cutoutPercentage: 80, + cutoutPercentage: 85, tooltips: { enabled: false }, legend: { display: false }}; gaugeType = "full"; diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index 9edffc6c..202c73a9 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -147,11 +147,10 @@ } .labelvalue-ar{ - + // margin-right: 19px !important; font-size: 24px !important; font-weight: bold !important; - /* margin-top: 7px !important; */ - margin-right: 19px !important; + margin-right: 25px !important; } @@ -162,8 +161,9 @@ } .percentage-ar{ + // margin-right: -54px; font-size: 19px !important; - margin-right: -54px; + margin-right: -51px; } .gauge{ 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/text-area.input.ts b/Mohem/src/app/uI-elements/text-area.input.ts index b16fa4f6..a2e9e07b 100644 --- a/Mohem/src/app/uI-elements/text-area.input.ts +++ b/Mohem/src/app/uI-elements/text-area.input.ts @@ -15,6 +15,7 @@ export class TextAreaInput extends UiElement { } public getTemplate() { + console.log("getTemplate"); let requiredClass: string = ""; if (this.required == 'Y') requiredClass = "requiredClass" @@ -30,6 +31,7 @@ export class TextAreaInput extends UiElement { "" + this.label + "" + "" + this.value + "" + "
"; + console.log("template"+ template); return template; } 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/home/home.component.html b/Mohem/src/app/vacation-rule/home/home.component.html index 459b9225..ba2b4758 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.html +++ b/Mohem/src/app/vacation-rule/home/home.component.html @@ -79,7 +79,7 @@ {{notBadge}} -

{{item.RULE_STATUS}}


+

{{item.RULE_STATUS}}


{{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}


{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}

{{'vacation-rule, notification' | translate}} - + {{x.NOTIFICATION_DISPLAY_NAME}} diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss index c42fe244..7edf7d17 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss @@ -91,6 +91,7 @@ color: black !important; .stepHeaderLebal{ margin:0; } + // .progcontainer { // margin: auto; // text-align: center; 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 fd79c21d..08576fb4 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -154,6 +154,10 @@ "en": "To activate fingerprint login service, please verify by using one of the following options. ", "ar": "لتفعيل خدمة الدخول بالبصمة، يرجى التحقق من خلال احدى الخيارات التالية" }, + "verify-faceId": { + "en": "To activate face ID login service, please verify by using one of the following options. ", + "ar": "لتفعيل خدمة الدخول ببصمة الوجه، يرجى التحقق من خلال احدى الخيارات التالية" + }, "Verify-text":{ "en":"Verify its you", "ar":"Verify its you" @@ -1381,17 +1385,17 @@ "en": "Accrual Balances", "ar": "رصيد حساب المستحقات" }, - "accrualNet": { - "en": "Accrual Net", - "ar": "صافي الاستحقاق" + "currentBalance": { + "en": "Current Balance", + "ar": " الرصيد الحالي" }, - "accrualUsed": { - "en": "Accrual Used", - "ar": "الاستحقاق المستخدم" + "usedBalance": { + "en": "Used Balance", + "ar": "الرصيد المستخدم" }, - "accrualYearly": { - "en": "Accrual Yearly", - "ar": "الاستحقاق السنوي" + "annualBalance": { + "en": "Annual Balance", + "ar": "الرصيد السنوي" }, "totalNumber": { "en": "TOTAL NUMBERS", @@ -1557,6 +1561,14 @@ } }, "eit": { + "done-text": { + "en": "Done", + "ar": "تم" + }, + "cancel-text": { + "en": "Cancel", + "ar": "إلغاء" + }, "my-requests": { "en": "My Requests", "ar": "طلباتي" @@ -2368,10 +2380,11 @@ "en": "Request Number", "ar":"Request Number" }, - "ITEM_AMU":{ - "en": "AMU (Last 3 months)", - "ar":"AMU (Last 3 months)" - } + "Tran_Succ":{ + "en": "Transaction Successful", + "ar":"عملية ناجحه" + } + }, "payslip": { "title":{ @@ -2444,7 +2457,7 @@ }, "earnings":{ "en": "Earnings", - "ar":"أرباح " + "ar":"مستحقات " }, "deductions":{ "en": "Deductions", diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 8dcf9cc4..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; } @@ -1514,3 +1514,7 @@ table.monthview-datetable th small { background: #094875; } } + +.alert-wrapper { + min-width: 80% !important;//what ever you like + }