diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 1335e79d..a3e4b9cc 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -174,7 +174,9 @@ public static host = 'https://uat.hmgwebservices.com/'; return false; } else if (result.ErrorType === 2 || result.ErrorType === 4) { // console.log("error expired"); + this.cs.stopLoading(); } else { + this.cs.stopLoading(); this.cs.showErrorMessageDialog( onError, errorLabel, 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 1715fb1c..4d57dbb9 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,5 +1,5 @@ - + diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 7f648459..dc54a457 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -133,4 +133,8 @@ height: 360px !important; padding-bottom: 21px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; + } + + .slider-container { + padding-bottom: 20px; } \ No newline at end of file diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index af154d2f..0fb04cdb 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -159,7 +159,7 @@
{{ts.trPK('attendance-tracking','non-analyzed')}} -

{{timeCardSummaryData.UNAUTHORIZED_LEAVE}}

+

{{timeCardSummaryData.NOT_ANALYZED_DAYS}}

diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 47dcda26..f8bd788e 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1284,7 +1284,7 @@ border:0px } .calendar-modal { - --height: 13.5cm !important; + --height: 14.5cm !important; --width: 88% !important; --border-radius: 0.4cm; } @@ -1422,3 +1422,11 @@ table.monthview-datetable th small { // --border-radius: 0.4cm; // } + +.calendar-modal .swiper-container-horizontal > .swiper-pagination-bullets{ + top: auto; + bottom: -8px; + .swiper-pagination-bullet-active { + background: #094875; + } +}