-
- {{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 @@