From 344bc11ab9803769ac24499f462c7fd4c8f8a432 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 10 Jun 2021 10:23:44 +0300 Subject: [PATCH 1/3] add icons in profile/home --- Mohem/src/app/profile/home/home.component.html | 9 ++++++--- .../imgs/profile-icons/basic-detail@21.png | Bin 0 -> 1253 bytes .../imgs/profile-icons/basic-detail@2x.png | Bin 0 -> 1141 bytes .../src/assets/imgs/profile-icons/info-a@2x.png | Bin 0 -> 1189 bytes Mohem/src/assets/imgs/profile-icons/info@2x.png | Bin 0 -> 1092 bytes .../imgs/profile-icons/main address-a@2x.png | Bin 0 -> 1281 bytes .../imgs/profile-icons/main-address@2x.png | Bin 0 -> 1190 bytes 7 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 Mohem/src/assets/imgs/profile-icons/basic-detail@21.png create mode 100644 Mohem/src/assets/imgs/profile-icons/basic-detail@2x.png create mode 100644 Mohem/src/assets/imgs/profile-icons/info-a@2x.png create mode 100644 Mohem/src/assets/imgs/profile-icons/info@2x.png create mode 100644 Mohem/src/assets/imgs/profile-icons/main address-a@2x.png create mode 100644 Mohem/src/assets/imgs/profile-icons/main-address@2x.png diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 1b7bb6ed..1dce5738 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -39,19 +39,22 @@
- + + {{ts.trPK('general','personal-info')}}
- + + {{ts.trPK('general','basic-details')}}
- + + {{ts.trPK('userProfile','address')}}
diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.png b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.png new file mode 100644 index 0000000000000000000000000000000000000000..b569617a78b6b2f1dd5e2bde457806b1cdc4b31f GIT binary patch literal 1253 zcmVPx#IAvH#W=%~1DgXcg2mk?xX#fNO00031000^Q000000-yo_1ONa40RR91C!hlW z1ONa40RR91CjbBd03H0`k^le%TS-JgR9FecSYJq_RTMv0ukH%YCI&%F;DjzD6%9e{ zQeY!RD#AMY(o3PjZVx@wK1Mz7!#>s0TM8!iR_GXnmVvXoV1J-g5R6pPhbek!DHZb1 z=4ZEKW6Yeg zRczv8pxJz_8r~T0*)Z{FdW{~KdJf+Qb%)}&D1gBR^gtik!@ULO zNqG3qcF0+MATM+VJs8?^2<5o~!{6p|RJ7}Jf)8Bl=*)-g%9M}eoF=df`(ATySWzyJ zMc&0~j1Ownx zbs`^dN&ch%@Rob%L~dq4(Y*EjFUPE_g`wVaeUtNL!-_xg(;F`z%a<7e7qWGcuLV|h zZmU=(KEHOAYWW`xOnpb120QQZe){2$2S$@u9&I+Rg%{LfMG2u5T&k}lSrg81gqS~o zG+U_0dL>PAJy~RRR-V&}yS})uhra%!pV!KU71`=dAfIqx0$l7lk>$|76Id%b#oh{L zquy^2zy%?y#&s?u*ROYF_)EwtDK7Dbe*4+BsO%f{AQ{|Si4ZDdKg+O2ySZeEg;L8R#9U3G)6RGU{n0Il7>3>nx2=1 z3tmJvPOT;{)lDtzg2P9}5z!sJP>mk;^~VkDyJ6K}suf-?QFl2*QyK?)*K?YfmlxBD z)TW-FQ@;eeL0chkcoGmtwdV|u8VajM@4PbQcQa?1!3ZThRti{Ia2h0@ z2-v+=$D5Y1>9P6OuXnqdSxUy}IWM#GvYAJr{{MBb;4R`Xp8T?D1x^DkybREgQX*}8 zL4_>NN*qb3{E@#2YjEBk-@Ev%biUr41(5_`04ZEx`4`tQzFkxT$ZO+2FGq!|U8Hes P00000NkvXXu0mjf!0$l7 literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.png b/Mohem/src/assets/imgs/profile-icons/basic-detail@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..413b18abc9abb44d402f0be29571cb4882de3b28 GIT binary patch literal 1141 zcmV-*1d98KP)Px#IAvH#W=%~1DgXcg2mk?xX#fNO00031000^Q000000-yo_1ONa40RR91C!hlW z1ONa40RR91CjbBd03H0`k^le$>q$gGR9FekSUpS|F%)*1V*#Y53#LB`a`~lapD;alQap!Pc-z4gjkU4-X$JmCA)lM)F?-hwy!d za9JuO*lr@+pW4|of^%IrgI~Cx#A=xUa1{}edC&70_6TXgO-)VZ)9Lg+q_Yu?=`#o`%SBI5PeV?0tG&O!&&e_qgq3xyTY$oT!#J8N=U4vk zVWDt;Yimp7a=9?;pZm0Ve0;36gAFpylcc$FhnpXL)17LZTYZ?;_S7v>EUG(<$igLLu$m0r< zY`~dpt9;^eRA#&J;NW0$n!Ai4B1s&#KPJGO@9-A#mRlD=RC(&ZTAM)9L9cyIL9<8PW0$ z%sRovrvCnZfip0ocXxNk>K@@s2Iu1t>s%cMtyWGNUS3|7-IjKDceia=nWNzi)S|2m znio(2tAbxr=CniR7L;1%WWJHff}9|E4r-H!Bg|@3FrgO~783MtG<6-^N+9AH#kw=m z#M8`bglY%jT{Pif2??JBCb>BLb|(q(&{nXu5ZWrnu{H(`bb!7g)m++@_c?*Pd$9wK zVw(hxvQ!Gd@lOSoGtuoPo!GYYFaO+7CkU%F(8ci95YB?c!8TYq$;7eb;urjq&#E6`Y-UbZZ=UkZSN#&^_YNXC&uTApR4D z)$yk4wi`3~aS8-GQz!c(I4b#16+7rAQ3q=*Tj5Px#IAvH#W=%~1DgXcg2mk?xX#fNO00031000^Q000000-yo_1ONa40RR91C!hlW z1ONa40RR91CjbBd03H0`k^le%8%ab#R9FecSlvrhK@>l;Ub7(046-nALxqH*E$HJ( zSJ2X4T6^gwXa(&dsCLNF^7PC`d8`vv!@%@9xfe zckkWZxtDDn(3v~)JLmlNoS8Epf;^V`zKQcJ8YDr1q>6wbs+2@O_uDcL zVq8_MPruanjR%Dgmzh8aM06!VnDL`h%AvWQj)<B!va`0Gbe0`cRehcpZHhES5 zHOg8tJ!qSA2xU=;;b(I?O4?0xLK?Zc{)xNn%3vCzNFT5Z`&M(Qup(Vx6P8~=e9@^=ON>(>woHM6So>_^H*Cx9or!2w(wl5 z#8hL?$)H=|V&J6^A)k;k;MLgT>RMjWB@K*|67Whc2&duvefQtax4-Um**4@%ANWc%$%?=V~~|T{~V!t+mxu!3o(~;LYJr zOEmN$>M^u(#`A(e7$+|_nc>VN29ik5*N@jTrrA>>h7KR+6ZV|D0%EtD4r>X4_~UaY z2z#)b0$%Jn5pg4gP~JLy$c>1J#UAXYaGo3W&3B*W`y{RC3Wg8Y+UA#zEW(Uql}-Vl z)Tu-WIjSQBOyiykU8oJGyU!{<=7M0RgEmcBI!^A}on<6{x9$&9e9Xfp)bc4H!cPr( zQwk<_d0AJ$th+~xHL|m9dxF3c|CroDar8>Gi0wCPUSgV zDmIAjse!GiVP9QtU_TXBMMgKg3SX$2?+vebg$AwqQl3+tF=Km3l8mbFBGvC;H`A7l z9G(QkMoBRVzT>x&aOP74h}y!c*qg6RvEQRQD_F_6tr1Fi%!wFuWhJK!;fa9VdqaH} zs>bA>?`}`6Oeej0$wA0`*^JR(A-tII7I7H!zieueQ@<+lGC*M|Maazo6?-MNBxL@A zzX>aH)*AO+Tq`$kZz2G~Ad)!1@_#<|;B?`Jkk!UNBhF*=tXQ2@00000NkvXXu0mjf D7?mF0 literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/profile-icons/info@2x.png b/Mohem/src/assets/imgs/profile-icons/info@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..30d0bedef6dadacd202d6fca1630789f179e7c74 GIT binary patch literal 1092 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 literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/profile-icons/main-address@2x.png b/Mohem/src/assets/imgs/profile-icons/main-address@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..03c87f8a232b21fdc05de2ffe296f018de697188 GIT binary patch literal 1190 zcmV;X1X=ruP)Px#IAvH#W=%~1DgXcg2mk?xX#fNO00031000^Q000000-yo_1ONa40RR91C!hlW z1ONa40RR91CjbBd03H0`k^le%97#k$R9FeUSUXP}K@dJas6dL-KzlUMfN%#DF`_{T zgy}*RN1_jD`2i?hoE|BpA{{m$5!I}msg;gdwF@u(nKPWV4K0y0I%-z*j5h?4$2(cQo=@IX=y135FenE z$3q~d)PP_Kpnn`59#&12jKD1{EV$`(`a6K-Oby4$0bup<@$qA&Qn`tf5q?{62;Wx- zZ-_z<+akjKxs|bgMYZ!3va~%pcfI5)l#X%u!krT+~VS5HkC^4LD~&z^qz6^ z^z^iPbaYhLO^3kIV-WrgL01><*O=K256OiWBTY)QAbx6b+bx!2m*q3pxM z!>E**v?#NVN#C?3n6|@bAILj6}dtTb98jn+1lE2 z1_uXYB>uDS@9&+>%}wX}+B_&okU73dyo5l!t%@u?W&(`x2;Njy{w44f*q3a5Cle+u zL#ca=`;1}a!@f$CU0+{US?&5O6iDFplt;_*VMO%W_V#u_mVn4(2uT7)-;4ZHA`>tW zF<@wu_{l}g#j++RCj)czk_wEI1VEnd!I_zvfNq;XK8g5d+Xw}wrCbQ}?CdPk8wAKX zm2_QoPVW^Xg|C*z@^p|0!@+?0)ltE;PkIE$~I926kWb=`oh?#aMpcrZn9nJ_<| z!^*GH$jFG7i7G%z2+pZwQ|q9Y;Tz%(&l}Z9t3LPA$;pW`Jw4qNV^-3GvN#L04vadc znd%$9Be*&qt2$RMmjmEvj9_#?{e~Nz7bHc#kvx>ge8$)!vY-^|-In_q!4S{QjJpRF7RjA*6toMiO z>g$BS@k-$N`T5lV5*XGi=vNU08UjZqFIDjUm_@h7aUZFMb#hUcI9xNd=X4m7TWWsO*=S9dvt*PI!m! zO!SS&3Y=<@-@90h7uejJB(?-hAay(r=Gm5P08vlqA8mihZzX9)hyVZp07*qoM6N<$ Eg84Qqv;Y7A literal 0 HcmV?d00001 From 8ccb01f1ac351ba178ec279de2e2c24fe820fe49 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Thu, 10 Jun 2021 15:23:40 +0300 Subject: [PATCH 2/3] fixed my team --- Mohem/src/app/app.component.html | 2 +- .../hr-request/hr-request.component.html | 77 +++++++----- .../hr-request/hr-request.component.scss | 50 +++++++- .../hr-request/hr-request.component.ts | 118 ++++++++++++++++-- Mohem/src/app/mowadhafi/mowadhafi.service.ts | 2 +- .../my-request/my-request.component.ts | 2 +- .../request-details.component.ts | 7 +- .../my-team/details/details.component.html | 13 +- .../app/my-team/details/details.component.ts | 11 +- Mohem/src/app/my-team/my-team.module.ts | 3 + Mohem/src/assets/imgs/favFilled.svg | 3 + Mohem/src/assets/localization/i18n.json | 4 + 12 files changed, 235 insertions(+), 57 deletions(-) create mode 100644 Mohem/src/assets/imgs/favFilled.svg 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 @@