diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index 32b3208a..9e7d9149 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -191,7 +191,7 @@ img.centerDiv { .last-circle { position: inherit; - background: #65C399 !important; + background: #91692d !important; border-radius: 50%; height: 166px; width: 140px; diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index a53d7d25..dba417f7 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -195,7 +195,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 5b827761..62bd7c23 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1611,7 +1611,7 @@ export class CommonService { value: 0, name: 'HR', active: false, - color: '#18a169', + color: '#c6903e', key: 'HRSSA', disable: false, total: 0 @@ -1686,7 +1686,7 @@ export class CommonService { { data: [0, 0, 0, 0, 0, 0, 0, 0], backgroundColor: [ - '#18a169', + '#c6903e', '#3cb9d5', '#114475', '#38c9b3', diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index ad694ecb..0d7f1475 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -98,14 +98,14 @@ export class HomePage implements OnInit { icon: 'assets/icon/new-design/leave_balance.png', link: '3', show: true, + }, + { + title: this.ts.trPK('eit', 'my-reports'), + statsValue: 0, + icon: 'assets/icon/new-design/report.png', + link: '4', + show: true } - // { - // title: this.ts.trPK('absenceList', 'tickets-balance'), - // statsValue: 0, - // icon: 'assets/icon/new-design/ticket_balance.png', - // link: '4', - // show: this.isShow - // } ]; public slideOptsOne = {}; @@ -861,13 +861,13 @@ export class HomePage implements OnInit { this.common.openNotificationPage(); // tslint:disable-next-line: triple-equals } else if (link == '2') { - this.openPage(this.missingSwipeRequestObject); + // this.openPage(this.missingSwipeRequestObject); // tslint:disable-next-line: triple-equals } else if (link == '3') { - this.openPage(this.leaveRequestObject); + // this.openPage(this.leaveRequestObject); // tslint:disable-next-line: triple-equals } else if (link == '4') { - this.openPage(this.ticketRequestObject); + // this.openPage(this.ticketRequestObject); } } diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index d56827ab..b39655b7 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -112,7 +112,7 @@ export class HomeComponent implements OnInit { value: 0, name: 'HR', active: false, - color: '#18a169', + color: '#c6903e', key: 'HRSSA', disable: false }, diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index 00918629..e766d317 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -356,7 +356,7 @@ ion-card { .active-Segment { font-size: 0.3cm !important; - background: #BE332F !important; + background: #c6903e !important; text-transform: none; --color-checked: none; border-radius: 100px; diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss index a53d7d25..dba417f7 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss @@ -195,7 +195,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss index a53d7d25..dba417f7 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss @@ -195,7 +195,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/assets/icon/new-design/report.png b/Mohem/src/assets/icon/new-design/report.png new file mode 100644 index 00000000..5b051aca Binary files /dev/null and b/Mohem/src/assets/icon/new-design/report.png differ diff --git a/Mohem/src/assets/imgs/profile-icons/Phone Number Active.png b/Mohem/src/assets/imgs/profile-icons/Phone Number Active.png new file mode 100644 index 00000000..c16c9c14 Binary files /dev/null and b/Mohem/src/assets/imgs/profile-icons/Phone Number Active.png differ diff --git a/Mohem/src/assets/imgs/profile-icons/info-a@2x.png b/Mohem/src/assets/imgs/profile-icons/info-a@2x.png index 79c470d6..9f1283dd 100644 Binary files a/Mohem/src/assets/imgs/profile-icons/info-a@2x.png and b/Mohem/src/assets/imgs/profile-icons/info-a@2x.png differ diff --git a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png index df4dce43..541f110e 100644 Binary files a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png and b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index de8301ac..568e8924 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2071,6 +2071,10 @@ } }, "eit": { + "my-reports": { + "en": "My Reports", + "ar": "تقاريري" + }, "done-text": { "en": "Done", "ar": "تم" diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index d84600b3..a177bc15 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1840,7 +1840,7 @@ ion-app[dir="rtl"] { } .slideFullWidth .swiper-slide { - margin-right: 10px !important; + margin-right: 0px !important; } .iconBox img {