diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 96965e58..fb652af8 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -186,7 +186,7 @@ ion-card-content.confirm-details{ .timeline .timeline-item { - width: 40px; + // width: 40px; } @@ -199,8 +199,8 @@ ion-card-content.confirm-details{ .empImge{ border-radius: 50%; - width:100%; - height: 100%; + width:60px; + height: 60px; border: #dedede solid 1px; } diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html index 5ecc61f1..d86a6c96 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html @@ -19,11 +19,11 @@ - + - + + + +
+
+ + + + +
+
+
+ +
+
+
+ +
+
+ + +
+
+ + +

{{User_name_Emp}}

+ + +

{{User_Job_name}}

+ +
+ + +
+ + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+ + + + + + + + + {{ts.trPK('userProfile','title')}} + + + + + + + + + + {{ts.trPK('login','changepassword')}} + + {{notBadge}} + + + + + + + + + + {{ts.trPK('myTeam','myTeam-header')}} + + + + + + +
+ +

{{CompanyImageDescription}}

+
+ +
+
+
@@ -102,6 +258,16 @@ + + + + + + {{ts.trPK('myTeam','myTeam-header')}} + + + + @@ -119,14 +285,7 @@ --> - - - - - - {{ts.trPK('myTeam','myTeam-header')}} - - + - +

{{'changePassword,newPassword' | translate}}

+ + + - +
- + +
\ No newline at end of file diff --git a/Mohem/src/app/authentication/change-password/change-password.component.scss b/Mohem/src/app/authentication/change-password/change-password.component.scss index baffb4ff..727737ed 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.scss +++ b/Mohem/src/app/authentication/change-password/change-password.component.scss @@ -29,3 +29,7 @@ width: 315px; } +.disabledButton{ + opacity:.5; + +} diff --git a/Mohem/src/app/authentication/change-password/change-password.component.ts b/Mohem/src/app/authentication/change-password/change-password.component.ts index 455ffffb..6ad7b9be 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -12,6 +12,7 @@ import { SharedDataService } from 'src/app/hmg-common/services/shared-data-servi import {LoginComponent} from "src/app/authentication/login/login.component"; import { Password } from '../models/password'; import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +//import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-change-password', @@ -20,14 +21,19 @@ import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/mo }) export class ChangePasswordComponent implements OnInit { private loginData = new LoginModel(); - public P_NEW_PASSWORD: string; - public P_Confirm_NEW_PASSWORD : string; - public P_OLD_PASSWORD : string; + public P_NEW_PASSWORD: string = ""; + public P_Confirm_NEW_PASSWORD : string = ""; + public P_OLD_PASSWORD : string = ""; public P_USER_NAME : string; public logo = "assets/icon/login/lock.png"; userData: any = {}; public isExpiredPwd: boolean = false; + public NEW_PASSWORD: boolean = false; + public Confirm_NEW_PASSWORD: boolean = false; + public OLD_PASSWORD: boolean = false; + //public profile_form: FormGroup; + constructor( public cs: CommonService, public authService: AuthenticationService, @@ -36,7 +42,9 @@ export class ChangePasswordComponent implements OnInit { public ts: TranslatorService, public smsService: SmsReaderService, public changeDetector: ChangeDetectorRef, - public sharedData: SharedDataService) { + public sharedData: SharedDataService, + // public formBuilder: FormBuilder, + ) { console.log("change password constructor"); } @@ -48,6 +56,11 @@ export class ChangePasswordComponent implements OnInit { this.P_USER_NAME =data.P_USER_NAME; console.log(this.isExpiredPwd); console.log(this.P_USER_NAME); + + + // this.profile_form = this.formBuilder.group({ + // password: ['', Validators.compose([Validators.minLength(8)])] + // }); // this.authService // .loadAuthenticatedUser() // .subscribe((user: AuthenticatedUser) => { @@ -119,6 +132,43 @@ export class ChangePasswordComponent implements OnInit { } }); } + onChangeCNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_Confirm_NEW_PASSWORD.length >= 3) { + this.Confirm_NEW_PASSWORD=true; + + }else{ + this.Confirm_NEW_PASSWORD=false; + + } } + +onChangeNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_NEW_PASSWORD.length >= 3) { + this.NEW_PASSWORD=true; + +}else{ + this.NEW_PASSWORD=false; + +} + +} +onChangeOP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_OLD_PASSWORD.length >= 3) { + this.OLD_PASSWORD=true; + +}else{ + this.OLD_PASSWORD=false; + +} + +} + +} diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index f1f487a9..46cecfb8 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -62,8 +62,8 @@ {{ts.trPK('login','signup')}}
- - + +
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index bdc8e9de..5736609d 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -95,6 +95,14 @@ export class LoginComponent implements OnInit, OnDestroy { private checkUserResult: CheckUserAuthenticationResponse; ngOnInit() { + console.log("ENAD TEST!!!") + if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { + this.language = "US"; + } else { + this.language = "AR"; + } + this.ts.switchLanguage(); + this.currentLang = TranslatorService.getCurrentLanguageCode(); // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) @@ -181,19 +189,24 @@ export class LoginComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.backClicked(); } - public changeLanguage() { - this.ts.switchLanguage(); - // tslint:disable-next-line: triple-equals - if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { - this.language = 'US'; - } else { - this.language = 'AR'; + + public changeLanguage(langNumber) { + if(this.currentLang == langNumber){ + return; + }else{ + this.ts.switchLanguage(); + if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { + this.language = "US"; + } else { + this.language = "AR"; + } + this.currentLang = TranslatorService.getCurrentLanguageCode(); } - this.currentLang = TranslatorService.getCurrentLanguageCode(); } public forgetPasswordPage() { this.cs.openUserForgot(); } + private hideSplashScreen(stopLoading = false) { // this.splash.hide(); if (stopLoading) { 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 81cc100e..384143a2 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -21,6 +21,8 @@ import { DatePicker } from "@ionic-native/date-picker/ngx"; import { EIT_ACTION } from "../models/submit.eit.action"; 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", @@ -87,6 +89,8 @@ export class AddEitComponent implements OnInit { false ); this.addEITData = this.cs.sharedService.getSharedData("AddEITData", false); + console.log("addEITData: " + this.addEITData); + console.log("dirfromNotificationPage: " + this.addEITData.dirfromNotificationPage); this.eitRequest = new EitRequest(); @@ -94,7 +98,7 @@ export class AddEitComponent implements OnInit { ////*new add*///// /**********resubmit************ */ - // this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false);//WARINING this.getPassdirfromNotifiPage = this.addEITData.dirfromNotificationPage; if (this.getPassdirfromNotifiPage) { this.functionName = this.getPassNotificationDetails.FUNCTION_NAME; //;this.getPassNotificationDetails.NOTIFICATION_NAME; @@ -1176,7 +1180,7 @@ export class AddEitComponent implements OnInit { let numbervalue: any = 0; let dateValue: any = null; let transNo: number = this.comtransNo; - let textValue = ""; + let textValue : any; // if(this.ExtraObj.transactionNo) // transNo=this.ExtraObj.transactionNo; for (let i = 0; i < this.eitResponse.length; i++) { @@ -1230,7 +1234,11 @@ export class AddEitComponent implements OnInit { } else { elem.classList.remove("requiredClassElm"); } - if (elemVal) varcharValue = elemVal; + if (elemVal != 'null'){ + varcharValue = elemVal; + } else{ + elemVal = null; + } valuseArr.push({ TRANSACTION_NUMBER: transNo, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME, @@ -1551,6 +1559,7 @@ export class AddEitComponent implements OnInit { validateEITTransaction() { // let EITTransactionValues:any= []; + this.arrValues = this.getElementsValues(); if (this.arrValues) { this.eitRequest = { @@ -1582,7 +1591,8 @@ export class AddEitComponent implements OnInit { data.eitRequest = this.eitRequest; data.updated = this.updatedValues; // this.viewCtrl.dismiss(data); - this.closemodal(); + this.modalController.dismiss(data); + // this.closemodal(); } else { this.submitEit(); // this.navCtrl.push("ConfirmAddEitPage"); diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index a7e8b1ab..f8a6c040 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -78,11 +78,12 @@ export class ConfirmAddEitComponent implements OnInit { this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false); this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit; if (this.isResubmitEIT) { - this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails); this.P_TransactionID = this.cs.sharedService.getSharedData("TransactionIDResubmit", true); - let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); - this.itemKey = notification.ITEM_KEY; + // let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + + this.itemKey = this.getPassNotificationDetails.ITEM_KEY; this.pActionMode = "RESUBMIT"; this.menuType = "E"; this.respID = -999; 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 be446609..8855aa28 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,10 @@ [headerText]="headerTitle"> - -
+ + + +
@@ -119,7 +121,7 @@ --> @@ -199,7 +201,7 @@ --> - +
@@ -222,9 +224,9 @@ - -
+
+ 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 6cd84bcb..5b43290c 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -141,12 +141,15 @@ export class EitListComponent implements OnInit { this.P_PAGE_NUM++; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; result.GetEITTransactionList.forEach(vr => { - if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { - this.IsReachEnd = true; - } else { - this.IsReachEnd = false; + console.log(vr.length); + if(vr.length && vr.length != 0){ + if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.getResEITTransactionList.push(vr); } - this.getResEITTransactionList.push(vr); }); } else { this.IsReachEnd = true; diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html index 5c562226..5ea12523 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html @@ -1,5 +1,5 @@ - + {{'eit, update-title' | translate}} @@ -11,34 +11,51 @@ -
{{'workListMain, notfDetails' | translate}}
+
{{'worklistMain, notfDetails' | translate}}
- +
+ + + -
+ +
- - - - + + +
+ +
+
+ +
+ + + + + + +
- + {{ 'general, next' | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss index e69de29b..8b091c54 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss @@ -0,0 +1,17 @@ +.addEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #22c6b3; + width: 80% !important; + color: white!important; + border-radius: 16px !important; + } + + .editIconDiv{ + right: 10px; + position: absolute; + top: 10px; + } \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts index 7218ba91..6a8681bf 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts @@ -25,8 +25,8 @@ export class EitUpdateListComponent implements OnInit { private descFlex: string; constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) { - this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, true); - let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false); + let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); this.itemKey = notification.ITEM_KEY; this.notificationId = notification.NOTIFICATION_ID; this.functionName = notification.FUNCTION_NAME; @@ -35,7 +35,7 @@ export class EitUpdateListComponent implements OnInit { this.fillEitTransactionTable(); } - ngOnInit() { } + ngOnInit() { console.log("ngOnInit");} async updateEitNot(index) { let item = this.notificationBodyRes[index].Collection_Notification; @@ -46,10 +46,15 @@ export class EitUpdateListComponent implements OnInit { modal.onDidDismiss() .then((data: any) => { + console.log("data" + data); + console.log("data" + data.data.updated); + console.log("data" + data.data.eitRequest.EITTransactionTBL); + + if (data) { - this.updatedData = this.updatedData ? this.updatedData.concat(data.updated) : data.updated; - this.notificationBodyRes[index].Collection_Notification = data.updated; - this.updateTransactionList(data.eitRequest.EITTransactionTBL); + this.updatedData = this.updatedData ? this.updatedData.concat(data.data.updated) : data.data.updated; + this.notificationBodyRes[index].Collection_Notification = data.data.updated; + this.updateTransactionList(data.data.eitRequest.EITTransactionTBL); } }); diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 93b4716b..1bb9e972 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -57,7 +57,8 @@ {{menuItem.PROMPT}} - + + 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 08163c91..31f9a7cd 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1171,6 +1171,11 @@ public getMonthNameAr(value: number): string { public openItemHistoryPage() { this.nav.navigateForward(['/notification/item-history-PO']); } + + public openMOItemHistoryPage(){ + this.nav.navigateForward(["/notification/item-history-MO"]); + + } public openQutationAnalysisPage() { this.nav.navigateForward(['/notification/qutation-analysis-PO']); } @@ -1211,8 +1216,12 @@ public getMonthNameAr(value: number): string { public openPerformanceevaluation() { this.nav.navigateForward(["/profile/performanceevaluation"]); } + public eitUpdate() { + this.nav.navigateForward(["/eit/eit-update-list"]); + } + public navigatePage(path) { this.nav.navigateForward([path]); } @@ -1399,10 +1408,10 @@ public getMonthNameAr(value: number): string { return FormatedDate; } - public setUpdateImage (image){ + public setUpdateImage (image,status?){ console.log('setUpdateImage'); this.setUpdateImg=image; - this.updateImage=true; + this.updateImage=status; } public getUpdateImage(){ console.log('getUpdateImage'); diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index a3e4b9cc..1f34b0ad 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -21,7 +21,7 @@ export class ConnectorService { headers: new HttpHeaders({ 'Content-Type': 'application/json' }) }; public static retryTimes = 0; - public static timeOut = 30 * 1000; + public static timeOut = 120 * 1000; // public static host = 'http://10.50.100.113:6060/'; // development service public static host = 'https://uat.hmgwebservices.com/'; diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index d2cfa8ae..b0f2c44f 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -14,10 +14,15 @@ width: 100%; position: static; img { + // display: block; + // max-width: 45%; + // padding-bottom: 5px; + // padding-top: 5px; display: block; - max-width: 45%; - padding-bottom: 5px; + max-width: 67%; + padding-bottom: 9px; padding-top: 5px; + height: 47px; } } diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index e4d952e5..571831aa 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -355,6 +355,7 @@ export class HomePage implements OnInit { for (let i = 0; i < this.menuList.length; i++) { if (this.menuList[i].MENU_TYPE === 'M') { this.events.publish('myTeamFlag', 'true'); + // this.common.sharedService.setSharedData('true', "myTeamFlag"); } } diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 0fb04cdb..6b880c28 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -3,7 +3,7 @@ - EMPLOYEE DETAIL + {{ts.trPK('userProfile','emp-detail')}} @@ -26,7 +26,7 @@ - Call + {{ts.trPK('vacation-rule','call')}}
@@ -34,7 +34,7 @@ - Create Request + {{ts.trPK('vacation-rule','create-request')}} @@ -42,7 +42,7 @@ - Message + {{ts.trPK('vacation-rule','message-label')}} @@ -56,17 +56,17 @@ - Attendance + {{ts.trPK('attendance','attendance')}} - Team Members + {{ts.trPK('myTeam','team-members')}} - About + {{ts.trPK('general','about')}} @@ -207,7 +207,7 @@
- Clear Search + {{ts.trPK('work-list','clear-search')}} @@ -231,43 +231,43 @@
-

Employee ID

+

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

{{employee.EMPLOYEE_NUMBER}}

-

Category

+

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

{{employee.EMPLOYMENT_CATEGORY_MEANING}}

-

Address

+

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

{{employee.LOCATION_NAME}}

-

Phone Number

+

{{ts.trPK('userProfile','phone-no')}}

{{employee.EMPLOYEE_MOBILE_NUMBER}}

-

Business Group

+

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

{{employee.ORGANIZATION_NAME}}

-

Job

+

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

{{employee.JOB_NAME}}

-

Payroll

+

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

{{employee.PAYROLL_NAME}}

-

Organization Email Address

+

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

{{employee.EMPLOYEE_EMAIL_ADDRESS}}

-

Position

+

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

{{employee.POSITION_NAME}}

-

Grade

+

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

{{employee.GRADE_NAME}}

diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 48caae91..567a0fe9 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -229,6 +229,16 @@ ion-title{ color: gray; } +.activeArrow-ar{ + height: 20px; + width: 20px; + color: #22c6b3; +} +.disabledArrow-ar{ + height: 20px; + width: 20px; + color: gray; +} .result-graph { position: relative; background: white; diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html index 846a9cfe..e89751b5 100644 --- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html @@ -1,3 +1,226 @@ -

- mo-item-history works! -

+ + + + + {{ts.trPK('worklistMain','ITEM_HIS')}} + + + + + + + + + + + + + +
+

{{ 'general, empty' | translate}}

+
+ + + + +
+ + + + + + + + + + + + +
+ + {{itemHistory.REQUEST_NUMBER}} +
+ + + + +
+ + {{itemHistory.UNIT_OF_MEASURE}} +
+
+ + + + +
+ + {{itemHistory.QUANTITY}} +
+ + + + +
+ + {{itemHistory.DATE_REQUIRED}} + +
+
+ + + + + +
+ + {{itemHistory.LINE_STATUS_DIS}} +
+ + + + + +
+ + {{itemHistory.STATUS_DATE}} +
+ +
+ + + + + +
+ + {{itemHistory.TRANSACTION_TYPE_NAME}} +
+ + + + + +
+ + {{itemHistory.ORGANIZATION_NAME}} +
+ +
+ + + + + +
+ + {{itemHistory.ORGANIZATION_CODE}} +
+ + + + + +
+ + {{itemHistory.OPERATING_UNIT_NAME}} +
+ +
+ + + + + +
+ + {{itemHistory.FROM_SUBINVENTORY_CODE}} +
+ + + + + +
+ + {{itemHistory.FROM_LOCATOR}} +
+ +
+ + + + + +
+ + {{itemHistory.TO_SUBINVENTORY_CODE}} +
+ + + + + +
+ + {{itemHistory.TO_LOCATOR}} +
+ +
+ + + + + +
+ + {{itemHistory.SHIP_TO_LOCATION}} +
+ + +
+
+ +
+ +
+
+ + + + + +
diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss index e69de29b..ae11a4d9 100644 --- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss @@ -0,0 +1,31 @@ +.itemeHistoryist { + background: #f0efef; + padding: 6px; + /* margin-top: 20px; */ + /* width: 100%;*/ +} +ion-label.labelValue.sc-ion-label-ios-h.sc-ion-label-ios-s.ios.hydrated, +ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated +{ + // white-space: pre-wrap !important; + // --color: initial; + // display: block; + // color: var(--color); + // font-family: var(--ion-font-family,inherit); + // font-size: inherit; + // text-overflow: ellipsis; + // overflow: hidden; + // -webkit-box-sizing: border-box; + // box-sizing: border-box + + + + --color: initial; + display: contents !important; + font-family: var(--ion-font-family, inherit); + font-size: inherit; + text-overflow: ellipsis !important; + white-space: pre; + overflow: hidden; + box-sizing: border-box; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts index 67073b99..f67d319d 100644 --- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts @@ -1,4 +1,11 @@ import { Component, OnInit } from '@angular/core'; +import { WorklistMainService } from '../service/work-list.main.service'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { ModalController } from '@ionic/angular'; +import { WorklistService } from '../service/worklist.service'; +import { MOItemHistoryReq } from '../models/MOItemHistoryReq'; +import { MOItemHistoryRes } from '../models/MOItemHistoryRes'; @Component({ selector: 'app-mo-item-history', @@ -6,12 +13,111 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./mo-item-history.component.scss'], }) export class MoItemHistoryComponent implements OnInit { + getPassMOInfo: any; + itemHistoryRes: any; + IsReachEnd: boolean = false; + P_PAGE_NUM: number = 1; + P_PAGE_LIMIT: number = 50; + MOItemHistoryReq: any; - constructor() { } + constructor( + public worklistMainService: WorklistMainService, + private cs: CommonService, + private ts: TranslatorService, + public worklistService: WorklistService + ) { + this.getPassMOInfo = this.cs.sharedService.getSharedData('passMOReq'); + + this.MOItemHistoryReq = new MOItemHistoryReq(); + this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + this.MOItemHistoryReq.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + this.MOItemHistoryReq.P_ITEM_ID= this.getPassMOInfo.P_ITEM_ID; + this.MOItemHistoryReq.P_ORG_ID= this.getPassMOInfo.P_ORG_ID; + + } ngOnInit() { + this.getMOItemHistory(this.getPassMOInfo.P_ITEM_ID,this.getPassMOInfo.P_ORG_ID); + + + + } + + getMOItemHistory(itemID ,orgID) { + console.log(itemID); + this.IsReachEnd = false; + const request = new MOItemHistoryReq(); + request.P_ITEM_ID = parseInt(itemID); + request.P_PAGE_LIMIT = 100; + request.P_PAGE_NUM = 1; + request.P_ORG_ID= parseInt(orgID); + + + + this.worklistMainService.getMOItemHistory(request). + subscribe((result: MOItemHistoryRes) => { + + this.handleItemHistoryResult(result); + }); + } + + + handleItemHistoryResult(result) { + if (this.cs.validResponse(result)) { + if (this.cs.hasData(result.GetMoItemHistoryList)) { + this.itemHistoryRes = result.GetMoItemHistoryList; + this.P_PAGE_NUM++; + this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + let lastItemIndex = this.itemHistoryRes.length - 1; + if (result.GetMoItemHistoryList[lastItemIndex]) { + let lastitem = result.GetMoItemHistoryList[lastItemIndex]; + if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + } + } + + } + +} + + +doInfinite(infiniteScroll) { + if (!this.IsReachEnd) { + // this.POItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistMainService.getMOItemHistory(this.MOItemHistoryReq). + subscribe((result: any) => { + if (this.cs.validResponse(result)) { + if (result.GetMoItemHistoryList != undefined) { + this.MOItemHistoryReq.P_PAGE_NUM=this.P_PAGE_NUM++; + (result.GetMoItemHistoryList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.itemHistoryRes.push(element); + }, (Error) => console.log(Error), () => infiniteScroll.target.complete()); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + infiniteScroll.target.complete(); + + }); + } else { + if (infiniteScroll) + infiniteScroll.target.complete(); } +}//end infiniteScroll + + + } diff --git a/Mohem/src/app/notification/notification.module.ts b/Mohem/src/app/notification/notification.module.ts index 6e3e109b..e191db27 100644 --- a/Mohem/src/app/notification/notification.module.ts +++ b/Mohem/src/app/notification/notification.module.ts @@ -27,10 +27,10 @@ import { QutationAnalysisComponent } from './qutation-analysis/qutation-analysis import { WorklistMainMRComponent } from './worklist-main-mr/worklist-main-mr.component'; import { WorklistAdvancedSearchComponent } from './worklist-advanced-search/worklist-advanced-search.component'; import { WorkListMainItgComponent } from './work-list-main-itg/work-list-main-itg.component'; -import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component'; // import { WorklistMainComponent } from './worklist-main/worklist-main.component'; import {MoreActionModalComponent} from './more-action-modal/more-action-modal.component' import { WorkListReplacementItgComponent } from './work-list-replacement-itg/work-list-replacement-itg.component'; +import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component'; const routes: Routes = [ @@ -114,7 +114,11 @@ const routes: Routes = [ { path: 'worklist-replacement-itg', component: WorkListReplacementItgComponent - } + }, + { + path: 'item-history-MO', + component: MoItemHistoryComponent + } ] } ]; diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts index 55721b2a..2876fe15 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -34,7 +34,7 @@ export class WorklistMainService { public static getPRNotificationBody = "Services/ERP.svc/REST/GET_PR_NOTIFICATION_BODY"; public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY"; - public static getMOItemHistory = "GET_MO_ITEM_HISTORY"; + public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY"; public static getNotificationButtons = "Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS"; public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation"; diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 24c7ebb4..164924ff 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -11,19 +11,20 @@ {{'replacementRoll, searchBy' | translate}} + [(ngModel)]="searchBy" (ionChange)="onChangeSelect($event)"> {{'addAttach, name' | translate}} {{'login, username' | translate}} {{'general, email' | translate}} + - + - + +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 2fa4ab18..038856d4 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -8,16 +8,19 @@ background: var(--ion-item-background,var(--ion-background-color,#fff)); } +.header-toolbar-new{ + --background: #22c6b3; +} .colorBG{ --background: #f0efef; } .header-div{ - text-transform: capitalize; - background: #22C6B3; - display: block; - position: relative; - height: 160px; - margin-bottom: 60px; + text-transform: capitalize; + background: #22C6B3; + display: block; + position: relative; + height: 113px; + margin-bottom: 60px; } diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts index 2e2a11aa..16b4fe15 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -114,6 +114,10 @@ private handlePerformanceAppraisalResult(result){ this.sharedData.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA); //localStorage.setItem("performanceData", this.performanceData) this.cs.openPerformanceevaluation(); + }else{ + let msg: string = this.ts.trPK("userProfile", "no-appraisal"); + this.cs.presentAlert(msg); + } } } diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index dadb3ce9..e48f48f7 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -47,8 +47,6 @@
- -
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index 9903b387..c6bb1a34 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -1,4 +1,3 @@ - {{ts.trPK('userProfile','performance')}} 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 03f9c6c2..9edffc6c 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -156,8 +156,9 @@ .percentage{ - font-size: 19px !important; + font-size: 20px !important; margin-top: 15px !important; + margin-left: -7px; } .percentage-ar{ diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 22e79717..59845218 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -1,20 +1,21 @@ - {{ts.trPK('userProfile','changepicture')}} + + {{ts.trPK('userProfile','changepicture')}} - - - +
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss index c18b2eff..0de83e93 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.scss +++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss @@ -47,4 +47,8 @@ width: 234px; //box-shadow: 0px 0px 0px 10px #8c8c8c; -} \ No newline at end of file +} + +.header-toolbar-new{ + --background: #22c6b3; + } \ No newline at end of file diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.ts b/Mohem/src/app/profile/profile-image/profile-image.component.ts index e62cb912..e2a22857 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.ts +++ b/Mohem/src/app/profile/profile-image/profile-image.component.ts @@ -75,7 +75,7 @@ public setImage:any; handleUpdateImageProfileResult(result) { if (this.common.validResponse(result)) { - this.common.setUpdateImage(this.displayImg); + this.common.setUpdateImage(this.displayImg,true); this.event.publish('img-change', this.displayImg); let msg: string = this.ts.trPK("userProfile", "successChange"); this.common.presentAlert(msg); diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html index 44770b53..2046cf66 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html @@ -16,7 +16,7 @@ {{'vacation-rule, search-by' | translate}} + [(ngModel)]="searchKeySelect" (ionChange)="onChangeSelect($event)"> {{'vacation-rule, search-by-name' | translate}} {{'vacation-rule, search-by-username' | translate}} {{'vacation-rule, search-by-email' | translate}} @@ -24,14 +24,14 @@ - + - + - + - +
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index 31ba8d46..f24f0ebd 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -108,6 +108,15 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 21px; padding-left: 10px !important; } +.filterInput-ar{ + border: solid var(--gray) 1px; + border-radius: 21px; + padding-left: 100px !important; + margin-left: 86px; + padding-right: 129px; + margin-right: -139px; + +} .filterBtn{ background: var(--newgreen); --background: var (--newgreen); @@ -116,7 +125,15 @@ button.item-button.button.button-md.button-clear.button-clear-md { width: 60px; } - +.filterBtn-ar{ + background: var(--newgreen); + --background: var (--newgreen); + border-radius: 50%; + height: 60px; + width: 60px; + margin-left: -167px; + margin-right: 247px; +} *{ box-sizing: border-box; @@ -164,4 +181,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: #dedede solid 1px; } +.disabledButton{ + opacity:.5; +} diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts index d136c2a1..0e8bc58f 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts @@ -29,12 +29,23 @@ export class ReplacementListComponent implements OnInit { isAbs: boolean = false; isSave: boolean = false; active: any; + public direction: string; + isSelect: boolean =false; + searchKeyEnter: boolean = false; + request: ReplacementServiceRequest; - constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { } + constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { + this.direction = TranslatorService.getCurrentLanguageName(); + } - ngOnInit() { } + ngOnInit() { + this.request = new ReplacementServiceRequest(); + + } SearchReplacementList() { + console.log("this.searchKeySelect" + this.searchKeySelect); + this.ReplacementList = []; this.IsReachEnd = false; this.P_PAGE_NUM = 1; @@ -73,15 +84,15 @@ export class ReplacementListComponent implements OnInit { this.P_SEARCH_EMAIL_ADDRESS = ""; } - const request = new ReplacementServiceRequest(); - request.P_SEARCH_USER_NAME = this.P_SEARCH_USER_NAME; - request.P_SEARCH_EMPLOYEE_DISPLAY_NAME = this.P_SEARCH_EMPLOYEE_DISPLAY_NAME; - request.P_SEARCH_EMAIL_ADDRESS = this.P_SEARCH_EMAIL_ADDRESS; - request.P_PAGE_NUM = this.P_PAGE_NUM; - request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; - request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; + // const request = new ReplacementServiceRequest(); + this.request.P_SEARCH_USER_NAME = this.P_SEARCH_USER_NAME; + this.request.P_SEARCH_EMPLOYEE_DISPLAY_NAME = this.P_SEARCH_EMPLOYEE_DISPLAY_NAME; + this.request.P_SEARCH_EMAIL_ADDRESS = this.P_SEARCH_EMAIL_ADDRESS; + this.request.P_PAGE_NUM = this.P_PAGE_NUM; + this.request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + this.request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; - this.vacationRuleService.getReplacementList(request). + this.vacationRuleService.getReplacementList(this.request). subscribe((result: any) => { this.handleReplacment(result); }); @@ -161,13 +172,14 @@ export class ReplacementListComponent implements OnInit { if (!this.IsReachEnd) { - const request = new ReplacementServiceRequest(); - request.P_PAGE_NUM = this.P_PAGE_NUM; - request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + ///const request = new ReplacementServiceRequest(); + console.log(this.request.P_SEARCH_USER_NAME + "-" + this.request.P_SEARCH_EMAIL_ADDRESS + "-" + this.request.P_SEARCH_EMPLOYEE_DISPLAY_NAME ) + this.request.P_PAGE_NUM = this.P_PAGE_NUM; + this.request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; // request.P_SELECTED_EMPLOYEE_NUMBER=this.selEmp; - this.vacationRuleService.getReplacementList(request). + this.vacationRuleService.getReplacementList(this.request). subscribe((result: any) => { if (this.cs.validResponse(result)) { if (this.cs.hasData(result.ReplacementList)) { @@ -198,4 +210,27 @@ export class ReplacementListComponent implements OnInit { infiniteScroll.target.complete(); } } + + onChangeSelect(select){ + console.log(select.detail.value); + let selectValue= select.detail.value; + + if(selectValue == "1" || selectValue == "2" ||selectValue == "3"){ + this.isSelect=true; + } + else{ + this.isSelect=false; + + } + } + + onChangeInput(){ + if (this.searchKey.length >0) { + this.searchKeyEnter=true; + + }else{ + this.searchKeyEnter=false; + + } + } } diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index f145118d..6d809799 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -33,8 +33,8 @@
-
- +
+
@@ -59,7 +59,7 @@
- +
@@ -93,7 +93,7 @@
- +
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 0e433265..63efad4b 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -160,15 +160,15 @@ }, "check-user-text1":{ "en":"Please Enter your Employee ID, A ", - "ar":"" + "ar":"يرجى ادخال رقم الموظف " }, "check-user-text2":{ "en":"login Code ", - "ar":"" + "ar":"رمز تسجيل الدخول" }, "check-user-text3":{ "en":"will be sent to your mobile number", - "ar":"" + "ar":"سيتم ارساله الى رقم هاتفك" } }, "verificationcode": { @@ -1005,6 +1005,10 @@ "en": "Performance", "ar": "الاداء" }, + "no-appraisal": { + "en": "No Performance Evaluation", + "ar": "لايوجد تقييم" + }, "your-performance": { "en": "Your Performance In", "ar": "ادائك في" @@ -1021,6 +1025,10 @@ "en": "Business Group", "ar": "مجموعة العمل" }, + "phone-no": { + "en": "Phone Number", + "ar": "رقم الجوال" + }, "job": { "en": "Job", "ar": "الوظيفة" @@ -1029,6 +1037,10 @@ "en": "Location Name", "ar": "اسم الموقع" }, + "emp-detail": { + "en": "Employee Detail", + "ar": "بيانات الموظف" + }, "address": { "en": "Address", "ar": "العنوان" @@ -1151,6 +1163,22 @@ "en": "Vacation Rule", "ar": "قواعد الإجازات" }, + "apply-for-vacation-rule": { + "en": "Apply for vacation Rule", + "ar": "التقدم بطلب اجازه" + }, + "step-1": { + "en": "Step 1", + "ar": "الخطوه الاولى" + }, + "step-2": { + "en": "Step 2", + "ar": "الخطوه الثانيه" + }, + "step-3": { + "en": "Step 3", + "ar": "الخطوه الثالثه" + }, "ruleName": { "en": "Rule Name", "ar": "اسم القاعدة" @@ -1175,6 +1203,14 @@ "en": "Rule Information", "ar": "معلومات القاعدة" }, + "create-request": { + "en": "Create Request", + "ar": "انشاء طلب" + }, + "call": { + "en": "Call", + "ar": "مكالمه" + }, "deleteVR": { "en": "Are you sure you want to delete this rule?", "ar": "هل تريد فعلا حذف هذه القاعدة؟" @@ -1792,7 +1828,7 @@ }, "title":{ "en": "Replacement Roll", - "ar":"استبدال لفة" + "ar":"تفويض موظف" }, "searchForReplacment":{ "en": "Search for an employee", @@ -2287,6 +2323,10 @@ "line_details":{ "en": "Line Details", "ar":"Line Details" + }, + "request_number":{ + "en": "Request Number", + "ar":"Request Number" } }, diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index a92d9b85..2d0905e7 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -671,7 +671,7 @@ img.flipImg{ transform: translate3d(0, 0, 0); width: 100%; padding: 6px 0px; - background: var(--light); + // background: var(--light); border-bottom: var(--cusgray) solid 1px; border-radius: 0px; -webkit-appearance: none; @@ -699,6 +699,7 @@ img.flipImg{ } content: ""; z-index: 98; + margin-left: 31px; } .daynamicForm-Select{ diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index 0b82b6c6..eb1d83b5 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -33,6 +33,7 @@ } .itemReqDiv{ padding:10px; + width: 100%; // padding-bottom: 10px; // padding-top: 10px; } @@ -231,7 +232,7 @@ ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated .timeline .timeline-item { - width: 40px; + // width: 40px; } @@ -547,9 +548,9 @@ left: 66px; height:70px } .empImge{ - border-radius: 50%; - width:100%; - height: 100%; + border-radius: 50% !important; + width: 60px !important; + height: 60px !important; border: #dedede solid 1px; }