From 8915e67b008d135d9358466bdbb064eb7161f117 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 24 Jul 2019 16:31:37 +0300 Subject: [PATCH] fixes --- Mohem/config.xml | 1 + .../absence-attachment.component.html | 93 ++++++++++--------- .../absence-attachment.component.ts | 2 +- .../services/connector/connector.service.ts | 4 +- .../notification-type.component.html | 6 +- .../replacement-list.component.html | 5 + .../vacation-type.component.html | 4 +- 7 files changed, 65 insertions(+), 50 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index c3510099..63fc4516 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -20,6 +20,7 @@ + diff --git a/Mohem/src/app/absence/absence-attachment/absence-attachment.component.html b/Mohem/src/app/absence/absence-attachment/absence-attachment.component.html index ac5ff227..f2c67f41 100644 --- a/Mohem/src/app/absence/absence-attachment/absence-attachment.component.html +++ b/Mohem/src/app/absence/absence-attachment/absence-attachment.component.html @@ -1,51 +1,56 @@ - - - - {{ts.trPK('addAttach','title')}} - - - - + + + {{ts.trPK('addAttach','title')}} + + + + + + - - - -
{{ts.trPK('addAttach','title')}}
-
-
+ + + +
{{ts.trPK('addAttach','title')}}
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
-
- {{ts.trPK('general','ok')}} -
+
+ {{ts.trPK('general','ok')}} +
\ No newline at end of file diff --git a/Mohem/src/app/absence/absence-attachment/absence-attachment.component.ts b/Mohem/src/app/absence/absence-attachment/absence-attachment.component.ts index 3601bbd9..444c3972 100644 --- a/Mohem/src/app/absence/absence-attachment/absence-attachment.component.ts +++ b/Mohem/src/app/absence/absence-attachment/absence-attachment.component.ts @@ -110,7 +110,7 @@ export class AbsenceAttachmentComponent implements OnInit { } // end ok button closeBtnModal() { - // this.viewCtrl.dismiss("cancel"); + this.modalCtrl.dismiss(); } onFileSelected(input) { 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 db98e772..ff28853e 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -20,8 +20,8 @@ export class ConnectorService { // public static host = 'http://10.50.100.113:6060/'; // development service -// public static host = 'https://hmgwebservices.com/'; - public static host = 'http://10.50.100.198:6060/'; // development service + public static host = 'https://hmgwebservices.com/'; + // public static host = 'http://10.50.100.198:6060/'; // development service /* public static host = 'http://10.200.204.101:6060/'; // video conference development public static host = 'http://10.50.100.198:6060/'; public static host = 'http://10.50.100.198:6060/'; // development service diff --git a/Mohem/src/app/vacation-rule/notification-type/notification-type.component.html b/Mohem/src/app/vacation-rule/notification-type/notification-type.component.html index 65937b1b..3db310f4 100644 --- a/Mohem/src/app/vacation-rule/notification-type/notification-type.component.html +++ b/Mohem/src/app/vacation-rule/notification-type/notification-type.component.html @@ -1,7 +1,9 @@ - - {{ 'vacation-rule, notification-type' | translate}} + + + + {{ 'vacation-rule, notification-type' | translate}} 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 c2e2980f..b36cf41d 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 @@ -2,6 +2,11 @@ {{ 'vacation-rule, search-employee' | translate}} + + + + +
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 e21f4b06..ef4dc2d2 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 @@ -1,6 +1,8 @@ - + + + {{ 'vacation-rule, vacation-type' | translate}}