add all for ITG

MOHEMM-Q3-DEV-LATEST
enadhilal 6 years ago
parent 1f50906684
commit 8c1b6dce0e

@ -49,7 +49,7 @@
<span>showing {{newWorkListResponse.length}} of {{filters[0].value}}</span> <span>showing {{newWorkListResponse.length}} of {{filters[0].value}}</span>
</div> --> </div> -->
<ion-row *ngIf='selectedFilter === "ITG"'> <ion-row *ngIf='selectedFilter === "ITG"' class="filters-row">
<ion-col> <ion-col>
<ion-slides> <ion-slides>
<ion-slide class='slideCss' *ngFor="let segment of ITGSegment"> <ion-slide class='slideCss' *ngFor="let segment of ITGSegment">
@ -72,12 +72,26 @@
<div [ngClass]="isEmptyObject() ? 'work-list-container' : ''" *ngIf="selectedFilter == 'ITG'" > <div [ngClass]="isEmptyObject() ? 'work-list-container' : ''" *ngIf="selectedFilter == 'ITG'" >
<div *ngFor='let segmentInfo of ITGItem[0]; let i= index' (click)='openITG(segmentInfo)'> <!-- <div *ngFor='let segmentInfo of ITGItem[0]; let i= index' (click)='openITG(segmentInfo)'> -->
<div *ngFor='let segmentInfo of ITGItem[0]; let i= index' >
<div *ngIf="activeSegment !== 'All'" (click)='openITG(segmentInfo)'>
<span class="date-span">{{segmentInfo.ModifiedDate |date}}</span> <span class="date-span">{{segmentInfo.ModifiedDate |date}}</span>
<div class="date-data"> <div class="date-data">
<p>{{segmentInfo.Title}}</p> <p>{{segmentInfo.Title}}</p>
</div> </div>
</div> </div>
<div *ngIf="activeSegment == 'All'" >
<div *ngFor="let data of segmentInfo" (click)="openITGAll(data.ID, data.ItemID)">
<span class="date-span">{{data.ModifiedDate | date}}</span>
<div class="date-data">
<p>{{data.Title}}</p>
</div>
</div>
</div>
</div>
</div> </div>

