Accounting financial activities using more readable concepts

src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.html

@@ -12,7 +12,7 @@
             <mat-label>{{"labels.inputs.Financial Activity" | translate}}</mat-label>
             <mat-select required formControlName="financialActivityId">
               <mat-option *ngFor="let financialActivity of financialActivityData" [value]="financialActivity.id">
-                {{ financialActivity.name }}
+                ({{financialActivity.id}}) {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="financialActivityMappingForm.controls.financialActivityId.hasError('required')">

src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.html

@@ -12,7 +12,7 @@
             <mat-label>{{"labels.inputs.Financial Activity" | translate}}</mat-label>
             <mat-select required formControlName="financialActivityId">
               <mat-option *ngFor="let financialActivity of financialActivityData" [value]="financialActivity.id">
-                {{ financialActivity.name }}
+                ({{financialActivity.id}}) {{ 'labels.accounting.financialActivity.' + financialActivity.name | translate }}
               </mat-option>
             </mat-select>
           </mat-form-field>

src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts

@@ -45,6 +45,7 @@ export class EditFinancialActivityMappingComponent implements OnInit {
               private router: Router) {
     this.route.data.subscribe((data: { financialActivityAccountAndTemplate: any }) => {
       this.financialActivityAccountId = data.financialActivityAccountAndTemplate.id;
+      console.log(data.financialActivityAccountAndTemplate.financialActivityData);
       this.financialActivityId = data.financialActivityAccountAndTemplate.financialActivityData.id;
       this.glAccountId = data.financialActivityAccountAndTemplate.glAccountData.id;
       this.glAccountOptions = data.financialActivityAccountAndTemplate.glAccountOptions;

src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html

@@ -13,12 +13,15 @@
 
     <ng-container matColumnDef="financialActivity">
       <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Financial Activity" | translate}} </th>
-      <td mat-cell *matCellDef="let financialActivityAccount"> {{ financialActivityAccount.financialActivityData.name }} </td>
+      <td mat-cell *matCellDef="let financialActivityAccount">
+          ({{financialActivityAccount.financialActivityData.id}}) 
+          {{ 'labels.accounting.financialActivity.' + financialActivityAccount.financialActivityData.name | translate }}
+        </td>
     </ng-container>
 
-    <ng-container matColumnDef="glAccountName">
+    <ng-container matColumnDef="glAccountType">
-      <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Account Name" | translate}} </th>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Account Type" | translate}} </th>
-      <td mat-cell *matCellDef="let financialActivityAccount"> {{ financialActivityAccount.glAccountData.name }} </td>
+      <td mat-cell *matCellDef="let financialActivityAccount"> {{ 'labels.inputs.accounting.' + financialActivityAccount.financialActivityData.mappedGLAccountType | translate }} </td>
     </ng-container>
 
     <ng-container matColumnDef="glAccountCode">
@@ -26,6 +29,11 @@
       <td mat-cell *matCellDef="let financialActivityAccount"> {{ financialActivityAccount.glAccountData.glCode }} </td>
     </ng-container>
 
+    <ng-container matColumnDef="glAccountName">
+      <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Account Name" | translate}} </th>
+      <td mat-cell *matCellDef="let financialActivityAccount"> {{ financialActivityAccount.glAccountData.name }} </td>
+    </ng-container>
+
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['view', row.id]" class="select-row"></tr>
 

src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.ts

@@ -22,7 +22,7 @@ export class FinancialActivityMappingsComponent implements OnInit, AfterViewInit
   /** Financial activity account data. */
   financialActivityAccountData: any;
   /** Columns to be displayed in financial activity mappings table. */
-  displayedColumns: string[] = ['financialActivity', 'glAccountName', 'glAccountCode'];
+  displayedColumns: string[] = ['financialActivity', 'glAccountType', 'glAccountCode', 'glAccountName'];
   /** Data source for financial activity mappings table. */
   dataSource: MatTableDataSource<any>;
 

src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.html

@@ -22,7 +22,15 @@
         </div>
 
         <div fxFlex="50%">
-          {{ financialActivityAccount?.financialActivityData.name }}
+          ({{financialActivityAccount?.financialActivityData.id}}) {{ 'labels.accounting.financialActivity.' + financialActivityAccount?.financialActivityData.name | translate }}
+        </div>
+
+        <div fxFlex="50%" class="header">
+          {{"labels.inputs.Account Type" | translate}}
+        </div>
+
+        <div fxFlex="50%">
+          {{ 'labels.inputs.accounting.' + financialActivityAccount?.financialActivityData.mappedGLAccountType | translate }}
         </div>
 
         <mifosx-gl-account-display fxFlex="100%"
@@ -35,6 +43,9 @@
 
     </mat-card-content>
 
+    <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
+      <button type="button" color="primary" mat-raised-button [routerLink]="['../..']">{{  "labels.buttons.Back" | translate}}</button>
+    </mat-card-actions>
   </mat-card>
 
 </div>

src/app/accounting/financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component.ts

@@ -8,6 +8,7 @@ import { AccountingService } from '../../accounting.service';
 
 /** Custom Components */
 import { DeleteDialogComponent } from '../../../shared/delete-dialog/delete-dialog.component';
+import { Location } from '@angular/common';
 
 /**
  * View financial activity mapping component.
@@ -34,7 +35,8 @@ export class ViewFinancialActivityMappingComponent implements OnInit {
   constructor(private accountingService: AccountingService,
               private route: ActivatedRoute,
               private router: Router,
-              public dialog: MatDialog) {
+              private dialog: MatDialog,
+              private location: Location) {
     this.route.data.subscribe((data: { financialActivityAccount: any }) => {
       this.financialActivityAccount = data.financialActivityAccount;
       this.financialActivityAccountId = data.financialActivityAccount.id;
@@ -61,4 +63,8 @@ export class ViewFinancialActivityMappingComponent implements OnInit {
     });
   }
 
+  goBack(): void {
+    this.location.back();
+  }
+
 }

src/assets/translations/cs-CS.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Akruální (periodické)",
       "Accrual (upfront)": "Akruální (předem)",
       "Cash": "Hotovost",
-      "NONE": "Žádný"
+      "NONE": "Žádný",
+      "financialActivity": {
+        "assetTransfer": "převod aktiv",
+        "cashAtMainVault": "hotovost v hlavním trezoru",
+        "cashAtTeller": "hotovost u Tellera",
+        "fundSource": "fond Zdroj",
+        "liabilityTransfer": "Převod odpovědnosti",
+        "openingBalancesTransferContra": "otevření zůstatků Převod proti",
+        "payableDividends": "splatné dividendy"
+      }
     },
     "breadcrumbs": {
       "Home": "Domov"

src/assets/translations/de-DE.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Abgrenzung (periodisch)",
       "Accrual (upfront)": "Rückstellung (im Voraus)",
       "Cash": "Kasse",
-      "NONE": "Keiner"
+      "NONE": "Keiner",
+      "financialActivity": {
+        "assetTransfer": "Vermögensübertragung",
+        "cashAtMainVault": "Bargeld im Haupttresor",
+        "cashAtTeller": "Bargeld beim Teller",
+        "fundSource": "Fondsquelle",
+        "liabilityTransfer": "Haftungsübertragung",
+        "openingBalancesTransferContra": "Eröffnungssalden Transferkontra",
+        "payableDividends": "zahlbare Dividenden"
+      }
     },
     "breadcrumbs": {
       "Home": "Heim"

src/assets/translations/en-US.json

@@ -275,7 +275,16 @@
             "Accrual (periodic)": "Accrual (periodic)",
             "Accrual (upfront)": "Accrual (upfront)",
             "Cash": "Cash",
-            "NONE": "None"
+            "NONE": "None",
+            "financialActivity": {
+                "assetTransfer": "Asset Transfer",
+                "cashAtMainVault": "Cash At Main Vault",
+                "cashAtTeller": "Cash At Teller",
+                "fundSource": "Fund Source",
+                "liabilityTransfer": "Liability Transfer",
+                "openingBalancesTransferContra": "Opening Balances Transfer Contra",
+                "payableDividends": "Payable Dividends"
+            }
         },
         "breadcrumbs": {
             "Home": "Home"

src/assets/translations/es-MX.json

@@ -275,7 +275,16 @@
             "Accrual (periodic)": "Devengo (periódico)",
             "Accrual (upfront)": "Devengo (adelantado)",
             "Cash": "Efectivo",
-            "NONE": "Ninguno"
+            "NONE": "Ninguno",
+            "financialActivity": {
+                "assetTransfer": "Transferencia de Activos",
+                "cashAtMainVault": "Efectivo en la bóveda principal",
+                "cashAtTeller": "Efectivo en el cajero",
+                "fundSource": "Fuente del Fondo",
+                "liabilityTransfer": "Transferencia de Pasivo",
+                "openingBalancesTransferContra": "Saldos de Apertura Transferencia Contra",
+                "payableDividends": "Dividendos a pagar"
+            }
         },
         "breadcrumbs": {
             "Home": "Inicio"

src/assets/translations/fr-FR.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Accumulation (périodique)",
       "Accrual (upfront)": "Accumulation (d'avance)",
       "Cash": "Espèces",
-      "NONE": "Aucun"
+      "NONE": "Aucun",
+      "financialActivity": {
+        "assetTransfer": "Transfert d'actif",
+        "cashAtMainVault": "espèces dans le coffre-fort principal",
+        "cashAtTeller": "en espèces au caissier",
+        "fundSource": "Source du fonds",
+        "liabilityTransfer": "Transfert de responsabilité",
+        "openingBalancesTransferContra": "Soldes d'ouverture Transfert Contrat",
+        "payableDividends": "Dividendes payables"
+      }
     },
     "breadcrumbs": {
       "Home": "Maison"

src/assets/translations/it-IT.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Accantonamento (periodico)",
       "Accrual (upfront)": "Accantonamento (in anticipo)",
       "Cash": "Contanti",
-      "NONE": "Nessuno"
+      "NONE": "Nessuno",
+      "financialActivity": {
+        "assetTransfer": "Trasferimento di beni",
+        "cashAtMainVault": "contanti nel caveau principale",
+        "cashAtTeller": "contanti al cassiere",
+        "fundSource": "Fonte del fondo",
+        "liabilityTransfer": "Trasferimento di responsabilità",
+        "openingBalancesTransferContra": "Saldi iniziali Trasferimento Contra",
+        "payableDividends": "dividendi pagabili"
+      }
     },
     "breadcrumbs": {
       "Home": "Casa"

src/assets/translations/ko-KO.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "발생(정기적)",
       "Accrual (upfront)": "발생(선불)",
       "Cash": "현금",
-      "NONE": "없음"
+      "NONE": "없음",
+      "financialActivity": {
+        "assetTransfer": "자산 이전",
+        "cashAtMainVault": "메인 볼트에서 현금",
+        "cashAtTeller": "텔러에서 현금",
+        "fundSource": "자금 출처",
+        "liabilityTransfer": "책임 이전",
+        "openingBalancesTransferContra": "기초 잔액 이체 대조",
+        "payableDividends": "지급 배당금"
+      }
     },
     "breadcrumbs": {
       "Home": "집"

src/assets/translations/lt-LT.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Kaupiamasis (periodinis)",
       "Accrual (upfront)": "Sukaupimas (išankstinis)",
       "Cash": "Grynieji pinigai",
-      "NONE": "Nė vienas"
+      "NONE": "Nė vienas",
+      "financialActivity": {
+        "assetTransfer": "turto perdavimas",
+        "cashAtMainVault": "grynieji pinigai Pagrindiniame saugykloje",
+        "cashAtTeller": "grynieji „Teller“.",	
+        "fundSource": "fondas Šaltinis",
+        "liabilityTransfer": "atsakomybės perdavimas",
+        "openingBalancesTransferContra": "atidarymo likučių pervedimo kontraktas",
+        "payableDividends": "mokėtini Dividendai"
+      }
     },
     "breadcrumbs": {
       "Home": "Namai"

src/assets/translations/lv-LV.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Uzkrāšana (periodiski)",
       "Accrual (upfront)": "Uzkrāšana (iepriekšēja)",
       "Cash": "Skaidra nauda",
-      "NONE": "Nav"
+      "NONE": "Nav",
+      "financialActivity": {
+        "assetTransfer": "aktīvu nodošana",
+        "cashAtMainVault": "skaidra nauda Galvenajā seifā",
+        "cashAtTeller": "skaidra nauda Teller",
+        "fundSource": "fonds Avots",
+        "liabilityTransfer": "atbildības nodošana",
+        "openingBalancesTransferContra": "atverot Atlikumu pārskaitījumu Contra",
+        "payableDividends": "izmaksājamās dividendes"
+      }
     },
     "breadcrumbs": {
       "Home": "Mājas"

src/assets/translations/ne-NE.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "उपार्जन (आवधिक)",
       "Accrual (upfront)": "उपार्जन (अगाडि)",
       "Cash": "नगद",
-      "NONE": "कुनै पनि छैन"
+      "NONE": "कुनै पनि छैन",
+      "financialActivity": {
+        "assetTransfer": "सम्पत्ति स्थानान्तरण",
+        "cashAtMainVault": "मुख्य भल्ट मा नगद",
+        "cashAtTeller": "टेलर मा नगद",
+        "fundSource": "कोष स्रोत",
+        "liabilityTransfer": "दायित्व स्थानान्तरण",
+        "openingBalancesTransferContra": "ब्यालेन्स ट्रान्सफर कन्ट्रा खोल्दै",
+        "payableDividends": "भुक्तानी योग्य लाभांश"
+      }
     },
     "breadcrumbs": {
       "Home": "घर"

src/assets/translations/pt-PT.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Acumulação (periódica)",
       "Accrual (upfront)": "Acumulação (antecipada)",
       "Cash": "Dinheiro",
-      "NONE": "Nenhum"
+      "NONE": "Nenhum",
+      "financialActivity": {
+        "assetTransfer": "Transferência de Ativos",
+        "cashAtMainVault": "dinheiro no cofre principal",
+        "cashAtTeller": "dinheiro no caixa",
+        "fundSource": "fonte do fundo",
+        "liabilityTransfer": "Transferência de responsabilidade",
+        "openingBalancesTransferContra": "abertura de transferência de saldos contra",
+        "payableDividends": "Dividendos a pagar"
+      }
     },
     "breadcrumbs": {
       "Home": "Lar"

src/assets/translations/sw-SW.json

@@ -275,7 +275,16 @@
       "Accrual (periodic)": "Accrual (mara kwa mara)",
       "Accrual (upfront)": "Accrual (mbele)",
       "Cash": "Fedha taslimu",
-      "NONE": "Hakuna"
+      "NONE": "Hakuna",
+      "financialActivity": {
+        "assetTransfer": "Uhamisho wa mali",
+        "cashAtMainVault": "fedha Katika Vault Kuu",
+        "cashAtTeller": "pesa kwa Teller",
+        "fundSource": "Chanzo cha mfuko",
+        "liabilityTransfer": "Uhamisho wa dhima",
+        "openingBalancesTransferContra": "kufungua Mizani Uhamisho Contra",
+        "payableDividends": "Gawio linalolipwa"
+      }
     },
     "breadcrumbs": {
       "Home": "Nyumbani"