Merge pull request #2542 from steinwinde/diverse-fixes

fix: Diverse problems in the Organization section

src/app/organization/fund-mapping/fund-mapping.component.html

@@ -1,5 +1,6 @@
 <mat-card class="container" *ngIf="!isCollapsed">
   <form [formGroup]="fundMappingForm" (ngSubmit)="submit()">
+    <mat-card-content>
       <div class="layout-row-wrap gap-2percent responsive-column align-start-center">
         <mat-form-field class="flex-48">
           <mat-label>{{ 'labels.inputs.Loan Status' | translate }}</mat-label>
@@ -41,7 +42,7 @@
           </mat-select>
         </mat-form-field>
 
-      <mat-form-field class="flex-fill flex-31" (click)="fromDatePicker.open()">
+        <mat-form-field class="flex-31" (click)="fromDatePicker.open()">
           <mat-label>{{ 'labels.inputs.From Date' | translate }}</mat-label>
           <input
             matInput
@@ -59,7 +60,7 @@
           </mat-error>
         </mat-form-field>
 
-      <mat-form-field class="flex-fill flex-31" (click)="toDatePicker.open()">
+        <mat-form-field class="flex-31" (click)="toDatePicker.open()">
           <mat-label>{{ 'labels.inputs.To Date' | translate }}</mat-label>
           <input
             matInput
@@ -185,6 +186,7 @@
           </mat-form-field>
         </div>
       </div>
+    </mat-card-content>
 
     <mat-card-actions class="layout-row align-center gap-5px responsive-column">
       <button type="button" mat-raised-button [routerLink]="['../']">{{ 'labels.buttons.Cancel' | translate }}</button>

src/app/organization/investors/investors.component.html

@@ -1,11 +1,12 @@
 <mat-card class="container">
+  <mat-card-content>
     <div class="layout-row-wrap gap-2px responsive-column">
-    <mat-form-field class="flex-fill flex-18">
+      <mat-form-field class="flex-18">
         <mat-label>{{ 'labels.text.Search by Text' | translate }}</mat-label>
         <input matInput [formControl]="searchText" />
       </mat-form-field>
 
-    <mat-form-field class="flex-fill flex-18" (click)="effectiveFromDatePicker.open()">
+      <mat-form-field class="flex-18" (click)="effectiveFromDatePicker.open()">
         <mat-label>{{ 'labels.text.Effective Date From' | translate }}</mat-label>
         <input
           matInput
@@ -18,7 +19,7 @@
         <mat-datepicker #effectiveFromDatePicker></mat-datepicker>
       </mat-form-field>
 
-    <mat-form-field class="flex-fill flex-18" (click)="effectiveToDatePicker.open()">
+      <mat-form-field class="flex-18" (click)="effectiveToDatePicker.open()">
         <mat-label>{{ 'labels.text.Effective Date To' | translate }}</mat-label>
         <input
           matInput
@@ -31,7 +32,7 @@
         <mat-datepicker #effectiveToDatePicker></mat-datepicker>
       </mat-form-field>
 
-    <mat-form-field class="flex-fill flex-18" (click)="settlementFromDatePicker.open()">
+      <mat-form-field class="flex-18" (click)="settlementFromDatePicker.open()">
         <mat-label>{{ 'labels.text.Settlement Date From' | translate }}</mat-label>
         <input
           matInput
@@ -44,7 +45,7 @@
         <mat-datepicker #settlementFromDatePicker></mat-datepicker>
       </mat-form-field>
 
-    <mat-form-field class="flex-fill flex-18" (click)="settlementToDatePicker.open()">
+      <mat-form-field class="flex-18" (click)="settlementToDatePicker.open()">
         <mat-label>{{ 'labels.text.Settlement Date To' | translate }}</mat-label>
         <input
           matInput
@@ -86,7 +87,9 @@
                   </td>
                   <td class="field-name">{{ 'labels.inputs.Transfer External Id' | translate }}</td>
                   <td>
-                  <mifosx-external-identifier externalId="{{ record.transferExternalId }}"></mifosx-external-identifier>
+                    <mifosx-external-identifier
+                      externalId="{{ record.transferExternalId }}"
+                    ></mifosx-external-identifier>
                   </td>
                   <td class="field-name">{{ 'labels.inputs.Effective From' | translate }}</td>
                   <td>{{ record.effectiveFrom | dateFormat }}</td>
@@ -222,4 +225,5 @@
         {{ 'labels.text.No data found' | translate }}
       </div>
     </div>
+  </mat-card-content>
 </mat-card>

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

