CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

create new translate pipe and remove TranslateCatalogPipe

Browse Source
This commit is contained in:
Omar-Nabil
2024-06-03 15:17:41 -06:00
committed by Jose Alberto Hernandez
parent c4d0eac2e3
commit 9a0124d358
53 changed files with 243 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/products/charges/charges.component.html
+5 -5
View File
@@ -17,7 +17,7 @@
<mat-form-field fxFlex fxFlex="28%">
<mat-select placeholder="{{'labels.inputs.Filter' | translate}}" (selectionChange)="filterByAppliesTo($event.value)">
<mat-option *ngFor="let chargeAppliesTo of chargeAppliesToOptions" [value]="chargeAppliesTo.id">
{{ chargeAppliesTo.value | translateCatalog }}
{{ chargeAppliesTo.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -34,17 +34,17 @@
<ng-container matColumnDef="chargeAppliesTo">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Applies To" | translate}} </th>
<td mat-cell *matCellDef="let charge"> {{ charge.chargeAppliesTo.value | translateCatalog }} </td>
<td mat-cell *matCellDef="let charge"> {{ charge.chargeAppliesTo.value | translateKey:'catalogs' }} </td>
</ng-container>
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Time" | translate}} </th>
<td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateCatalog }} </td>
<td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateKey:'catalogs' }} </td>
</ng-container>
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Calculation" | translate}} </th>
<td mat-cell *matCellDef="let charge"> {{ charge.chargeCalculationType.value | translateCatalog }} </td>
<td mat-cell *matCellDef="let charge"> {{ charge.chargeCalculationType.value | translateKey:'catalogs' }} </td>
</ng-container>
<ng-container matColumnDef="amount">
@@ -119,4 +119,4 @@
(click)="popover.close();showPopover(templateFilter,filter, 'bottom', true)">Back</button>
<button mat-raised-button color="primary" (click)="popover.close();nextStep()">Next</button>
</div>
</ng-template>
</ng-template>
src/app/products/charges/create-charge/create-charge.component.html
+5 -5
View File
@@ -13,7 +13,7 @@
<mat-select required formControlName="chargeAppliesTo">
<mat-option *ngFor="let chargeAppliesTo of chargesTemplateData.chargeAppliesToOptions"
[value]="chargeAppliesTo.id">
{{ chargeAppliesTo.value | translateCatalog }}
{{ chargeAppliesTo.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.chargeAppliesTo.hasError('required')">
@@ -50,7 +50,7 @@
<mat-label>{{"labels.inputs.Charge Time Type" | translate}}</mat-label>
<mat-select required formControlName="chargeTimeType">
<mat-option *ngFor="let chargeTimeType of chargeTimeTypeData" [value]="chargeTimeType.id">
{{ chargeTimeType.value | translateCatalog }}
{{ chargeTimeType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.chargeTimeType.hasError('required')">
@@ -63,7 +63,7 @@
<mat-select required formControlName="chargeCalculationType">
<mat-option *ngFor="let chargeCalculationType of filteredChargeCalculationType()"
[value]="chargeCalculationType.id">
{{ chargeCalculationType.value | translateCatalog }}
{{ chargeCalculationType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.chargeCalculationType.hasError('required')">
@@ -76,7 +76,7 @@
<mat-select required formControlName="chargePaymentMode">
<mat-option *ngFor="let chargePaymentMode of chargesTemplateData.chargePaymetModeOptions"
[value]="chargePaymentMode.id">
{{ chargePaymentMode.value | translateCatalog }}
{{ chargePaymentMode.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.chargePaymentMode.hasError('required')">
@@ -110,7 +110,7 @@
<mat-select required formControlName="feeFrequency">
<mat-option *ngFor="let feeFrequency of chargesTemplateData.feeFrequencyOptions"
[value]="feeFrequency.id">
{{ feeFrequency.value | translateCatalog }}
{{ feeFrequency.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.feeFrequency.hasError('required')">
src/app/products/charges/edit-charge/edit-charge.component.html
+5 -5
View File
@@ -13,7 +13,7 @@
<mat-select required formControlName="chargeAppliesTo">
<mat-option *ngFor="let chargeAppliesTo of chargeData.chargeAppliesToOptions"
[value]="chargeAppliesTo.id">
{{ chargeAppliesTo.value | translateCatalog }}
{{ chargeAppliesTo.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -47,7 +47,7 @@
<mat-label>{{"labels.inputs.Charge Time Type" | translate}}</mat-label>
<mat-select required formControlName="chargeTimeType">
<mat-option *ngFor="let chargeTime of chargeTimeTypeOptions" [value]="chargeTime.id">
{{ chargeTime.value | translateCatalog }}
{{ chargeTime.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.chargeTimeType.hasError('required')">
@@ -60,7 +60,7 @@
<mat-label>{{"labels.inputs.Charge Calculation" | translate}}</mat-label>
<mat-select required formControlName="chargeCalculationType">
<mat-option *ngFor="let chargeCalculation of chargeCalculationTypeOptions" [value]="chargeCalculation.id">
{{ chargeCalculation.value | translateCatalog }}
{{ chargeCalculation.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.chargeCalculationType.hasError('required')">
@@ -73,7 +73,7 @@
<mat-select required formControlName="chargePaymentMode">
<mat-option *ngFor="let chargePaymentMode of chargeData.chargePaymetModeOptions"
[value]="chargePaymentMode.id">
{{ chargePaymentMode.value | translateCatalog }}
{{ chargePaymentMode.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.chargePaymentMode.hasError('required')">
@@ -144,7 +144,7 @@
<mat-label>{{"labels.inputs.Charge Frequency" | translate}}</mat-label>
<mat-select required formControlName="feeFrequency">
<mat-option *ngFor="let chargeFrequency of chargeData.feeFrequencyOptions" [value]="chargeFrequency.id">
{{ chargeFrequency.value | translateCatalog }}
{{ chargeFrequency.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error *ngIf="chargeForm.controls.feeFrequency.hasError('required')">
src/app/products/charges/view-charge/view-charge.component.html
+5 -5
View File
@@ -30,7 +30,7 @@
</div>
<div fxFlex="50%">
{{ chargeData.chargeAppliesTo.value | translateCatalog }}
{{ chargeData.chargeAppliesTo.value | translateKey:'catalogs' }}
</div>
<div fxFlex="50%" class="mat-body-strong">
@@ -78,7 +78,7 @@
</div>
<div fxFlex="50%">
{{ chargeData.chargeTimeType.value | translateCatalog }}
{{ chargeData.chargeTimeType.value | translateKey:'catalogs' }}
</div>
<div fxFlex="50%" class="mat-body-strong">
@@ -86,7 +86,7 @@
</div>
<div fxFlex="50%">
{{ chargeData.chargeCalculationType.value | translateCatalog }}
{{ chargeData.chargeCalculationType.value | translateKey:'catalogs' }}
</div>
<div fxFlex="50%" class="mat-body-strong">
@@ -94,7 +94,7 @@
</div>
<div fxFlex="50%">
{{ chargeData.chargePaymentMode.value | translateCatalog }}
{{ chargeData.chargePaymentMode.value | translateKey:'catalogs' }}
</div>
<div fxFlex="50%" class="mat-body-strong">
@@ -111,7 +111,7 @@
<div fxFlex="50%"
*ngIf="chargeData.chargeTimeType.id == 9 && chargeData.feeFrequency && chargeData.feeFrequency">
{{ chargeData.feeFrequency.value | translateCatalog }}
{{ chargeData.feeFrequency.value | translateKey:'catalogs' }}
</div>
<div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.chargeTimeType.id == 9 && chargeData.feeInterval">
src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
+18 -18
View File
@@ -96,7 +96,7 @@
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Installment day calculation from' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.repaymentStartDateType?.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.repaymentStartDateType?.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
@@ -117,7 +117,7 @@
<span fxFlex="53%">{{ loanProduct.interestRatePerPeriod + ' (Min: ' + (loanProduct.minInterestRatePerPeriod ?
loanProduct.minInterestRatePerPeriod : loanProduct.interestRatePerPeriod) + ', Max: ' +
(loanProduct.maxInterestRatePerPeriod ? loanProduct.maxInterestRatePerPeriod : loanProduct.interestRatePerPeriod)
+ ')'}} {{ loanProduct.interestRateFrequencyType?.value | translateCatalog }}</span>
+ ')'}} {{ loanProduct.interestRateFrequencyType?.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill *ngIf="loanProduct.isLinkedToFloatingInterestRates" fxLayout="row wrap" fxLayout.lt-md="column">
@@ -148,7 +148,7 @@
<ng-container matColumnDef="valueConditionType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Condition' | translate}} </th>
<td mat-cell *matCellDef="let variation">
{{ variation.valueConditionType.value | translateCatalog }}
{{ variation.valueConditionType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -197,7 +197,7 @@
<ng-container matColumnDef="valueConditionType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Condition' | translate}} </th>
<td mat-cell *matCellDef="let variation">
{{ variation.valueConditionType.value | translateCatalog }}
{{ variation.valueConditionType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -246,7 +246,7 @@
<ng-container matColumnDef="valueConditionType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Condition' | translate}} </th>
<td mat-cell *matCellDef="let variation">
{{ variation.valueConditionType.value | translateCatalog }}
{{ variation.valueConditionType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -287,12 +287,12 @@
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Repay Every' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.repaymentEvery }} {{ loanProduct.repaymentFrequencyType.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.repaymentEvery }} {{ loanProduct.repaymentFrequencyType.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill *ngIf="loanProduct.fixedLength">
<span fxFlex="47%">{{ 'labels.inputs.Fixed Length' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.fixedLength }} {{ loanProduct.repaymentFrequencyType.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.fixedLength }} {{ loanProduct.repaymentFrequencyType.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill *ngIf="loanProduct.minimumDaysBetweenDisbursalAndFirstRepayment">
@@ -306,7 +306,7 @@
<div fxFlexFill *ngIf="loanProduct.amortizationType?.value">
<span fxFlex="47%">{{ 'labels.inputs.Amortization' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.amortizationType.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.amortizationType.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
@@ -316,12 +316,12 @@
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Interest Method' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.interestType?.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.interestType?.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Interest Calculation Period' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.interestCalculationPeriodType?.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.interestCalculationPeriodType?.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill *ngIf="loanProduct.allowPartialPeriodInterestCalculation">
@@ -335,12 +335,12 @@
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Loan Schedule Type' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.loanScheduleType.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.loanScheduleType.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Repayment Strategy' | translate}}:</span>
<span fxFlex="53%" class="repayment-strategy">{{ loanProduct.transactionProcessingStrategyName | translateCatalog }}</span>
<span fxFlex="53%" class="repayment-strategy">{{ loanProduct.transactionProcessingStrategyName | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill *ngIf="isAdvancedPaymentAllocation">
@@ -431,12 +431,12 @@
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Days in year' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.daysInYearType?.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.daysInYearType?.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="47%">{{ 'labels.inputs.Days in month' | translate}}:</span>
<span fxFlex="53%">{{ loanProduct.daysInMonthType?.value | translateCatalog }}</span>
<span fxFlex="53%">{{ loanProduct.daysInMonthType?.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
@@ -655,7 +655,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Charge Type' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -669,7 +669,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -694,7 +694,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Charge Type' | translate }} </th>
<td mat-cell *matCellDef="let overdueCharge">
{{ overdueCharge.chargeCalculationType.value | translateCatalog }}
{{ overdueCharge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -708,7 +708,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' | translate }} </th>
<td mat-cell *matCellDef="let overdueCharge">
{{ overdueCharge.chargeTimeType.value | translateCatalog }}
{{ overdueCharge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
src/app/products/loan-products/loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component.html
+4 -4
View File
@@ -31,7 +31,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -45,7 +45,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -100,7 +100,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let overdueCharge">
{{ overdueCharge.chargeCalculationType.value | translateCatalog }}
{{ overdueCharge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -114,7 +114,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let overdueCharge">
{{ overdueCharge.chargeTimeType.value | translateCatalog }}
{{ overdueCharge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/advance-payment-allocation-tab/advance-payment-allocation-tab.component.html
+3 -3
View File
@@ -26,7 +26,7 @@
<ng-container matColumnDef="allocationRule">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Payment Allocation Rule' | translate }}</th>
<td mat-cell *matCellDef="let paymentAllocation"> {{ paymentAllocation.value | translateCatalog }} </td>
<td mat-cell *matCellDef="let paymentAllocation"> {{ paymentAllocation.value | translateKey:'catalogs' }} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
@@ -52,7 +52,7 @@
<ng-container matColumnDef="allocationRule">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Credit Allocation Rule' | translate }}</th>
<td mat-cell *matCellDef="let creditAllocation"> {{ creditAllocation.value | translateCatalog }} </td>
<td mat-cell *matCellDef="let creditAllocation"> {{ creditAllocation.value | translateKey:'catalogs' }} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
@@ -65,7 +65,7 @@
<mat-select [formControl]="futureInstallmentAllocationRule">
<mat-option *ngFor="let futureInstallmentAllocationRule of advancedPaymentAllocation.futureInstallmentAllocationRules"
[value]="futureInstallmentAllocationRule.code">
{{ futureInstallmentAllocationRule.value | translateCatalog }}
{{ futureInstallmentAllocationRule.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html
+2 -2
View File
@@ -3,7 +3,7 @@
<mat-tab *ngFor="let advancedPaymentAllocation of advancedPaymentAllocations">
<ng-template mat-tab-label>
{{advancedPaymentAllocation.transaction.value | translateCatalog}}
{{advancedPaymentAllocation.transaction.value | translateKey:'catalogs'}}
</ng-template>
<mifosx-advance-payment-allocation-tab [advancedPaymentAllocation]="advancedPaymentAllocation"
(allocationChanged)="allocationChanged($event)"
@@ -13,7 +13,7 @@
<mat-tab *ngFor="let advancedCreditAllocation of advancedCreditAllocations">
<ng-template mat-tab-label>
{{advancedCreditAllocation.transaction.value | translateCatalog}}
{{advancedCreditAllocation.transaction.value | translateKey:'catalogs'}}
</ng-template>
<mifosx-advance-payment-allocation-tab [advancedCreditAllocation]="advancedCreditAllocation"
(allocationChanged)="allocationChanged($event)"
src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
+15 -15
View File
@@ -18,7 +18,7 @@
<mat-label>{{'labels.inputs.Interest Method' | translate}}</mat-label>
<mat-select formControlName="interestType" matTooltip="The Interest method value is input to calculating the payments amount for repayment of the loan. " required>
<mat-option *ngFor="let interestType of interestTypeData" [value]="interestType.id">
{{ interestType.value | translateCatalog }}
{{ interestType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -31,7 +31,7 @@
<mat-select formControlName="interestCalculationPeriodType" matTooltip="Daily - Will Calculate the interest on DAILY basis ex: Month of February has 28days
and it will calculate interest for 28days, SAME AS REPAYMENT PERIOD- it calculates for the month,that is, 30days." required>
<mat-option *ngFor="let interestCalculationPeriodType of interestCalculationPeriodTypeData" [value]="interestCalculationPeriodType.id">
{{ interestCalculationPeriodType.value | translateCatalog }}
{{ interestCalculationPeriodType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -58,7 +58,7 @@
<mat-label>{{'labels.inputs.Loan Schedule Type' | translate}}</mat-label>
<mat-select formControlName="loanScheduleType" required>
<mat-option *ngFor="let loanScheduleType of loanScheduleTypeData" [value]="loanScheduleType.code">
{{ loanScheduleType.value | translateCatalog }}
{{ loanScheduleType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -68,7 +68,7 @@
<mat-select formControlName="transactionProcessingStrategyCode" matTooltip="The repayment strategy determines the sequence in which each of the components is paid."
required [disabled]="advancedTransactionProcessingStrategyDisabled">
<mat-option *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyData" [value]="transactionProcessingStrategy.code">
{{ transactionProcessingStrategy.name | translateCatalog }}
{{ transactionProcessingStrategy.name | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -80,7 +80,7 @@
<mat-label>{{'labels.inputs.Loan Schedule Processing Type' | translate}}</mat-label>
<mat-select formControlName="loanScheduleProcessingType" required>
<mat-option *ngFor="let loanScheduleProcessingType of loanScheduleProcessingTypeData" [value]="loanScheduleProcessingType.code">
{{ loanScheduleProcessingType.value | translateCatalog }}
{{ loanScheduleProcessingType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -189,7 +189,7 @@
<mat-label>{{'labels.inputs.Days in year' | translate}}</mat-label>
<mat-select matTooltip="The setting for number of days in year to use to calculate interest" formControlName="daysInYearType" required>
<mat-option *ngFor="let daysInYearType of daysInYearTypeData" [value]="daysInYearType.id">
{{ daysInYearType.value | translateCatalog }}
{{ daysInYearType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -201,7 +201,7 @@
<mat-label>{{'labels.inputs.Days in month' | translate}}</mat-label>
<mat-select matTooltip="Number of days in month." formControlName="daysInMonthType" required>
<mat-option *ngFor="let daysInMonthType of daysInMonthTypeData" [value]="daysInMonthType.id">
{{ daysInMonthType.value | translateCatalog }}
{{ daysInMonthType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -282,7 +282,7 @@
<mat-label>{{'labels.inputs.Pre-closure interest calculation rule' | translate}}</mat-label>
<mat-select formControlName="preClosureInterestCalculationStrategy" required>
<mat-option *ngFor="let preClosureInterestCalculationStrategy of preClosureInterestCalculationStrategyData" [value]="preClosureInterestCalculationStrategy.id">
{{ preClosureInterestCalculationStrategy.value | translateCatalog }}
{{ preClosureInterestCalculationStrategy.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -294,7 +294,7 @@
<mat-label>{{'labels.inputs.Advance payments adjustment type' | translate}}</mat-label>
<mat-select formControlName="rescheduleStrategyMethod" required>
<mat-option *ngFor="let rescheduleStrategyType of rescheduleStrategyTypeData" [value]="rescheduleStrategyType.id">
{{ rescheduleStrategyType.value | translateCatalog }}
{{ rescheduleStrategyType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -306,7 +306,7 @@
<mat-label>{{'labels.inputs.Interest recalculation compounding on' | translate}}</mat-label>
<mat-select formControlName="interestRecalculationCompoundingMethod" required>
<mat-option *ngFor="let interestRecalculationCompoundingType of interestRecalculationCompoundingTypeData" [value]="interestRecalculationCompoundingType.id">
{{ interestRecalculationCompoundingType.value | translateCatalog }}
{{ interestRecalculationCompoundingType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -352,7 +352,7 @@
<mat-form-field fxFlexFill>
<mat-select formControlName="recalculationCompoundingFrequencyNthDayType">
<mat-option *ngFor="let interestRecalculationNthDayType of interestRecalculationNthDayTypeData" [value]="interestRecalculationNthDayType.id">
{{ interestRecalculationNthDayType.value | translateCatalog }}
{{ interestRecalculationNthDayType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -365,7 +365,7 @@
<mat-form-field fxFlexFill>
<mat-select formControlName="recalculationCompoundingFrequencyDayOfWeekType">
<mat-option *ngFor="let interestRecalculationDayOfWeekType of interestRecalculationDayOfWeekTypeData" [value]="interestRecalculationDayOfWeekType.id">
{{ interestRecalculationDayOfWeekType.value | translateCatalog }}
{{ interestRecalculationDayOfWeekType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -391,7 +391,7 @@
<mat-label>{{'labels.inputs.Frequency for recalculate Outstanding Principal' | translate}}</mat-label>
<mat-select formControlName="recalculationRestFrequencyType" required>
<mat-option *ngFor="let interestRecalculationFrequencyType of interestRecalculationFrequencyTypeData" [value]="interestRecalculationFrequencyType.id">
{{ interestRecalculationFrequencyType.value | translateCatalog }}
{{ interestRecalculationFrequencyType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -404,7 +404,7 @@
<mat-form-field fxFlexFill>
<mat-select formControlName="recalculationRestFrequencyNthDayType">
<mat-option *ngFor="let interestRecalculationNthDayType of interestRecalculationNthDayTypeData" [value]="interestRecalculationNthDayType.id">
{{ interestRecalculationNthDayType.value | translateCatalog }}
{{ interestRecalculationNthDayType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -417,7 +417,7 @@
<mat-form-field fxFlexFill>
<mat-select formControlName="recalculationRestFrequencyDayOfWeekType">
<mat-option *ngFor="let interestRecalculationDayOfWeekType of interestRecalculationDayOfWeekTypeData" [value]="interestRecalculationDayOfWeekType.id">
{{ interestRecalculationDayOfWeekType.value | translateCatalog }}
{{ interestRecalculationDayOfWeekType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
+5 -5
View File
@@ -37,7 +37,7 @@
<mat-label>{{'labels.inputs.Over Amount Calculation Type' | translate}}</mat-label>
<mat-select formControlName="overAppliedCalculationType" required>
<mat-option *ngFor="let overAppliedCalculationType of overAppliedCalculationTypeData" [value]="overAppliedCalculationType.id">
{{ overAppliedCalculationType.value | translateCatalog }}
{{ overAppliedCalculationType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -52,7 +52,7 @@
<mat-label>{{'labels.inputs.Installment day calculation from' | translate}} <i class="fas fa-question" matTooltip="Repayment schedule will start the installment dates from the submitted date or the disbursement date"></i></mat-label>
<mat-select formControlName="repaymentStartDateType" required>
<mat-option *ngFor="let repaymentStartDateType of repaymentStartDateTypeOptions" [value]="repaymentStartDateType.id">
{{ repaymentStartDateType.value | translateCatalog}}
{{ repaymentStartDateType.value | translateKey:'catalogs'}}
</mat-option>
</mat-select>
</mat-form-field>
@@ -127,7 +127,7 @@
<mat-label>{{'labels.inputs.Frequency' | translate}}</mat-label>
<mat-select formControlName="interestRateFrequencyType" required [disabled]="isZeroInterest()">
<mat-option *ngFor="let interestRateFrequencyType of interestRateFrequencyTypeData" [value]="interestRateFrequencyType.id">
{{ interestRateFrequencyType.value | translateCatalog }}
{{ interestRateFrequencyType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -408,7 +408,7 @@
<mat-label>{{'labels.inputs.Frequency Type' | translate}}</mat-label>
<mat-select formControlName="repaymentFrequencyType" required>
<mat-option *ngFor="let repaymentFrequencyType of repaymentFrequencyTypeData" [value]="repaymentFrequencyType.id">
{{ repaymentFrequencyType.value | translateCatalog }}
{{ repaymentFrequencyType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -423,7 +423,7 @@
<mat-label>{{'labels.inputs.Fixed Length' | translate}}</mat-label>
<input type="number" matInput formControlName="fixedLength">
</mat-form-field>
<span fxFlex="30%" *ngIf="allowFixedLength()" class="label-field">{{ loanProductTermsForm.value.repaymentFrequencyType | find:repaymentFrequencyTypeData:'id':'value' | translateCatalog }}</span>
<span fxFlex="30%" *ngIf="allowFixedLength()" class="label-field">{{ loanProductTermsForm.value.repaymentFrequencyType | find:repaymentFrequencyTypeData:'id':'value' | translateKey:'catalogs' }}</span>
<mat-form-field fxFlex="48%">
<mat-label>{{'labels.inputs.Minimum days between disbursal and first repayment date' | translate}}</mat-label>
src/app/products/loan-products/view-loan-product/shared/view-advance-paymeny-allocation/view-advance-paymeny-allocation.component.html
+4 -4
View File
@@ -12,7 +12,7 @@
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Future Installment Allocation Rule' | translate }}:</span>
<span fxFlex="60%">{{ futureInstallmentRuleValue(paymentAllocation.futureInstallmentAllocationRule) | translateCatalog }}</span>
<span fxFlex="60%">{{ futureInstallmentRuleValue(paymentAllocation.futureInstallmentAllocationRule) | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
@@ -28,7 +28,7 @@
<tbody>
<tr *ngFor="let paymentAllocation of paymentAllocation.paymentAllocationOrder; let idx = index;">
<td>{{ (idx + 1) }}</td>
<td>{{ allocationRuleValue(paymentAllocation.paymentAllocationRule) | translateCatalog }}</td>
<td>{{ allocationRuleValue(paymentAllocation.paymentAllocationRule) | translateKey:'catalogs' }}</td>
</tr>
</tbody>
</table>
@@ -61,11 +61,11 @@
<tbody>
<tr *ngFor="let creditAllocation of creditAllocation.creditAllocationOrder; let idx = index;">
<td>{{ (idx + 1) }}</td>
<td>{{ allocationRuleValue(creditAllocation.creditAllocationRule) | translateCatalog}}</td>
<td>{{ allocationRuleValue(creditAllocation.creditAllocationRule) | translateKey:'catalogs'}}</td>
</tr>
</tbody>
</table>
</span>
</div>
</div>
</mat-expansion-panel>
</mat-expansion-panel>
src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.html
+2 -2
View File
@@ -34,7 +34,7 @@
<mat-label>{{'labels.inputs.Debit Account Type' | translate}}</mat-label>
<mat-select formControlName="debitAccountType">
<mat-option *ngFor="let debitAccountType of debitAccountTypeData" [value]="debitAccountType.id">
{{ debitAccountType.value | translateCatalog }}
{{ debitAccountType.value | translateKey:'inputs.accounting' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -48,7 +48,7 @@
<mat-label>{{'labels.inputs.Credit Account Type' | translate}}</mat-label>
<mat-select formControlName="creditAccountType">
<mat-option *ngFor="let creditAccountType of creditAccountTypeData" [value]="creditAccountType.id">
{{ creditAccountType.value | translateCatalog }}
{{ creditAccountType.value | translateKey:'inputs.accounting' }}
</mat-option>
</mat-select>
</mat-form-field>
src/app/products/manage-tax-components/view-tax-component/view-tax-component.component.html
+1 -1
View File
@@ -50,7 +50,7 @@
</div>
<div fxFlex="50%" *ngIf="taxComponentData.creditAccountType">
{{ taxComponentData.creditAccountType.value | translateCatalog }}
{{ taxComponentData.creditAccountType.value | translateKey:'catalogs' }}
</div>
<div fxFlex="50%" class="mat-body-strong" *ngIf="taxComponentData.creditAccount">
src/app/products/saving-products/saving-product-stepper/saving-product-charges-step/saving-product-charges-step.component.html
+2 -2
View File
@@ -28,7 +28,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -42,7 +42,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
src/app/products/saving-products/saving-product-stepper/saving-product-preview-step/saving-product-preview-step.component.html
+7 -7
View File
@@ -48,22 +48,22 @@
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Interest Compounding Period' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType | find:savingProductsTemplate.interestCompoundingPeriodTypeOptions:'id':'value' | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType | find:savingProductsTemplate.interestCompoundingPeriodTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Interest Posting Period' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestPostingPeriodType | find:savingProductsTemplate.interestPostingPeriodTypeOptions:'id':'value' | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestPostingPeriodType | find:savingProductsTemplate.interestPostingPeriodTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Interest Calculated using' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationType | find:savingProductsTemplate.interestCalculationTypeOptions:'id':'value' | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationType | find:savingProductsTemplate.interestCalculationTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Days in Year' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType | find:savingProductsTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType | find:savingProductsTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
</div>
<h3 class="mat-h3" fxFlexFill>{{'labels.inputs.Settings' | translate}}</h3>
@@ -77,7 +77,7 @@
<div fxFlexFill *ngIf="savingProduct.lockinPeriodFrequency">
<span fxFlex="40%">{{'labels.inputs.Lock-in Period' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.lockinPeriodFrequency + ' ' + (savingProduct.lockinPeriodFrequencyType | find:savingProductsTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.lockinPeriodFrequency + ' ' + (savingProduct.lockinPeriodFrequencyType | find:savingProductsTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
@@ -162,7 +162,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -176,7 +176,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
src/app/products/saving-products/saving-product-stepper/saving-product-settings-step/saving-product-settings-step.component.html
+1 -1
View File
@@ -17,7 +17,7 @@
<mat-form-field fxFlex="48%">
<mat-select formControlName="lockinPeriodFrequencyType">
<mat-option *ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData" [value]="lockinPeriodFrequencyType.id">
{{ lockinPeriodFrequencyType.value | translateCatalog }}
{{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
src/app/products/saving-products/saving-product-stepper/saving-product-terms-step/saving-product-terms-step.component.html
+4 -4
View File
@@ -16,7 +16,7 @@
<mat-label>{{'labels.inputs.Interest Compounding Period' | translate}}</mat-label>
<mat-select formControlName="interestCompoundingPeriodType" matTooltip="The period at which interest rate is compounded" required>
<mat-option *ngFor="let interestCompoundingPeriodType of interestCompoundingPeriodTypeData" [value]="interestCompoundingPeriodType.id">
{{ interestCompoundingPeriodType.value | translateCatalog }}
{{ interestCompoundingPeriodType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -28,7 +28,7 @@
<mat-label>{{'labels.inputs.Interest Posting Period' | translate}}</mat-label>
<mat-select formControlName="interestPostingPeriodType" matTooltip="The period at which interest rate is posted or credited to a saving account" required>
<mat-option *ngFor="let interestPostingPeriodType of interestPostingPeriodTypeData" [value]="interestPostingPeriodType.id">
{{ interestPostingPeriodType.value | translateCatalog }}
{{ interestPostingPeriodType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -40,7 +40,7 @@
<mat-label>{{'labels.inputs.Interest Calculated using' | translate}}</mat-label>
<mat-select formControlName="interestCalculationType" matTooltip="The method used to calculate interest" required>
<mat-option *ngFor="let interestCalculationType of interestCalculationTypeData" [value]="interestCalculationType.id">
{{ interestCalculationType.value | translateCatalog }}
{{ interestCalculationType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
@@ -52,7 +52,7 @@
<mat-label>{{'labels.inputs.Days in Year' | translate}}</mat-label>
<mat-select formControlName="interestCalculationDaysInYearType" matTooltip="The setting for number of days in year to use to calculate interest" required>
<mat-option *ngFor="let interestCalculationDaysInYearType of interestCalculationDaysInYearTypeData" [value]="interestCalculationDaysInYearType.id">
{{ interestCalculationDaysInYearType.value | translateCatalog }}
{{ interestCalculationDaysInYearType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
<mat-error>
src/app/products/saving-products/view-saving-product/saving-product-general-tab/saving-product-general-tab.component.html
+7 -7
View File
@@ -57,22 +57,22 @@
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Interest Compounding Period' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType.value | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Interest Posting Period' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestPostingPeriodType.value | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestPostingPeriodType.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Interest Calculated using' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationType.value | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationType.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{'labels.inputs.Days in Year' | translate}}:</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType.value | translateCatalog }}</span>
<span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType.value | translateKey:'catalogs' }}</span>
</div>
<h3 class="mat-h3" fxFlexFill>{{'labels.heading.Settings' | translate}}</h3>
@@ -172,7 +172,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -186,7 +186,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -206,7 +206,7 @@
[accountingMappings]="savingProduct.accountingMappings"
>
</mifosx-view-savings-accounting-details>
<div
*ngIf="savingProduct.paymentChannelToFundSourceMappings?.length || savingProduct.feeToIncomeAccountMappings?.length || savingProduct.penaltyToIncomeAccountMappings?.length"
fxFlexFill fxLayout="row wrap" fxLayout.lt-md="column">
src/app/products/share-products/share-product-stepper/share-product-charges-step/share-product-charges-step.component.html
+2 -2
View File
@@ -28,7 +28,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -42,7 +42,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
src/app/products/share-products/share-product-stepper/share-product-preview-step/share-product-preview-step.component.html
+2 -2
View File
@@ -132,7 +132,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -146,7 +146,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
src/app/products/share-products/share-product-stepper/share-product-settings-step/share-product-settings-step.component.html
+2 -2
View File
@@ -33,7 +33,7 @@
<mat-label>{{'labels.inputs.Type' | translate}}</mat-label>
<mat-select formControlName="minimumactiveperiodFrequencyType">
<mat-option *ngFor="let minimumActivePeriodFrequencyType of minimumActivePeriodFrequencyTypeData" [value]="minimumActivePeriodFrequencyType.id">
{{ minimumActivePeriodFrequencyType.value | translateCatalog }}
{{ minimumActivePeriodFrequencyType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
@@ -49,7 +49,7 @@
<mat-label>{{'labels.inputs.Type' | translate}}</mat-label>
<mat-select formControlName="lockinPeriodFrequencyType">
<mat-option *ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData" [value]="lockinPeriodFrequencyType.id">
{{ lockinPeriodFrequencyType.value | translateCatalog }}
{{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }}
</mat-option>
</mat-select>
</mat-form-field>
src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.html
+12 -12
View File
@@ -89,12 +89,12 @@
<div fxFlexFill *ngIf="shareProduct.minimumActivePeriod">
<span fxFlex="40%">{{'labels.inputs.Minimum Active Period' | translate}}:</span>
<span fxFlex="60%">{{ shareProduct.minimumActivePeriod }} {{ shareProduct.minimumActivePeriodForDividendsTypeEnum.value | translateCatalog }}</span>
<span fxFlex="60%">{{ shareProduct.minimumActivePeriod }} {{ shareProduct.minimumActivePeriodForDividendsTypeEnum.value | translateKey:'catalogs' }}</span>
</div>
<div fxFlexFill *ngIf="shareProduct.lockinPeriod">
<span fxFlex="40%">{{'labels.inputs.Lock-in Period' | translate}}:</span>
<span fxFlex="60%">{{ shareProduct.lockinPeriod }} {{ shareProduct.lockPeriodTypeEnum.value | translateCatalog}}</span>
<span fxFlex="60%">{{ shareProduct.lockinPeriod }} {{ shareProduct.lockPeriodTypeEnum.value | translateKey:'catalogs'}}</span>
</div>
<div fxFlexFill>
@@ -149,7 +149,7 @@
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateCatalog }}
{{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -163,7 +163,7 @@
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateCatalog }}
{{ charge.chargeTimeType.value | translateKey:'catalogs' }}
</td>
</ng-container>
@@ -188,33 +188,33 @@
<h4 fxFlexFill class="mat-h4">{{'labels.heading.Assets' | translate}}</h4>
<div fxFlexFill>
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Share reference'"
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Share reference'"
[glAccount]="shareProduct.accountingMappings.shareReferenceId" [withTitle]="'40%'">
</mifosx-gl-account-display>
</mifosx-gl-account-display>
</div>
<h4 fxFlexFill class="mat-h4">{{'labels.heading.Liabilities' | translate}}</h4>
<div fxFlexFill>
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Share suspense control'"
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Share suspense control'"
[glAccount]="shareProduct.accountingMappings.shareSuspenseId" [withTitle]="'40%'">
</mifosx-gl-account-display>
</mifosx-gl-account-display>
</div>
<h4 fxFlexFill class="mat-h4">{{'labels.heading.Share Equity' | translate}}</h4>
<div fxFlexFill>
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Equity'"
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Equity'"
[glAccount]="shareProduct.accountingMappings.shareEquityId" [withTitle]="'40%'">
</mifosx-gl-account-display>
</mifosx-gl-account-display>
</div>
<h4 fxFlexFill class="mat-h4">{{'labels.heading.Income' | translate}}</h4>
<div fxFlexFill>
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Income from fees'"
<mifosx-gl-account-display fxFlex="100%" [accountTitle]="'Income from fees'"
[glAccount]="shareProduct.accountingMappings.incomeFromFeeAccountId" [withTitle]="'40%'">
</mifosx-gl-account-display>
</mifosx-gl-account-display>
</div>
</div>