Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April

Fatima-Q2-June
Sultan Khan 5 years ago
commit 392d898e21

@ -45,7 +45,7 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyRequestPage()"> <ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left> <img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail> </ion-thumbnail>
@ -131,7 +131,7 @@
{{ts.trPK('myTeam','myTeam-header')}} {{ts.trPK('myTeam','myTeam-header')}}
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyRequestPage()"> <ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left> <img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail> </ion-thumbnail>

@ -16,7 +16,7 @@
</div> </div>
<div> <div>
<ion-row class="custom-radio"> <ion-row class="custom-radio">
<ion-radio-group [(ngModel)]="SelectedServiceType" class="radio-list"> <ion-radio-group [(ngModel)]="SelectedServiceType" class="radio-list" required>
<!-- <!--
<ion-radio value="HRServices" [color]="myColor">{{HR}}</ion-radio> <ion-radio value="HRServices" [color]="myColor">{{HR}}</ion-radio>
<ion-label class="text-label" >{{HR}}</ion-label> <ion-label class="text-label" >{{HR}}</ion-label>
@ -115,9 +115,9 @@
<!-- </form> --> <!-- </form> -->
</ion-content> </ion-content>
<ion-footer > <ion-footer >
<div class="centerDiv"> <div class="centerDiv" >
<button class="gridCancelBtn" ion-button (click)="cancelRequest()">{{ts.trPK('general','cancel')}}</button> <ion-button class="gridCancelBtn main-button" ion-button (click)="cancelRequest()">{{ts.trPK('general','cancel')}}</ion-button>
<button class="gridSubmitBtn" ion-button (click)="CreateTicket()">{{ts.trPK('general','submit')}}</button> <ion-button [disabled]="isValidForm()" class="gridSubmitBtn main-button" ion-button (click)="CreateTicket()">{{ts.trPK('general','submit')}}</ion-button>
</div> </div>
</ion-footer> </ion-footer>

