fixed conflict issues

mekawy-issues
umasoodch 6 years ago
parent 97f6089272
commit 25ada829df

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

Loading…
Cancel
Save