@@ -339,7 +339,7 @@ const routes: Routes = [
         {
           path: 'fund-mapping',
           component: FundMappingComponent,
-          data: { title: 'Advance Search', breadcrumb: 'Advance Search' },
+          data: { title: 'Fund Mapping', breadcrumb: 'Fund Mapping' },
           resolve: {
             advanceSearchTemplate: AdvanceSearchTemplateResolver
           }

src/app/organization/organization.component.html

@@ -102,7 +102,7 @@
           <div #standinginstructions>
             <mat-list-item *mifosxHasPermission="'READ_STANDINGINSTRUCTION'">
               <div class="menu-list-item-content">
-                <div class="menu-left-section" [routerLink]="['standing-instructions']">
+                <div class="menu-left-section" [routerLink]="['standing-instructions-history']">
                   <mat-icon matListIcon>
                     <fa-icon icon="book" size="sm"></fa-icon>
                   </mat-icon>

src/assets/translations/cs-CS.json

@@ -1425,6 +1425,7 @@
       "Created At": "Vytvořeno v",
       "Created By": "Vytvořil",
       "Created On": "Vytvořeno dne",
+      "Creation Date": "Datum vytvoření",
       "Credit": "Kredit",
       "Credit Account": "Úvěrový účet",
       "Credit Account Name": "Název kreditního účtu",

src/assets/translations/de-DE.json

@@ -1425,6 +1425,7 @@
       "Created At": "Hergestellt in",
       "Created By": "Erstellt von",
       "Created On": "Erstellt am",
+      "Creation Date": "Erstellungsdatum",
       "Credit": "Kredit",
       "Credit Account": "Kreditkonto",
       "Credit Account Name": "Name des Kreditkontos",

src/assets/translations/en-US.json

@@ -1429,6 +1429,7 @@
       "Created At": "Created At",
       "Created By": "Created By",
       "Created On": "Created On",
+      "Creation Date": "Creation Date",
       "Credit": "Credit",
       "Credit Account": "Credit Account",
       "Credit Account Name": "Credit Account Name",

src/assets/translations/es-CL.json

@@ -1424,6 +1424,7 @@
       "Created At": "Creado en",
       "Created By": "Creado por",
       "Created On": "Creado en",
+      "Creation Date": "Fecha de creación",
       "Credit": "Crédito",
       "Credit Account": "Cuenta de crédito",
       "Credit Account Name": "Nombre de la cuenta de crédito",

src/assets/translations/es-MX.json

@@ -1424,6 +1424,7 @@
       "Created At": "Creado en",
       "Created By": "Creado por",
       "Created On": "Creado en",
+      "Creation Date": "Fecha de creación",
       "Credit": "Crédito",
       "Credit Account": "Cuenta de crédito",
       "Credit Account Name": "Nombre de la cuenta de crédito",

src/assets/translations/fr-FR.json

@@ -1425,6 +1425,7 @@
       "Created At": "Créé à",
       "Created By": "Créé par",
       "Created On": "Créé sur",
+      "Creation Date": "Date de création",
       "Credit": "Crédit",
       "Credit Account": "Compte créditeur",
       "Credit Account Name": "Nom du compte de crédit",

src/assets/translations/it-IT.json

@@ -1425,6 +1425,7 @@
       "Created At": "Creato a",
       "Created By": "Creato da",
       "Created On": "Creato",
+      "Creation Date": "Data di creazione",
       "Credit": "Credito",
       "Credit Account": "Conto di credito",
       "Credit Account Name": "Nome del conto di credito",

src/assets/translations/ko-KO.json

@@ -1426,6 +1426,7 @@
       "Created At": "생성 날짜",
       "Created By": "작성자",
       "Created On": "에 만든",
+      "Creation Date": "생성 날짜",
       "Credit": "신용 거래",
       "Credit Account": "신용 계좌",
       "Credit Account Name": "신용 계좌 이름",

src/assets/translations/lt-LT.json

@@ -1425,6 +1425,7 @@
       "Created At": "Sukurta",
       "Created By": "Sukurta",
       "Created On": "Sukurtas",
+      "Creation Date": "Sukūrimo data",
       "Credit": "Kreditas",
       "Credit Account": "Kredito sąskaita",
       "Credit Account Name": "Kredito sąskaitos pavadinimas",

src/assets/translations/lv-LV.json

@@ -1425,6 +1425,7 @@
       "Created At": "Izveidots plkst",
       "Created By": "Radīts",
       "Created On": "Izveidots",
+      "Creation Date": "Izveidošanas datums",
       "Credit": "Kredīts",
       "Credit Account": "Kredīta konts",
       "Credit Account Name": "Kredīta konta nosaukums",

src/assets/translations/ne-NE.json

@@ -1425,6 +1425,7 @@
       "Created At": "मा सिर्जना गरियो",
       "Created By": "द्वारा सिर्जना गरिएको",
       "Created On": "मा सिर्जना गरियो",
+      "Creation Date": "सिर्जना मिति",
       "Credit": "क्रेडिट",
       "Credit Account": "क्रेडिट खाता",
       "Credit Account Name": "क्रेडिट खाता नाम",

src/assets/translations/pt-PT.json

@@ -1425,6 +1425,7 @@
       "Created At": "Criado em",
       "Created By": "Criado por",
       "Created On": "Criado em",
+      "Creation Date": "Data de Criação",
       "Credit": "Crédito",
       "Credit Account": "Conta de crédito",
       "Credit Account Name": "Nome da conta de crédito",

src/assets/translations/sw-SW.json

@@ -1425,6 +1425,7 @@
       "Created At": "Imeundwa Katika",
       "Created By": "Imetengenezwa na",
       "Created On": "Imeundwa Juu",
+      "Creation Date": "Tarehe ya Uumbaji",
       "Credit": "Mikopo",
       "Credit Account": "Akaunti ya Mkopo",
       "Credit Account Name": "Jina la Akaunti ya Mkopo",