diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index fcd68935..73f72e84 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -73,8 +73,8 @@ - {{getDotted(item.description, 60)}} - {{getDotted(item.description_Ar, 60)}} +
{{getDotted(item.description, 60)}}
+
{{getDotted(item.description_Ar, 60)}}

{{item.status}}

diff --git a/Mohem/src/app/itemforsale/items/items.component.scss b/Mohem/src/app/itemforsale/items/items.component.scss index 1433bcb5..b6e1bfcd 100644 --- a/Mohem/src/app/itemforsale/items/items.component.scss +++ b/Mohem/src/app/itemforsale/items/items.component.scss @@ -270,4 +270,10 @@ ion-fab-button{ margin: auto; width: 25px; +} +.description-cont{ + min-height: 60px; + height: 65px; + overflow: hidden; + font-size: 14px; } \ No newline at end of file diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts index e42896c1..456a45c8 100644 --- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts +++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts @@ -63,10 +63,11 @@ export class ConcurrentReportComponent implements OnInit { // this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; } getConcurrentProgram() { + this.cs.startLoading(); this.reports.getConcurrentProgram({ P_REQUEST_GROUP_ID: this.selectedMenu.REQUEST_GROUP_ID }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => { - console.log(response); + this.cs.stopLoading(); this.programList = response.GetConcurrentProgramsList; }) diff --git a/Mohem/src/app/termination/termination-form/termination-form.component.ts b/Mohem/src/app/termination/termination-form/termination-form.component.ts index a7082c9c..a874077e 100644 --- a/Mohem/src/app/termination/termination-form/termination-form.component.ts +++ b/Mohem/src/app/termination/termination-form/termination-form.component.ts @@ -79,7 +79,9 @@ export class TerminationFormComponent implements OnInit { this.cs.startLoading(); this.terminationFormService.getTerminationColStructure({ 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.drawEitFieldsStatic(this.termColStructure); this.getTermDiffStructure(); @@ -89,7 +91,9 @@ export class TerminationFormComponent implements OnInit { this.terminationFormService.getTermDiffStructure({ P_DESC_FLEX_CONTEXT_CODE: null, 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.handleDiffStructure(response); })