Enhancement for accounting view in back button (#1618)

Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>

src/app/accounting/accounting-routing.module.ts

@@ -265,7 +265,7 @@ const routes: Routes = [
         },
         {
           path: 'accounting-rules',
-          data: { title: extract('Accounting Rules'), breadcrumb: 'Rules' },
+          data: { title: extract('Accounting Rules'), breadcrumb: 'Accounting Rules' },
           children: [
             {
               path: '',

src/app/accounting/accounting-rules/create-rule/create-rule.component.html

@@ -106,7 +106,7 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
+        <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
         <button mat-raised-button color="primary" [disabled]="!accountingRuleForm.valid" *mifosxHasPermission="'CREATE_ACCOUNTINGRULE'">Submit</button>
       </mat-card-actions>
 

src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html

@@ -106,7 +106,7 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
+        <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
         <button mat-raised-button color="primary" [disabled]="accountingRuleForm.pristine || !accountingRuleForm.valid" *mifosxHasPermission="'UPDATE_ACCOUNTINGRULE'">Submit</button>
       </mat-card-actions>
 

src/app/accounting/create-journal-entry/create-journal-entry.component.html

@@ -167,7 +167,7 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
+        <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
         <button mat-raised-button color="primary" [disabled]="!journalEntryForm.valid" *mifosxHasPermission="'CREATE_JOURNALENTRY'">Submit</button>
       </mat-card-actions>
 

src/app/accounting/frequent-postings/frequent-postings.component.html

@@ -181,7 +181,7 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
+        <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
         <button mat-raised-button color="primary" [disabled]="!frequentPostingsForm.valid" *mifosxHasPermission="'CREATE_JOURNALENTRY'">Submit</button>
       </mat-card-actions>
 

src/app/accounting/search-journal-entry/search-journal-entry.component.html

@@ -118,14 +118,19 @@
       <td mat-cell *matCellDef="let journalEntry"> {{ journalEntry.glAccountName }} </td>
     </ng-container>
 
+    <ng-container matColumnDef="currency">
+      <th mat-header-cell *matHeaderCellDef mat-sort-header> Currency </th>
+      <td mat-cell *matCellDef="let journalEntry">{{ journalEntry.currency.code }}</td>
+    </ng-container>
+
     <ng-container matColumnDef="debit">
       <th mat-header-cell *matHeaderCellDef mat-sort-header> Debit </th>
-      <td mat-cell *matCellDef="let journalEntry"><span *ngIf="journalEntry.entryType.value === 'DEBIT'"> {{ (journalEntry.currency.displaySymbol || journalEntry.currency.code) + ' ' + journalEntry.amount | number }} </span></td>
+      <td mat-cell *matCellDef="let journalEntry"><span *ngIf="journalEntry.entryType.value === 'DEBIT'"> {{ journalEntry.amount | number }} </span></td>
     </ng-container>
 
     <ng-container matColumnDef="credit">
       <th mat-header-cell *matHeaderCellDef mat-sort-header> Credit </th>
-      <td mat-cell *matCellDef="let journalEntry"><span *ngIf="journalEntry.entryType.value === 'CREDIT'"> {{ (journalEntry.currency.displaySymbol || journalEntry.currency.code) + ' ' + journalEntry.amount | number }} </span></td>
+      <td mat-cell *matCellDef="let journalEntry"><span *ngIf="journalEntry.entryType.value === 'CREDIT'"> {{ journalEntry.amount | number }} </span></td>
     </ng-container>
 
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
@@ -133,6 +138,6 @@
 
   </table>
 
-  <mat-paginator [length]="dataSource?.records$ | async" [pageSize]="25" [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
+  <mat-paginator [length]="dataSource?.records$ | async" [pageSize]="50" [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
 
 </div>

src/app/accounting/search-journal-entry/search-journal-entry.component.ts

@@ -70,7 +70,7 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
   /** Submitted on date to form control. */
   submittedOnDateTo = new FormControl();
   /** Columns to be displayed in journal entries table. */
-  displayedColumns: string[] = ['id', 'officeName', 'transactionId', 'transactionDate', 'glAccountType', 'createdByUserName', 'submittedOnDate', 'glAccountCode', 'glAccountName', 'debit', 'credit'];
+  displayedColumns: string[] = ['id', 'officeName', 'transactionId', 'transactionDate', 'glAccountType', 'createdByUserName', 'submittedOnDate', 'glAccountCode', 'glAccountName', 'currency', 'debit', 'credit'];
   /** Data source for journal entries table. */
   dataSource: JournalEntriesDataSource;
   /** Journal entries filter. */

src/app/clients/clients.component.ts

@@ -29,6 +29,7 @@ export class ClientsComponent implements OnInit {
   constructor(private searchService: SearchService) { }
 
   ngOnInit() {
+    this.getClients('');
   }
 
   /**
@@ -44,12 +45,16 @@ export class ClientsComponent implements OnInit {
    */
   search(value: string) {
     if (value !== '') {
-      this.searchService.getSearchResults(value, 'clients').subscribe((data: any) => {
+      this.getClients(value);
-        this.dataSource = new MatTableDataSource(data);
-        this.existsClientsToFilter = (data.length > 0);
-        this.notExistsClientsToFilter = !this.existsClientsToFilter;
-        this.moreClientsToFilter = (data.length > 50);
-      });
     }
   }
+
+  private getClients(value: string) {
+    this.searchService.getSearchResults(value, 'clients').subscribe((data: any) => {
+      this.dataSource = new MatTableDataSource(data);
+      this.existsClientsToFilter = (data.length > 0);
+      this.notExistsClientsToFilter = !this.existsClientsToFilter;
+      this.moreClientsToFilter = (data.length > 50);
+    });
+  }
 }

src/assets/translations/en-US.json

@@ -112,7 +112,8 @@
     "texts": {
       "Welcome": "Welcome",
       "Version": "Version",
-      "by": "by"
+      "by": "by",
+      "Login into Tenant": "Login into Tenant"
     }
   },
   "errors": {

src/assets/translations/es-MX.json

@@ -112,7 +112,8 @@
     "texts": {
       "Welcome": "Bienvenido",
       "Version": "Versión",
-      "by": "por"
+      "by": "por",
+      "Login into Tenant": "Iniciar sesión en"
     }
   },
   "errors": {