From 15108e45548b6e64ab92a3110dd3fac7c02f10f8 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Wed, 18 Dec 2019 14:34:26 +0300 Subject: [PATCH] prduction version --- Mohem/config.xml | 4 +- Mohem/src/app/app.component.html | 1 - .../confirm-login/confirm-login.component.ts | 23 +- Mohem/src/app/hmg-common/hmg-common.module.ts | 11 +- .../authentication/authentication.service.ts | 2 +- .../services/common/common.service.ts | 56 -- .../services/connector/connector.service.ts | 6 +- Mohem/src/app/home/home.page.html | 12 +- .../app/notification/home/home.component.html | 228 ++------ .../app/notification/home/home.component.scss | 96 +--- .../app/notification/home/home.component.ts | 7 - .../app/notification/notification.module.ts | 26 +- .../service/work-list.main.service.ts | 4 +- .../worklist-main-mr.component.ts | 14 +- .../worklist-main-po.component.ts | 18 +- .../worklist-main-pr.component.html | 356 ++++++------- .../worklist-main-pr.component.scss | 496 +++++++++--------- .../worklist-main-pr.component.ts | 6 +- .../worklist-main.component.html | 2 +- .../src/app/payslip/home/home.component.html | 318 +++-------- .../src/app/payslip/home/home.component.scss | 41 -- Mohem/src/app/payslip/home/home.component.ts | 59 +-- Mohem/src/app/payslip/payslip.module.ts | 2 - Mohem/src/assets/localization/i18n.json | 267 +--------- Mohem/src/global.scss | 1 - Mohem/src/theme/styles.scss | 39 +- Mohem/src/theme/variables.scss | 1 - 27 files changed, 625 insertions(+), 1471 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index 79a3f1b2..a3b570f1 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -1,8 +1,8 @@ - + MOHEMM an app created by cloud Solutions - HMG + cloud solution diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 1556b050..92bf721c 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -52,7 +52,6 @@
-

{{CompanyImageDescription}}

