From 5e53ec783f4e8b3c0fa6f7a4b4b9f0da47dd7e5c Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Thu, 24 Jun 2021 10:15:31 +0300 Subject: [PATCH] fixed testing issues --- .../src/app/absence/home/home.component.scss | 22 +- Mohem/src/app/eit/home/home.component.html | 3 +- .../hr-request-form.component.html | 54 +++-- .../hr-request-form.component.scss | 96 ++++++--- .../hr-request-form.component.ts | 188 +++++++----------- .../hr-request/hr-request.component.scss | 8 +- Mohem/src/app/mowadhafi/mowadhafi.service.ts | 4 +- .../my-request/my-request.component.html | 11 +- .../my-request/my-request.component.scss | 65 +++++- .../my-request/my-request.component.ts | 38 ++-- .../request-details.component.html | 4 +- .../request-details.component.scss | 61 ++++-- .../my-team/details/details.component.html | 20 +- .../my-team/details/details.component.scss | 49 ++++- .../app/my-team/details/details.component.ts | 6 + Mohem/src/assets/localization/i18n.json | 4 + 16 files changed, 400 insertions(+), 233 deletions(-) diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 48d4d205..0e176a32 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -98,12 +98,9 @@ } .datetime{ - // text-align: center; - // font-family: WorkSans-Bold; - // margin-left: 111px; text-align: center; font-family: WorkSans-Bold; - margin-left: -142px; + margin-left: -120px; margin-top: -19px; } @@ -310,18 +307,21 @@ margin-top: -13px; .today-graph { - max-height: 4cm; display: block; - height: 124px; - width: 249px; - margin-left: -39px; + height: 102px; + width: 211px; + margin-top: 20px; +margin-left: -39px; +max-height: 4cm; } .today-graph-ar { - max-height: 4cm; display: block; - height: 132px; - width: 264px; + height: 102px; + width: 211px; + margin-top: 20px; + /* margin-right: -39px; */ + max-height: 4cm; margin-right: 105px; } diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 8030b210..17ee0d5c 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -1,9 +1,8 @@ - + 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 db7a65b7..6b2064ea 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 @@ -17,15 +17,24 @@
- - {{HR}} + + +
+ + + {{ticket.typeName}} +
+ + +
@@ -34,30 +43,33 @@
- - + + - + + + - + + - + + @@ -75,10 +87,10 @@ - + - + @@ -105,7 +117,7 @@
- +
diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss index 9c117329..cc1ebf50 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss @@ -212,6 +212,7 @@ ion-input { margin-left: 22px; } + @media screen and (min-width: 1px) and (max-width:320px){ .custom-radio .radio-icon { margin: 0px; border-radius: 50%; @@ -224,11 +225,30 @@ ion-input { .text-label{ color: black !important; - font-size: 10px; - margin-left: 15px; - margin-right: 18px; + font-size: 9px; + margin-left: 2px; + margin-right: 2px; font-family: 'WorkSans-Bold'; - } + } } + + @media screen and (min-width: 325px){ + .custom-radio .radio-icon { + margin: 0px; + border-radius: 50%; + border-width: var(--border-width); + border-style: var(--border-style); + border-color: #dcdcdc; + margin-top: 6px !important; + border-color: #d8d4d4 !important; + margin-bottom: 18px;} + + .text-label{ + color: black !important; + font-size: 10px; + margin-left: 15px; + margin-right: 13px; + font-family: 'WorkSans-Bold'; + } } // .radio-list{ // background: white; @@ -263,34 +283,13 @@ ion-input { 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: 115px; - } - .filed2{ - border-radius: 30px; - border: 1px solid #d3d5d5 !important; - margin: 10px; - padding-left: 11px !important; - padding-top: 6px !important; + padding-left: 10px !important; + padding-top: 10px !important; color: #636161; - padding-bottom: 15px; - padding-right: 44px; - - } - .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: 30px; + padding-bottom: 10px; + width: 130% !important; } + .filedDesc{ border-radius: 30px; border: 1px solid #d3d5d5 !important; @@ -455,13 +454,22 @@ ion-input { --background: #259CB8; width: 80%; } - + @media screen and (min-width: 325px){ .fileUpload { position: relative; overflow: hidden; margin: 10px; margin-left: -233px; - } + }} + @media screen and (min-width: 1px) and (max-width:320px){ + .fileUpload { + position: relative; + overflow: hidden; + margin: 10px; + margin-left: -158px; + + }} + .fileUpload input.upload { position: absolute; top: 0; @@ -482,4 +490,26 @@ ion-input { button.iconButton.button.button-ios.button-default.button-default-ios, button.iconButton.button.button-md.button-default.button-default-md { padding: 0px; -} \ No newline at end of file +} + +select option[data-default] { + color: #888; + } + + .Field-en{ + border-radius: 30px; + border: 1px solid #a2a5a6!important; + margin-bottom: 20px; + padding-left: 20px !important; + padding-top: 6px !important; + color: #999999 !important; + } + + .Field-ar{ + border-radius: 30px; + border: 1px solid #a2a5a6!important; + margin-bottom: 20px; + padding-right: 20px !important; + padding-top: 6px !important; + color: #999999 !important; + } \ No newline at end of file diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts index 6a529cfc..5c1bb330 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts @@ -54,9 +54,9 @@ export class HrRequestFormComponent implements OnInit { public sectionDep: any; public projectCode; public SelectedServiceType: any; - public depType: any; - public secType: any; - public topicType: any; + public depType: any =""; + public secType: any = ""; + public topicType: any=""; indexLastObj: any; addAttachRequest: any = []; TransactionID: any; @@ -73,8 +73,17 @@ export class HrRequestFormComponent implements OnInit { "application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ]; - + projctid:any; + employeeNumber:any; + ticketType: any =[]; public direction: string; + HRServices = ''; + Complaints=''; + Inquiry=''; + input = document.getElementById ("firstLabel"); + + + constructor( public ts: TranslatorService, public cs: CommonService, @@ -91,16 +100,42 @@ export class HrRequestFormComponent implements OnInit { } ngOnInit() { - this.projectCode = this.cs.sharedService.getSharedData("projcet-code"); - this.getTicketsByEmployee(); + this.projectCode = this.cs.sharedService.getSharedData("projcet-code",false); this.getTicketTypes(); this.getProject(); - //this.getCreateTicket(); - + + } + + + onSelectChange(event, type) { + const value = event.target.value; + this.depType = value; + console.log(value); + // this.topicTypeList =[]; + // this.sectionTypeList =[]; + if(type==1){ + this.getDepartmentSections(value); + this.sectionTypeList =[]; + this.topicTypeList =[]; + + }else if(type==2){ + this.getSectionTopics(value); + this.topicTypeList =[]; + + }else if(type==3){ + + }else{} + + } + + onFileSelectedclick(event){ + event.target.value = ''; } + + goback() { this.location.back(); @@ -119,11 +154,11 @@ export class HrRequestFormComponent 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; + this.ticketType =result.Mohemm_Itg_TicketTypesList; + } + ///////////////////////////////////////////////// getProject() { const request = { @@ -138,10 +173,11 @@ export class HrRequestFormComponent implements OnInit { } handlegetProjectResult(result) { this.Projectresult = result.Mohemm_Itg_ProjectsList; + this.projctid=this.Projectresult[0].projectId this.getProjectDepartments(); } - +//////////////////////////////////////////////////// getProjectDepartments() { const request = { EmployeeNumber: "", @@ -156,14 +192,15 @@ export class HrRequestFormComponent implements OnInit { } handlegetProjectDepartmentsResult(result) { this.departTypeList = result.Mohemm_ITG_ProjectDepartmentsList; - this.getDepartmentSections(); + // this.getDepartmentSections(); } + ////////////////////////////////////////////////////// - getDepartmentSections() { + getDepartmentSections(value=null) { const request = { EmployeeNumber: "", - ItgProjectDepartmentId: this.departTypeList.projectDepartmentId, + ItgProjectDepartmentId: value ?value : this.departTypeList.projectDepartmentId, }; @@ -175,13 +212,14 @@ export class HrRequestFormComponent implements OnInit { handlegetDepartmentSectionsResult(result) { this.sectionTypeList = result.Mohemm_ITG_DepartmentSectionsList; - this.getSectionTopics(); + // this.getSectionTopics(); } - getSectionTopics() { + getSectionTopics(value=null) { const request = { EmployeeNumber: "", - ItgDepartmentSectionId: this.sectionTypeList.departmentSectionId, + // ItgDepartmentSectionId: this.sectionTypeList.departmentSectionId, + ItgDepartmentSectionId: value ?value : this.sectionTypeList.departmentSectionId, }; this.MowadhafiService.getSectionTopics(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { @@ -197,107 +235,37 @@ export class HrRequestFormComponent implements OnInit { } + /*******************Create Ticket Function*************/ - // getTicketDetails(){ - // const request = { - // EmployeeNumber:'', - // ItgTicketId:this.teckitDetial.ticketId, - - // }; - // this.MowadhafiService.getTicketDetails(request, ()=> {} , this.ts.trPK('general', 'retry')).subscribe((result)=> - // { - // this.handlegetTicketDetailsResult(result); - - // }) } - // handlegetTicketDetailsResult(result){ - - // let res; - // if(this.cs.validResponse(result)){ - // res = JSON.parse(result.Mohemm_ITG_ResponseItem); - // console.log(res); - // this.teckitInfo = res.result.data; - - // } - - // } - - getTicketsByEmployee() { - const request = { - // TokenID:"xxx", - EmployeeNumber: "", - ItgPageSize: 10, - ItgPageNo: 1 - - }; - this.MowadhafiService.getTicketsByEmployee(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { - this.handlegetTicketsByEmployeeResult(result); - - }) - } - - handlegetTicketsByEmployeeResult(result) { - let x; - if (this.cs.validResponse(result)) { - x = JSON.parse(result.Mohemm_ITG_ResponseItem); - console.log(x); - this.teckitInfo = x.result.data; - // for (let i = 0; i < this.ticketsInfo.length; i++) { - // console.log(i + ' : ' + this.ticketsInfo[i].ticketTypeName) - - // } - console.log("getTicketsByEmployee()-------------------------------------------------------"); - console.log(this.teckitInfo); - console.log("Type Id" + this.teckitInfo[0].ticketTypeId); - - } - } - - - getCreateTicket() { - // const request = { - // // EmployeeNumber:"", - // // ticketTypeId:this.teckitInfo[0].ticketTypeId, - // // projectId:this.teckitInfo[0].projectId, - // // departmentId:this.teckitInfo[0].departmentId, - // // sectionId:this.teckitInfo[0].sectionId, - // // sectionTopicId:this.teckitInfo[0].topicId, - // // description:this.teckitInfo[0].description, - // // fileColl:this. - // // employeeNumber:this.teckitInfo[0].employeeNumber, - // // ticketStatus:this.teckitInfo[0].ticketStatusName, - - - - // // channelId:this.teckitInfo.channelId, - - - - // }; - + CreateTicket() { + + var authUser =this.authService.getAuthenticatedRequest(); this.cs.startLoading(); var request = new FormData(); - request.append('ticketTypeId', '1'); - request.append('projectId', '11'); - request.append('departmentId', '1'); - request.append('sectionId', '1'); - request.append('sectionTopicId', '1'); + request.append('ticketTypeId', this.SelectedServiceType); + request.append('projectId', this.projctid); + request.append('departmentId', this.depType); + request.append('sectionId', this.secType); + request.append('sectionTopicId', this.topicType); request.append('description', this.Description); request.append('fileColl', this.selectedFile[0], this.selectedFile[0].name); - request.append('employeeNumber', '13777'); + request.append('employeeNumber', authUser.P_USER_NAME); request.append('ticketStatus', 'new'); - request.append('Channel', '31'); - request.append('channelId', '1'); - request.append('LogInToken', 'test'); - request.append('Token', '@dm!n'); - request.append('EmployeeNumber', '13777'); - request.append('MobileNo', '0567'); + request.append('channelId', '3'); + request.append('Channel', authUser.Channel.toString()); + request.append('LogInToken', authUser.LogInTokenID); + request.append('Token', authUser.TokenID); + request.append('EmployeeNumber', authUser.P_USER_NAME); + request.append('MobileNo', authUser.MobileNumber); this.MowadhafiService.getCreateTicket(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { this.cs.stopLoading(); this.handlegetCreateTicketResult(result); this.checkERM('After Service Submission'); + //hear you have to redirect page + this.cs.openMyRequestPage(); }) } handlegetCreateTicketResult(result) { @@ -341,10 +309,6 @@ export class HrRequestFormComponent implements OnInit { }); - // onFileSelected(event) { - // //event.target.value = ''; - // this.selectedFile = event; - // } onFileSelected(input) { @@ -357,7 +321,7 @@ export class HrRequestFormComponent implements OnInit { else { const file = input.target.files[0]; this.selectedFile = input.target.files; - // console.log(file); + this.getBase64(file).then(data => this.pushObject(data, file.name, file.type) @@ -376,7 +340,7 @@ export class HrRequestFormComponent implements OnInit { } pushObject(fileData, name, type) { - // console.log("before push: "+ this.index); + this.indexLastObj++; try { let array = name.split("."); 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 b4355fe1..7a316f32 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss @@ -3,7 +3,9 @@ .header-toolbar-new{ --background: #269DB8; } - + ion-content { + --ion-background-color: whitesmoke; +} .contentBg{ padding: 0px 20px; } @@ -422,7 +424,7 @@ ion-input { font-family: 'WorkSans-Bold'; } - @media screen and (min-width: 300px) { .CreateBtn{ + @media screen and (min-width: 325px) { .CreateBtn{ --background: var(--newgreen) !important; background: var(--newgreen) !important; white-space: normal; @@ -434,7 +436,7 @@ ion-input { --min-height: 1.6cm !important; width: 315px; }} - @media screen and (min-width: 1px) and (max-width:290px) { + @media screen and (min-width: 1px) and (max-width:320px) { .CreateBtn{ --background: var(--newgreen) !important; background: var(--newgreen) !important; diff --git a/Mohem/src/app/mowadhafi/mowadhafi.service.ts b/Mohem/src/app/mowadhafi/mowadhafi.service.ts index e56485b3..20f13c9a 100644 --- a/Mohem/src/app/mowadhafi/mowadhafi.service.ts +++ b/Mohem/src/app/mowadhafi/mowadhafi.service.ts @@ -61,12 +61,14 @@ export class MowadhafiService { const request = absence; this.authService.authenticateRequest(request); request.EmployeeNumber = request.P_USER_NAME; + request.ItgProjectDepartmentId = absence.ItgProjectDepartmentId; return this.con.post(MowadhafiService.getProjectDepartments, request, onError, errorLabel); } public getDepartmentSections(absence: any, onError?: any, errorLabel?: string) { const request = absence; this.authService.authenticateRequest(request); request.EmployeeNumber = request.P_USER_NAME; + request.ItgDepartmentSectionId = absence.ItgProjectDepartmentId; return this.con.post(MowadhafiService.getDepartmentSections, request, onError, errorLabel); } public getSectionTopics(absence: any, onError?: any, errorLabel?: string) { @@ -105,7 +107,7 @@ export class MowadhafiService { public getCreateTicket(absence: any, onError?: any, errorLabel?: string) { const request = absence; this.authService.authenticateRequest(request); - request.EmployeeNumber = request.P_USER_NAME; + request.employeeNumber = request.P_USER_NAME; const HttpUploadOptions = { headers: new HttpHeaders({ "Content-Type": "multipart/form-data", }) } 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 854c9930..a69a3e3d 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.html +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.html @@ -14,7 +14,7 @@ {{ticket.ticketTypeName}} - {{ts.trPK('userProfile','postedDate')}} {{(ticket.created)?.substring(0,10)}} + {{ts.trPK('userProfile','postedDate')}} {{(ticket.created)?.substring(0,10)}} {{ticket.description}} - {{status}} - {{ts.trPK('userProfile','postedDate')}}{{date}} + {{status}} + {{ts.trPK('userProfile','postedDate')}}{{date}}

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

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 a9f7e47a..c8087f11 100644 --- a/Mohem/src/app/mowadhafi/request-details/request-details.component.scss +++ b/Mohem/src/app/mowadhafi/request-details/request-details.component.scss @@ -1,5 +1,7 @@ - + ion-content { + --ion-background-color: whitesmoke; +} .sendCodeBtn{ --background: #269DB8; @@ -59,14 +61,15 @@ // margin-top: -9px; font-family: 'WorkSans-bold'; } - @media screen and (min-width: 1px) and (max-width:360px) { + @media screen and (min-width: 1px) and (max-width:320px) { .date{ - margin-right: -38px; + // margin-right: -38px; color: gray; font-size: 12px; + margin-left: -44px; }} - @media screen and (min-width: 365px) { + @media screen and (min-width: 325px) { .date{ // margin-top: -9px; margin-right: -49px; @@ -74,6 +77,22 @@ font-size: 12px; }} + @media screen and (min-width: 1px) and (max-width:320px) { + .date-ar{ + // margin-right: -38px; + color: gray; + font-size: 10px; + margin-left: 58px; + }} + + @media screen and (min-width: 325px) { + .date-ar{ + // margin-top: -9px; + margin-right: -49px; + color: gray; + font-size: 12px; + }} + .labels{ font-size: 13px; margin-bottom: 0px; @@ -103,7 +122,7 @@ padding-left: 60px; clear: both; min-height: 200px; - margin-bottom: 80px; + // margin-bottom: 80px; padding-top: 15px; } .request-list-container-ar:before{ @@ -164,32 +183,42 @@ font-size: 14px; } } - @media screen and (min-width: 365px){ + @media screen and (min-width: 325px){ .date-span{ font-size: 13px; margin-bottom: 0px; margin-top: -10px; color: gray; - margin-left: 172px; + margin-left: 160px; }} - @media screen and (min-width: 1px) and (max-width:360px) { + @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: 162px; + margin-left: 76px; }} - .date-span-ar{ - font-size: 13px; - margin-bottom: 0px; - margin-top: -10px; - color: gray; - margin-right: 155px; - } + @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; + }} .New{ diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 4fdd446a..cf523ffb 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -46,7 +46,7 @@
+ value="TeamMembers" + [ngClass]="activeSegment == 'TeamMembers' ? 'active-Segment' : 'normal-Segment'"> @@ -292,7 +292,10 @@
-
+
+
@@ -307,12 +310,13 @@ {{absentDays}}
-
+
+

{{totalAttendancePrecentage}}

{{ts.trPK('absenceList','days')}}
- +
@@ -329,7 +333,7 @@ - @@ -393,7 +397,7 @@
-
+

{{ts.trPK('myTeam','my-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 cd0ca7f9..21c57d8e 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -395,7 +395,7 @@ ion-title{ padding: 0; margin: 0; position: absolute; - left: 85%; + left: 69%; top: 50%; display: block; text-align: center; @@ -414,6 +414,7 @@ ion-title{ font-family: workSans-Regular; } } + @media screen and (min-width: 325px){ .today-graph { // width: 100%; max-height: 4cm; @@ -421,6 +422,23 @@ ion-title{ height: 132px; width: 264px; margin-left: 154px; + }} + @media screen and (min-width: 1px) and (max-width:320px) { + .today-graph { + // width: 100%; + max-height: 4cm; + display: block; + height: 132px; + width: 264px; + margin-left: 84px; + }} + + .today-graph-ar { + max-height: 4cm; + display: block; + height: 132px; + width: 264px; + margin-right: -74px; } .green-label{ @@ -514,16 +532,31 @@ ion-title{ } } - @media screen and (min-width: 360px) { + @media screen and (min-width: 325px) { .statsIcon{ - background: white; margin-left: 15px; margin-top: 6px; + background: white; + margin-left: 12px; + margin-top: 6px; }} - @media screen and (min-width: 300px) and (max-width:359px) { + @media screen and (min-width: 1px) and (max-width:320px) { .statsIcon{ background: white; - margin-left: -1px; + margin-left: -15px; margin-top: 6px; }} + + @media screen and (min-width: 325px) { + .statsIcon-ar{ + background: white; +// margin-left: 12px; + margin-top: 6px; +}} +@media screen and (min-width: 1px) and (max-width:320px) { +.statsIcon-ar{ + background: white; + margin-right: -2px; + margin-top: 6px; +}} .month-year-span{ font-size: 16px; // font-family: WorkSans-Bold; @@ -607,6 +640,12 @@ ion-title{ position: relative; margin-right: 50px; } + +.graph-container-ar{ + margin-right: -50px; + position: relative; + margin-left: 50px; +} .label-container{ position: absolute; // width: 20%; diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 63cb72ed..0a4a5311 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -96,6 +96,7 @@ export class DetailsComponent implements OnInit { public EmpNumer:any; public isFavor:any; public EmployeeTotal:any; + // public activeSegment = 'About'; @@ -260,8 +261,13 @@ export class DetailsComponent implements OnInit { this.common.startLoading(); this.initAttendance(); } + else if(this.activeSegment != 'Attendance' && this.activeSegment != 'TeamMembers'){ + this.activeSegment = 'About'; + } } + + initAttendance() { this.data = {}; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index a5b20b62..3d16b82d 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1151,6 +1151,10 @@ "en": "Profile Details", "ar": "تفاصيل الملف الشخصي" }, + "showMore": { + "en": "Show More", + "ar": "عرض المزيد" + }, "edit-profile": { "en": "Edit Profile", "ar": "تعديل المعلومات"