diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts index ecf0bdef..1b25ee4e 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts @@ -84,7 +84,7 @@ export class DateInfoModalComponent implements OnInit { this.day = localDate[1]; this.year = localDate[2]; // tslint:disable-next-line: radix - this.month = parseInt(localDate[0]) + 1; + this.month = parseInt(localDate[0]); this.nameMonth = this.direction === 'ltr' ? this.common.getMonthName(this.month) : this.common.getMonthNameAr(this.month); this.nameDay = this.getHeaderDay(new Date(date)); const d = new Date(date); diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 5587119a..3681ea1f 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -22,18 +22,6 @@ - - -

{{'home,monthly-attendance' | translate}}

- {{'home,monthly-time-sheet-view' | translate}} - - {{'home,view-detail' | translate}} - -
- - - -
{{menuItem.PROMPT}} @@ -54,6 +42,19 @@ + + + +

{{'home,monthly-attendance' | translate}}

+ {{'home,monthly-time-sheet-view' | translate}} + + {{'home,view-detail' | translate}} + +
+ + + +
diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index 849965c9..b0af3af9 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -70,6 +70,8 @@ ion-label{ padding: 10px; color: white; width: 100%; + margin-top: 25px; + margin-bottom: 0px; h3{ font-size: 18px; font-weight: bold;