fix design in worklist

mekawy-issues
ashwaq 6 years ago
parent 8451b5fdac
commit 6d7dca0d12

@ -21,8 +21,8 @@
<p class="leftDiv">{{'verificationcode,title' | translate}}
<span class="boldTxtNav">{{'verificationcode,verificationcode' | translate}}</span>
{{'verificationcode,by' | translate}}
<span *ngIf="loginType == 1 || activeType == 1" class="boldTxtNav">{{'verificationcode , sms' | translate}}</span>
<span *ngIf="loginType == 4 || activeType == 4" class="boldTxtNav">{{'verificationcode , whatsapp' | translate}}</span>
<span *ngIf="loginType == 1 || activeType == 1" class="boldTxtNav">{{'verificationcode , sms' | translate}}, </span>
<span *ngIf="loginType == 4 || activeType == 4" class="boldTxtNav">{{'verificationcode , whatsapp' | translate}}, </span>
{{'verificationcode,instruct' | translate}}
<span class="boldTxtNav">{{'general,submit' | translate}}</span
@ -58,7 +58,6 @@
</ion-col>
</ion-row>
</div>
</ion-content>

@ -195,8 +195,6 @@ public static host = 'https://uat.hmgwebservices.com/';
this.cs.stopLoading();
this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => {
this.cs.sharedService.clearAll();
// this.cs.setIsTimeSessionOut(result.IsAuthenticated);
this.cs.openLogin();
});
@ -227,9 +225,7 @@ public static host = 'https://uat.hmgwebservices.com/';
this.cs.stopLoading();
this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => {
console.log("presentAcceptDialog");
this.cs.sharedService.clearAll();
// this.cs.setIsTimeSessionOut(result.IsAuthenticated);
this.cs.sharedService.clearAll();
this.cs.openLogin();
});

@ -32,17 +32,18 @@
<ion-item class="itemReqContent" *ngFor="let itemHistory of itemHistoryRes; let i=index; ">
<div class="itemReqDiv">
<ion-row>
<!-- <ion-row>
<ion-col class="colItemReqHeader">
<!-- <label for="">{{ts.trPK('worklistMain','description')}}
</label> -->
<!-- </ion-col>
<ion-col> {{itemHistory.OU_NAME}}-->
<label for="">{{i+1}}. </label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="colItems">
colBorder
</ion-row> -->
<ion-row class="rowBorder">
<ion-col class="colItems colBorder ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','operating_unit')}}
</label>
<br />
@ -62,9 +63,9 @@
<ion-label class="labelValue" for="">{{itemHistory.PO_NUMBER}} </ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','revision')}} </label>
<br />
<!-- </ion-col>
@ -83,10 +84,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','Supplier')}} </label>
<br />
<!-- </ion-col>
@ -106,10 +107,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','uom')}} </label>
<br />
<!-- </ion-col>
@ -129,10 +130,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity_received')}} </label>
<br />
<!-- </ion-col>
@ -152,10 +153,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','purchase_price')}} </label>
<br />
<!-- </ion-col>
@ -175,10 +176,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','balance_quantity')}} </label>
<br />
<!-- </ion-col>

@ -41,8 +41,8 @@
<!-- <label for="">{{i+1}}. </label> -->
<!-- </ion-col> -->
<!-- </ion-row> -->
<ion-row>
<ion-col size="6" class="colItems">
<ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','request_number')}}
</label>
<br />
@ -62,9 +62,9 @@
<ion-label class="labelValue" for="">{{itemHistory.UNIT_OF_MEASURE}} </ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col size="6" class="colItems">
<ion-col size="6" class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label>
<br />
<!-- </ion-col>
@ -83,10 +83,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col size="6" class="colItems">
<ion-col size="6" class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','line_status')}} </label>
<br />
<!-- </ion-col>
@ -106,10 +106,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col size="6" class="colItems">
<ion-col size="6" class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','trans_type')}} </label>
<br />
<!-- </ion-col>
@ -129,10 +129,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col size="6" class="colItems">
<ion-col size="6" class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','organization_code')}} </label>
<br />
<!-- </ion-col>
@ -152,10 +152,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col size="6" class="colItems">
<ion-col size="6" class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','from_subinventory')}} </label>
<br />
<!-- </ion-col>
@ -175,10 +175,10 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col size="6" class="colItems">
<ion-col size="6" class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','to_subinventory')}} </label>
<br />
<!-- </ion-col>

