diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index c9d9d569..815489bd 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -21,8 +21,8 @@

{{'verificationcode,title' | translate}} {{'verificationcode,verificationcode' | translate}} {{'verificationcode,by' | translate}} - {{'verificationcode , sms' | translate}} - {{'verificationcode , whatsapp' | translate}} + {{'verificationcode , sms' | translate}}, + {{'verificationcode , whatsapp' | translate}}, {{'verificationcode,instruct' | translate}} {{'general,submit' | translate}} - 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 38a135ac..2857c3b1 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -195,8 +195,6 @@ public static host = 'https://uat.hmgwebservices.com/'; this.cs.stopLoading(); this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { this.cs.sharedService.clearAll(); - // this.cs.setIsTimeSessionOut(result.IsAuthenticated); - this.cs.openLogin(); }); @@ -227,9 +225,7 @@ public static host = 'https://uat.hmgwebservices.com/'; this.cs.stopLoading(); this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { console.log("presentAcceptDialog"); - this.cs.sharedService.clearAll(); - // this.cs.setIsTimeSessionOut(result.IsAuthenticated); - + this.cs.sharedService.clearAll(); this.cs.openLogin(); }); diff --git a/Mohem/src/app/notification/item-history/item-history.component.html b/Mohem/src/app/notification/item-history/item-history.component.html index f3bba0cc..494a5c0c 100644 --- a/Mohem/src/app/notification/item-history/item-history.component.html +++ b/Mohem/src/app/notification/item-history/item-history.component.html @@ -32,17 +32,18 @@

- + - + - - - + colBorder + --> + + + + +
@@ -62,9 +63,9 @@ {{itemHistory.PO_NUMBER}}
- + - +
- - + +
@@ -62,9 +62,9 @@ {{itemHistory.UNIT_OF_MEASURE}}
- + - +
- + - +
- +
- +
- +
- +
- +
- +
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 045344e2..16ed9cf8 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 @@ -44,8 +44,9 @@ --> - - + + + @@ -66,8 +67,8 @@ - - + +
@@ -88,8 +89,8 @@
- - + +
@@ -147,12 +148,12 @@
{{totalH}}
-
{{valueH}}
+
{{valueH}}
{{taxH}}
-
{{taxvalueH}}
+
{{taxvalueH}}
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 e776d04d..0c91d8b5 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 @@ -263,6 +263,7 @@ export class WorklistMainPRComponent implements OnInit { } else if (Type == 'PR') { if (result.GetPrNotificationBodyList) { console.log('PR'); + this.pInformation = result.GetPrNotificationBodyList.P_INFORMATION; this.PRHeader = result.GetPrNotificationBodyList.PRHeader; this.PRLines = result.GetPrNotificationBodyList.PRLines; 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 1b4b3ac6..50fb327b 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -55,7 +55,7 @@ + size="6" [hidden]="notificationBody.DISPLAY_FLAG == 'N'" >