Haroon6138
/
sfh-mohemm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed mohemm IC issues

Browse Source
MOHEMM-Q3-DEV-LATEST
umasoodch 3 years ago
parent 3afc649085
commit cd910f4bdc
11 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File

6
Mohem/src/app/app.component.html
Unescape Escape View File

@ -61,8 +61,7 @@
</ion-label>
</ion-item>
<div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01' && menu.MENU_TYPE =='E'">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
</ion-thumbnail>
@ -184,8 +183,7 @@
</ion-label>
</ion-item>
<div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01' && menu.MENU_TYPE =='E'">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
</ion-thumbnail>

4
Mohem/src/app/authentication/app-update/app-update.component.html
Unescape Escape View File

@ -1,5 +1,5 @@
<ion-content style="--background: white;">
<div>
<ion-content style="--background: white;" class="biggerPhone">
<div class="rocket-image">
<img src="assets/icon/update_rocket_image.png" style="width: 100%;" />
</div>
<div style="text-align: center;">

10
Mohem/src/app/authentication/app-update/app-update.component.scss
Unescape Escape View File

@ -0,0 +1,10 @@
@media only screen and (min-width: 540px) and (max-width: 767px) {
.biggerPhone {
.rocket-image {
img {
height: 350px;
}
}
}
}

2
Mohem/src/app/home/home.page.ts
Unescape Escape View File

@ -427,6 +427,8 @@ export class HomePage implements OnInit {
if (this.menuList[i].MENU_TYPE === 'M') {
this.events.publish('myTeamFlag', 'true');
// this.common.sharedService.setSharedData('true', "myTeamFlag");
} else {
this.events.publish('myTeamFlag', 'false');
}
}

4
Mohem/src/app/notification/home/home.component.html
Unescape Escape View File

@ -100,8 +100,8 @@
</div>
</div>
</div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)" *ngIf="itemType !== ''">
<ion-infinite-scroll (ionInfinite)="doInfinite($event)" *ngIf="itemType !== '' && worklistLength >= 25">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>

3
Mohem/src/app/notification/home/home.component.ts
Unescape Escape View File

@ -80,6 +80,7 @@ export class HomeComponent implements OnInit {
public totalMR = 0;
public totalIC = 0;
public totalStamp = 0;
public worklistLength = 0;
public showChart = false;
@ -423,6 +424,7 @@ export class HomeComponent implements OnInit {
}
this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => {
if (this.common.validResponse(result)) {
this.worklistLength = result.GetWorkList.length;
this.handleWorkListResult(result.GetWorkList);
}
}
@ -589,6 +591,7 @@ export class HomeComponent implements OnInit {
if (!this.isReachEnd && this.selectedFilter !== 'ITG') {
this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => {
if (this.common.validResponse(result)) {
this.worklistLength = result.GetWorkList.length;
this.handleWorkListResult(result.GetWorkList);
}
});

4
Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html
Unescape Escape View File

@ -414,7 +414,7 @@
<ion-tabs>
<ion-tab-bar class="tabBar" slot="bottom" style="height: 100% !important;">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVE')">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVED')">
<img src="../assets/imgs/mohemm-action/Approve.png">
<ion-label class="action-btn"> {{approve_label}}</ion-label>
@ -426,7 +426,7 @@
</ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')">
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
<img src="../assets/imgs/mohemm-action/Reject.png">
<ion-label class="action-btn"> {{reject_label}}</ion-label>
</ion-tab-button>

25
Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts
Unescape Escape View File

@ -497,16 +497,16 @@ export class WorklistMainIcComponent implements OnInit {
checkRequestType(index) {
if (this.notificationArray[index].REQUEST_TYPE === 'PO') {
this.intializeNotificationDetail();
} else
if (this.notificationArray[index].REQUEST_TYPE === 'PR') {
this.common.openWorklistMainPOPage();
} else if (this.notificationArray[index].REQUEST_TYPE === 'PR') {
this.common.openWorklistMainPRPage();
} else
if (this.notificationArray[index].REQUEST_TYPE === 'MO') {
} else if (this.notificationArray[index].REQUEST_TYPE === 'MO') {
this.common.openWorklistMainMRPage();
} else {
} else if (this.notificationArray[index].REQUEST_TYPE === 'ITEM_CREATION') {
this.intializeNotificationDetail();
} else {
this.common.openWorklistMainPage();
}
}
}
actionButton(action) {
@ -544,8 +544,8 @@ export class WorklistMainIcComponent implements OnInit {
// }
if (
ButtonAction == "APPROVE" ||
ButtonAction == "REJECT" ||
ButtonAction == "APPROVED" ||
ButtonAction == "REJECTED" ||
ButtonAction == "DEL" ||
ButtonAction == "CLOSE"
) {
@ -560,10 +560,10 @@ export class WorklistMainIcComponent implements OnInit {
// this.WorkListActionObj,
// WorklistMainPRComponent.PASS_NOTIFICATION_INFO
// );
if (ButtonAction == "APPROVE") {
if (ButtonAction == "APPROVED") {
this.confirmMsg = this.ts.trPK('worklistMain', 'approveMsg')
}
else if (ButtonAction == "REJECT") {
else if (ButtonAction == "REJECTED") {
this.confirmMsg = this.ts.trPK('worklistMain', 'rejectMsg')
}
@ -653,7 +653,8 @@ export class WorklistMainIcComponent implements OnInit {
ButtonAction == "TRANSFER" ||
ButtonAction == "TRANSFER_INFO" ||
ButtonAction == "APPROVE_AND_FORWARD" ||
ButtonAction == "FORWARD"
ButtonAction == "FORWARD" ||
ButtonAction == "RETURNED"
) {

4
Mohem/src/app/notification/worklist-main/worklist-main.component.html
Unescape Escape View File

@ -317,12 +317,12 @@
<ion-row>
<ion-col class="rowBorder" style="background: #269db8;">
<ion-label>
<p style="color: white;">Current</p>
<p style="color: white;">{{ 'general, current' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder" style="background: #269db8;">
<ion-label>
<p style="color: white;">Proposed</p>
<p style="color: white;">{{ 'general, proposed' | translate}}</p>
</ion-label>
</ion-col>
</ion-row>

2
Mohem/src/app/reports/transactions/transactions.component.html
Unescape Escape View File

@ -44,7 +44,7 @@
<div class="output-container" >
<p class="color-black display-inline">{{'transaction,output' | translate}}</p>
<p class="display-inline" (click)="getCppOutput(transaction)" [ngClass]="transaction.CCP_PHASE =='Running' || transaction.CCP_PHASE =='Pending'? 'disabled-icon' : '' " ><ion-icon name="download" class="download"></ion-icon></p>
<p class="display-inline" (click)="refresh(transaction)" *ngIf="transaction.CCP_PHASE =='Running' || transaction.CCP_PHASE =='Pending'"><ion-icon name="refresh" class="refresh" > </ion-icon></p>
<p class="display-inline" (click)="refresh()" *ngIf="transaction.CCP_PHASE =='Running' || transaction.CCP_PHASE =='Pending'"><ion-icon name="refresh" class="refresh" > </ion-icon></p>
</div>
</ion-label>

8
Mohem/src/assets/localization/i18n.json
Unescape Escape View File

@ -249,6 +249,14 @@
}
},
"general": {
"current": {
"en": "Current",
"ar": "تيار"
},
"proposed": {
"en": "Proposed",
"ar": "مقترح"
},
"fav-showData": {
"en": "Please select an alphabet to see your favourites",
"ar": "الرجاء تحديد الأبجدية لرؤية المفضلة لديك"

Write Preview
Loading…
Cancel
Save