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/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 @@ - - - - - - -
-
-
-

{{percentage}}

- Completed



+ + + + + + +
+
+
+

{{percentage}}

+ Completed



+
+
- -
-
- - -
+
+
+ +
+ +

{{nameDay}}

+
+ +

{{day}}

+
-

{{nameDay}}

-
+

{{nameMonth}}

+ -

{{day}}

-
- -

{{nameMonth}}

-
- -

{{year}}

-
- -

{{ts.trPK('attendance','present')}}

-
-
-
- - - -
- +

{{year}}

+ + +

{{ts.trPK('attendance','present')}}

+
+
+ + - +

{{shiftTime}}

{{ts.trPK('attendance-tracking','shift-time')}}

- + +

{{scheduled}}

{{ts.trPK('attendance-tracking','regular')}}

-
- - + + +

{{startDate}}

{{ts.trPK('attendance-tracking','check-in')}}

- + + +

{{endDate}}

{{ts.trPK('attendance-tracking','check-out')}}

-
- - + +

{{lateIn}}

{{ts.trPK('attendance-tracking','late-in')}}

- + +

{{excess}}

{{ts.trPK('attendance-tracking','excess')}}

-
- - + +

{{shortage}}

{{ts.trPK('attendance-tracking','shortage')}}

- + +

{{earlyOut}}

{{ts.trPK('attendance-tracking','early-out')}}

- -
- - - + + + + 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 53ea08a2..10600f8b 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 @@ -1,54 +1,23 @@ .result-text-container { - - // padding: 0; - - // margin: 0; - - // position: absolute; - - // left: 50%; - - // top: 50%; - - // display: block; - - // text-align: center; - - // transform: translate(-50%, -50%); -//////////////////////////here padding: 0; margin: 0; position: absolute; - left: 58%; - top: 67%; + left: 42%; + top: 60%; display: block; text-align: center; - -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%); - h2 { - font-size: 25px; - - // font-family: WorkSans-Bold; font-weight: bold; - margin: 0 auto; - line-height: 36px; - } - span { - width: 125px; - display: block; - margin: 0 auto; - font-size: 12px; - font-family: workSans-Regular; color: rgb(163, 163, 163) !important; } @@ -57,20 +26,26 @@ .today-graph{ display: block; height: 127px; - width: 288px; + width: 270px; + margin-left: -60px; } .amountlabel{ - color: black !important; - font-weight: bold !important; - font-size: 13px !important; -// border-top: 1px solid rgb(163, 163, 163) !important; - margin-left: 0px !important; - margin-bottom: -29px !important; + color: black !important; + font-weight: bold !important; + font-size: 13px !important; + margin-bottom: -29px !important; + width: 100%; + display: block; + text-align: center; } .rowlabel{ -color: rgb(163, 163, 163) !important; -font-size: 13px !important; -font-family: WorkSans-Bold; + color: #a3a3a3 !important; + font-size: 13px !important; + font-family: WorkSans-Bold; + display: block; + width: 100%; + text-align: center; + padding: 1px; } .grid{ padding-bottom: -20px !important; @@ -95,18 +70,9 @@ height: 360px !important; } .div{ - // border: 1px solid #a3a3a3 !important; - // text-align: center; - // width: 274%; - // border-radius: 8%; - // height: 40%; - // margin-right: -11px; border: 1px solid #a3a3a3 !important; - border-radius: 9px; - width: 241%; - margin-right: -226px; - - + border-radius: 10px; + margin-bottom:10px; } .p0{ margin-bottom: -13px !important; @@ -128,22 +94,28 @@ height: 360px !important; display: block; width: 100%; } - .p2{ font-weight: bold !important; + .p2{ + font-weight: bold !important; font-size: 17px !important; margin-bottom: 43px !important; margin-top: 0px !important; color: black !important; font-weight: bold !important; - margin-left: 33px; - } - .p3{ /* margin-bottom: -72px !important; */ + text-align: center; + display: block; + width: 100%; + } + .p3{ color: black !important; font-weight: bold !important; font-size: 19px; margin-top: -43px; - margin-left: 27px; + text-align: center; + display: block; + width: 100%; } - .p4{ margin-bottom: 56px !important; + .p4{ + margin-bottom: 56px !important; margin-top: -26px !important; color: black !important; } @@ -158,23 +130,7 @@ height: 360px !important; height: 21px; width: 110px; padding-top: 7px; - /* font-family: WorkSans-Bold !important; */ padding-bottom: 21px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - } - // .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 + } \ 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 001b4b25..1cc15754 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 @@ -98,7 +98,7 @@ export class DateInfoModalComponent implements OnInit { slideChanged(ev) { this.slides.getActiveIndex().then(index => { - const shiftDetails = this.SHIFTDETAILS[index]; + const shiftDetails = this.SHIFTDETAILS.GetScheduleShiftsDetailsList[index]; this.assignData(shiftDetails); }); } diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index bf839752..ae4acf22 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -132,12 +132,7 @@ export class DetailsComponent implements OnInit { this.currentDate = new Date(); this.showData = false; this.nextMonth = new Date().getMonth() + 2; - this.preMonth = new Date().getMonth() - 2; - if (this.preMonth < 0) { - this.preMonth = this.preMonth * - 1; - } else { - this.preMonth = this.preMonth * - 1; - } + this.preMonth = new Date().getMonth(); this.calendarConfig(this.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); } @@ -210,6 +205,7 @@ export class DetailsComponent implements OnInit { } + changeMonthTitle(title) { this.monthTitle = title; this.getTimeCardSummaryDetails(); diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 8383911a..7b2230aa 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -76,12 +76,7 @@ export class TimeCardDetailsComponent implements OnInit { ngOnInit() { this.showData = false; this.nextMonth = new Date().getMonth() + 2; - this.preMonth = new Date().getMonth() - 2; - if (this.preMonth < 0) { - this.preMonth = this.preMonth * - 1; - } else { - this.preMonth = this.preMonth * - 1; - } + this.preMonth = new Date().getMonth(); this.calendarConfig(this.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); } @@ -218,7 +213,6 @@ export class TimeCardDetailsComponent implements OnInit { }); } - nextSlide() { this.normalDays = []; if (this.currentMonthName !== this.month) { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index c3380444..1e791c08 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1284,12 +1284,9 @@ border:0px } .calendar-modal { - --height: 15cm !important; + --height: 13cm !important; --width: 88% !important; --border-radius: 0.4cm; - - // height: 544px !important; - // width: 332px !important; }