- - - + {{notificationList.SUBJECT}} + + + + @@ -155,73 +75,11 @@ + - - {{ts.trPK('worklist','search')}} - - - - - - - - -
- - {{ts.trPK('worklist','view')}} - - {{ts.trPK('worklist','openNot')}} - {{ts.trPK('worklist','fyi')}} - {{ts.trPK('worklist','toDo')}} - {{ts.trPK('worklist','all')}} - {{ts.trPK('worklist','meNot')}} - - - -
-
- - {{ts.trPK('worklist','searchby')}} - - {{ts.trPK('worklist','from')}} - {{ts.trPK('worklist','subject')}} - {{ts.trPK('worklist','sent')}} - {{ts.trPK('worklist','itemType')}} - {{ts.trPK('worklist','none')}} - - - -
-
- - {{ts.trPK('worklist','sent')}} - - -
-
- - - - -
-
-
- - {{ts.trPK('worklist','search')}} - - {{ts.trPK('general','close')}} -
+ +
- Call details ITG - Call count ITG - -
- - - + {{ts.trPK('worklist','search')}} +
\ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index bd5af293..ae8332ce 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -16,26 +16,25 @@ right: 8px; } - .timelineMain { + .timeline { position: relative; margin: 15px 0 0 0; } - .timelineMain:before { + .timeline:before { content: ''; position: absolute; top: 0; bottom: 0; - width: 1.5%; - height: 99%; + width: 4px; background: #e4e4e4; z-index: 1; /* margin-left: -10px; */ /* z-index: 1; */ } - .timelineMain .timelineMain-thumb { + .timeline .timeline-thumb { border-radius: 500px; width: 50px; @@ -52,7 +51,7 @@ top: 0px; } - .timelineMain .timelineMain-thumb.timelineMain-icon { + .timeline .timeline-thumb.timeline-icon { height: 50px; // text-align: center; // color: white; @@ -62,12 +61,12 @@ - .timelineMain .timelineMain-item { + .timeline .timeline-item { width: 50px; } - .timelineMain .timelineMain-stats { + .timeline .timeline-stats { position: relative; font-size: 12px; color: var(--darkgray); @@ -96,30 +95,28 @@ } .notification-list{ - background: none; ion-item{ // margin-top: 5px; // margin-bottom: 5px; background-color: transparent; .item-date{ - width: 100%; - font-size: 16px; + width: 55px; + font-size: 14px; font-weight: bold; - text-align: start; + text-align: center; padding: 0; margin: 0; position: absolute; left: 0; - top: 12%; + top: 0; } ion-label , [item-end]{ white-space: normal; font-size: 14px; - padding-top: 15%; // :root[dir="ltr"]{ // margin-left: 10px; // } @@ -138,82 +135,25 @@ ion-input ,ion-datetime{ border-bottom: #dedede 1px solid; } .left { - --background: #f0efef; - .timelineMain:before{ - left: 21px; + .timeline:before{ + left: 62px; } .notification-list ion-item{ padding-left: 3px; - margin-left: -12%; } - .timelineMain-thumb{ - left: 9%; - top: 30%; + .timeline-thumb{ + left: 37px; } - } .right { - --background: #f0efef; - .timelineMain:before{ + .timeline:before{ right: 62px; } .notification-list ion-item{ padding-right: 3px; } - .timelineMain-thumb{ + .timeline-thumb{ right: 37px; } } - -.menuList{ - margin-left: -40px; - height: 160%; - padding-top: 370%; - } - .colorBG{ - --background: #f0efef; - } - -.menuListCol{ - padding-left: 50px; - margin-left: -33px; -} -.menuListItem{ - padding-top: 9%; - margin: -20%; - padding-left: 13%; -} -.menuListBtn{ - width: 100%; - background: white; - --background: white; -} -.activeTabMenu{ - --background: #ff726f; -} - -.notifincationList{ - margin-left: 5%; - margin-top: 6%; -} -.itemListNotification{ - padding-bottom: 18px; -} - -.footerSearchBtn{ - padding: 0px !important; - background: #f0efef !important; -} - -.viewAndSearch{ - margin-bottom: 13px; -} - -.toSearchBtn{ - margin-top: 4%; -} - -.emptyItem{ - white-space: normal; - padding-left: 10%; -} \ No newline at end of file + \ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 5383e1bf..0832c437 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -171,13 +171,6 @@ export class HomeComponent implements OnInit { if(obj.REQUEST_TYPE == "PR"){ this.common.openWorklistMainPRPage(); } - else if(obj.REQUEST_TYPE == "PO"){ - this.common.openWorklistMainPOPage(); - } - else if(obj.REQUEST_TYPE == "MO"){ - this.common.openWorklistMainMRPage(); - } - else{ this.common.openWorklistMainPage(); diff --git a/Mohem/src/app/notification/notification.module.ts b/Mohem/src/app/notification/notification.module.ts index df9194f2..02f1f52e 100644 --- a/Mohem/src/app/notification/notification.module.ts +++ b/Mohem/src/app/notification/notification.module.ts @@ -21,10 +21,6 @@ import { WorkListDetailsComponent } from './work-list-details/work-list-details. import { WorklistAttachService } from '../absence/service/work-list-attach.service'; import { WorklistMainPRComponent } from './worklist-main-pr/worklist-main-pr.component'; import { ApplyActionModalComponent } from './apply-action-modal/apply-action-modal.component'; -import { WorklistMainPoComponent } from './worklist-main-po/worklist-main-po.component'; -import { ItemHistoryComponent } from './item-history/item-history.component'; -import { QutationAnalysisComponent } from './qutation-analysis/qutation-analysis.component'; -import { WorklistMainMRComponent } from './worklist-main-mr/worklist-main-mr.component'; // import { WorklistMainComponent } from './worklist-main/worklist-main.component'; @@ -82,22 +78,6 @@ const routes: Routes = [ { path:'apply-action-modal', component:ApplyActionModalComponent - }, - { - path:'worklist-main-PO', - component:WorklistMainPoComponent - }, - { - path:'item-history-PO', - component:ItemHistoryComponent - }, - { - path:'qutation-analysis-PO', - component:QutationAnalysisComponent - }, - { - path:'worklist-main-MR', - component:WorklistMainMRComponent } ] } @@ -124,11 +104,7 @@ const routes: Routes = [ WorkListActionHistoryComponent, WorkListAttachComponent, WorkListDetailsComponent, - WorklistMainPRComponent, - WorklistMainPoComponent, - ItemHistoryComponent, - QutationAnalysisComponent, - WorklistMainMRComponent + WorklistMainPRComponent // WorklistMainComponent ], providers:[WorklistService,WorklistMainService, WorklistAttachService] 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 99799c56..066a3462 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -136,9 +136,7 @@ export class WorklistMainService { errorLabel?: string ): Observable { const request = POItemHistoryReq; - this.authService.authenticateRequest(request); - // this.authService.setPublicFields(request); - + this.authService.authenticateRequest(request); return this.api.post( WorklistMainService.getPOItemHistory, request, diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index 14423f3c..27abc3b1 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -378,13 +378,13 @@ export class WorklistMainMRComponent implements OnInit { } - this.common.confirmAlertDialogAction( - () => { - this.applyAction(this.WorkListActionObj); - }, this.ts.trPK('general', 'ok'), - () => {}, this.ts.trPK('general', 'cancel'), - this.ts.trPK('vacation-rule', 'confirmation'), - this.confirmMsg); + // //this.common.confirmAlertDialogAction( + // () => { + // this.applyAction(this.WorkListActionObj); + // }, this.ts.trPK('general', 'ok'), + // () => {}, this.ts.trPK('general', 'cancel'), + // this.ts.trPK('vacation-rule', 'confirmation'), + // this.confirmMsg); 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 430383fe..99b2010b 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 @@ -403,13 +403,13 @@ export class WorklistMainPoComponent implements OnInit { } - this.common.confirmAlertDialogAction( - () => { - this.applyAction(this.WorkListActionObj); - }, this.ts.trPK('general', 'ok'), - () => {}, this.ts.trPK('general', 'cancel'), - this.ts.trPK('vacation-rule', 'confirmation'), - this.confirmMsg); + // this.common.confirmAlertDialogAction( + // () => { + // this.applyAction(this.WorkListActionObj); + // }, this.ts.trPK('general', 'ok'), + // () => {}, this.ts.trPK('general', 'cancel'), + // this.ts.trPK('vacation-rule', 'confirmation'), + // this.confirmMsg); @@ -785,7 +785,7 @@ export class WorklistMainPoComponent implements OnInit { WorklistMainPoComponent.PASS_PO_INFO ); //open page - this.common.openItemHistoryPage(); + // this.common.openItemHistoryPage(); //this.handleItemHistoryResult(result); }); } @@ -842,7 +842,7 @@ export class WorklistMainPoComponent implements OnInit { //set sheard data // - this.common.openQutationAnalysisPage(); + //this.common.openQutationAnalysisPage(); // this.QutationAnalysisRes = result.GetQutationAnalysisList; 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 ebf8c840..5bb4c206 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 @@ -130,9 +130,8 @@
- - + + @@ -145,28 +144,28 @@

- + -
- - -
{{totalH}}
-
{{valueH}}
- -
- +
+ + +
{{totalH}}
+
{{valueH}}
+ +
+
{{taxH}}
{{taxvalueH}}
- -
+ +
- +
- - - + + + @@ -194,153 +193,143 @@ - - - - -
-

{{ 'general, empty' | translate}}

-
- -
- - - -
- - - - - - - - - - - -
- - {{Lines.COST_CENTER}} -
- - - -
- - {{Lines.ITEM_CODE}} -
-
- + + + + - - -
- - {{Lines.UOM}} -
- - - -
- - {{Lines.UNIT_PRICE}} + -
-
- + + + - - -
- - {{Lines.LINE_AMOUNT}} -
+ + - - - -
- - {{Lines.QUANTITY}} -
+ + -
-
+ -
+
-
- - - + + + -
-

{{ 'general, empty' | translate}}

-
-
- -
- - -
- - +
+

{{ 'general, empty' | translate}}

+
+
+ +
+ -
+
+ + - -
- + + +
+ -
-
+
- - {{actionHistory.ACTION}} - {{actionHistory.NAME}} - - - {{actionHistory.NOTIFICATION_DATE| dateString }} - -
-
-
+
+ + {{actionHistory.ACTION}} + {{actionHistory.NAME}} + + + {{actionHistory.NOTIFICATION_DATE| dateString }} + + +
+
@@ -353,46 +342,39 @@

{{ 'general, notAttch' | translate}}

- - -
- - -
- -
-
-
-
- -
-
- -
- - {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} -
- -
-
+ +
-
- @@ -407,47 +389,55 @@ --> + + + +
+
+
+
- -
-
-
-
- - - - + + - + - - - {{'actionHis, action' | translate}} - - - {{notificationButtons.BUTTON_LABEL}} - - + + {{'actionHis, action' | translate}} + + + {{notificationButtons.BUTTON_LABEL}} + + - - - {{'worklistMain, skip' | translate}} - + + + {{'worklistMain, skip' | translate}} + - - + + - + + diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss index a1d96baf..1d9aa14f 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss @@ -1,306 +1,306 @@ -// .colorBG{ -// --background: #f0efef; -// } -// .footerSearchBtn{ -// padding: 0px !important; -// background: #f0efef !important; +.colorBG{ + --background: #f0efef; + } + .footerSearchBtn{ + padding: 0px !important; + background: #f0efef !important; +} + +.actionList{ + // position: fixed; + // bottom: 0px; + width: 215px; + border-top-left-radius: 7px; + border-top-right-radius: 7px +} +.cardContent{ + width:100%; + margin-top: 33px +} +.colItemReq{ + color: var(--dark); + font-weight: bold; + font-size: 15px; + text-align: left; + +} + +.colItemReqHeader{ +text-align: left; +color: var(--primary); +font-weight: bold; +} +.labelTotal{ + color: var(--danger); + font-weight: bold; + font-size: 17px; + + +} +.labelAction{ +color:var(--customnavy) !important; +font-weight:bold; +} + +.segmentPR{ + + // --background-hover: rgba(var(--ion-color-contrast-rgb),0.04); + // --background-activated: var(--danger); + // --color: rgba(--primary); + --color-checked: var(--dark); + --indicator-color-checked: var(--secondary); + --background: #f0efef; + --background-activated: #f0efef; + --background-hover:#f0efef; + --background-activated:#f0efef; + --background-checked:#f0efef; + + + +} + +.ion-modal#ion-overlay-1 { + width: 90%; + height: 50%; + top: 20%; + left: 5%; + right: 5%; + bottom: 5%; + border: solid 1px red; + +} + +// .swiper-pagination.swiper-pagination-bullets{ +// top: 6px; +// bottom: inherit; // } -// .actionList{ -// // position: fixed; -// // bottom: 0px; -// width: 215px; -// border-top-left-radius: 7px; -// border-top-right-radius: 7px -// } -// .cardContent{ -// width:100%; -// margin-top: 33px -// } -// .colItemReq{ -// color: var(--dark); -// font-weight: bold; -// font-size: 15px; -// text-align: left; - -// } - -// .colItemReqHeader{ -// text-align: left; -// color: var(--primary); -// font-weight: bold; -// } -// .labelTotal{ -// color: var(--danger); -// font-weight: bold; -// font-size: 17px; - - -// } -// .labelAction{ -// color:var(--customnavy) !important; -// font-weight:bold; -// } - -// .segmentPR{ - -// // --background-hover: rgba(var(--ion-color-contrast-rgb),0.04); -// // --background-activated: var(--danger); -// // --color: rgba(--primary); -// --color-checked: var(--dark); -// --indicator-color-checked: var(--secondary); -// --background: #f0efef; -// --background-activated: #f0efef; -// --background-hover:#f0efef; -// --background-activated:#f0efef; -// --background-checked:#f0efef; - -// } - -// .ion-modal#ion-overlay-1 { -// width: 90%; -// height: 50%; -// top: 20%; -// left: 5%; -// right: 5%; -// bottom: 5%; -// border: solid 1px red; - -// } - -// // .swiper-pagination.swiper-pagination-bullets{ -// // top: 6px; -// // bottom: inherit; -// // } - - - -// // .swiper-pagination.swiper-pagination-bullets { -// // top: 6px !important; -// // bottom: 0px !important; -// // } +// .swiper-pagination.swiper-pagination-bullets { +// top: 6px !important; +// bottom: 0px !important; +// } -// // .swiper-pagination { -// // top: 6px; -// // } +// .swiper-pagination { +// top: 6px; +// } -// .bar-stable { -// background-color: var(--cusgray) !important; -// } -// .tabs{ -// background-color: var(--cusgray) !important; -// } -// .icon-size-lg { -// font-size: 40px; -// } +.bar-stable { + background-color: var(--cusgray) !important; + } + .tabs{ + background-color: var(--cusgray) !important; + } + .icon-size-lg { + font-size: 40px; + } -// /*Timeline*/ + /*Timeline*/ -// .pos-absolute-right { -// position: absolute; -// right: 8px; -// } + .pos-absolute-right { + position: absolute; + right: 8px; + } -// .timeline { -// position: relative; -// margin: 15px 0 0 0; -// } + .timeline { + position: relative; + margin: 15px 0 0 0; + } -// .timeline:before { + .timeline:before { -// content: ''; -// position: absolute; -// top: 0; -// bottom: 0; -// width: 4px; -// background: #e4e4e4; -// z-index: 1; -// left: 66px; -// /* margin-left: -10px; */ -// /* z-index: 1; */ -// } + content: ''; + position: absolute; + top: 0; + bottom: 0; + width: 4px; + background: #e4e4e4; + z-index: 1; + left: 66px; + /* margin-left: -10px; */ + /* z-index: 1; */ + } -// .timeline .timeline-thumb { + .timeline .timeline-thumb { -// border-radius: 500px; -// width: 40px !important; -// z-index: 2; -// position: absolute; -// left: 48px; -// // :root[dir="ltr"]{ -// // left: 37px; -// // } -// // :root[dir="rtl"]{ -// // right: 37px; -// // } -// float: right; -// top: 9px; -// } + border-radius: 500px; + width: 40px !important; + z-index: 2; + position: absolute; + left: 48px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; + } -// .timeline .timeline-thumb.timeline-icon { -// height: 40px; -// // text-align: center; -// // color: white; -// // border: 5px solid #CBD0D3; -// // transform: scale(0.2); -// } + .timeline .timeline-thumb.timeline-icon { + height: 40px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); + } -// .timeline .timeline-item { -// width: 50px; + .timeline .timeline-item { + width: 50px; -// } + } -// .timeline .timeline-stats { -// position: relative; -// font-size: 12px; -// color: var(--darkgray); + .timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); -// } + } -// .divider-title { -// background: #e4e4e4; -// padding: 5px 15px; -// } + .divider-title { + background: #e4e4e4; + padding: 5px 15px; + } -// .color-red { -// color: var(--danger) !important; -// } + .color-red { + color: var(--danger) !important; + } -// .bg-color-dot { + .bg-color-dot { -// background: var(--gray); + background: var(--gray); -// /* background: linear-gradient(45deg, var(--primary) 0%, #19a163 36%, var(--secondary) 59%, var(--customnavy) 100%); */ -// // border: var(--secondary) solid 1px; -// // background-color: #ff3b30 !important; -// // background: var(--primary); -// //background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); -// //background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); -// //background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + /* background: linear-gradient(45deg, var(--primary) 0%, #19a163 36%, var(--secondary) 59%, var(--customnavy) 100%); */ + // border: var(--secondary) solid 1px; + // background-color: #ff3b30 !important; + // background: var(--primary); + //background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + //background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + //background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); -// } + } -// .bg-blue-dot { + .bg-blue-dot { -// border: var(--blue) solid 1px; -// background: var(--gray); + border: var(--blue) solid 1px; + background: var(--gray); -// } -// .bg-orange-dot { + } + .bg-orange-dot { -// border: var(--orange) solid 1px; -// background: var(--gray); -// } -// .bg-red-dot { + border: var(--orange) solid 1px; + background: var(--gray); + } + .bg-red-dot { -// border: var(--red) solid 1px; -// background: var(--gray); + border: var(--red) solid 1px; + background: var(--gray); -// } -// .bg-green-dot { + } + .bg-green-dot { -// border: var(--green) solid 1px; -// background: var(--gray); -// } + border: var(--green) solid 1px; + background: var(--gray); + } -// .bg-blue-txt { + .bg-blue-txt { -// color: var(--blue) !important; -// font-weight:bold; + color: var(--blue) !important; + font-weight:bold; -// } -// .bg-orange-txt { -// font-weight:bold; + } + .bg-orange-txt { + font-weight:bold; -// color: var(--orange) !important; -// } -// .bg-red-txt { -// font-weight:bold; + color: var(--orange) !important; + } + .bg-red-txt { + font-weight:bold; -// color: var(--red) !important; + color: var(--red) !important; -// } -// .bg-green-txt { -// font-weight:bold; + } + .bg-green-txt { + font-weight:bold; -// color: var(--green) !important; -// } + color: var(--green) !important; + } -// .notification-list{ -// ion-item{ -// // margin-top: 5px; -// // margin-bottom: 5px; +.notification-list{ +ion-item{ + // margin-top: 5px; + // margin-bottom: 5px; -// background-color: transparent; -// .item-date{ -// width: 55px; -// font-size: 14px; -// font-weight: bold; + background-color: transparent; + .item-date{ + width: 55px; + font-size: 14px; + font-weight: bold; -// text-align: center; -// padding: 0; -// margin: 0; + text-align: center; + padding: 0; + margin: 0; -// position: absolute; -// left: 0; -// top: 0; -// } -// ion-label , [item-end]{ + position: absolute; + left: 0; + top: 0; + } + ion-label , [item-end]{ -// white-space: normal; -// font-size: 14px; -// // :root[dir="ltr"]{ -// // margin-left: 10px; -// // } -// // :root[dir="rtl"]{ -// // margin-right: 10px; -// // } + white-space: normal; + font-size: 14px; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } -// } - -// } -// } -// .input-wrapper { -// --flex:none; -// } -// ion-input ,ion-datetime{ -// border-bottom: #dedede 1px solid; -// } -// .left { -// .timeline:before{ -// left: 66px; -// } -// .notification-list ion-item{ -// padding-left: 3px; -// } -// .timeline-thumb{ -// left: 37px; -// } -// } -// .right { -// .timeline:before{ -// right: 62px; -// } -// .notification-list ion-item{ -// padding-right: 3px; -// } -// .timeline-thumb{ -// right: 37px; -// } -// } + } + +} +} +.input-wrapper { +--flex:none; +} +ion-input ,ion-datetime{ +border-bottom: #dedede 1px solid; +} +.left { +.timeline:before{ +left: 66px; +} +.notification-list ion-item{ + padding-left: 3px; +} +.timeline-thumb{ + left: 37px; +} +} +.right { +.timeline:before{ + right: 62px; + } + .notification-list ion-item{ + padding-right: 3px; + } + .timeline-thumb{ + right: 37px; + } +} 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 884f5521..c31ae21e 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 @@ -218,8 +218,8 @@ export class WorklistMainPRComponent implements OnInit { this.worklistMainService .getPONotificationBody(notificationBodyObj) .subscribe((result: PONotificatonBodyResponse) => { - console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); - this.handleWorkListBodyResult(result, "PO"); + // console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); + // this.handleWorkListBodyResult(result, "PO"); }); } @@ -406,7 +406,7 @@ export class WorklistMainPRComponent implements OnInit { } - this.common.confirmAlertDialogAction( + this.common.confirmAlertDialog( () => { this.applyAction(this.WorkListActionObj); }, this.ts.trPK('general', 'ok'), 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 c9965cd0..592b36d3 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -131,6 +131,6 @@ {{ts.trPK('general','submit')}}
- {{'worklistMain, skip' | translate}} + {{ts.trPK('worklistMain','skip')}}
\ No newline at end of file diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index b6e25a7a..1f61f828 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -6,19 +6,16 @@ {{ts.trPK('payslip','title')}} - + - + choose payslip - {{options.PAYSLIP_CHOICE}} + {{options.PAYSLIP_CHOICE}} - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
- + - - - -
+ +
- + - + - + - + - + - + - + - + - + - + - + - + @@ -193,181 +138,72 @@
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - -
-
- - - - - - - - -
+
- - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
-
- - + + - + \ No newline at end of file diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 3b9e5d21..e69de29b 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -1,41 +0,0 @@ -.rowAccordin{ - border: none; - - -} - -.gridAccordin{ - margin: 10px; - background: #ffffff; - border-radius: 5px; -} - -.colPayslip{ - text-align: center; - color: var(--labelColor); - -} -.earingTotH{ - text-align: right; - font-weight: bold; - font-size:20px !important; - padding-right: 15px; -} - -.earingTotG{ - text-align: left; - padding-left: 15px; - font-weight: bold; - font-size: 20px !important; - color: var(--green); - -} - -.earingTotR{ - text-align: left; - padding-left: 15px; - font-weight: bold; - font-size: 20px !important; - color: var(--red); - -} diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 22e62ac3..4ab1ab45 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -20,10 +20,6 @@ export class HomeComponent implements OnInit { showPaySlip:any=[]; ActionContextID:any; public static ACTION_CONTEXT_ID = "passActionContectID"; - GetEarningsList: any=''; - GetDeductionsList: any=''; - earingTotal: any; - deductionTotal: any; constructor( public payslipService:PayslipService, @@ -103,9 +99,7 @@ export class HomeComponent implements OnInit { this.ActionContextID=this.GetPayslipList[index].ACTION_CONTEXT_ID; this.common.sharedService.setSharedData(this.ActionContextID,HomeComponent.ACTION_CONTEXT_ID); this.getSummeryOfPayment(this.ActionContextID); - this.getPaymentInfo(this.ActionContextID); - this.getDeduction(this.ActionContextID); - this.getEarings(this.ActionContextID); + this.getPaymentInfo(this.ActionContextID) } @@ -124,9 +118,6 @@ export class HomeComponent implements OnInit { handleSummeryOfPaymentResult(result){ if (result.GetSummaryOfPaymentList != null) { this.GetSummaryOfPaymentList = result.GetSummaryOfPaymentList[0]; - this.earingTotal = this.GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT; - this.deductionTotal = this.GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT; - } } @@ -157,52 +148,4 @@ openDeductions(){ this.common.openDeductionsPage(); } -getEarings(ActionContextID){ - const request = { - P_ACTION_CONTEXT_ID: ActionContextID, - P_PAGE_NUM: 1, - P_PAGE_LIMIT: 1000 - }; - - this.payslipService.getEarings(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleGetEaringsResult(result); - } - ); -} - -handleGetEaringsResult(result){ - if (result.GetEarningsList != null) { - this.GetEarningsList = result.GetEarningsList; - } - - - -} - -getDeduction(ActionContextID){ - const request = { - P_ACTION_CONTEXT_ID: ActionContextID, - P_PAGE_NUM: 1, - P_PAGE_LIMIT: 1000 - }; - - this.payslipService.getDeduction(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - { - this.handleGetDeductionResult(result); - } - ); - } - - handleGetDeductionResult(result){ - if (result.GetDeductionsList != null) { - this.GetDeductionsList = result.GetDeductionsList; - } - } - - - - - - } diff --git a/Mohem/src/app/payslip/payslip.module.ts b/Mohem/src/app/payslip/payslip.module.ts index c191af9d..be74137e 100644 --- a/Mohem/src/app/payslip/payslip.module.ts +++ b/Mohem/src/app/payslip/payslip.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { Routes, RouterModule } from '@angular/router'; -import { HmgCommonModule } from 'src/app/hmg-common/hmg-common.module'; import { IonicModule } from '@ionic/angular'; import {EarningsComponent}from './earnings/earnings.component' @@ -36,7 +35,6 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, - HmgCommonModule, RouterModule.forChild(routes) ], providers:[ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 6714c2ec..5be6f116 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1727,268 +1727,8 @@ "closeMsg":{ "en": "Are you sure to close this purchase requisition ?", "ar":"العناصر المطلوبة" - }, - "Supplier":{ - "en": "Supplier", - "ar":"Supplier" - }, - "Site":{ - "en": "Site", - "ar":"Site" - }, - "Preparer":{ - "en": "Preparer", - "ar":"Preparer" - }, - "Buyer":{ - "en": "Buyer", - "ar":"Buyer" - }, - "CreationDate":{ - "en": "Creation Date", - "ar":"Creation Date" - }, - "ShipToLocation":{ - "en": "Ship To Location", - "ar":"Ship To Location " - }, - "QuotationNumber":{ - "en": "Quotation Number", - "ar":"Quotation Number" - }, - "QuotationDate":{ - "en": "Quotation Date", - "ar":"Quotation Date" - }, - "PaymentTerms":{ - "en": "Payment Terms", - "ar":"Payment Terms " - }, - "GrossAmount":{ - "en": "Gross Amount", - "ar":"Gross Amount" - }, - "DiscountAmount":{ - "en": "Discount Amount", - "ar":"Discount Amount" - }, - "TotalPODiscount":{ - "en": "Total PO Discount", - "ar":"Total PO Discount" - }, - "VATAmount":{ - "en": "VAT Amount", - "ar":"VAT Amount" - }, - "CustomDuty":{ - "en": "Custom Duty", - "ar":"Custom Duty" - }, - "ShipHandle":{ - "en": "Ship Handle", - "ar":"Ship Handle" - }, - "OtherCharges":{ - "en": "Other Charges", - "ar":"Other Charges" - }, - "TotalPOAmountWithVAT":{ - "en": "Total PO Amount with VAT", - "ar":"Total PO Amount with VAT" - }, - "TotalPOAmountInWords":{ - "en": "Total PO Amount in Words", - "ar":"Total PO Amount in Words" - }, - "Currency":{ - "en": "Currency", - "ar":"Currency" - }, - "PONumber":{ - "en": "PO NUMBER", - "ar":"PO NUMBER" - }, - "des-PO":{ - "en": "Standard Purchase Order", - "ar":"Standard Purchase Order" - }, - "MFG":{ - "en": "MFG", - "ar":"MFG" - }, - "LINE_TYPE":{ - "en": "Line Type", - "ar":"Line Type" - }, - "LINE_DIS":{ - "en": "Line Discount %", - "ar":"Line Discount %" - }, - "LINE_AMOUNT":{ - "en": "Line Amount", - "ar":"Line Amount" - }, - "NEED_TO":{ - "en": "Need By Date", - "ar":"Need By Date" - }, - "PROMISED_DATE":{ - "en": "Promised Date", - "ar":"Promised Date" - }, - "DELIVER_TO":{ - "en": "Deliver To Location", - "ar":"Deliver To Location" - }, - "PR_NO":{ - "en": "Requisition Number", - "ar":"Requisition Number" - }, - "REQUEST":{ - "en": "Requestor", - "ar":"Requestor" - }, - "ITEM_HIS":{ - "en": "Item History", - "ar":"Item History" - }, - "QUOTATION_ANALYSIS":{ - "en": "Quotation Analysis", - "ar":"Quotation Analysis" - }, - "Date_Req":{ - "en": "Date Required", - "ar":"Date Required" - }, - "line_status":{ - "en": "Line Status", - "ar":"Line Status" - }, - "date_status":{ - "en": "Status Date", - "ar":"Status Date" - }, - "trans_type":{ - "en": "Transaction Type", - "ar":"Transaction Type" - }, - "operating_unit":{ - "en": "Operating Unit", - "ar":"Operating Unit" - }, - "to_locator":{ - "en": "To Locator", - "ar":"To Locator" - }, - "to_subinventory":{ - "en": "To Subinventory", - "ar":"To Subinventory" - }, - "from_locator":{ - "en": "From Locator", - "ar":"From Locator" - }, - "from_subinventory":{ - "en": "From Subinventory", - "ar":"From Subinventory" - }, - "organization":{ - "en": "Organization", - "ar":"Organization" - }, - "organization_code":{ - "en": "Organization Code", - "ar":"Organization Code" - }, - "revision":{ - "en": "Revision", - "ar":"Revision " - }, - "uom":{ - "en": "UOM", - "ar":"UOM" - }, - "quantity_ordered":{ - "en": "Quantity Ordered", - "ar":"Quantity Ordered" - }, - "quantity_received":{ - "en": "Quantity Received", - "ar":"Quantity Received" - }, - "bonus_quantity":{ - "en": "Bonus Quantity", - "ar":"Bonus Quantity" - }, - "purchase_price":{ - "en": "Purchase Price", - "ar":"Purchase Price" - }, - - "discount":{ - "en": "Discount %", - "ar":"Discount %" - }, - "balance_quantity":{ - "en": "Balance Quantity", - "ar":"Balance Quantity" - }, - "net_price":{ - "en": "Net Price", - "ar":"Net Price" - }, - "closure_status":{ - "en": "Closure Status", - "ar":"Closure Status" - }, - "vendor_name":{ - "en": "Vendor Name", - "ar":"Vendor Name" - }, - "item_code":{ - "en": "Item Code", - "ar":"Item Code" - }, - "QUOTATION_QTY":{ - "en": "Quotation Qty", - "ar":"Quotation Qty" - }, - "quotation_uom":{ - "en": "Quotation UOM", - "ar":"Quotation UOM" - }, - "quotatio_net_price":{ - "en": "Quotatio Net Price", - "ar":"Quotatio Net Price" - }, - "quotatio_line_tot":{ - "en": "Quotation Line Total", - "ar":"Quotation Line Total" - }, - "quotatio_bonus_quantity":{ - "en": "Quotation Bonus Quantity", - "ar":"Quotation Bonus Quantity" - }, - "quotation_delivery_date":{ - "en": "Quotation Delivery Date", - "ar":"Quotation Delivery Date" - }, - "MFG_part_number":{ - "en": "Quotation MFG Part Number", - "ar":"Quotation MFG Part Number" - }, - "RFQ_number":{ - "en": "RFQ Number", - "ar":"RFQ Number" - }, - "RFQ_qty":{ - "en": "RFQ Qty", - "ar":"RFQ Qty" - }, - "RFQ_UOM":{ - "en": "RFQ UOM", - "ar":"RFQ UOM" } + }, "payslip": { "title":{ @@ -2070,11 +1810,6 @@ "payroll-info":{ "en": "Payroll Processing Information", "ar":"معلومات كشف الراتب " - }, - "total":{ - "en": "Total", - "ar":"المجموع " } - } } \ No newline at end of file diff --git a/Mohem/src/global.scss b/Mohem/src/global.scss index 4421a600..6543a146 100644 --- a/Mohem/src/global.scss +++ b/Mohem/src/global.scss @@ -10,4 +10,3 @@ @import '~@ionic/angular/css/text-transformation.css'; @import '~@ionic/angular/css/flex-utils.css'; @import "theme/styles.scss"; -@import "theme/worklist.scss"; diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 32566988..8de24f91 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -800,7 +800,6 @@ color: var(--dark); // .skipbutton,.button-md, button-ios{ .skipbutton{ - width: 100px; --background: var(--orange); white-space: normal; color: var(--light); @@ -816,32 +815,26 @@ color: var(--dark); } .cancelBtn { - background:var(--red) !important; - white-space: normal !important; - color:var(--light) !important; - text-transform: capitalize !important; + background:var(--red); + white-space: normal; + color:var(--light); + text-transform: capitalize; // min-width: 200px; - min-height: 45px !important; - border-radius: 5px !important; - width:125px !important; - min-width: 5px !important; - width: 10px !important; - margin: 8px !important; + min-height: 45px; + border-radius: 5px; + width:125px; } -.confirmBtn { - background:var(--green) !important; - white-space: normal !important; - color:var(--light) !important; - text-transform: capitalize !important; + .confirmBtn { + background:var(--green); + white-space: normal; + color:var(--light); + text-transform: capitalize; // min-width: 200px; - min-height: 45px !important; - border-radius: 5px !important; - width:125px !important; - min-width: 5px !important; - width: 10px !important; - margin: 8px !important; - } + min-height: 45px; + border-radius: 5px; + width:125px; + } // .slides-gray-bullets .swiper-wrapper { // margin-top: 14px !important; diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index 33bb3b43..454fe9ee 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -68,7 +68,6 @@ --green:#209B48; --red:#BE1E2D; --blue:#223262; - --cyanblue:#1b75bc; // $font-family-base: $fontFamilyMediumEN !default; // $font-family-ios-base: $fontFamilyMediumEN !default;