@ -386,8 +386,15 @@ ion-input {
margin-left: 15px; margin-left: 15px;
margin-right: 5px; margin-right: 5px;
font-family: 'WorkSans-bold'; font-family: 'WorkSans-bold';
font-size: 16px;
min-height: 1.0cm;
--background: #d00a0a !important;
} }
.main-button{
--box-shadow:none;
}
.gridSubmitBtn{ .gridSubmitBtn{
min-width: auto; min-width: auto;
// margin: 0px; // margin: 0px;
@ -403,7 +410,10 @@ ion-input {
color: white; color: white;
// margin-left: 15px; // margin-left: 15px;
// margin-right: 5px; // margin-right: 5px;
font-family: 'WorkSans-bold';} font-family: 'WorkSans-bold';
font-size: 16px;
min-height: 1.0cm;
--background: #19a163 !important;}
.filed-container{ .filed-container{
@ -512,4 +522,8 @@ select option[data-default] {
padding-right: 20px !important; padding-right: 20px !important;
padding-top: 6px !important; padding-top: 6px !important;
color: #999999 !important; color: #999999 !important;
}
.button-native {
box-shadow: none!important;
} }

@ -54,9 +54,9 @@ export class HrRequestFormComponent implements OnInit {
public sectionDep: any; public sectionDep: any;
public projectCode; public projectCode;
public SelectedServiceType: any; public SelectedServiceType: any;
public depType: any =""; public depType: any;
public secType: any = ""; public secType: any;
public topicType: any=""; public topicType: any;
indexLastObj: any; indexLastObj: any;
addAttachRequest: any = []; addAttachRequest: any = [];
TransactionID: any; TransactionID: any;
@ -108,6 +108,13 @@ export class HrRequestFormComponent implements OnInit {
} }
public isValidForm(): boolean {
if (this.depType && this.SelectedServiceType && this.secType && this.topicType) {
return false;
}
return true;
}
onSelectChange(event, type) { onSelectChange(event, type) {
const value = event.target.value; const value = event.target.value;
@ -248,7 +255,11 @@ export class HrRequestFormComponent implements OnInit {
request.append('sectionId', this.secType); request.append('sectionId', this.secType);
request.append('sectionTopicId', this.topicType); request.append('sectionTopicId', this.topicType);
request.append('description', this.Description); request.append('description', this.Description);
request.append('fileColl', this.selectedFile[0], this.selectedFile[0].name); console.log("TEST:______")
console.log(this.selectedFile);
if(this.selectedFile && this.selectedFile !== undefined){
request.append('fileColl', this.selectedFile[0], this.selectedFile[0].name);
}
request.append('employeeNumber', authUser.P_USER_NAME); request.append('employeeNumber', authUser.P_USER_NAME);
request.append('ticketStatus', 'new'); request.append('ticketStatus', 'new');
request.append('channelId', '3'); request.append('channelId', '3');

@ -85,11 +85,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
<ion-footer class="footer">
<div class="Btn">
<ion-button class="CreateBtn" (click)="createRequest()" >{{ts.trPK('userProfile','createHR-Request')}}</ion-button>
</div>
</ion-footer>
</div> </div>
<!-- ///////////////////////////////////////////////////////////////////next page --> <!-- ///////////////////////////////////////////////////////////////////next page -->
@ -129,3 +125,9 @@
</ion-content> </ion-content>
<ion-footer class="footer">
<div class="Btn">
<ion-button class="CreateBtn" (click)="createRequest()" >{{ts.trPK('userProfile','createHR-Request')}}</ion-button>
</div>
</ion-footer>

@ -30,7 +30,7 @@
<ion-row style="margin-top: 5px;color: #259CB8; font-family:'WorkSans-bold';">{{ticket.ticketStatusName}}</ion-row> <ion-row style="margin-top: 5px;color: #259CB8; font-family:'WorkSans-bold';">{{ticket.ticketStatusName}}</ion-row>
</ion-card-content> </ion-card-content>
</ion-card> </ion-card>
<div style=" position: relative; display: flex;"> <div *ngIf=" ticketsInfo.length >= 10 && ticketTotal != ticketsInfo.length" style=" position: relative; display: flex;">
<button [ngClass]=" direction == 'en'? 'show' : 'show-ar'" (click)="getTicketsByEmployee()" >{{ts.trPK('userProfile','showMore')}}</button> <button [ngClass]=" direction == 'en'? 'show' : 'show-ar'" (click)="getTicketsByEmployee()" >{{ts.trPK('userProfile','showMore')}}</button>
</div> </div>
</div> </div>

@ -162,7 +162,7 @@ ion-content {
padding: 30px; padding: 30px;
position: absolute; position: absolute;
left: 85px; left: 85px;
bottom: 50%; bottom: 40%;
} }
.show{ .show{
background-color: white; background-color: white;

@ -19,6 +19,7 @@ export class MyRequestComponent implements OnInit {
public ticketCount = 10; public ticketCount = 10;
public ticketPage = 1; public ticketPage = 1;
public increseCount = 0; public increseCount = 0;
public ticketTotal :any;
@Input() @Input()
ngClass:string |string[]| Set<string>| {[klass:string]:any;} ngClass:string |string[]| Set<string>| {[klass:string]:any;}
@ -73,12 +74,19 @@ export class MyRequestComponent implements OnInit {
} }
handlegetTicketsByEmployeeResult(result){ handlegetTicketsByEmployeeResult(result){
this.ticketsInfo=result.Mohemm_ITG_TicketsByEmployeeList this.ticketsInfo=result.Mohemm_ITG_TicketsByEmployeeList;
this.ticketTotal=this.ticketsInfo[0].totalItemsCount;
console.log("length______________________-."); console.log("length______________________-.");
console.log(this.ticketsInfo.length); console.log(this.ticketsInfo.length);
this.increseCount++; this.ticketCount += 10;
this.ticketCount = this.ticketCount * this.increseCount // this.ticketPage += 1;
this.ticketPage = this.increseCount; // if(this.ticketsInfo.length > this.ticketCount){
// this.ticketCount = this.ticketsInfo.length - this.ticketCount;
// }else{
// this.ticketCount = this.ticketCount * this.increseCount
// }
// this.increseCount++;
// this.ticketPage = this.increseCount;
// let x; // let x;
// if(this.cs.validResponse(result)){ // if(this.cs.validResponse(result)){
// x = JSON.parse(result.Mohemm_ITG_ResponseItem); // x = JSON.parse(result.Mohemm_ITG_ResponseItem);

@ -158,6 +158,9 @@ export class WorkListMainItgComponent implements OnInit {
if (actionName == "Answer") { if (actionName == "Answer") {
return "../assets/imgs/mohemm-action/info.png" return "../assets/imgs/mohemm-action/info.png"
} }
if (actionName == "ReportGenerated") {
return "../assets/imgs/mohemm-action/info.png"
}
} }
public segmentChangedClick(event: any) { public segmentChangedClick(event: any) {
@ -400,6 +403,31 @@ export class WorkListMainItgComponent implements OnInit {
} }
} }
} else if (action == 7) { //grant
url = WorkListMainItgComponent.GRANT;
if (this.grantRequest) {
request.AdditionalFields = this.grantRequest;
this.workListService.getITGActionRequest(request, url)
.subscribe((result: any) => {
if (result.MessageStatus != 1) {
this.common.presentAlert(this.ts.trPK('general', 'error-itg'));
} else if (result.MessageStatus == 1) {
this.messageSuccess = true;
setTimeout(() => {
this.messageSuccess = false;
this.common.sharedService.setSharedData(true, 'loadWorkList');
// this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ'));
this.common.sharedService.setSharedData(true, 'loadWorkList');
this.confirmMsg(6);
this.skip();
}, 2000);
}
});
} else {
this.common.presentAlert(this.ts.trPK('worklist', 'empty-comment'));
}
} }
}, this.ts.trPK('general', 'ok'), }, this.ts.trPK('general', 'ok'),
() => { () => {
@ -462,7 +490,9 @@ export class WorkListMainItgComponent implements OnInit {
if (this.actionSelected === 'RequestInformation') { if (this.actionSelected === 'RequestInformation') {
this.presentModal(3); this.presentModal(3);
} }
if (this.actionSelected === 'ReportGenerated') {
this.actionService(7, this.grantRequest);
}
} }

Loading…
Cancel
Save