diff --git a/Mohem/src/app/app.scss b/Mohem/src/app/app.scss index 08bb1e93..cc3da01e 100644 --- a/Mohem/src/app/app.scss +++ b/Mohem/src/app/app.scss @@ -33,6 +33,6 @@ } .my-custom-modal-css .modal-wrapper { - width: 90%; - height: 55%; + width: 95%; + height: 60%; } \ 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 e0ae39d0..3779b172 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -10,8 +10,7 @@ class="ion-segment-all"> - + {{'worklistMain, info'| translate}} @@ -24,8 +23,9 @@ [ngClass]="activeSegment == 'action-history' ? 'active-Segment' : 'normal-Segment'"> {{'worklistMain, action' | translate}} - - + + {{'worklistMain, attach-file' | translate}} @@ -40,21 +40,24 @@ - {{pInformation}} + {{pInformation}} + 0 "> - + 0"> - {{notificationBody.SEGMENT_PROMPT}} + *ngFor="let notificationBody of item.Collection_Notification;" + size="6" [hidden]="notificationBody.DISPLAY_FLAG == 'N'"> + {{notificationBody.SEGMENT_PROMPT}} {{notificationBody.SEGMENT_VALUE_DSP}} @@ -65,41 +68,49 @@ 0"> - {{ts.trPK('worklistMain','employee-on-leave')}} + {{ts.trPK('worklistMain','employee-on-leave')}} - - + - - {{List.EMPLOYEE_NAME}} + {{List.EMPLOYEE_NAME}} {{List.POSITION_TITLE}} - {{List.STATUS}} + {{List.STATUS}} - + - {{ts.trPK('worklistMain','from')}} + + {{ts.trPK('worklistMain','from')}} {{List.DATE_START |date}} - {{ts.trPK('worklistMain','to')}} + {{ts.trPK('worklistMain','to')}} {{List.DATE_END | date}} @@ -107,177 +118,189 @@ - + - - - - - - - - - - {{ts.trPK('worklistMain','from')}} - - - - {{getPassNotificationDetails.FROM_USER}} - - - {{ts.trPK('worklistMain','to')}} - - - {{getPassNotificationDetails.TO_USER}} - - - - - - {{ts.trPK('worklistMain','sent')}} - - - {{getPassNotificationDetails.BEGIN_DATE}} - - - {{ts.trPK('worklistMain','closed')}} - - - {{getPassNotificationDetails.END_DATE}} - - - - - {{ts.trPK('worklistMain','id')}} - - - {{getPassNotificationDetails.NOTIFICATION_ID}} - - - {{ts.trPK('worklistMain','responder')}} - - - {{getPassNotificationDetails.RESPONDER}} - - - - - - - - - - - - 0 "> - - - - {{'userProfile, emp-detail' | translate}} - - - - - {{'userProfile, empNo' | translate}} - - {{submitterInfo.EMPLOYEE_NUMBER}} - - - - - {{'userProfile, name' | translate}} - - {{submitterInfo.EMPLOYEE_NAME}} - - - - - {{'worklistMain, job-name' | translate}} - - {{submitterInfo.POSITION_NAME}} - - - - - {{'userProfile, grade' | translate}} - - {{submitterInfo.GRADE_NAME}} - - - - - {{'worklistMain, job_cate' | translate}} - - {{submitterInfo.JOB_NAME}} - - - - - {{'worklistMain, category' | translate}} - - {{submitterInfo.EMPLOYMENT_CATEGORY_MEANING}} - - - - - {{'worklistMain, emp-email' | translate}} - - {{submitterInfo.EMPLOYEE_EMAIL_ADDRESS}} - - - - - {{'worklistMain, org-name' | translate}} - - {{submitterInfo.ORGANIZATION_NAME}} - - - - - - {{'worklistMain, loc-name' | translate}} - - - {{submitterInfo.LOCATION_NAME}} - - - - - {{'worklistMain, branch-payrol' | translate}} - - - {{submitterInfo.PAYROLL_NAME}} - - - - - - - - - - - - - - - - - - + + + + + + + + + + + {{ts.trPK('worklistMain','from')}} + + + + {{getPassNotificationDetails.FROM_USER}} + + + {{ts.trPK('worklistMain','to')}} + + + {{getPassNotificationDetails.TO_USER}} + + + + + + {{ts.trPK('worklistMain','sent')}} + + + {{getPassNotificationDetails.BEGIN_DATE}} + + + {{ts.trPK('worklistMain','closed')}} + + + {{getPassNotificationDetails.END_DATE}} + + + + + {{ts.trPK('worklistMain','id')}} + + + {{getPassNotificationDetails.NOTIFICATION_ID}} + + + {{ts.trPK('worklistMain','responder')}} + + + {{getPassNotificationDetails.RESPONDER}} + + + + + + + + + + + + 0 "> + + + + {{'userProfile, emp-detail' | translate}} + + + + + {{'userProfile, empNo' | + translate}} + + {{submitterInfo.EMPLOYEE_NUMBER}} + + + + + {{'userProfile, name' | + translate}} + + {{submitterInfo.EMPLOYEE_NAME}} + + + + + {{'worklistMain, job-name' | + translate}} + + {{submitterInfo.POSITION_NAME}} + + + + + {{'userProfile, grade' | + translate}} + + {{submitterInfo.GRADE_NAME}} + + + + + {{'worklistMain, job_cate' | + translate}} + + {{submitterInfo.JOB_NAME}} + + + + + {{'worklistMain, category' | + translate}} + + {{submitterInfo.EMPLOYMENT_CATEGORY_MEANING}} + + + + + {{'worklistMain, emp-email' | + translate}} + + {{submitterInfo.EMPLOYEE_EMAIL_ADDRESS}} + + + + + + + + {{'worklistMain, branch-payrol' | + translate}} + + + {{submitterInfo.PAYROLL_NAME}} + + + + + + + + + + + + + + + + + + @@ -292,13 +315,14 @@ - - + + src="../assets/imgs/profile.png"> + @@ -322,7 +346,8 @@ {{ actionHistory.visible ? 'Show less': 'Show More' }} + (click)="actionHistory.visible = !actionHistory.visible">{{ + actionHistory.visible ? 'Show less': 'Show More' }} @@ -336,9 +361,11 @@ {{actionHistory.NOTIFICATION_DATE| dateString }} - - - + + + @@ -452,37 +479,37 @@ - {{approve_label}} + {{approve_label}} - {{close_label}} + {{close_label}} - {{reject_label}} + {{reject_label}} - {{reqInfo_label}} + {{reqInfo_label}} - {{'worklistMain, skip' | translate}} + {{'worklistMain, skip' | translate}} - {{'worklistMain, more' | translate}} + {{'worklistMain, more' | translate}} diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 1dce5738..52e8150b 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -14,7 +14,7 @@ - + @@ -39,23 +39,23 @@ - - - {{ts.trPK('general','personal-info')}} + + + {{ts.trPK('general','personal-info')}} - - - {{ts.trPK('general','basic-details')}} + + + {{ts.trPK('general','basic-details')}} - - - {{ts.trPK('userProfile','address')}} + + + {{ts.trPK('userProfile','address')}} @@ -112,86 +112,86 @@ - + - {{ts.trPK('userProfile','personal-informaion')}} + {{ts.trPK('userProfile','personal-informaion')}} - {{ts.trPK('userProfile','category')}} + {{ts.trPK('userProfile','category')}} - part-time + part-time - {{ts.trPK('userProfile','address')}} + {{ts.trPK('userProfile','address')}} - DR.Sulaiman Alhabib Medical Group + DR.Sulaiman Alhabib Medical Group - {{ts.trPK('userProfile','phone-no')}} + {{ts.trPK('userProfile','phone-no')}} - 0567845661 + 0567845661 - {{ts.trPK('userProfile','busG')}} + {{ts.trPK('userProfile','busG')}} - CORP Cloud Solutions + CORP Cloud Solutions - {{ts.trPK('userProfile','payrol')}} + {{ts.trPK('userProfile','payrol')}} - Cloud Solutions Payroll + Cloud Solutions Payroll - + - {{ts.trPK('general','basic-details')}} + {{ts.trPK('general','basic-details')}} - - {{ts.trPK('general','full-name')}} + {{ts.trPK('general','full-name')}} - ENAD HILAL NASSER MOHAMMED + ENAD HILAL NASSER MOHAMMED - {{ts.trPK('general','marital-status')}} + {{ts.trPK('general','marital-status')}} - Married + Married - {{ts.trPK('general','birth_date')}} + {{ts.trPK('general','birth_date')}} - 01-FEB-1991 + 01-FEB-1991 - {{ts.trPK('general','civil-identity-number')}} + {{ts.trPK('general','civil-identity-number')}} - 2093486013 + 2093486013 - + - {{ts.trPK('general','basic-details')}} + {{ts.trPK('general','basic-details')}} - {{ts.trPK('general','effective-date')}} + {{ts.trPK('general','effective-date')}} @@ -201,7 +201,11 @@ - {{ts.trPK('general','title')}} + + + {{ts.trPK('general','title')}} + + Mr Miss @@ -210,60 +214,96 @@ - {{ts.trPK('userProfile','family-name')}} + + + {{ts.trPK('userProfile','family-name')}} + + - {{ts.trPK('userProfile','preferred-name')}} + + + {{ts.trPK('userProfile','preferred-name')}} + + - {{ts.trPK('userProfile','previous-family-name')}} + + + {{ts.trPK('userProfile','previous-family-name')}} + + - {{ts.trPK('userProfile','father-name')}} + + + {{ts.trPK('userProfile','father-name')}} + + - {{ts.trPK('userProfile','grand-father-name')}} + + + {{ts.trPK('userProfile','grand-father-name')}} + + - {{ts.trPK('userProfile','arabic-first-name')}} + + + {{ts.trPK('userProfile','arabic-first-name')}} + + - {{ts.trPK('userProfile','arabic-father-name')}} + + + {{ts.trPK('userProfile','arabic-father-name')}} + + - {{ts.trPK('userProfile','arabic-grand-father-name')}} + + + {{ts.trPK('userProfile','arabic-grand-father-name')}} + + - + - {{ts.trPK('general','other')}} + {{ts.trPK('general','other')}} - {{ts.trPK('general','gender')}} + + + {{ts.trPK('general','gender')}} + + Male Female @@ -272,7 +312,11 @@ - {{ts.trPK('general','marital-status')}} + + + {{ts.trPK('general','marital-status')}} + + Singal Married @@ -281,7 +325,11 @@ - {{ts.trPK('general','nationality')}} + + + {{ts.trPK('general','nationality')}} + + Mr Miss @@ -290,7 +338,11 @@ - {{ts.trPK('general','religion')}} + + + {{ts.trPK('general','religion')}} + + Islam Other @@ -299,7 +351,11 @@ - {{ts.trPK('general','education-level')}} + + + {{ts.trPK('general','education-level')}} + + University other @@ -310,62 +366,62 @@ - + - {{ts.trPK('general','main-address')}} + {{ts.trPK('general','main-address')}} - - {{ts.trPK('general','address')}} + {{ts.trPK('general','address')}} - Riyadh + Riyadh - {{ts.trPK('general','street')}} + {{ts.trPK('general','street')}} - - + - - {{ts.trPK('general','area')}} + {{ts.trPK('general','area')}} - - + - - {{ts.trPK('general','p-o-box')}} + {{ts.trPK('general','p-o-box')}} - 22617 + 22617 - {{ts.trPK('general','city')}} + {{ts.trPK('general','city')}} - Riyadh + Riyadh - {{ts.trPK('general','postal-code')}} + {{ts.trPK('general','postal-code')}} - 11416 + 11416 - {{ts.trPK('general','address')}} + {{ts.trPK('general','address')}} - {{ts.trPK('general','effective-date')}} + {{ts.trPK('general','effective-date')}} MMMM @@ -374,7 +430,11 @@ - {{ts.trPK('general','nationality')}} + + + {{ts.trPK('general','nationality')}} + + Mr Miss @@ -383,37 +443,61 @@ - {{ts.trPK('userProfile','address')}} + + + {{ts.trPK('userProfile','address')}} + + - {{ts.trPK('userProfile','street')}} + + + {{ts.trPK('userProfile','street')}} + + - {{ts.trPK('userProfile','area')}} + + + {{ts.trPK('userProfile','area')}} + + - {{ts.trPK('userProfile','p-o-box')}} + + + {{ts.trPK('userProfile','p-o-box')}} + + - {{ts.trPK('userProfile','city')}} + + + {{ts.trPK('userProfile','city')}} + + - {{ts.trPK('userProfile','postal-code')}} + + + {{ts.trPK('userProfile','postal-code')}} + + @@ -529,11 +613,11 @@ - Cancel + Cancel - Update + Update diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index f23b9670..f5991ca4 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -970,7 +970,7 @@ $actionBtnSize: 36px; .header-background-style-card { padding-top: 1px; background: #269db8; - height: 15%; + height: 115px; } .text-years { @@ -997,7 +997,7 @@ $actionBtnSize: 36px; .changeImgBtn { position: absolute; left: 60%; - bottom: 150%; + bottom: 230%; } .changeImgBtn-ar { position: absolute; @@ -1013,12 +1013,12 @@ $actionBtnSize: 36px; } .changeIcon { - bottom: 6px; - width: 10px; - border-radius: 50% !important; - position: relative; - color: #7f8c8d; - height: 35px; + // bottom: 6px; + // width: 10px; + // border-radius: 50% !important; + // position: relative; + // color: #7f8c8d; + // height: 35px; } .card-style-details-info { @@ -1039,3 +1039,34 @@ $actionBtnSize: 36px; .login-input { border: none; } + +.card-size-info-en{ + width: 90%; + left: 2%; +} + +.card-size-info-ar{ + width: 90%; + right: 2%; +} + +.header-label-text-form{ + opacity: 1; + color: #2B353E; + font: normal normal 600 20px/30px Poppins; + letter-spacing: -0.8px; +} + +.type-label-text-form{ + font: normal normal 600 13px/20px Poppins; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; +} + +.result-label-text-form{ + font: normal normal 600 16px/25px Poppins; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; +} \ No newline at end of file diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html index b6dbd408..ade67c87 100644 --- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html @@ -27,7 +27,7 @@ - {{ts.trPK('userProfile','cancel-text')}} + {{ts.trPK('eit','cancel-text')}} diff --git a/Mohem/src/assets/imgs/profile-icons/editing@2x.png b/Mohem/src/assets/imgs/profile-icons/editing@2x.png new file mode 100644 index 00000000..16950e66 Binary files /dev/null and b/Mohem/src/assets/imgs/profile-icons/editing@2x.png differ