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 @@
-
-
-
+
+
@@ -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 @@
-
-
-
+
+
-
+
@@ -21,10 +17,22 @@
{{ts.trPK('userProfile','postedDate')}} {{(ticket.created)?.substring(0,10)}}
{{ticket.description}}
- {{ticket.ticketStatusName}}
+
+ {{ticket.ticketStatusName}}
+
+ {{ts.trPK('general','empty')}}