From 3080d0bb74d48bf9859a1cfb86fddcbe06b29b0f Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Sun, 20 Jun 2021 15:20:30 +0300 Subject: [PATCH] fixed merge issues --- Mohem/src/app/eit/home/home.component.html | 1 + .../hr-request-form.component.html | 52 ++---------- .../hr-request/hr-request.component.html | 19 +---- .../hr-request/hr-request.component.scss | 19 ++++- .../hr-request/hr-request.component.ts | 55 ++++--------- .../my-request/my-request.component.html | 28 ++++--- .../my-request/my-request.component.scss | 82 ++++++++++++++++++- .../request-details.component.html | 30 ++++--- .../request-details.component.scss | 65 ++++++++++++++- .../request-details.component.ts | 2 + .../my-team/details/details.component.html | 24 +++--- .../my-team/details/details.component.scss | 49 +++++++++-- .../src/app/my-team/home/home.component.html | 3 +- .../src/app/my-team/home/home.component.scss | 42 ++++++++-- Mohem/src/app/my-team/home/home.component.ts | 6 +- Mohem/src/assets/localization/i18n.json | 4 +- 16 files changed, 318 insertions(+), 163 deletions(-) diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 5a17cfae..8030b210 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -1,5 +1,6 @@ diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html index 583e139f..db7a65b7 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html @@ -1,13 +1,9 @@ - - - - - - {{ts.trPK('userProfile','createHR-Request')}} - - + + @@ -46,12 +42,6 @@ *ngFor="let x of departTypeList; let i=index;"> {{x.departmentName}} - @@ -72,16 +62,14 @@ - -
{{ts.trPK('userProfile','SupportingDocument')}}
-
- +
@@ -90,58 +78,30 @@ - - - - - - - - - - -
{{ts.trPK('userProfile','Description')}}
- - -
-
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 14c682d4..63b85eb7 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html @@ -1,13 +1,9 @@ - - - - - - {{ts.trPK('userProfile','createHR-Request')}} - - + + @@ -133,10 +129,3 @@ - - \ No newline at end of file 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 18a11f07..b4355fe1 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss @@ -422,7 +422,7 @@ ion-input { font-family: 'WorkSans-Bold'; } - .CreateBtn{ + @media screen and (min-width: 300px) { .CreateBtn{ --background: var(--newgreen) !important; background: var(--newgreen) !important; white-space: normal; @@ -433,7 +433,22 @@ ion-input { border-radius: 7px !important; --min-height: 1.6cm !important; width: 315px; - } + }} + @media screen and (min-width: 1px) and (max-width:290px) { + .CreateBtn{ + --background: var(--newgreen) !important; + background: var(--newgreen) !important; + white-space: normal; + color: var(--light); + text-transform: capitalize; + min-height: 1.0cm; + --border-radius: 7px !important; + border-radius: 7px !important; + --min-height: 1.6cm !important; + width: 231px; + }} + + .footer{ padding: 15px 0px 0px 0px; background-color: var(--light) !important; diff --git a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts index ddcf1639..baed17b0 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts @@ -34,43 +34,24 @@ export class HRRequestComponent implements OnInit { public EmpImg: string; public userImage: any = '../assets/imgs/profile.png'; public loginData = new LoginModel(); - public searchKeySelect = 'Complaints'; - myColor: string = 'secondary'; - public showRequestDetails = false; - public proID = "CS" - public inquiry: string; - public HR: string; - public complaints: string; - public Projectresult: any; - public EmpRelations: any; - public Hr: any; - public Payroll: any; - public GovRelation: any; - public projName: any; - public topicName: any; - public departTypeList: any; - public topicTypeList: any; - public sectionTypeList: any; - filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; - public projectDetial: any; - public projectDep: any; - public sectionDep: any; - - - public direction: string; - constructor( - public ts: TranslatorService, - public cs: CommonService, - public authService: AuthenticationService, - public sharedData: SharedDataService, - public events: Events, - public MowadhafiService: MowadhafiService, - private location: Location, - private menu: MenuController, - - ) { - this.direction = TranslatorService.getCurrentLanguageName(); - } + + + + + public direction: string; + constructor( + public ts: TranslatorService, + public cs: CommonService, + public authService: AuthenticationService, + public sharedData: SharedDataService, + public events: Events, + public MowadhafiService: MowadhafiService, + private location: Location, + private menu: MenuController, + + ) { + this.direction = TranslatorService.getCurrentLanguageName(); + } ngOnInit() { this.getUserInformation(); 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 db119586..854c9930 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.html +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.html @@ -1,19 +1,15 @@ - - - - - - {{ts.trPK('userProfile','MyHR-request')}} - - + + -
+
@@ -21,10 +17,22 @@ {{ts.trPK('userProfile','postedDate')}} {{(ticket.created)?.substring(0,10)}} {{ticket.description}} - {{ticket.ticketStatusName}} + + {{ticket.ticketStatusName}}
+
+ {{ts.trPK('general','empty')}}
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 2553812f..816015dd 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.scss +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.scss @@ -32,15 +32,27 @@ font-family: 'WorkSans-bold'; } + + @media screen and (min-width: 300px){ .date{ margin-top: -9px; margin-right: -49px; color: gray; font-size: 12px; - } + }} + + @media screen and (min-width: 1px) and (max-width:290px) { + .date{ + margin-top: -9px; + margin-right: -55px; + color: gray; + font-size: 12px; + margin-left: -88px; + }} - .CreateBtn{ + @media screen and (min-width: 300px){ + .CreateBtn{ --background: var(--newgreen) !important; background: var(--newgreen) !important; white-space: normal; @@ -51,7 +63,22 @@ border-radius: 7px !important; --min-height: 1.6cm !important; width: 315px; - } + }} + + @media screen and (min-width: 1px) and (max-width:290px) { + .CreateBtn{ + --background: var(--newgreen) !important; + background: var(--newgreen) !important; + white-space: normal; + color: var(--light); + text-transform: capitalize; + min-height: 1.0cm; + --border-radius: 7px !important; + border-radius: 7px !important; + --min-height: 1.6cm !important; + width: 257px; + }} + .footer{ padding: 15px 0px; background-color: var(--light) !important; @@ -61,4 +88,51 @@ } .Btn{ margin: auto; text-align: center; display: block; - } \ No newline at end of file + } + + .New{ + margin-top: 5px; + color: #1FA169; + font-family:'WorkSans-bold'; + } + + .ReOpen{ margin-top: 5px; + color: #1FA169; + font-family:'WorkSans-bold';} + .AssToManager{ margin-top: 5px; + color: #259CB8; + font-family:'WorkSans-bold';} + .AssToSpec{ margin-top: 5px; + color: #259CB8; + font-family:'WorkSans-bold';} + .Pending{ margin-top: 5px; + color: #E29D03; + font-family:'WorkSans-bold';} + .BackToSpec{ margin-top: 5px; + color: #3A476E; + font-family:'WorkSans-bold';} + .Closed{ margin-top: 5px; + color: #CA3332; + font-family:'WorkSans-bold';} + .BackToManager{ margin-top: 5px; + color: #3A476E; + font-family:'WorkSans-bold';} + .AssignedToHR{ margin-top: 5px; + color: #259CB8; + font-family:'WorkSans-bold';} + + .empty-en{ + color: black; + text-align: center; + font-size: 15px; + font-family: WorkSans-Bold; + margin: 50px 0px 0px 100px; + } + .empty-ar{ + color: black; + text-align: center; + font-size: 15px; + font-family: WorkSans-Bold; + margin: 50px 100px 0px 0px; + } + \ 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 286eb418..a6ad10e7 100644 --- a/Mohem/src/app/mowadhafi/request-details/request-details.component.html +++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.html @@ -1,25 +1,29 @@ - - - - - - - - {{ts.trPK('userProfile','MyHR-request')}} - - + +
- + - - {{status}} + + + {{status}} {{ts.trPK('userProfile','postedDate')}}{{date}} 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 7ecde242..a9f7e47a 100644 --- a/Mohem/src/app/mowadhafi/request-details/request-details.component.scss +++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.scss @@ -59,12 +59,20 @@ // margin-top: -9px; font-family: 'WorkSans-bold'; } + @media screen and (min-width: 1px) and (max-width:360px) { + .date{ + margin-right: -38px; + color: gray; + font-size: 12px; + }} + + @media screen and (min-width: 365px) { .date{ // margin-top: -9px; margin-right: -49px; color: gray; font-size: 12px; - } + }} .labels{ font-size: 13px; @@ -156,7 +164,7 @@ font-size: 14px; } } - + @media screen and (min-width: 365px){ .date-span{ font-size: 13px; margin-bottom: 0px; @@ -164,11 +172,60 @@ color: gray; margin-left: 172px; - } + }} + @media screen and (min-width: 1px) and (max-width:360px) { + .date-span{ + font-size: 13px; + margin-bottom: 0px; + margin-top: -10px; + color: gray; + margin-left: 162px; + + }} + .date-span-ar{ font-size: 13px; margin-bottom: 0px; margin-top: -10px; color: gray; margin-right: 155px; - } \ No newline at end of file + } + + + .New{ + margin-top: 5px; + color: #1FA169; + font-family:'WorkSans-bold'; + } + + .ReOpen{ margin-top: 5px; + color: #1FA169; + } + .AssToManager{ margin-top: 5px; + color: #259CB8; + } + .AssToSpec{ margin-top: 5px; + color: #259CB8; + } + .Pending{ margin-top: 5px; + color: #E29D03; + } + .BackToSpec{ margin-top: 5px; + color: #3A476E; + } + .Closed{ margin-top: 5px; + color: #CA3332; + } + .BackToManager{ margin-top: 5px; + color: #3A476E; + } + .AssignedToHR{ margin-top: 5px; + color: #259CB8; + } + + .card-content{ + margin-left: -3px; margin-right: -9px;} + .card-content-ar{ + margin-left: -122px; + } + diff --git a/Mohem/src/app/mowadhafi/request-details/request-details.component.ts b/Mohem/src/app/mowadhafi/request-details/request-details.component.ts index c122da44..2c5a6f2e 100644 --- a/Mohem/src/app/mowadhafi/request-details/request-details.component.ts +++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.ts @@ -24,6 +24,7 @@ export class RequestDetailsComponent implements OnInit { public date:any; public status:any; public teckitDetial:any; + public statusID :any; constructor( @@ -97,6 +98,7 @@ export class RequestDetailsComponent implements OnInit { console.log(res); this.teckitInfo = res.result.data; this.status =this.teckitInfo.ticketStatusName; + this.statusID =this.teckitInfo.ticketStatusId; this.date =this.teckitInfo.created.substring(0, 10); this.ticketRefre =this.teckitInfo.ticketReferenceNo; this.section = this.teckitInfo.sectionName; diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index e8bc1fd3..4fdd446a 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -1,11 +1,8 @@ - - - - - - {{ts.trPK('userProfile','emp-detail')}} - - + + +
@@ -13,14 +10,14 @@