@@ -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 dec9d371..80f8b472 100644
--- a/Mohem/src/app/my-team/my-team.module.ts
+++ b/Mohem/src/app/my-team/my-team.module.ts
@@ -9,6 +9,7 @@ import { IonicModule } from '@ionic/angular';
import { MyTeamPage } from './my-team.page';
import { HmgCommonModule } from '../hmg-common/hmg-common.module';
import { from } from 'rxjs';
+import { WorklistService } from 'src/app/notification/service/worklist.service';
const routes: Routes = [
@@ -40,7 +41,9 @@ const routes: Routes = [
FormsModule,
IonicModule,
RouterModule.forChild(routes)
+
],
+ providers:[WorklistService],
declarations: [MyTeamPage,HomeComponent,DetailsComponent,
]
})
diff --git a/Mohem/src/assets/imgs/favFilled.svg b/Mohem/src/assets/imgs/favFilled.svg
new file mode 100644
index 00000000..7987c91b
--- /dev/null
+++ b/Mohem/src/assets/imgs/favFilled.svg
@@ -0,0 +1,3 @@
+
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index d2741d65..bdd200ba 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -1191,6 +1191,10 @@
"en": "CREATE HR REQUEST",
"ar": "انشاء طلب"
},
+ "HR-Request": {
+ "en": "HR Request",
+ "ar": "HR طلبات ال "
+ },
"performance-evaluation": {
"en": "Performance Evaluation",
"ar": "تقييم الاداء"