@ -21,6 +21,8 @@ export class HomeComponent implements OnInit {
public static ALL_REQUEST = 'all_request'; public static ALL_REQUEST = 'all_request';
public static NOTIFICATION_DATA = 'notification_data'; public static NOTIFICATION_DATA = 'notification_data';
public static NOTIFICATION_ARR = 'notification_arr'; public static NOTIFICATION_ARR = 'notification_arr';
public static NAMES_ALL_iTEMS = 'names-all-items';
public static IS_ALL_NAME = 'is_all_names';
@ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll;
private WorkListObj: WorkListRequest; private WorkListObj: WorkListRequest;
WorkListResObj: any; WorkListResObj: any;
@ -47,10 +49,11 @@ export class HomeComponent implements OnInit {
public isSearch = false; public isSearch = false;
public direction = 'ltr'; public direction = 'ltr';
public ITGCount = 0; public ITGCount = 0;
public ITGSegment: {name: string, code: any, data: any, style: boolean} [] = []; public ITGSegment: { name: string, code: any, data: any, style: boolean, names?: any }[] = [];
public ITGAllItem: any = []; public ITGAllItem: any = [];
public selectedITGToActive = false; public selectedITGToActive = false;
public ITGItem: any = []; public ITGItem: any = [];
public ITGAllItems: any = [];
public activeSegment: any; public activeSegment: any;
public currentActiveIndex = 0; public currentActiveIndex = 0;
@ -268,7 +271,7 @@ export class HomeComponent implements OnInit {
this.WorkListObj.P_SEARCH_SUBJECT = this.selectedValue === '2' ? this.inputSearch : ''; this.WorkListObj.P_SEARCH_SUBJECT = this.selectedValue === '2' ? this.inputSearch : '';
this.WorkListObj.P_SEARCH_SENT_DATE = (this.inputDate && this.selectedValue === '3') this.WorkListObj.P_SEARCH_SENT_DATE = (this.inputDate && this.selectedValue === '3')
? moment(this.inputDate).format('DD-MMM-YYYY') : ''; ? moment(this.inputDate).format('DD-MMM-YYYY') : '';
this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = this.selectedValue === '4' ? this.inputSearch : ''; ; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = this.selectedValue === '4' ? this.inputSearch : '';;
this.WorkListObj.P_ITEM_TYPE = this.itemType !== '' ? this.itemType : ''; this.WorkListObj.P_ITEM_TYPE = this.itemType !== '' ? this.itemType : '';
this.WorkListObj.P_NOTIFICATION_TYPE = this.notificationType !== '' ? this.notificationType : '1'; this.WorkListObj.P_NOTIFICATION_TYPE = this.notificationType !== '' ? this.notificationType : '1';
if (this.selectedValue === '5') { if (this.selectedValue === '5') {
@ -396,16 +399,28 @@ export class HomeComponent implements OnInit {
} }
Count() { Count() {
let datas =[];
let names =[];
this.ITGSegment[0] = {
name: 'All',
code: 'All',
data: null,
style: false
};
this.workListService.getITGCount() this.workListService.getITGCount()
.subscribe((result: any) => { .subscribe((result: any) => {
for (let i = 0; i < result.RequestType.length; i++) { for (let i = 1; i < result.RequestType.length; i++) {
this.ITGSegment[i] = { this.ITGSegment[i] = {
name: result.RequestType[i].RequestTypeName, name: result.RequestType[i].RequestTypeName,
code: result.RequestType[i].RequestTypeCode, code: result.RequestType[i].RequestTypeCode,
data: result.RequestType[i].RequestDetails, data: result.RequestType[i].RequestDetails,
style: false style: false
}; };
datas[i] = result.RequestType[i].RequestDetails;
names[i] = result.RequestType[i].RequestTypeCode;
} }
this.ITGSegment[0].data = datas;
this.ITGSegment[0].names = names;
this.setActive(this.ITGSegment[0].code); this.setActive(this.ITGSegment[0].code);
}); });
} }
@ -442,17 +457,41 @@ export class HomeComponent implements OnInit {
this.ITGSegment[i].style = true; this.ITGSegment[i].style = true;
this.ITGItem[count] = this.ITGSegment[i].data; this.ITGItem[count] = this.ITGSegment[i].data;
count++; count++;
} else { }else{
this.ITGSegment[i].style = false; this.ITGSegment[i].style = false;
} }
} }
console.log(this.ITGSegment)
} }
openITG(segmentInfo) { openITG(segmentInfo, name?) {
this.common.sharedService.setSharedData(segmentInfo, HomeComponent.REQUSET_INFO); if(name){
this.common.sharedService.setSharedData(name, HomeComponent.REQUSET_NAME);
this.common.sharedService.setSharedData(this.ITGSegment, HomeComponent.NAMES_ALL_iTEMS);
this.common.sharedService.setSharedData(true, HomeComponent.IS_ALL_NAME);
}else{
this.common.sharedService.setSharedData(this.activeSegment, HomeComponent.REQUSET_NAME); this.common.sharedService.setSharedData(this.activeSegment, HomeComponent.REQUSET_NAME);
this.common.sharedService.setSharedData(false, HomeComponent.IS_ALL_NAME);
}
this.common.sharedService.setSharedData(segmentInfo, HomeComponent.REQUSET_INFO);
this.common.sharedService.setSharedData(this.ITGItem, HomeComponent.ALL_REQUEST); this.common.sharedService.setSharedData(this.ITGItem, HomeComponent.ALL_REQUEST);
this.common.openWorklistITGPage(); this.common.openWorklistITGPage();
} }
openITGAll(id, item){
let count =0;
let ITEM: any;
let NAME: any;
for (let i = 1; i < this.ITGSegment.length; i++) {
for(let j =0; j< this.ITGSegment[i].data.length; j++){
if (this.ITGSegment[i].data[j].ID === id && this.ITGSegment[i].data[j].ItemID === item) {
ITEM = this.ITGSegment[i].data[j];
NAME = this.ITGSegment[i].code;
count++;
}
}
}
this.openITG(ITEM, NAME)
}
} }

