bug fixes

sultan-q3
Sultan Khan 4 years ago
parent 2567bc2c8b
commit d81bae290d

@ -73,8 +73,8 @@
</ion-card-header> </ion-card-header>
<ion-card-content> <ion-card-content>
<span *ngIf="direction == 'ltr'">{{getDotted(item.description, 60)}}</span> <div class="description-cont" *ngIf="direction == 'ltr'">{{getDotted(item.description, 60)}}</div>
<span *ngIf="direction =='rtl'">{{getDotted(item.description_Ar, 60)}}</span> <div class="description-cont" *ngIf="direction =='rtl'">{{getDotted(item.description_Ar, 60)}}</div>
<p [class]="item.status=='Approved' ? 'green' : 'yellow'">{{item.status}}</p> <p [class]="item.status=='Approved' ? 'green' : 'yellow'">{{item.status}}</p>
<ion-row> <ion-row>
<ion-col size="10"> <ion-col size="10">

@ -270,4 +270,10 @@ ion-fab-button{
margin: auto; margin: auto;
width: 25px; width: 25px;
}
.description-cont{
min-height: 60px;
height: 65px;
overflow: hidden;
font-size: 14px;
} }

@ -63,10 +63,11 @@ export class ConcurrentReportComponent implements OnInit {
// this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; // this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT;
} }
getConcurrentProgram() { getConcurrentProgram() {
this.cs.startLoading();
this.reports.getConcurrentProgram({ this.reports.getConcurrentProgram({
P_REQUEST_GROUP_ID: this.selectedMenu.REQUEST_GROUP_ID P_REQUEST_GROUP_ID: this.selectedMenu.REQUEST_GROUP_ID
}, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => {
console.log(response); this.cs.stopLoading();
this.programList = response.GetConcurrentProgramsList; this.programList = response.GetConcurrentProgramsList;
}) })

@ -79,7 +79,9 @@ export class TerminationFormComponent implements OnInit {
this.cs.startLoading(); this.cs.startLoading();
this.terminationFormService.getTerminationColStructure({ this.terminationFormService.getTerminationColStructure({
P_FUNCTION_NAME: this.selectedMenu.P_FUNCTION_NAME P_FUNCTION_NAME: this.selectedMenu.P_FUNCTION_NAME
}, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { }, () => {
}, this.ts.trPK('general', 'retry')).subscribe((response) => {
this.termColStructure = response['GetTermColsStructureList']; this.termColStructure = response['GetTermColsStructureList'];
this.drawEitFieldsStatic(this.termColStructure); this.drawEitFieldsStatic(this.termColStructure);
this.getTermDiffStructure(); this.getTermDiffStructure();
@ -89,7 +91,9 @@ export class TerminationFormComponent implements OnInit {
this.terminationFormService.getTermDiffStructure({ this.terminationFormService.getTermDiffStructure({
P_DESC_FLEX_CONTEXT_CODE: null, P_DESC_FLEX_CONTEXT_CODE: null,
P_FUNCTION_NAME: this.selectedMenu.FUNCTION_NAME P_FUNCTION_NAME: this.selectedMenu.FUNCTION_NAME
}, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { }, () => {
this.cs.back();
}, this.ts.trPK('general', 'retry')).subscribe((response) => {
this.cs.stopLoading(); this.cs.stopLoading();
this.handleDiffStructure(response); this.handleDiffStructure(response);
}) })

Loading…
Cancel
Save