diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
index a1a18349..05b56ff0 100644
--- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
+++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
@@ -15,7 +15,7 @@
+ (change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts
index f8a6c040..72cf9af1 100644
--- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts
+++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts
@@ -482,6 +482,12 @@ export class ConfirmAddEitComponent implements OnInit {
});
+ onFileSelectedclick(event){
+ event.target.value = '';
+ }
+
+
+
onFileSelected(input) {
// this.uploader.onWhenAddingFileFailed = function (item: any, filter: any, options: any){
diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts
index 31f9a7cd..711a8ec5 100644
--- a/Mohem/src/app/hmg-common/services/common/common.service.ts
+++ b/Mohem/src/app/hmg-common/services/common/common.service.ts
@@ -596,7 +596,7 @@ public getMonthNameAr(value: number): string {
if (result.MessageStatus === 1) {
return true;
} else if (result.MessageStatus === 2) {
- return this.hasData(result['SameClinicApptList']);
+ return false;
}
return false;
}
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 1f34b0ad..e1ce2293 100644
--- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts
+++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
@@ -167,6 +167,7 @@ public static host = 'https://uat.hmgwebservices.com/';
}
if (!this.cs.validResponse(result)) {
if (result.IsAuthenticated === false) {
+ this.cs.stopLoading();
this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => {
this.cs.sharedService.clearAll();
this.cs.openLogin();
diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html
index 6b880c28..081b6b44 100644
--- a/Mohem/src/app/my-team/details/details.component.html
+++ b/Mohem/src/app/my-team/details/details.component.html
@@ -79,14 +79,14 @@
- {{ts.trPK('myTeam','checkIn')}}
+ {{ts.trPK('myTeam','check-in')}}
{{attendanceTrackingList.P_SWIPE_IN | slice:0:-3}}
--:--
- {{ts.trPK('myTeam','checkOut')}}
+ {{ts.trPK('myTeam','check-out')}}
{{attendanceTrackingList.P_SWIPE_OUT | slice:0:-3}}
--:--
@@ -103,14 +103,15 @@