@ -35,11 +35,11 @@
<ion-row>
<ion-col class="colItemReqHeader">
<label for="">{{i+1}}. {{QutationAnalysis.ITEM_CODE}} - {{QutationAnalysis.ITEM_DESC}} </label>
<label class="colItemReq" for="">{{i+1}}. {{QutationAnalysis.ITEM_CODE}} - {{QutationAnalysis.ITEM_DESC}} </label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="colItems">
<ion-row class="rowBorder">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','QuotationNumber')}} </label>
<br />
<!-- </ion-col>
@ -56,11 +56,11 @@
<!-- </ion-row>
<ion-row> -->
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','item_code')}} </label>
<br />
<!-- </ion-col>
@ -77,14 +77,14 @@
<ion-label class="labelValue" for="">{{QutationAnalysis.ITEM_DESC}} </ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<!-- </ion-row>
<ion-row> -->
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','QUOTATION_QTY')}} </label>
<br />
<!-- </ion-col>
@ -101,7 +101,7 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
@ -109,7 +109,7 @@
<!-- </ion-row>
<ion-row> -->
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quotatio_net_price')}} </label>
<br />
<!-- </ion-col>
@ -125,14 +125,14 @@
<ion-label class="labelValue" for="">{{QutationAnalysis.QUOT_LINE_TOTAL}} </ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder" >
<!-- </ion-row>
<ion-row> -->
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quotatio_bonus_quantity')}} </label>
<br />
<!-- </ion-col>
@ -148,7 +148,7 @@
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
@ -156,7 +156,7 @@
<!-- </ion-row>
<ion-row> -->
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','MFG_part_number')}} </label>
<br />
<!-- </ion-col>
@ -179,7 +179,7 @@
<!-- </ion-row>
<ion-row> -->
<ion-col class="colItems">
<ion-col class="colItems colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','RFQ_qty')}} </label>
<br />
<!-- </ion-col>

@ -108,7 +108,7 @@
</ion-col>
</ion-row >
<ion-row class="rowBorder" *ngIf=" getPassNotificationDetails.RESPONDER != '' ">
<ion-col class="colBorder">
<ion-col class="">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','responder')}}
</label>
<br />
@ -148,7 +148,7 @@
</ion-col>
</ion-row>
<ion-row class="rowBorder">
<ion-col class="colBorder">
<ion-col size="6" class="colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','Buyer')}} </label>
<br />
@ -156,7 +156,7 @@
</ion-col>
<!-- </ion-row>
<ion-row> -->
<ion-col>
<ion-col size="6">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','Preparer')}} </label>
<br />

@ -44,8 +44,9 @@
</ion-card-header> -->
<ion-card-content>
<ion-grid style="text-align: left">
<ion-row>
<ion-col>
<ion-row class="rowBorder">
<ion-col class="colBorder">
<label class="colItemReq" for=""> {{ts.trPK('worklistMain','from')}}
</label>
@ -66,8 +67,8 @@
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<ion-row class="rowBorder">
<ion-col class="colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','sent')}}
</label>
<br />
@ -88,8 +89,8 @@
<label for="">{{getPassNotificationDetails.END_DATE}}</label>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<ion-row class="rowBorder">
<ion-col class="colBorder">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','id')}}
</label>
<br />
@ -147,12 +148,12 @@
<ion-row style="text-align: center !important">
<ion-col *ngIf="totalH">
<div class="colItemReq" style="text-align: center !important">{{totalH}}</div>
<div class="labelTotal">{{valueH}}</div>
<div class="">{{valueH}}</div>
</ion-col>
<ion-col *ngIf="taxH ">
<div class="colItemReq" style="text-align: center !important">{{taxH}}</div>
<div class="labelTotal">{{taxvalueH}}</div>
<div class="">{{taxvalueH}}</div>
</ion-col>
</ion-row>

@ -263,6 +263,7 @@ export class WorklistMainPRComponent implements OnInit {
} else if (Type == 'PR') {
if (result.GetPrNotificationBodyList) {
console.log('PR');
this.pInformation = result.GetPrNotificationBodyList.P_INFORMATION;
this.PRHeader = result.GetPrNotificationBodyList.PRHeader;
this.PRLines = result.GetPrNotificationBodyList.PRLines;

@ -55,7 +55,7 @@
<ion-row class="" *ngIf=" item.Collection_Notification.DISPLAY_FLAG != 'N' ">
<ion-col class="rowBorder" *ngFor="let notificationBody of item.Collection_Notification;"
size="6">
size="6" [hidden]="notificationBody.DISPLAY_FLAG == 'N'" >
<label class="colItemReq" for="">{{notificationBody.SEGMENT_PROMPT}}</label>
<!-- </ion-col>

Loading…
Cancel
Save