diff --git a/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.scss b/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.scss index 60f914b3..da97397a 100644 --- a/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.scss +++ b/Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.scss @@ -16,5 +16,6 @@ .text-span{ font-size: 13px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); } diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html index a863abf6..fbea2ff7 100644 --- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html +++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html @@ -9,7 +9,7 @@
- +

{{name}}

{{title}}
diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss index 64fec999..09b14503 100644 --- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss +++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss @@ -61,28 +61,109 @@ display: inline-block; width: 80%; .name{ - font-size: 16px; - color: black; - // margin: 0; - width: 100%; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - margin-left: -10px; - margin-top: -5px; - font-family: 'WorkSans-Bold'; + // font-size: 16px; + // color: black; + // // margin: 0; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; + // overflow: hidden; + // margin-left: -10px; + // margin-top: -5px; + // font-family: 'WorkSans-Bold'; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-left: -10px; + margin-top: -5px; + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 25px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + } + + .title{ + // font-size: 13px; + // color: #888; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; + // overflow: hidden; + // display: block; + // margin-left: -10px; + // margin-top: -6px; + // color: black; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 12px; + letter-spacing: -0.56px; + color: #575757; + opacity: 1; + font-size: 14px; + width: 100%; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + margin-left: -10px; + margin-top: -10px; + } +} + +.employee-name-ar{ + display: inline-block; + width: 80%; + .name{ + // font-size: 16px; + // color: black; + // // margin: 0; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; + // overflow: hidden; + // margin-left: -10px; + // margin-top: -5px; + // font-family: 'WorkSans-Bold'; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-left: -10px; + margin-top: -5px; + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 25px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; } + .title{ - font-size: 13px; - color: #888; - width: 100%; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - display: block; - margin-left: -10px; - margin-top: -6px; - color: black; + // font-size: 13px; + // color: #888; + // width: 100%; + // text-overflow: ellipsis; + // white-space: nowrap; + // overflow: hidden; + // display: block; + // margin-left: -10px; + // margin-top: -6px; + // color: black; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 12px; + letter-spacing: -0.56px; + color: #575757; + opacity: 1; + font-size: 14px; + width: 100%; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; + margin-left: -10px; + margin-top: -10px; } } .image-container{ diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts index 47fe4440..26b1ab47 100644 --- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts +++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts @@ -1,12 +1,13 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; - +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @Component({ selector: 'app-employee-information', templateUrl: './employee-information.component.html', styleUrls: ['./employee-information.component.scss'], + }) export class EmployeeInformationComponent implements OnInit { - +public direction: string; public userImage: any = '../assets/imgs/profile.png'; @Input() name: string; @Input() title: string; @@ -15,7 +16,11 @@ export class EmployeeInformationComponent implements OnInit { // tslint:disable-next-line: no-output-on-prefix @Output() onGetDetails = new EventEmitter(); - constructor() { } + constructor( + public ts: TranslatorService, + ) { + this.direction = TranslatorService.getCurrentLanguageName(); + } ngOnInit() {} diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index d9a4bb30..9f614c6a 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -64,7 +64,7 @@ - + diff --git a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html index 89565f14..4361edfa 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html @@ -15,21 +15,21 @@ Team Member Image
-
+
{{EmpName}} -

{{EmpEmail}}

+

{{EmpEmail}}

-

{{ts.trPK('userProfile','role')}}

+

{{ts.trPK('userProfile','role')}}

{{EmpJob}}
-

{{ts.trPK('userProfile','empNo')}}

+

{{ts.trPK('userProfile','empNo')}}

{{EmpNum}}
@@ -38,47 +38,47 @@
-
+
-

{{ts.trPK('userProfile','profile-details')}}

+
{{ts.trPK('userProfile','profile-details')}}
- +

{{ts.trPK('userProfile','category')}}

{{EmpCatMeaning}}

-
- + +

{{ts.trPK('userProfile','address')}}

-

{{EmpLocation}}

+

{{EmpLocation}}

- +

{{ts.trPK('userProfile','phone-no')}}

{{EmpMobile}}

- +

{{ts.trPK('userProfile','busG')}}

{{EmpOrgName}}

- +

{{ts.trPK('userProfile','job')}}

{{EmpJob}}

- +

{{ts.trPK('userProfile','payrol')}}

{{EmpPayrol}}

- +

{{ts.trPK('userProfile','position')}}

-

{{EmpPosition}}

+

{{EmpPosition}}

- +

{{ts.trPK('userProfile','grade')}}

{{EmpGRADENAME}}

diff --git a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss index 7a316f32..3999867e 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss @@ -65,26 +65,85 @@ }} .Boldtext{ + // font-size: 13px; + // font-family: WorkSans-Bold; + // color: black !important; + // display: block !important; + text-align: center; + // font: normal normal 600 16px/19px Poppins; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-size: 16px; + line-height: 19px; + + } + .p{ + text-align: center; + // font: normal normal 600 13px/0px Poppins; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); font-size: 13px; - font-family: WorkSans-Bold; - color: black !important; - display: block !important; - // line-height: 0px !important; + line-height: 0px; + } + .p1{ + text-align: center; + // font: normal normal 600 13px/6px Poppins; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-size: 13px; + line-height: 6px; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; + } + .Nametext{ + // font-size: 15px; + // font-family: WorkSans-Bold; + // color: black !important; + // display: block !important; + text-align: center; + /* font: normal normal 600 21px/31px Poppins; */ + letter-spacing: -0.84px; + color: #2B353E; + opacity: 1; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 21px; + font-size: 21px; + } - .Nametext{ - font-size: 15px; - font-family: WorkSans-Bold; - color: black !important; - display: block !important; - // line-height: 0px !important; + .title{ + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 20px; + font-size: 20px; + letter-spacing: -0.8px; + color: #2B353E; + opacity: 1; + margin-top: 12px; + margin-bottom: -22px; + } + + .title-ar{ + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 20px; + font-size: 20px; + letter-spacing: -0.8px; + color: #2B353E; + opacity: 1; + margin-top: 12px; + margin-bottom: -22px; } .employee-information-indetail{ background: white; - margin-top: 15px; + // margin-top: 15px; border-radius: 20px; - margin-bottom: 15px; + // margin-bottom: 15px; border-radius: 20px; border: 1px solid #ccc; ion-col{ @@ -92,17 +151,75 @@ // border-bottom: 1px solid #ccc; } h2{ + // font-size: 13px; + // margin: 0; + // font-weight: bold; + // color: rgb(128, 124, 124); + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 0px; font-size: 13px; - // font-family: WorkSans-Bold; - margin: 0; - font-weight: bold; - color: rgb(128, 124, 124); + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; } p{ + // font-size: 13px; + // margin: 0; + // font-family: WorkSans-Bold; + + text-align: left; + // font: normal normal 600 16px/5px Poppins; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 5px; + font-size: 16px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + + + } + } + + .employee-information-indetail-ar{ + background: white; + // margin-top: 15px; + border-radius: 20px; + // margin-bottom: 15px; + border-radius: 20px; + border: 1px solid #ccc; + ion-col{ + padding: 15px; + // border-bottom: 1px solid #ccc; + } + h2{ + // font-size: 13px; + // margin: 0; + // font-weight: bold; + // color: rgb(128, 124, 124); + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 0px; font-size: 13px; - margin: 0; - font-family: WorkSans-Bold; - // margin-bottom: 10px; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; + } + p{ + // font-size: 13px; + // margin: 0; + // font-family: WorkSans-Bold; + + text-align: right; + // font: normal normal 600 16px/5px Poppins; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 5px; + font-size: 16px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + + } } @@ -435,6 +552,7 @@ ion-input { border-radius: 7px !important; --min-height: 1.6cm !important; width: 315px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); }} @media screen and (min-width: 1px) and (max-width:320px) { .CreateBtn{ @@ -448,6 +566,7 @@ ion-input { border-radius: 7px !important; --min-height: 1.6cm !important; width: 231px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); }} @@ -490,4 +609,8 @@ ion-input { cursor: pointer; opacity: 0; filter: alpha(opacity=0); + } + + .hL{ + line-height: 19px !important; } \ No newline at end of file diff --git a/Mohem/src/app/mowadhafi/my-request/my-request.component.html b/Mohem/src/app/mowadhafi/my-request/my-request.component.html index aee2672f..dab49ddb 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.html +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.html @@ -12,11 +12,15 @@
- +
+
{{ticket.ticketTypeName}}
+
{{ts.trPK('userProfile','postedDate')}} {{(ticket.created)?.substring(0,10)}}
+
+ + {{ticket.description}} - {{ticket.ticketStatusName}} + {{ticket.ticketStatusName}}
diff --git a/Mohem/src/app/mowadhafi/my-request/my-request.component.scss b/Mohem/src/app/mowadhafi/my-request/my-request.component.scss index c72cd943..f331455b 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.scss +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.scss @@ -20,56 +20,104 @@ ion-content { } .result-container{ - position: relative; - background: white; - /* padding-bottom: 3px; */ - border-radius: 20px; - z-index: 1; - margin: 15px; + // position: relative; + // background: white; + // border-radius: 20px; + // z-index: 1; + // margin: 15px; + // border-radius: 10px; + // border: 1px solid #ccc; + background: #FFFFFF 0% 0% no-repeat padding-box; + box-shadow: 0px 0px 5px #00000029; border-radius: 10px; - border: 1px solid #ccc; + opacity: 1; } .text{ - font-size: 15px; - margin-top: -9px; - font-family: 'WorkSans-bold'; + // font-size: 15px; + // margin-top: -9px; + // font-family: 'WorkSans-bold'; + //font-weight: 600; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + // width: 77px; + // height: 20px; + text-align: left; + letter-spacing: -0.56px; + color: #2B353E; + opacity: 1; + font-size: 14px; + line-height: 11px; } - @media screen and (min-width: 325px){ - .date{ - margin-top: -9px; - margin-right: -49px; - color: gray; - font-size: 12px; - }} + // @media screen and (min-width: 325px){ + // .date{ + // margin-top: -9px; + // margin-right: -49px; + // color: gray; + // font-size: 12px; + // }} - @media screen and (min-width: 1px) and (max-width:320px) { - .date{ - margin-top: -9px; - margin-right: -55px; - color: gray; - font-size: 12px; - margin-left: -88px; - }} + // @media screen and (min-width: 1px) and (max-width:320px) { + // .date{ + // margin-top: -9px; + // margin-right: -55px; + // color: gray; + // font-size: 12px; + // margin-left: -88px; + // }} - @media screen and (min-width: 325px){ - .date-ar{ - margin-top: -9px; - // margin-right: -49px; - color: gray; - font-size: 12px; - }} + // @media screen and (min-width: 325px){ + // .date-ar{ + // margin-top: -9px; + // // margin-right: -49px; + // color: gray; + // font-size: 12px; + // }} - @media screen and (min-width: 1px) and (max-width:320px) { - .date-ar{ - margin-top: -9px; - margin-right: -55px; - color: gray; - font-size: 12px; - margin-left: -88px; - }} - + // @media screen and (min-width: 1px) and (max-width:320px) { + // .date-ar{ + // margin-top: -9px; + // margin-right: -55px; + // color: gray; + // font-size: 12px; + // margin-left: -88px; + // }} + .date{ + text-align: left; + letter-spacing: -0.4px; + color: #969696; + opacity: 1; + // font-weight: 600; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-size: 10px; + line-height: 16px; + } + .desc{ + // width: 287px; + // height: 32px; + text-align: left; + // font: normal normal medium 11px/16px Poppins; + letter-spacing: -0.44px; + color: #535353; + opacity: 1; + font-family: var(--fontFamilyPoppins-Medium, inherit); + // font-weight: 500; + font-size: 11px; + line-height: 16px; + } + .status{ + color: #259CB8; + width: 75px; + height: 15px; + text-align: left; + letter-spacing: -0.4px; + opacity: 1; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + // font-family: 'Poppins'; + //font-weight: 600; + font-size: 10px; + line-height: 16px; + } @media screen and (min-width: 300px){ .CreateBtn{ @@ -83,6 +131,7 @@ ion-content { border-radius: 7px !important; --min-height: 1.6cm !important; width: 315px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); }} @media screen and (min-width: 1px) and (max-width:290px) { @@ -97,6 +146,7 @@ ion-content { border-radius: 7px !important; --min-height: 1.6cm !important; width: 257px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); }} .footer{ @@ -194,4 +244,10 @@ ion-content { // border-radius: 30px; height: 26px; padding: 6px 24px; + } + + .div{ + position: relative; + display: flex; + justify-content: space-between; } \ No newline at end of file diff --git a/Mohem/src/app/mowadhafi/request-details/request-details.component.html b/Mohem/src/app/mowadhafi/request-details/request-details.component.html index 2a3924a6..f4aab9a3 100644 --- a/Mohem/src/app/mowadhafi/request-details/request-details.component.html +++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.html @@ -12,35 +12,29 @@
- - +
+
{{status}}
+
{{ts.trPK('userProfile','postedDate')}}{{date}}
+
+ -

{{ts.trPK('userProfile','refrence')}}

-

{{ticketRefre}}

+

{{ts.trPK('userProfile','refrence')}}

+

{{ticketRefre}}

-

{{ts.trPK('userProfile','section')}}

-

{{section}}

+

{{ts.trPK('userProfile','section')}}

+

{{section}}

-

{{ts.trPK('userProfile','topic')}}

-

{{topic}}

+

{{ts.trPK('userProfile','topic')}}

+

{{topic}}

-

{{ts.trPK('userProfile','Description')}}

-

{{description}}

+

{{ts.trPK('userProfile','Description')}}

+

{{description}}

@@ -49,14 +43,18 @@
-
+
{{ts.trPK('userProfile','actionBy')}}{{action.actionBy}} -
+

{{action.comments}}

- {{(action.actionDate)?.substring(0,10)}} + +
+
+
+
{{(action.actionDate)?.substring(0,10)}}
diff --git a/Mohem/src/app/mowadhafi/request-details/request-details.component.scss b/Mohem/src/app/mowadhafi/request-details/request-details.component.scss index c8087f11..a0ae8e95 100644 --- a/Mohem/src/app/mowadhafi/request-details/request-details.component.scss +++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.scss @@ -36,30 +36,55 @@ } .result-container{ - position: relative; - background: white; - /* padding-bottom: 3px; */ - border-radius: 20px; - z-index: 1; - margin: 15px; + // position: relative; + // background: white; + + // border-radius: 20px; + // z-index: 1; + // margin: 15px; + // border-radius: 10px; + // border: 1px solid #ccc; + background: #FFFFFF 0% 0% no-repeat padding-box; + box-shadow: 0px 0px 5px #00000029; border-radius: 10px; - border: 1px solid #ccc; + opacity: 1; } .result-containerList{ - position: relative; - background: white; - /* padding-bottom: 3px; */ - border-radius: 20px; - z-index: 1; - margin: 15px; + // position: relative; + // background: white; + // border-radius: 20px; + // z-index: 1; + // margin: 15px; + // border-radius: 10px; + // border: 1px solid #ccc; + background: #FFFFFF 0% 0% no-repeat padding-box; + box-shadow: 0px 0px 5px #00000029; border-radius: 10px; - border: 1px solid #ccc; + opacity: 1; } .text{ - font-size: 15px; - // margin-top: -9px; - font-family: 'WorkSans-bold'; + text-align: left; + /* font-family: var(--fontFamilyPoppins-Medium, inherit); */ + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 11px; + font-size: 16px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + + } + + .text-ar{ + text-align: right; + /* font-family: var(--fontFamilyPoppins-Medium, inherit); */ + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 11px; + font-size: 16px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + } @media screen and (min-width: 1px) and (max-width:320px) { .date{ @@ -94,13 +119,39 @@ }} .labels{ + // font-size: 13px; + // margin-bottom: 0px; + // margin-top: -10px; + // color: #a9a5a5; + // font-family: 'WorkSans-bold'; + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + // font-weight: 600; + line-height: 20px; font-size: 13px; - margin-bottom: 0px; - margin-top: -10px; - color: #a9a5a5; - font-family: 'WorkSans-bold'; + // font: normal normal 600 13px/20px Poppins; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; + padding-bottom: 3px; + } + .labels-ar{ + // font-size: 13px; + // margin-bottom: 0px; + // margin-top: -10px; + // color: #a9a5a5; + // font-family: 'WorkSans-bold'; + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + // font-weight: 600; + line-height: 20px; + font-size: 13px; + // font: normal normal 600 13px/20px Poppins; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; + padding-bottom: 3px; } - .request-list-container { position: relative; padding-left: 37px; @@ -137,10 +188,15 @@ } .text-span { - position: relative; - display: block; - // margin-bottom: 10px; - font-family: 'WorkSans-bold'; + position: relative; + display: block; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + // font-weight: 600; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 25px; + font-size: 16px; } .text-span:before{ content: ""; @@ -155,15 +211,20 @@ .text-span-ar{ position: relative; - display: block; - // margin-bottom: 10px; - /* margin-top: 10px; */ - margin-right: 30px; + display: block; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + // font-weight: 600; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 25px; + font-size: 16px; + margin-right: 37px; } .text-span-ar:before{ content: ""; position: absolute; - right: -29px; + right: -35px; border-radius: 50%; width: 15px; height: 15px; @@ -180,45 +241,86 @@ margin-right: 20px; margin-bottom: 15px; p{ - font-size: 14px; + // font-size: 14px; + text-align: left; + letter-spacing: -0.52px; + color: #535353; + opacity: 1; + //font-weight: 500; + font-family: var(--fontFamilyPoppins-Medium, inherit); + line-height: 18px; + font-size: 13px; + } } + + .action-data-ar{ + background-color: white; + padding: 1px; + border-radius: 20px; + font-family: WorkSans-Regular; + // padding-left: 15px; + margin-right: 20px; + margin-bottom: 15px; + p{ + // font-size: 14px; + text-align: right; + letter-spacing: -0.52px; + color: #535353; + opacity: 1; + //font-weight: 500; + font-family: var(--fontFamilyPoppins-Medium, inherit); + line-height: 18px; + font-size: 13px; + } + } + .date-span{ + text-align: right; + + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + //font-weight: 600; + line-height: 20px; + font-size: 13px; + // font: normal normal 600 13px/20px Poppins; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; } - @media screen and (min-width: 325px){ - .date-span{ - font-size: 13px; - margin-bottom: 0px; - margin-top: -10px; - color: gray; - margin-left: 160px; + // @media screen and (min-width: 325px){ + // .date-span{ + // font-size: 13px; + // margin-bottom: 0px; + // margin-top: -10px; + // color: gray; + // margin-left: 160px; - }} - @media screen and (min-width: 1px) and (max-width:320px) { - .date-span{ - font-size: 13px; - margin-bottom: 0px; - margin-top: -10px; - color: gray; - margin-left: 76px; + // }} + // @media screen and (min-width: 1px) and (max-width:320px) { + // .date-span{ + // font-size: 13px; + // margin-bottom: 0px; + // margin-top: -10px; + // color: gray; + // margin-left: 76px; - }} + // }} - @media screen and (min-width: 1px) and (max-width:320px) { - .date-span-ar{ - font-size: 13px; - margin-bottom: 0px; - margin-top: -10px; - color: gray; - margin-right: 60px; - }} + // @media screen and (min-width: 1px) and (max-width:320px) { + // .date-span-ar{ + // font-size: 13px; + // margin-bottom: 0px; + // margin-top: -10px; + // color: gray; + // margin-right: 60px; + // }} - @media screen and (min-width: 325px){ - .date-span-ar{ - font-size: 13px; - margin-bottom: 0px; - margin-top: -10px; - color: gray; - margin-right: 140px; - }} + // @media screen and (min-width: 325px){ + // .date-span-ar{ + // font-size: 13px; + // margin-bottom: 0px; + // margin-top: -10px; + // color: gray; + // margin-right: 140px; + // }} .New{ @@ -252,9 +354,61 @@ color: #259CB8; } - .card-content{ - margin-left: -3px; margin-right: -9px;} - .card-content-ar{ - margin-left: -122px; + // .card-content{ + // margin-left: -3px; margin-right: -9px;} + // .card-content-ar{ + // margin-left: -122px; + // } + + + .status{ + text-align: left; + /* font: normal normal 600 10px/16px Poppins; */ + letter-spacing: -0.4px; + opacity: 1; + + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + // font-weight: 600; + line-height: 16px; + font-size: 10px; + color: #269db8; + } + .postedDate{ + text-align: left !important; + // font-weight: 600; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 16px !important; + font-size: 10px !important; + letter-spacing: -0.4px !important; + color: #969696 !important; + opacity: 1 !important; + } + .DescrText{ + text-align: left; + // font: normal normal medium 13px/18px Poppins; + letter-spacing: -0.52px; + color: #535353; + opacity: 1; + // font-weight: 500; + font-family: var(--fontFamilyPoppins-Medium, inherit); + line-height: 5px; + font-size: 13px; + } + .DescrText-ar{ + text-align: right; + // font: normal normal medium 13px/18px Poppins; + letter-spacing: -0.52px; + color: #535353; + opacity: 1; + // font-weight: 500; + font-family: var(--fontFamilyPoppins-Medium, inherit); + line-height: 5px; + font-size: 13px; + } + .div{ + position: relative; + display: flex; + justify-content: space-between; + margin-bottom: -12px; } diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index cf523ffb..3114641a 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -24,59 +24,80 @@ -->
-
-

{{employee.EMPLOYEE_NAME}}

- {{employee.EMPLOYEE_EMAIL_ADDRESS}} +
+

{{employee.EMPLOYEE_NAME}}

+
- + -

{{ts.trPK('userProfile','role')}}

+

{{ts.trPK('userProfile','role')}}

{{employee.JOB_NAME}}
-

{{ts.trPK('userProfile','empNo')}}

+

{{ts.trPK('userProfile','empNo')}}

{{employee.EMPLOYEE_NUMBER}}
-
- +
+ + + - + + + + {{ts.trPK('myTeam','profile-details')}} + + + + - + + {{ts.trPK('vacation-rule','create-request')}} + + + + + {{ts.trPK('myTeam','view-attendence')}} + + + + + {{ts.trPK('myTeam','team-members')}} + - +
- diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 21c57d8e..d7c2ad65 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -99,6 +99,7 @@ ion-title{ $actionBtnSize : 36px; .user-actions{ text-align: center; + margin-left: 1px; .action-button{ font-size: 11px; font-weight: bold; @@ -113,38 +114,52 @@ ion-title{ background-color: #269DB8; line-height: $actionBtnSize; margin-bottom: 3px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + display: flex; img{ margin: 0 auto; vertical-align: middle; } + .span{ + font-size: 10px; + display: block; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + } } } } -.employee-information-indetail{ - background: white; - margin-top: 15px; - border-radius: 20px; - margin-bottom: 15px; + + .employee-information-indetail{ + background: #FFFFFF 0% 0% no-repeat padding-box; + box-shadow: 0px 0px 5px #00000029; border-radius: 20px; - border: 1px solid #ccc; - ion-col{ - padding: 15px; - // border-bottom: 1px solid #ccc; - } - h2{ - font-size: 13px; - // font-family: WorkSans-Bold; - margin: 0; - font-weight: bold; - color: rgb(128, 124, 124); - } - p{ - font-size: 13px; - margin: 0; - font-family: WorkSans-Bold; - // margin-bottom: 10px; - } -} + opacity: 1; + } +// .employee-information-indetail{ +// background: white; +// margin-top: 15px; +// border-radius: 20px; +// margin-bottom: 15px; +// border-radius: 20px; +// border: 1px solid #ccc; +// ion-col{ +// padding: 15px; +// // border-bottom: 1px solid #ccc; +// } +// h2{ +// font-size: 13px; +// // font-family: WorkSans-Bold; +// margin: 0; +// font-weight: bold; +// color: rgb(128, 124, 124); +// } +// p{ +// font-size: 13px; +// margin: 0; +// font-family: WorkSans-Bold; +// // margin-bottom: 10px; +// } +// } .segments-container { border-radius: 100px; @@ -158,56 +173,70 @@ ion-title{ .active-Segment { width: 11%; max-width: 11%; - min-width: 11%; + min-width: 39px; height: 30% !important; - min-height: 36px; + min-height: 39px; padding-right: -10px; border-radius: 50% !important; margin-right: 22px; margin-left: 22px; background-color: #269DB8; - }} + display: flex; + } + } @media screen and (min-width: 768px) and (max-width:1024px){ .active-Segment{ - width: 11%; - max-width: 11%; - min-width: 11%; - height: 56% !important; - min-height: 68px; - padding-right: -10px; - border-radius: 50% !important; - margin-right: 62px; - margin-left: 45px; + background: #269DB8 !important; - padding-left: 17px;}} + // padding-left: 17px; + // display: flex; + width: 11%; + max-width: 11%; + min-width: 39px; + height: 30% !important; + min-height: 39px; + padding-right: -10px; + border-radius: 50% !important; + padding-left: 6px; + margin-right: 10px; + margin-left: 57px; + display: flex; + + }} @media screen and (min-width: 1px) and (max-width:767px){ .normal-Segment { width: 11%; max-width: 11%; - min-width: 11%; + min-width: 39px; height: 30% !important; - min-height: 36px; + min-height: 39px; padding-right: -10px; border-radius: 50% !important; margin-right: 22px; margin-left: 22px; background: #414040 !important; + display: flex; - }} + } + } @media screen and (min-width: 768px) and (max-width:1024px){ .normal-Segment{ width: 11%; - max-width: 11%; - min-width: 11%; - height: 56% !important; - min-height: 68px; - padding-right: -10px; - border-radius: 50% !important; - margin-right: 62px; - margin-left: 45px; - background: #414040 !important; - padding-left: 17px;}} + max-width: 11%; + min-width: 39px; + height: 30% !important; + min-height: 39px; + padding-right: -10px; + border-radius: 50% !important; + padding-left: 6px; + margin-right: 10px; + margin-left: 57px; + background: #414040 !important; + display: flex; + }} + + @media screen and (min-width: 1px) and (max-width:767px){ .imgSize{ @@ -218,14 +247,16 @@ ion-title{ left: 7px; margin: auto; height: 18px; + display: flex; }} @media screen and (min-width: 768px) and (max-width:1024px){ .imgSize{position: absolute; top: 0; bottom: 0; - left: 9px; + left: 2px; margin: auto; - height: 28px;}} + height: 28px; + display: flex;}} .colum-container{ @@ -507,30 +538,34 @@ ion-title{ font-weight: bolder; // border-right: 1px solid rgb(221, 221, 221); - @media screen and (min-width: 300px) and (max-width:359px) { + // @media screen and (min-width: 300px) and (max-width:359px) { h2{ padding: 0; margin: 0; - font-size: 14px; + font-size: 10px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); } span{ - font-size: 9px; + font-size: 10px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); } - } + // } - @media screen and (min-width: 360px) { - h2{ - padding: 0; - margin: 0; - font-size: 14px; - } - span{ - font-size: 12px; - margin-bottom: 3px; - } + // @media screen and (min-width: 360px) { + // h2{ + // padding: 0; + // margin: 0; + // font-size: 10px; + // font-family: var(--fontFamilyPoppins-SemiBold, inherit); + // } + // span{ + // font-size: 10px; + // font-family: var(--fontFamilyPoppins-SemiBold, inherit); + // margin-bottom: 3px; + // } - } + // } } @media screen and (min-width: 325px) { .statsIcon{ @@ -655,6 +690,7 @@ ion-title{ left: 20px; } +@media screen and (min-width: 325px){ .attendance-summary .attendance-information { span{ height: 32px; @@ -668,7 +704,23 @@ ion-title{ font-size: 13px; } -} +}} +@media screen and (min-width: 1px) and (max-width:320px) { +.attendance-summary .attendance-information { + span{ + height: 32px; + display: block; + line-height: 7px; + font-size: 7px; + } + h2{ + // text-align: right; + // font-family: WorkSans-Bold; + font-weight: bolder; + font-size: 13px; + } + +}} .calendar-container{ background: white; @@ -701,11 +753,17 @@ ion-title{ .Boldtext{ - font-size: 13px; - font-family: WorkSans-Bold; - color: black !important; - display: block !important; - // line-height: 0px !important; + // font-size: 13px; + // font-family: WorkSans-Bold; + // color: black !important; + // display: block !important; + text-align: center; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-size: 16px; + line-height: 19px; } .attendence{ @@ -718,8 +776,9 @@ ion-title{ .attendence-text{ margin-bottom: 1px; margin-left: 10px; - font-family: WorkSans-Bold; + // font-family: WorkSans-Bold; font-size: 16px; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); } .stats{ color: #289DB8; font-size: 9px; @@ -727,6 +786,12 @@ ion-title{ font-family: 'WorkSans-Bold'; } +.stats-ar{ + color: #289DB8; font-size: 9px; + margin-left: 5px; + font-family: 'WorkSans-Bold'; +} + .text{ font-size: 16px; font-weight: bolder; @@ -790,10 +855,157 @@ ion-title{ .call-ar{ margin-left: 16px; } +.name{ + text-align: center; + letter-spacing: -0.84px; + color: #2B353E; + opacity: 1; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 21px; + font-size: 21px; +} +.email{ + text-align: center; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-size: 13px; + line-height: 6px; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; +} +.subTitle{ + text-align: center; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-size: 13px; + line-height: 0px; +} +.profile{ + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 20px; + font-size: 20px; + letter-spacing: -0.8px; + color: #2B353E; + opacity: 1; + margin-top: 20px; + margin-bottom: 2px; +} +.label1{ + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 0px; + font-size: 13px; + letter-spacing: -0.52px; + color: #A2A2A2; + opacity: 1; +} +.label2{ + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 5px; + font-size: 16px; + letter-spacing: -0.64px; + color: #2B353E; + opacity: 1; +} +.profile-ar{ + text-align: right; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 20px; + font-size: 20px; + letter-spacing: -0.8px; + color: #2B353E; + opacity: 1; + margin-top: 20px; + margin-bottom: 2px; +} +.label1-ar{ +text-align: right; +font-family: var(--fontFamilyPoppins-SemiBold, inherit); +line-height: 0px; +font-size: 13px; +letter-spacing: -0.52px; +color: #A2A2A2; +opacity: 1; +} + +.label2-ar{ +text-align: right; +font-family: var(--fontFamilyPoppins-SemiBold, inherit); +line-height: 5px; +font-size: 16px; +letter-spacing: -0.64px; +color: #2B353E; +opacity: 1; +} +@media screen and (min-width: 768px) and (max-width:1024px){ +.div{ + position: relative; + display: flex; + margin-left: 48px; + +}} +@media screen and (min-width: 1px) and (max-width:767px){ +.div{ + position: relative; + display: flex; + margin-left: -1px; +}} - +.MyTeamdiv{ + position: relative; + display: flex; + margin-bottom: -12px; +} +.numberEmp{ + color: white; + font-size: 12px; + font-weight: bolder; + /* padding-top: 5px; */ + /* padding-right: 20px; */ + margin-left: 13px; + width: 23px; + height: 23px; + border-radius: 100%; + background-color: #269DB8; + z-index: 9; + margin-top: 25px; + /* padding-left: 4px; */ + text-align: center; + padding-top: 3px; +} + +.MyTeamtext{ + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 11px; + font-size: 20px; + letter-spacing: -0.8px; + color: #2B353E; + opacity: 1; + margin-top: 30px; + margin-bottom: 28px; +} + .btnTitle{ + text-align: center; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 10px; + font-size: 11px; + color: #4D4D4D; + } +.btnDiv{ + position: relative; + display: flex; + justify-content: space-between; + margin-bottom: -15px; + margin-top: -12px; + +} \ No newline at end of file diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 59dba377..62f8bf28 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -51,14 +51,18 @@
-->
-
+
+
{{ts.trPK('myTeam','my-team-members')}}
+
{{EmployeeTotal}}
+
+ diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index cc5f8943..03049664 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -29,17 +29,22 @@ ion-content { --ion-background-color: whitesmoke; } .request-heading { + padding-left: 15px; + margin-top: 10px; span { - // text-align: center; // display: block; // padding-top: 8px; - // font-family: workSans-Regular; - display: block; - padding-top: 8px; - padding-left: 15px; - font-weight: bold; + // padding-left: 15px; + // font-weight: bold; + // font-size: 12px; + // margin-top: 9px; + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 18px; font-size: 12px; - margin-top: 9px; + letter-spacing: -0.48px; + color: #2B353E; + opacity: 1; } } @@ -190,8 +195,18 @@ ion-content { // } .text-label{ - --color: black !important; - font-size: 13px; + // --color: black !important; + // font-size: 13px; + // margin-left: 15px; + // margin-right: 18px; + text-align: left; + // font: normal normal 600 12px/18px Poppins; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 18px; + font-size: 12px; + letter-spacing: -0.48px; + color: #575757 !important; + opacity: 1; margin-left: 15px; margin-right: 18px; } @@ -217,13 +232,22 @@ ion-content { border-style: var(--border-style); border-color: #dcdcdc; margin-top: 6px !important; - border-color: #d8d4d4 !important;} + border-color: #d8d4d4 !important;} } .text{ - font-size: 16px; - font-weight: bolder; - font-family: 'WorkSans-Bold'; - margin-top: 27px; + // font-size: 16px; + // font-weight: bolder; + // font-family: 'WorkSans-Bold'; + // margin-top: 27px; + text-align: left; + font-family: var(--fontFamilyPoppins-SemiBold, inherit); + line-height: 11px; + font-size: 20px; + letter-spacing: -0.8px; + color: #2B353E; + opacity: 1; + margin-top: 30px; + margin-bottom: 28px; } @@ -266,7 +290,22 @@ ion-content { color: white; font-size: 12px; font-weight: bolder; - /* margin-left: 3px; */ - padding-top: 2px; + /* padding-top: 5px; */ + /* padding-right: 20px; */ + margin-left: 13px; + width: 23px; + height: 23px; + border-radius: 100%; + background-color: #269DB8; + z-index: 9; + margin-top: 25px; + /* padding-left: 4px; */ + text-align: center; + padding-top: 3px; +} +.div{ + position: relative; + display: flex; + // justify-content: space-between; + margin-bottom: -12px; } - diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts index 57b95655..3d8b9608 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts @@ -122,8 +122,8 @@ export class AddBasicDetailsComponent implements OnInit { ngOnInit() {} ngAfterViewInit() { - // this.getEitDffStructure(); - this.getColumnStructure(); + this.getEitDffStructure(); + // this.getColumnStructure(); } public getColumnStructure() { diff --git a/Mohem/src/assets/font/Poppins-Black.ttf b/Mohem/src/assets/font/Poppins-Black.ttf new file mode 100644 index 00000000..a9520b78 Binary files /dev/null and b/Mohem/src/assets/font/Poppins-Black.ttf differ diff --git a/Mohem/src/assets/font/Poppins-Bold.ttf b/Mohem/src/assets/font/Poppins-Bold.ttf new file mode 100644 index 00000000..b94d47f3 Binary files /dev/null and b/Mohem/src/assets/font/Poppins-Bold.ttf differ diff --git a/Mohem/src/assets/font/Poppins-ExtraBold.ttf b/Mohem/src/assets/font/Poppins-ExtraBold.ttf new file mode 100644 index 00000000..8f008c36 Binary files /dev/null and b/Mohem/src/assets/font/Poppins-ExtraBold.ttf differ diff --git a/Mohem/src/assets/font/Poppins-ExtraLight.ttf b/Mohem/src/assets/font/Poppins-ExtraLight.ttf new file mode 100644 index 00000000..ee623825 Binary files /dev/null and b/Mohem/src/assets/font/Poppins-ExtraLight.ttf differ diff --git a/Mohem/src/assets/font/Poppins-Light.ttf b/Mohem/src/assets/font/Poppins-Light.ttf new file mode 100644 index 00000000..2ab02219 Binary files /dev/null and b/Mohem/src/assets/font/Poppins-Light.ttf differ diff --git a/Mohem/src/assets/font/Poppins-Medium.ttf b/Mohem/src/assets/font/Poppins-Medium.ttf new file mode 100644 index 00000000..e90e87ed Binary files /dev/null and b/Mohem/src/assets/font/Poppins-Medium.ttf differ diff --git a/Mohem/src/assets/font/Poppins-Regular.ttf b/Mohem/src/assets/font/Poppins-Regular.ttf new file mode 100644 index 00000000..be06e7fd Binary files /dev/null and b/Mohem/src/assets/font/Poppins-Regular.ttf differ diff --git a/Mohem/src/assets/font/Poppins-SemiBold.ttf b/Mohem/src/assets/font/Poppins-SemiBold.ttf new file mode 100644 index 00000000..dabf7c24 Binary files /dev/null and b/Mohem/src/assets/font/Poppins-SemiBold.ttf differ diff --git a/Mohem/src/assets/font/Poppins-Thin.ttf b/Mohem/src/assets/font/Poppins-Thin.ttf new file mode 100644 index 00000000..f5c0fdd5 Binary files /dev/null and b/Mohem/src/assets/font/Poppins-Thin.ttf differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 1aaf29e0..5a6310be 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1189,7 +1189,7 @@ }, "actionBy": { "en": "Action By :", - "ar": " : بواسطة" + "ar": "الرد بواسطة :" }, "postedDate": { "en": "Posted on", diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index 64c5b457..9bca9b5c 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -34,6 +34,14 @@ font-family: WorkSans-Bold; src: url('../assets/font/WorkSans-Bold.otf'); } +@font-face { + font-family: Poppins-SemiBold; + src: url('../assets/font/Poppins-SemiBold.ttf'); +} +@font-face { + font-family: Poppins-Medium; + src: url('../assets/font/Poppins-Medium.ttf'); +} @font-face { font-family: Poppins-Bold; @@ -85,6 +93,8 @@ --darkblue:#269DB8; --lightblue:#3cb9d5; --newred:#cb3232; + --fontFamilyPoppins-SemiBold: 'Poppins-SemiBold'; + --fontFamilyPoppins-Medium: 'Poppins-Medium'; // $font-family-base: $fontFamilyMediumEN !default; // $font-family-ios-base: $fontFamilyMediumEN !default; // $font-family-md-base:$fontFamilyMediumEN !default;