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 8acfdf27..d3580c46 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 @@ -91,6 +91,7 @@ export class CircleCalendarComponent implements OnInit { ngOnInit() { this.isFirst = false; this.reRenderCalendar(); + console.log("1") } @@ -98,8 +99,12 @@ export class CircleCalendarComponent implements OnInit { setTimeout(() => { this.reRenderCalendar(); }, 1000); + console.log("2") } + // ngOnChanges(){ + // console.log("3") + // } getHeaderDay(date: any) { return this.weekDaysEnSort[date.getDay()]; 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 03d27609..ca3d45aa 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 @@ -173,4 +173,8 @@ --> + 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 c0ca54c1..19132960 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 @@ -160,4 +160,19 @@ height: 360px !important; padding-bottom: 21px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - } \ No newline at end of file + } + // .less{ background-color: #22C6B3; + // background-color: #22C6B3; + // border: none; + // color: white; + // text-align: center; + // text-decoration: none; + // display: inline-block; + // font-size: 12px; + // border-radius: 30px; + // height: 26px; + // padding: 6px 24px; + // margin-left: 123px; + // /* margin-top: -19px; */ + // margin-bottom: 17px; + // } \ No newline at end of file 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 3f3fb1d8..11ccb02a 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 @@ -195,6 +195,10 @@ export class DateInfoModalComponent implements OnInit { return this.weekDaysEn[date.getDay()]; } + + // hide(){ + // this.hideMe = true; + // } // @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; // public options = { // cutoutPercentage: 80, diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html index 71f0c3ef..8e104463 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html @@ -412,11 +412,9 @@
{{year}}
{{ts.trPK('attendance','monthly-attendance-calendar')}}