diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index f5ba5e91..3bcbe947 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -136,7 +136,7 @@ - HR REQUEST + {{ts.trPK('userProfile','HR-Request')}} 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 77005a95..c2f7eb28 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html @@ -140,14 +140,14 @@ - HR Services - HR Services + {{HR}} + {{HR}} - Complaints - Complaints + {{complaints}} + {{complaints}} - Inquiry - Inquiry + {{inquiry}} + {{inquiry}} @@ -159,23 +159,35 @@ - + + - + + + - - + + @@ -186,17 +198,24 @@ {{ts.trPK('userProfile','SupportingDocument')}}
- + +
+ + +
+
{{ts.trPK('userProfile','Description')}}
- + - + @@ -204,13 +223,13 @@ - -
- - -
-
+ - \ No newline at end of file + +
+ + +
+
\ 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 6147cc4e..18a11f07 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss @@ -259,7 +259,7 @@ ion-input { } } - .filed{ + .filed1{ border-radius: 30px; border: 1px solid #d3d5d5 !important; margin: 10px; @@ -267,7 +267,30 @@ ion-input { padding-top: 6px !important; color: #636161; padding-bottom: 15px; - padding-right: 252px; + // padding-right: 252px; + padding-right: 115px; + } + .filed2{ + border-radius: 30px; + border: 1px solid #d3d5d5 !important; + margin: 10px; + padding-left: 11px !important; + padding-top: 6px !important; + color: #636161; + padding-bottom: 15px; + // padding-right: 252px; + padding-right: 153px; + } + .filed3{ + border-radius: 30px; + border: 1px solid #d3d5d5 !important; + margin: 10px; + padding-left: 11px !important; + padding-top: 6px !important; + color: #636161; + padding-bottom: 15px; + // padding-right: 252px; + padding-right: 61px; } .filedDesc{ border-radius: 30px; @@ -427,4 +450,27 @@ ion-input { border: 0px !important; box-shadow: none !important; -webkit-box-shadow: none; + } + + ion-footer .footer-button{ + --background: #259CB8; + width: 80%; + } + + .fileUpload { + position: relative; + overflow: hidden; + margin: 10px; + margin-left: -233px; + } + .fileUpload input.upload { + position: absolute; + top: 0; + right: 0; + margin: 0; + padding: 0; + font-size: 20px; + cursor: pointer; + opacity: 0; + filter: alpha(opacity=0); } \ No newline at end of file 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 2ed8bda9..dda723cb 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.ts @@ -10,6 +10,7 @@ import { Location } from '@angular/common'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { LoginModel } from 'src/app/authentication/models/LoginModel'; import { SendActivationByType } from 'src/app/authentication/models/sendActivationByType'; +import { FileUploader } from 'ng2-file-upload'; @Component({ selector: 'app-hr-request', @@ -37,6 +38,21 @@ export class HRRequestComponent implements OnInit { 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 direction: string; @@ -106,7 +122,7 @@ export class HRRequestComponent implements OnInit { getTicketTypes(){ const request = { // TokenID:"xxx", - // EmployeeNumber:"191817" + EmployeeNumber:"121816", }; this.MowadhafiService.getTicketTypes(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> @@ -115,14 +131,16 @@ export class HRRequestComponent implements OnInit { }) } handlegetTicketTypesResult(result){ - + this.HR = result.Mohemm_Itg_TicketTypesList[0].typeName; + this.complaints = result.Mohemm_Itg_TicketTypesList[1].typeName; + this.inquiry = result.Mohemm_Itg_TicketTypesList[2].typeName; } getProject(){ const request = { // TokenID:"xxx", - // EmployeeNumber:"191817", + EmployeeNumber:"121816", ItgProjectCode:"CS" }; @@ -132,14 +150,14 @@ export class HRRequestComponent implements OnInit { }) } handlegetProjectResult(result){ - + this.Projectresult=result.Mohemm_Itg_ProjectsList[0]; } getProjectDepartments(){ const request = { // TokenID:"xxx", - // EmployeeNumber:"191817", + EmployeeNumber:"121816", ItgProjectId:11, @@ -150,13 +168,18 @@ export class HRRequestComponent implements OnInit { }) } handlegetProjectDepartmentsResult(result){ + this.departTypeList= result.Mohemm_ITG_ProjectDepartmentsList; + // this.EmpRelations= result .Mohemm_ITG_ProjectDepartmentsList[0].departmentName; + // this.Hr = result .Mohemm_ITG_ProjectDepartmentsList[1].departmentName; + // this.Payroll = result .Mohemm_ITG_ProjectDepartmentsList[2].departmentName; + // this.GovRelation = result .Mohemm_ITG_ProjectDepartmentsList[3].departmentName; } getDepartmentSections(){ const request = { // TokenID:"xxx", - // EmployeeNumber:"191817", + EmployeeNumber:"121816", ItgProjectDepartmentId:1 }; @@ -166,13 +189,15 @@ export class HRRequestComponent implements OnInit { }) } handlegetDepartmentSectionsResult(result){ + // this.projName=result.Mohemm_ITG_DepartmentSectionsList[0].projectName; + this.sectionTypeList= result.Mohemm_ITG_DepartmentSectionsList; } getSectionTopics(){ const request = { // TokenID:"xxx", - // EmployeeNumber:"191817", + EmployeeNumber:"121816", ItgDepartmentSectionId:1 }; @@ -182,6 +207,8 @@ export class HRRequestComponent implements OnInit { }) } handlegetSectionTopicsResult(result){ + // this.topicName=result.Mohemm_ITG_SectionTopicsList[0].topicName + this.topicTypeList= result.Mohemm_ITG_SectionTopicsList; } @@ -202,11 +229,80 @@ export class HRRequestComponent implements OnInit { this.menu.toggle(); } - submitRequest(){ + /*******************Add attchement Functions*************/ + public uploader: FileUploader = new FileUploader({ + allowedMimeType: ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'], + maxFileSize: 10 * 1024 * 1024, + formatDataFunctionIsAsync: true, + formatDataFunction: async (item) => { + return new Promise((resolve, reject) => { + resolve({ + name: item._file.name, + length: item._file.size, + contentType: item._file.type, + date: new Date() + }); + }); + } + }); + onFileSelectedclick(event){ + event.target.value = ''; } - - uploadDocument(){ - + + + onFileSelected(input) { + + // this.uploader.onWhenAddingFileFailed = function (item: any, filter: any, options: any){ + if (!(this.filterAllowedType.indexOf(input.target.files[0].type) > -1)) { + let msg: string = ""; + msg = this.ts.trPK("general", "notSupport"); + this.cs.presentAlert(msg); + return + } // todo: show alert that you tried uploading wrong files + + else { + const file = input.target.files[0]; + this.getBase64(file).then( + data => this.pushObject(data, file.name, file.type) + ); + + } + } + + + getBase64(file) { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(file); + reader.onload = () => resolve(reader.result); + reader.onerror = error => reject(error); + }); } + + + pushObject(fileData, name, type) { + // console.log('before push: '+ this.index); + // try { + // let array = name.split('.'); + // let attachType: string = array[array.length - 1]; + + // this.attachListOver.push( + // AttachmentID: this.attachListOver.length, + // P_FILE_CONTENT_TYPE: attachType,//type.split('/')[1], + // P_FILE_DATA: fileData.split(',')[1], + // P_FILE_NAME: name,//.split('.')[0], + // P_TRANSACTION_ID: this.P_TransactionID + // { + + // }) + + // } catch (e) { + + // } + } + + + submitRequest(){} + } diff --git a/Mohem/src/app/mowadhafi/mowadhafi.service.ts b/Mohem/src/app/mowadhafi/mowadhafi.service.ts index bfa4eba3..ce7c9f3e 100644 --- a/Mohem/src/app/mowadhafi/mowadhafi.service.ts +++ b/Mohem/src/app/mowadhafi/mowadhafi.service.ts @@ -18,7 +18,7 @@ export class MowadhafiService { public static getTicketsByEmployee ='Services/COCWS.svc/REST/Mohemm_ITG_GetTicketsByEmployee'; public static getTicketStatisticsByEmp ='Services/COCWS.svc/REST/Mohemm_ITG_GetTicketStatisticsByEmployee'; public static getTicketTransaction ='Services/COCWS.svc/REST/Mohemm_ITG_GetTicketTransaction'; - public static getTicketDetails =' Services/COCWS.svc/REST/Mohemm_ITG_GetTicketDetails'; + public static getTicketDetails ='Services/COCWS.svc/REST/Mohemm_ITG_GetTicketDetails'; constructor( public con: ConnectorService, diff --git a/Mohem/src/app/mowadhafi/my-request/my-request.component.ts b/Mohem/src/app/mowadhafi/my-request/my-request.component.ts index d1b82775..05549566 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.ts +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.ts @@ -54,7 +54,7 @@ public openRequestDetailsPage() { getTicketsByEmployee(){ const request = { // TokenID:"xxx", - // EmployeeNumber:"191817", + EmployeeNumber:"121816", ItgPageSize:10, ItgPageNo:1 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 8895bdbd..ca0a2600 100644 --- a/Mohem/src/app/mowadhafi/request-details/request-details.component.ts +++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.ts @@ -44,7 +44,7 @@ export class RequestDetailsComponent implements OnInit { getTicketTransaction(){ const request = { - // EmployeeNumber:"191817", + EmployeeNumber:"121816", ItgTicketId:"5a10de61-c4db-4c77-e464-08d8a1beaaac", }; @@ -59,8 +59,9 @@ export class RequestDetailsComponent implements OnInit { getTicketDetails(){ const request = { - // EmployeeNumber:"191817", - ItgTicketId:"5a10de61-c4db-4c77-e464-08d8a1beaaac", + EmployeeNumber:"121816", + TokenID:"@dm!n", + ItgTicketId:"5a10de61-c4db-4c77-e464-08d8a1beaaac", }; this.MowadhafiService.getTicketDetails(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index a7a6a422..a22f7da9 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -12,8 +12,9 @@