MOE changes "commented functionalities "

MOE_DEV
Sultan Khan 3 years ago
parent 65425020c9
commit bec7b24621

@ -43,7 +43,7 @@
<ng-container *ngFor="let buttonsGroup of buttons">
<ng-container *ngFor="let button of buttonsGroup">
<ion-col [size]="accessFromOutSide ? 12 : 6" *ngIf="button.visible">
<ion-col [size]="accessFromOutSide ? 12 : 6" *ngIf="button.visible && !button.disabled">
<!-- <ng-container *ngFor="let buttonsGroup of buttons">
@ -52,7 +52,7 @@
<app-button (click)="checkAccess(button)" [title]="button.title | translate " [icon]="button.icon"
[settings]="button.settings" [strong]="button.txt" [class]="button.class"
*ngIf="button.visible && !button.disabled"
[buttonClass]="button.buttonClass" [pClass]="button.pClass">
</app-button>

@ -1616,69 +1616,69 @@ export class CommonService {
disable: false,
total: 0
},
{
value: 0,
name: 'MR',
active: false,
color: '#3cb9d5',
key: 'INVMOA',
disable: false,
total: 0
},
{
value: 0,
name: 'PR',
active: false,
color: '#114475',
key: 'REQAPPRV',
disable: false,
total: 0
},
{
value: 0,
name: 'PO',
active: false,
color: '#38c9b3',
key: 'POAPPRV',
disable: false,
total: 0
},
{
value: 0,
name: 'ITG',
active: false,
color: '#cc3232',
key: 'ITG',
disable: false,
total: 0
},
{
value: 0,
name: 'IC',
active: false,
color: '#9e7e97',
key: 'INVITEM',
disable: false,
total: 0
},
{
value: 0,
name: 'STAMP',
active: false,
color: '#ff9800',
key: 'STAMP',
disable: false,
total: 0,
},
{
value: 0,
name: 'COC',
active: false,
color: '#787299',
key: 'COC',
disable: true,
total: 0,
}
// {
// value: 0,
// name: 'MR',
// active: false,
// color: '#3cb9d5',
// key: 'INVMOA',
// disable: false,
// total: 0
// },
// {
// value: 0,
// name: 'PR',
// active: false,
// color: '#114475',
// key: 'REQAPPRV',
// disable: false,
// total: 0
// },
// {
// value: 0,
// name: 'PO',
// active: false,
// color: '#38c9b3',
// key: 'POAPPRV',
// disable: false,
// total: 0
// },
// {
// value: 0,
// name: 'ITG',
// active: false,
// color: '#cc3232',
// key: 'ITG',
// disable: false,
// total: 0
// },
// {
// value: 0,
// name: 'IC',
// active: false,
// color: '#9e7e97',
// key: 'INVITEM',
// disable: false,
// total: 0
// },
// {
// value: 0,
// name: 'STAMP',
// active: false,
// color: '#ff9800',
// key: 'STAMP',
// disable: false,
// total: 0,
// },
// {
// value: 0,
// name: 'COC',
// active: false,
// color: '#787299',
// key: 'COC',
// disable: true,
// total: 0,
// }
];
public data = {
@ -1700,28 +1700,27 @@ export class CommonService {
};
getFiltersData() {
// for (const notification of openNotificationsArray) {
// if (notification.ITEM_TYPE === 'HRSSA') {
this.filters[0].value = this.filterKeys['HRSSA'];
this.data.datasets[0].data[0] = this.filterKeys['HRSSA'];
// } else if (notification.ITEM_TYPE === 'INVMOA') {
this.filters[1].value = this.filterKeys['INVMOA'];
this.data.datasets[0].data[1] = this.filterKeys['INVMOA'];
// } else if (notification.ITEM_TYPE === 'REQAPPRV') {
this.filters[2].value = this.filterKeys['REQAPPRV'];
this.data.datasets[0].data[2] = this.filterKeys['REQAPPRV'];
// } else if (notification.ITEM_TYPE === 'POAPPRV') {
this.filters[3].value = this.filterKeys['POAPPRV'];
this.data.datasets[0].data[3] = this.filterKeys['POAPPRV'];
// } else if (notification.ITEM_TYPE === 'INVITEM') {
this.filters[5].value = this.filterKeys['INVITEM'];
this.data.datasets[0].data[5] = this.filterKeys['INVITEM'];
// } else if (notification.ITEM_TYPE === 'STAMP') {
this.filters[6].value = this.filterKeys['STAMP'];
this.data.datasets[0].data[6] = this.filterKeys['STAMP'];
this.filters[7].value = this.filterKeys['COC'];
this.data.datasets[0].data[7] = this.filterKeys['COC'];
// this.filters[1].value = this.filterKeys['INVMOA'];
// this.data.datasets[0].data[1] = this.filterKeys['INVMOA'];
// this.filters[2].value = this.filterKeys['REQAPPRV'];
// this.data.datasets[0].data[2] = this.filterKeys['REQAPPRV'];
// this.filters[3].value = this.filterKeys['POAPPRV'];
// this.data.datasets[0].data[3] = this.filterKeys['POAPPRV'];
// this.filters[5].value = this.filterKeys['INVITEM'];
// this.data.datasets[0].data[5] = this.filterKeys['INVITEM'];
// this.filters[6].value = this.filterKeys['STAMP'];
// this.data.datasets[0].data[6] = this.filterKeys['STAMP'];
// this.filters[7].value = this.filterKeys['COC'];
// this.data.datasets[0].data[7] = this.filterKeys['COC'];
let val = { 'filters': [], 'data': {} };
val.filters = this.filters;

@ -27,8 +27,8 @@ export class ConnectorService {
public static retryTimes = 0;
public static timeOut = 180 * 1000;
// public static host = 'https://uat.hmgwebservices.com/';
public static host = 'https://hmgwebservices.com/';
public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/';
constructor(public httpClient: HttpClient,
public cs: CommonService,
private events: Events,

@ -116,54 +116,54 @@ export class HomeComponent implements OnInit {
key: 'HRSSA',
disable: false
},
{
value: 0,
name: 'MR',
active: false,
color: '#3cb9d5',
key: 'INVMOA',
disable: false
},
{
value: 0,
name: 'PR',
active: false,
color: '#114475',
key: 'REQAPPRV',
disable: false
},
{
value: 0,
name: 'PO',
active: false,
color: '#38c9b3',
key: 'POAPPRV',
disable: false
},
{
value: 0,
name: 'ITG',
active: false,
color: '#cc3232',
key: 'ITG',
disable: false
},
{
value: 0,
name: 'IC',
active: false,
color: '#9e7e97',
key: 'INVITEM',
disable: false
},
{
value: 0,
name: 'STAMP',
active: false,
color: '#ff9800',
key: 'STAMP',
disable: false
}
// {
// value: 0,
// name: 'MR',
// active: false,
// color: '#3cb9d5',
// key: 'INVMOA',
// disable: false
// },
// {
// value: 0,
// name: 'PR',
// active: false,
// color: '#114475',
// key: 'REQAPPRV',
// disable: false
// },
// {
// value: 0,
// name: 'PO',
// active: false,
// color: '#38c9b3',
// key: 'POAPPRV',
// disable: false
// },
// {
// value: 0,
// name: 'ITG',
// active: false,
// color: '#cc3232',
// key: 'ITG',
// disable: false
// },
// {
// value: 0,
// name: 'IC',
// active: false,
// color: '#9e7e97',
// key: 'INVITEM',
// disable: false
// },
// {
// value: 0,
// name: 'STAMP',
// active: false,
// color: '#ff9800',
// key: 'STAMP',
// disable: false
// }
];
public slideOptsOne = {
@ -243,7 +243,7 @@ export class HomeComponent implements OnInit {
}
openNotificationsDashboardLocal() {
this.Details();
// this.Details();
this.callWorkListServices();
}
@ -255,22 +255,23 @@ export class HomeComponent implements OnInit {
if (notification.ITEM_TYPE === 'HRSSA') {
this.filters[0].value = notification.OPEN_NTF_NUMBER;
this.data.datasets[0].data[0] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'INVMOA') {
this.filters[1].value = notification.OPEN_NTF_NUMBER;
this.data.datasets[0].data[1] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'REQAPPRV') {
this.filters[2].value = notification.OPEN_NTF_NUMBER;
this.data.datasets[0].data[2] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'POAPPRV') {
this.filters[3].value = notification.OPEN_NTF_NUMBER;
this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'INVITEM') {
this.filters[5].value = notification.OPEN_NTF_NUMBER;
this.data.datasets[0].data[5] = notification.OPEN_NTF_NUMBER;
} else if (notification.ITEM_TYPE === 'STAMP') {
this.filters[6].value = notification.OPEN_NTF_NUMBER;
this.data.datasets[0].data[6] = notification.OPEN_NTF_NUMBER;
}
// else if (notification.ITEM_TYPE === 'INVMOA') {
// this.filters[1].value = notification.OPEN_NTF_NUMBER;
// this.data.datasets[0].data[1] = notification.OPEN_NTF_NUMBER;
// } else if (notification.ITEM_TYPE === 'REQAPPRV') {
// this.filters[2].value = notification.OPEN_NTF_NUMBER;
// this.data.datasets[0].data[2] = notification.OPEN_NTF_NUMBER;
// } else if (notification.ITEM_TYPE === 'POAPPRV') {
// this.filters[3].value = notification.OPEN_NTF_NUMBER;
// this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER;
// } else if (notification.ITEM_TYPE === 'INVITEM') {
// this.filters[5].value = notification.OPEN_NTF_NUMBER;
// this.data.datasets[0].data[5] = notification.OPEN_NTF_NUMBER;
// } else if (notification.ITEM_TYPE === 'STAMP') {
// this.filters[6].value = notification.OPEN_NTF_NUMBER;
// this.data.datasets[0].data[6] = notification.OPEN_NTF_NUMBER;
// }
}
this.showChart = true;
this.isLoading = false;

@ -50,11 +50,11 @@
<ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}"
[(ngModel)]="itemType">
<ion-select-option value="HRSSA">HR</ion-select-option>
<ion-select-option value="POAPPRV">PO</ion-select-option>
<!-- <ion-select-option value="POAPPRV">PO</ion-select-option>
<ion-select-option value="REQAPPRV">PR</ion-select-option>
<ion-select-option value="INVMOA">MR</ion-select-option>
<ion-select-option value="INVITEM">IC</ion-select-option>
<ion-select-option value="STAMP">STAMP</ion-select-option>
<ion-select-option value="STAMP">STAMP</ion-select-option> -->
</ion-select>
</ion-item>

@ -58,8 +58,9 @@
<span class="btnTitle">{{ts.trPK('userProfile','contact-details')}} </span>
</div>
</ion-col>
<ion-col [size]="3" (click)="selectedSegment('family')">
<div class="action-button col-button">
<!-- (click)="selectedSegment('family')" -->
<ion-col [size]="3">
<div class="action-button col-button disabledButton">
<img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg">
<img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg">
<span class="btnTitle">{{ts.trPK('userProfile','family-members')}}</span>

@ -1843,4 +1843,7 @@ ion-app[dir="rtl"] {
margin-right: 10px !important;
}
.iconBox img {
margin: 5px !important;
}
}
Loading…
Cancel
Save