@@ -268,28 +269,28 @@
{{ts.trPK('attendance-tracking','schedule')}}
-
{{timeCardSummaryData.SCHEDULE_DAYS}}
+ {{timeCardSummaryData?.SCHEDULE_DAYS}}
{{ts.trPK('attendance-tracking','off-days')}}
-
{{timeCardSummaryData.OFF_DAYS}}
+ {{timeCardSummaryData?.OFF_DAYS}}
{{ts.trPK('attendance-tracking','non-analyzed')}}
-
{{timeCardSummaryData.NOT_ANALYZED_DAYS}}
+ {{timeCardSummaryData?.NOT_ANALYZED_DAYS}}
{{ts.trPK('attendance-tracking','shortage-hours')}}
-
{{timeCardSummaryData.SHORTAGE_HRS}}
+ {{timeCardSummaryData?.SHORTAGE_HRS}}
diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts
index 02118570..83674888 100644
--- a/Mohem/src/app/my-team/details/details.component.ts
+++ b/Mohem/src/app/my-team/details/details.component.ts
@@ -92,6 +92,7 @@ export class DetailsComponent implements OnInit {
public selectedFilter = '';
public itemType = '';
public monthNo: any;
+ isFavorite: boolean = false;
@@ -804,13 +805,15 @@ export class DetailsComponent implements OnInit {
confirmBoxhtml
, () => {
var request =
- [{ "USER_NAME": selEmp['USER_NAME'], "EMPLOYEE_DISPLAY_NAME": selEmp['EMPLOYEE_DISPLAY_NAME'], "EMAIL_ADDRESS": selEmp.EMAIL_ADDRESS, "EMPLOYEE_IMAGE": selEmp.EMPLOYEE_IMAGE, "IsFavorite": true }];
+ { "USER_NAME": selEmp['USER_NAME'], "EMPLOYEE_DISPLAY_NAME": selEmp['EMPLOYEE_DISPLAY_NAME'], "EMAIL_ADDRESS": selEmp.EMAIL_ADDRESS, "EMPLOYEE_IMAGE": selEmp.EMPLOYEE_IMAGE, "IsFavorite": true };
this.saveUserFavruiteList(request);
+ // this.isFavorite = false;
+
}, () => {
})
-
+ this.isFavorite = false;
// if (selectValue == "1" || selectValue == "2" || selectValue == "3") {
// this.isSelect = true;
// }
@@ -825,11 +828,12 @@ export class DetailsComponent implements OnInit {
getFavruite() {
this.worklistService.getFavorite({}, () => {
-
}).subscribe((result) => {
if (this.common.validResponse(result)) {
this.common.stopLoading();
this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList'];
+
+
}
})
}
@@ -838,6 +842,7 @@ export class DetailsComponent implements OnInit {
}).subscribe((result) => {
if (this.common.validResponse(result)) {
this.common.toastPK("replacementRoll", "favorite-saved");
+ this.isFavorite = true;
}
})
diff --git a/Mohem/src/app/my-team/my-team.module.ts b/Mohem/src/app/my-team/my-team.module.ts
index 5dda2aeb..a569754b 100644
--- a/Mohem/src/app/my-team/my-team.module.ts
+++ b/Mohem/src/app/my-team/my-team.module.ts
@@ -9,7 +9,11 @@ import { IonicModule } from '@ionic/angular';
import { MyTeamPage } from './my-team.page';
import { HmgCommonModule } from '../hmg-common/hmg-common.module';
import { from } from 'rxjs';
+<<<<<<< HEAD
import { WorklistService } from '../notification/service/worklist.service';
+=======
+import { WorklistService } from 'src/app/notification/service/worklist.service';
+>>>>>>> e0a02c254f3a86fa5c1f466668fe4a4a90433c95
const routes: Routes = [
@@ -41,9 +45,10 @@ const routes: Routes = [
FormsModule,
IonicModule,
RouterModule.forChild(routes)
- ],
- declarations: [MyTeamPage, HomeComponent, DetailsComponent,
+
],
providers: [WorklistService],
+ declarations: [MyTeamPage, HomeComponent, DetailsComponent,
+ ]
})
export class MyTeamPageModule { }
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 e0ae39d0..3779b172 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
@@ -10,8 +10,7 @@
class="ion-segment-all">
-
+
{{'worklistMain, info'| translate}}
@@ -24,8 +23,9 @@
[ngClass]="activeSegment == 'action-history' ? 'active-Segment' : 'normal-Segment'">
{{'worklistMain, action' | translate}}
-
-
+
+
{{'worklistMain, attach-file' | translate}}
@@ -40,21 +40,24 @@
- {{pInformation}}
+ {{pInformation}}
+
0 ">
-
+
0">
-
+ *ngFor="let notificationBody of item.Collection_Notification;"
+ size="6" [hidden]="notificationBody.DISPLAY_FLAG == 'N'">
+
@@ -65,41 +68,49 @@
0">
- {{ts.trPK('worklistMain','employee-on-leave')}}
+ {{ts.trPK('worklistMain','employee-on-leave')}}
-
-
+
-
-
+
-
+
-
+
@@ -107,177 +118,189 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0 ">
-
-
-
- {{'userProfile, emp-detail' | translate}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0 ">
+
+
+
+ {{'userProfile, emp-detail' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -292,13 +315,14 @@
-
-
+
+ src="../assets/imgs/profile.png">
+
@@ -322,7 +346,8 @@
+ (click)="actionHistory.visible = !actionHistory.visible">{{
+ actionHistory.visible ? 'Show less': 'Show More' }}
@@ -336,9 +361,11 @@
{{actionHistory.NOTIFICATION_DATE| dateString }}
@@ -452,37 +479,37 @@
diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html
index 1b7bb6ed..52e8150b 100644
--- a/Mohem/src/app/profile/home/home.component.html
+++ b/Mohem/src/app/profile/home/home.component.html
@@ -14,7 +14,7 @@