@ -26,6 +26,8 @@ export class WorkListMainItgComponent implements OnInit {
public request_info: any; public request_info: any;
public request_name: any; public request_name: any;
public all_request: any; public all_request: any;
public all_request_names: any;
public is_all_items_sents: any;
public request = new itgRequest(); public request = new itgRequest();
public activeSegment: any = "info"; public activeSegment: any = "info";
public request_details: any; public request_details: any;
@ -49,6 +51,7 @@ export class WorkListMainItgComponent implements OnInit {
public ExchangeServerSelected: any; public ExchangeServerSelected: any;
public ExchangeServerDBSelected: any; public ExchangeServerDBSelected: any;
public actionBTN: { name: string, image: string, isAvailable: boolean }[] = []; public actionBTN: { name: string, image: string, isAvailable: boolean }[] = [];
index2: number;
constructor( constructor(
public common: CommonService, public common: CommonService,
public ts: TranslatorService, public ts: TranslatorService,
@ -59,6 +62,8 @@ export class WorkListMainItgComponent implements OnInit {
this.request_info = this.common.sharedService.getSharedData(HomeComponent.REQUSET_INFO); this.request_info = this.common.sharedService.getSharedData(HomeComponent.REQUSET_INFO);
this.request_name = this.common.sharedService.getSharedData(HomeComponent.REQUSET_NAME); this.request_name = this.common.sharedService.getSharedData(HomeComponent.REQUSET_NAME);
this.all_request = this.common.sharedService.getSharedData(HomeComponent.ALL_REQUEST); this.all_request = this.common.sharedService.getSharedData(HomeComponent.ALL_REQUEST);
this.all_request_names = this.common.sharedService.getSharedData(HomeComponent.NAMES_ALL_iTEMS);
this.is_all_items_sents = this.common.sharedService.getSharedData(HomeComponent.IS_ALL_NAME);
this.all_request = this.all_request[0]; this.all_request = this.all_request[0];
this.changeITGForm(this.request_info, this.request_name); this.changeITGForm(this.request_info, this.request_name);
} }
@ -76,10 +81,9 @@ export class WorkListMainItgComponent implements OnInit {
this.workListService.getITGFormDetails(this.request).subscribe((result: any) => { this.workListService.getITGFormDetails(this.request).subscribe((result: any) => {
this.request_details = result.ITGRequest; this.request_details = result.ITGRequest;
this.grantInfo = result.ITGRequest.GrantFields; this.grantInfo = result.ITGRequest.GrantFields;
let count = 0;
for (let i = 0; i < result.ITGRequest.FieldGoups.length; i++) { for (let i = 0; i < result.ITGRequest.FieldGoups.length; i++) {
this.segmentsArray[i] = { name: result.ITGRequest.FieldGoups[i].Title, number: i }; this.segmentsArray[i] = { name: result.ITGRequest.FieldGoups[i].Title, number: i };
this.segmentData[i] = { name: result.ITGRequest.FieldGoups[i].Title, data: result.ITGRequest.FieldGoups[i].Fields} this.segmentData[i] = { name: result.ITGRequest.FieldGoups[i].Title, data: result.ITGRequest.FieldGoups[i].Fields }
} }
this.segmentsArray[this.segmentsArray.length] = { name: 'Approval Level', number: this.segmentsArray.length } this.segmentsArray[this.segmentsArray.length] = { name: 'Approval Level', number: this.segmentsArray.length }
this.workList = this.request_details.WFHistory; this.workList = this.request_details.WFHistory;
@ -87,7 +91,9 @@ export class WorkListMainItgComponent implements OnInit {
this.activeSegment = this.segmentsArray[0].name; this.activeSegment = this.segmentsArray[0].name;
for (let i = 0; i < this.options.length; i++) { for (let i = 0; i < this.options.length; i++) {
this.imageURL(this.options[i].Action); this.imageURL(this.options[i].Action);
this.actionBTN[i] = { name: this.options[i].Action, image: this.imageURL(this.options[i].Action), isAvailable: this.options[i].IsAvailable } this.actionBTN[i] = {
name: this.options[i].Action, image: this.imageURL(this.options[i].Action), isAvailable: this.options[i].IsAvailable
};
} }
if (this.grantInfo) { if (this.grantInfo) {
@ -134,20 +140,44 @@ export class WorkListMainItgComponent implements OnInit {
} }
skip() { skip() {
if (this.is_all_items_sents) {
for (let i = 1; i < this.all_request_names.length; i++) {
for (let j = 0; j < this.all_request_names[i].data.length; j++) {
if (this.request_info.ID === this.all_request_names[i].data[j].ID
&& this.request_info.ItemID === this.all_request_names[i].data[j].ItemID) {
this.index2 = j + 1;
this.index = i + 1;
if (this.all_request_names[i].data.length !== this.index2) {// if there is another request with same type
this.clearDataArray();
this.changeITGForm(this.all_request_names[i].data[this.index2], this.all_request_names[i].code);
return false;
} else if (this.index !== this.all_request_names.length) { // if there is another deffernet type.
this.clearDataArray();
this.changeITGForm(this.all_request_names[this.index].data[j], this.all_request_names[this.index].code);
return false;
}
} else if (this.index === this.all_request_names.length) { //if its the end request redirecte to worklist home
this.common.openNotificationPage();
return false;
}
}
}
} else {
for (let i = 0; i < this.all_request.length; i++) { // search for the request that clicked on all request for (let i = 0; i < this.all_request.length; i++) { // search for the request that clicked on all request
if (this.request_info.ID == this.all_request[i].ID) { // check if the ID for the request is found. if (this.request_info.ID == this.all_request[i].ID) { // check if the ID for the request is found.
this.index = i + 1; this.index = i + 1;
if (this.index !== this.all_request.length) { // check if its last one to redirecte to home otherwise to next request. if (this.index !== this.all_request.length) { // check if its last one to redirecte to home otherwise to next request.
this.clearDataArray(); this.clearDataArray();
this.changeITGForm(this.all_request[this.index], this.request_name); this.changeITGForm(this.all_request[this.index], this.request_name);
break; break
} else { } else {
this.common.openNotificationPage(); this.common.openNotificationPage();
break; break
} }
} else { } else {
this.common.openNotificationPage(); this.common.openNotificationPage();
break; break
}
} }
} }
} }

Loading…
Cancel
Save