diff --git a/Mohem/config.xml b/Mohem/config.xml
index 55d5ce3c..0943daff 100644
--- a/Mohem/config.xml
+++ b/Mohem/config.xml
@@ -20,6 +20,7 @@
+
diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts
index 9cdfc021..2c882ac2 100644
--- a/Mohem/src/app/app.component.ts
+++ b/Mohem/src/app/app.component.ts
@@ -57,6 +57,7 @@ export class AppComponent implements OnInit, AfterViewInit {
ngOnInit() {
this.initializeApp();
+
}
ngAfterViewInit() {}
initializeApp() {
@@ -94,9 +95,13 @@ export class AppComponent implements OnInit, AfterViewInit {
? user.CompanyImageDescription
: "Powered By Cloud Solutions";
this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME;
+ if(this.cs.getUpdateImage().status){
+ this.user_image =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.cs.getUpdateImage().img);
+ }else{
this.user_image = user.EMPLOYEE_IMAGE
? "data:image/png;base64," + user.EMPLOYEE_IMAGE
: "../assets/imgs/profile.png";
+ }
this.User_Job_name=user.JOB_NAME;
console.log(user);
diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
index 931f7349..5ab6a2b0 100644
--- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
+++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
@@ -13,11 +13,11 @@
[ngClass]="{'content-class':accessFromOutSide, 'ion-padding': !accessFromOutSide}" has-bouncing="false" forceOverscroll="false" scrollY="false" class="ion-no-padding">
-
+
+
-
+ -->
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html
index 725130e9..f2811d6a 100644
--- a/Mohem/src/app/authentication/sms-page/sms-page.page.html
+++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html
@@ -9,13 +9,13 @@
-
+
+
-
+ -->
diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
index f265cb6e..67a8ab9d 100644
--- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
+++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
@@ -1,11 +1,3 @@
-
-
-
-// .modalCss .modal-Wrapper {
-// width: 600px;
-// height: 300px;
-// }
-
.chart-modal .modal-Wrapper {
--background: rgb(116, 108, 108) !important;
--border-color:white!important ;
@@ -18,12 +10,9 @@
font-size: 10px !important;
--background: #22C6B3 !important;
color: aliceblue !important;
-// margin-top: 10px !important;
-
}
- .menu{
- // margin-left:330px !important;
+ .menu {
margin-top: 0px !important;
font-size: 35px !important;
background: #22C6B3;
@@ -33,7 +22,6 @@
}
.person{
-
margin-left:100px !important;
margin-top: 0px !important;
font-size: 23px !important;
@@ -43,20 +31,19 @@
}
.grid{
-margin-bottom: 550px !important;
-margin-top: 20px !important;
-margin-left: 15px !important;
-margin-right: 15px !important;
-background-color:white !important;
-border-radius: 20px !important;
-height: 250px !important;
+ margin-bottom: 550px !important;
+ margin-top: 20px !important;
+ margin-left: 15px !important;
+ margin-right: 15px !important;
+ background-color:white !important;
+ border-radius: 20px !important;
+ height: 250px !important;
}
-.ionSliders{
- margin: 0px !important;
- padding: 0px !important;
-
-}
+ .ionSliders{
+ margin: 0px !important;
+ padding: 0px !important;
+ }
.ionSlide{
diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts
index c664d3dc..842cbd83 100644
--- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts
+++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts
@@ -17,11 +17,6 @@ import { GetSwipesRequest } from 'src/app/time-card/service/models/get-swipes-re
styleUrls: ['./circle-calendar.component.scss']
})
export class CircleCalendarComponent implements OnInit {
-
- @Input() eventsdateDayOff: any = [];
- @Input() eventsdateAttend: any = [];
- @Input() eventsdateAbsent: any = [];
- @Input() normalDays: any = [];
@Input() dayHoursTypeDetailsList: any = [];
@Input() currentDateParent: string;
@Output() monthTitle = new EventEmitter();
@@ -86,10 +81,7 @@ export class CircleCalendarComponent implements OnInit {
}
reRenderCalendar() {
- this.renderDate(this.eventsdateAbsent, 'absent');
- this.renderDate(this.eventsdateAttend, 'present');
- this.renderDate(this.eventsdateDayOff, 'dayoff');
- this.renderDate(this.normalDays, 'scheduleDay');
+ this.renderDate(this.dayHoursTypeDetailsList);
}
public async dateModal(shiftDetails) {
@@ -106,14 +98,23 @@ export class CircleCalendarComponent implements OnInit {
await modal.present();
}
- public renderDate(arrayDays, cssClass) {
+ public renderDate(arrayDays) {
const td = document.querySelectorAll('.swiper-slide-active .monthview-datetable td:not(.text-muted)');
arrayDays.forEach(dateObj => {
- const date = dateObj.startTime;
+ const date = dateObj.customScheduleDate;
td.forEach(element => {
// tslint:disable-next-line: triple-equals
- if (date.getDate() == element.textContent.trim()) {
- element.classList.add(cssClass);
+ if (date.getDate() == element.textContent.trim() && dateObj.customPresent === true) {
+ element.classList.add('present');
+ // tslint:disable-next-line: triple-equals
+ } else if (date.getDate() == element.textContent.trim() && dateObj.customAbsent === true) {
+ element.classList.add('absent');
+ // tslint:disable-next-line: triple-equals
+ } else if (date.getDate() == element.textContent.trim() && dateObj.customDaysOff === true) {
+ element.classList.add('dayoff');
+ // tslint:disable-next-line: triple-equals
+ } else if (date.getDate() == element.textContent.trim() && dateObj.customSchedule === true) {
+ element.classList.add('scheduleDay');
}
});
});
@@ -124,7 +125,7 @@ export class CircleCalendarComponent implements OnInit {
console.log(event.selectedTime.getDate());
const selectedIndex = event.selectedTime.getDate();
this.selectedIndexData = this.dayHoursTypeDetailsList[selectedIndex - 1];
- if (this.selectedIndexData.present) {
+ if (this.selectedIndexData.customPresent) {
const rtpID = this.selectedIndexData.RTP_ID;
this.getScheduleShiftDetails(rtpID);
}
diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html
index 5c57f654..1715fb1c 100644
--- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html
+++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html
@@ -1,104 +1,100 @@
-
-
-
-