diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html index fb3f1a49..00480f11 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html @@ -3,3 +3,5 @@ {{value}} {{text}} + + 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..046d138b 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 @@ -8,9 +8,9 @@
{{shiftTime}}
{{ts.trPK('attendance-tracking','shift-time')}}
@@ -50,7 +52,7 @@{{startDate}}
{{ts.trPK('attendance-tracking','check-in')}}
@@ -65,13 +67,12 @@{{lateIn}}
{{ts.trPK('attendance-tracking','late-in')}}
{{excess}}
{{shortage}}
{{ts.trPK('attendance-tracking','shortage')}}
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 307738f4..096e04ab 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 @@ -68,11 +68,11 @@ margin-left: -60px; } .today-graph-ar{ - display: block; - height: 134px; - width: 285px; - margin-left: -18px; + height: 127px; + width: 270px; + /* margin-left: -61px; */ + margin-right: -18px; } .amountlabel{ color: black !important; @@ -202,4 +202,19 @@ height: 360px !important; padding-bottom: 21px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - } \ No newline at end of file + } + .col{ + border-bottom: 1px solid rgb(204, 204, 204); + border-right: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + } + .col-ar{ + border-bottom: 1px solid rgb(204, 204, 204); + border-left: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + } + \ No newline at end of file diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 099f55e2..ef9fcc82 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1125,6 +1125,10 @@ "ar": "تقويم الحضور الشهري", "en": "Monthly Attendance Calendar" }, + "completed": { + "ar": "منجز", + "en": "Completed" + }, "present": { "ar": "حضور", "en": "Present"