fixed conflict issues

MOHEMM-Q3-DEV-LATEST
umasoodch 6 years ago
parent 97f6089272
commit 25ada829df

@ -58,7 +58,7 @@ export class DetailsComponent implements OnInit {
public yearTitle: string; public yearTitle: string;
public activeMonth: any; public activeMonth: any;
public currentMonthName = this.getMonthName(new Date().getMonth() + 1); public currentMonthName = this.getMonthName(new Date().getMonth() + 1);
public showData = false; public showData = false;
public currentYear = new Date().getFullYear(); public currentYear = new Date().getFullYear();
public attendanceTrackingList: any = []; public attendanceTrackingList: any = [];
@ -83,7 +83,7 @@ export class DetailsComponent implements OnInit {
public searchEmail = ''; public searchEmail = '';
public showEmailInput = false; public showEmailInput = false;
public showUserNameOrNameInput = true; public showUserNameOrNameInput = true;
constructor( constructor(
public timeCardService: TimeCardService, public timeCardService: TimeCardService,
@ -95,7 +95,7 @@ export class DetailsComponent implements OnInit {
private location: Location, private location: Location,
public authService: AuthenticationService, public authService: AuthenticationService,
public dashboardService: DashboredService, public dashboardService: DashboredService,
) { ) {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
} }
@ -135,15 +135,12 @@ export class DetailsComponent implements OnInit {
this.showData = false; this.showData = false;
this.nextMonth = new Date().getMonth() + 2; this.nextMonth = new Date().getMonth() + 2;
this.preMonth = new Date().getMonth(); this.preMonth = new Date().getMonth();
if(this.direction == 'en'){ if (this.direction === 'en') {
this.currentMonthName = this.getMonthName(new Date().getMonth() + 1); this.currentMonthName = this.getMonthName(new Date().getMonth() + 1);
} else {
}
else{
this.currentMonthName = this.getMonthNameAr(new Date().getMonth() + 1); this.currentMonthName = this.getMonthNameAr(new Date().getMonth() + 1);
} }
this.calendarConfig(this.currentMonthName) , (new Date().getFullYear()); this.calendarConfig(this.currentMonthName, new Date().getFullYear());
} }
calendarConfig(month?, year?) { calendarConfig(month?, year?) {
@ -179,7 +176,7 @@ export class DetailsComponent implements OnInit {
}); });
} }
nextSlide() { nextSlide() {
this.common.startLoading(); this.common.startLoading();
if (this.currentMonthName !== this.month) { if (this.currentMonthName !== this.month) {
@ -326,29 +323,29 @@ export class DetailsComponent implements OnInit {
public getMonthNameAr(value: any): any { public getMonthNameAr(value: any): any {
switch (value) { switch (value) {
case 1: case 1:
return "يناير"; return 'يناير';
case 2: case 2:
return " فبراير"; return ' فبراير';
case 3: case 3:
return "مارس"; return 'مارس';
case 4: case 4:
return "أبريل"; return 'أبريل';
case 5: case 5:
return "مايو"; return 'مايو';
case 6: case 6:
return "يونيو"; return 'يونيو';
case 7: case 7:
return "يوليو"; return 'يوليو';
case 8: case 8:
return "أغسطس"; return 'أغسطس';
case 9: case 9:
return "سبتمبر"; return 'سبتمبر';
case 10: case 10:
return " اكتوبر"; return ' اكتوبر';
case 11: case 11:
return " نوفمبر"; return ' نوفمبر';
case 12: case 12:
return "ديسمبر"; return 'ديسمبر';
} }
} }
@ -526,7 +523,7 @@ doInfinite(infiniteScroll) {
sortMenuEntires(list) { sortMenuEntires(list) {
const tree = this.common.list_to_tree(list); const tree = this.common.list_to_tree(list);
this.common.sharedService.setSharedData(tree, 'menuEntries'); this.common.sharedService.setSharedData(tree, 'menuEntries');
this.common.sharedService.setSharedData("myteam", "homemenuentries"); this.common.sharedService.setSharedData('myteam', 'homemenuentries');
this.common.openEITPage(); this.common.openEITPage();
} }

Loading…
Cancel
Save