Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.0.25 prepare #310

Merged
merged 9 commits into from
Feb 7, 2024
Merged

Release/1.0.25 prepare #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5c03a2
FBR-575: Mostrar un filtro para seleccionar la cartera (#304)
fiter-julius-oketayot Feb 5, 2024
d04762f
Enhancements/FBR-579: Standardize the format in the amounts (#305)
fiter-julius-oketayot Feb 5, 2024
3eb5ba3
fix fbr 427
BrianMuhimbura Feb 6, 2024
e4c5134
Merge pull request #306 from fiterlatam/fix/FBR-427
BrianMuhimbura Feb 6, 2024
2ad1c05
Enhancements/FBR-581: Add Spanish Translations (#307)
fiter-julius-oketayot Feb 6, 2024
de0d012
Update capital letter for label header (#308)
leonardohildt Feb 6, 2024
2e01fb3
fix fbr 578
BrianMuhimbura Feb 6, 2024
915ee83
Merge pull request #309 from fiterlatam/fix/FBR-578
BrianMuhimbura Feb 6, 2024
f889aad
Merge branch 'fiter/fb/dev' into v1.0.25-alpha-fb
fiter-julius-oketayot Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/global-translations/locale-en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4754,7 +4754,7 @@
"label.input.select.supervision" : "Select Supervision",
"label.input.supervisionResponsibleUser": "Responsible",
"label.heading.loanProductShortName":"Type",
"label.heading.loanTotalRepayment": "Paid",
"label.heading.loanTotalRepayment": "Payments",
"label.heading.loanTotalOverdue": "Overdue",
"label.heading.groupNumberOfClients": "Customers",
"label.heading.portfolioHeader": "Portfolio: ",
Expand Down Expand Up @@ -5305,7 +5305,7 @@
"label.description.additional.aniosComunidad": "Years community",
"label.description.additional.servicios": "Services",
"validation.msg.group.legacyNumber.not.greater.than.zero": "Old Group No. must be greater than zero",
"error.msg.prequalification.is.not.linked.to.a.group": "Asegúrese de que esta precalificación esté vinculada a un grupo.",
"error.msg.prequalification.is.not.linked.to.a.group": "Please ensure that this prequalification `{{params[0].value}}` is linked to a group",
"bank.cheque.status.invalid": "Invalidd",
"bank.cheque.status.available":"Available",
"bank.cheque.status.issued": "Issued",
Expand Down Expand Up @@ -5342,5 +5342,6 @@
"error.msg.meeting.date.meeting.end.time.earlier.than.start.time": "Meeting Start Time should be before meeting end time",
"label.anchor.createportfolio": "Create portfolio",
"label.button.createportfolio": "Create portfolio",
"label.heading.editbankaccount": "Edit bank account",
"----End---": "--End of file--- "
}
12 changes: 9 additions & 3 deletions app/global-translations/locale-es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4395,7 +4395,7 @@
"label.heading.portfolioHeader": "Cartera: ",
"label.heading.loanProductShortName":"Tipo",
"label.heading.loanTotalRepayment": "A Cobrar",
"label.heading.loanTotalOverdue": "Mora",
"label.heading.loanTotalOverdue": "En Mora",
"label.heading.groupNumberOfClients": "Clientes",
"label.heading.prequalification.validation.result": "Resultado de validación de Politicas Duras Grupal",
"label.heading.hard.policy.status": "Politica Dura",
Expand Down Expand Up @@ -4928,8 +4928,8 @@
"label.input.document.type": "Tipo de Documento",
"label.heading.prequalification.name": "Nombre de precalificación",
"validation.msg.group.legacyNumber.not.greater.than.zero": "El número de grupo antiguo debe ser mayor que cero.",
"error.msg.prequalification.is.not.linked.to.a.group": "Please ensure that this prequalification is linked to a group",
"label.addBankAccount": "Crear cuenta bancaria",
"error.msg.prequalification.is.not.linked.to.a.group": "Asegúrese de que esta precalificación `{{params[0].value}}` esté vinculada a un grupo",
"label.addBankAccount": "Nueva Cuenta Bancaria",
"validation.msg.blacklist.description.cannot.be.blank": "La descripción de la lista negra no puede estar vacía",
"validation.msg.loan.charges.not.greater.than.zero": "Los cargos del préstamo no pueden ser mayores que cero",
"bank.cheque.status.invalid": "Inválida",
Expand Down Expand Up @@ -4958,5 +4958,11 @@
"buro.check.classification.red": "Rojo",
"buro.check.classification.orange": "Naranja",
"error.msg.meeting.date.meeting.end.time.earlier.than.start.time": "La hora de inicio de la reunión debe ser anterior a la hora de finalización de la reunión.",
"label.anchor.createbankaccount": "Nueva cuenta bancaria",
"label.heading.createbankaccount": "Nueva Cuenta Bancaria",
"label.heading.editbankaccount": "Editar cuenta bancaria",
"label.input.glaccount.name": "Seleccione cuenta del libro mayor",
"label.input.bank": "Banco",
"label.heading.member.hardpolicy": "Resultados de Política Dura",
"----End---": "---Fin del archivo---"
}
20 changes: 4 additions & 16 deletions app/scripts/controllers/loanAccount/NewLoanAccAppController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,21 +179,6 @@
}
} ;

scope.resolveFrequencyRange = function (centerName){
if(centerName.includes('-R1-')){
scope.disableFrequencySelect = true;
return 1;
}if(centerName.includes('-R2-')){
scope.disableFrequencySelect = true;
return 2;
}if(centerName.includes('-R3-')){
scope.disableFrequencySelect = true;
return 3;
}if(centerName.includes('-R4-')){
scope.disableFrequencySelect = true;
return 4;
}
}
scope.loanProductChange = function (loanProductId) {
// _.isUndefined(scope.datatables) ? scope.tempDataTables = [] : scope.tempDataTables = scope.datatables;
// WizardHandler.wizard().removeSteps(1, scope.tempDataTables.length);
Expand All @@ -216,7 +201,10 @@
if (data.product.ownerTypeOption.value ==='Group'){
if (data.group){
scope.formData.repaymentFrequencyDayOfWeekType = scope.resolveFrequencyDayOfWeek(data.group.meetingDayName)
scope.formData.repaymentFrequencyNthDayType = scope.resolveFrequencyRange(data.group.centerName)
if (data.group.meetingFrequencyRange){
scope.disableFrequencySelect = true;
scope.formData.repaymentFrequencyNthDayType = data.group.meetingFrequencyRange
}
}
}
scope.loandetails.interestValue = scope.loanaccountinfo.interestType.value;
Expand Down
13 changes: 13 additions & 0 deletions app/scripts/controllers/organization/PortfoliosPlanningController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,19 @@
data.sort(sortByParentId);

});

scope.searchByName = function () {
const params = {
name: this.searchText,
};
resourceFactory.portfolioResource.getAllPortfoliosForCurrentUser(params, function (data) {
scope.portfolios = scope.deepCopy(data);
function sortByParentId(a, b) {
return a.parentId - b.parentId;
}
data.sort(sortByParentId);
});
}
}
});
mifosX.ng.application.controller('PortfoliosPlanningController', ['$scope', 'ResourceFactory', '$location', mifosX.controllers.PortfoliosPlanningController]).run(function ($log) {
Expand Down
12 changes: 4 additions & 8 deletions app/scripts/directives/NumberFormatDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,11 @@
num = num.replace(decimalSep, DECIMAL_SEP);
}
var fractionLength = (num.split(DECIMAL_SEP)[1] || []).length;

var initialnumber = "";
if ($locale.id == 'es') {
if (value != undefined) {
initialnumber = value.toLocaleString('en');
}
} else {
initialnumber = $filter('number')(num, fractionLength);
if(!fractionLength || fractionLength === 0){
fractionLength = 2;
}
var initialnumber = $filter('number')(num, fractionLength);

if (stringValue != undefined && stringValue.indexOf(DECIMAL_SEP) > 0 && decimalSep!= DECIMAL_SEP) {
if ($locale.id == 'es') {
num = value.toLocaleString('en');
Expand Down
13 changes: 7 additions & 6 deletions app/scripts/filters/FormatNumber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
mifosX.filters = _.extend(module, {
FormatNumber: function ($filter) {
return function (input, fractionSize) {
let formattedText = input;
if (isNaN(input)) {
return input;
formattedText = input;
} else {
//TODO- Add number formatting also
if (input != "" && input != undefined) {
return $filter('number')(input, fractionSize);
};
};
if (input !== "" && input !== undefined) {
formattedText = $filter('number')(input, fractionSize);
}
}
return formattedText;
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions app/views/accounting/search_transaction.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ <h4 class="control-label ng-binding">{{'label.heading.transactionid' | translate
</td>
<td class="pointer" data-ng-click="routeTo(transaction.transactionId)">
<div ng-show="transaction.entryType.value == 'DEBIT'">
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | number}}
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | FormatNumber:2}}
</div>
</td>
<td class="pointer" data-ng-click="routeTo(transaction.transactionId)">
<div ng-show="transaction.entryType.value == 'CREDIT'">
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | number}}
{{transaction.currency.displaySymbol}}&nbsp;{{transaction.amount | FormatNumber:2}}
</div>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions app/views/banks/bankcheques/approvechequesissuance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ <h4 class="pull-left">{{'label.anchor.approve.cheques.issuance' | translate}}</h
<td>{{cheque.bankAccNo}}</td>
<td>{{cheque.loanAmount && cheque.loanAmount>0? 'label.heading.disbursement':'label.heading.guarantees'|translate }}</td>
<td>{{cheque.clientName}}</td>
<td>{{cheque.chequeAmount}}</td>
<td>{{cheque.chequeAmount | FormatNumber:2 }}</td>
<td>{{cheque.depositNumber}}</td>
<td>{{cheque.guaranteeAmount}}</td>
<td>{{cheque.guaranteeAmount | FormatNumber:2}}</td>
<td>{{cheque.description}}</td>
<td>{{cheque.createdByUsername}}</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion app/views/banks/bankcheques/authorizechequesissuance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ <h4 class="pull-left">{{'label.anchor.authorize.cheques.issuance' | translate}}<
<td>{{cheque.batchNo}}</td>
<td>{{cheque.bankAccNo}}</td>
<td>{{cheque.loanAmount && cheque.loanAmount>0? 'label.heading.disbursement':'label.heading.guarantees'|translate }}</td>
<td>{{cheque.chequeAmount}}</td>
<td>{{cheque.chequeAmount | FormatNumber:2}}</td>
<td>{{cheque.status.code | translate}}</td>
<td>{{cheque.description}}</td>
<td>{{cheque.createdDate | DateFormat}}</td>
Expand Down
2 changes: 1 addition & 1 deletion app/views/banks/bankcheques/payguaranteeswithcheques.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h4 class="pull-left">{{'label.heading.pay.guarantees.by.cheques' | translate}}<
<td>{{guaranteeData.clientNo}}</td>
<td>{{guaranteeData.clientName}}</td>
<td>{{guaranteeData.withdrawalReason}}</td>
<td>{{guaranteeData.requestedAmount}}</td>
<td>{{guaranteeData.requestedAmount | FormatNumber:2}}</td>
<td>{{guaranteeData.status}}</td>
<td>{{guaranteeData.caseId}}</td>
<td ng-show="isChequeAssigned">{{guaranteeData.chequeData.accountName}}</td>
Expand Down
2 changes: 1 addition & 1 deletion app/views/groups/viewgroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ <h3 class="panel-title ng-binding">{{ 'label.heading.clients' | translate }}</h3
</div>
<div class="col-md-5" ng-if="group.prequalificationStatus">
<div class="alert alert-info" role="alert" style="word-break: break-word">
<strong>{{'label.heading.prequalificationstatus' | translate}}</strong> {{group.prequalificationStatus.value}}
<strong>{{'label.heading.prequalificationstatus' | translate}}</strong> {{group.prequalificationStatus.code | translate}}
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/views/loans/disburseloansbycheques.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ <h4 class="pull-left">{{'label.anchor.disburse.loans.by.cheques' | translate}}</
<td>{{loanAccount.clientName}}</td>
<td>{{loanAccount.loanProductName}}</td>
<td>{{loanAccount.expectedFirstRepaymentOnDate | DateFormat}}</td>
<td>{{loanAccount.approvedPrincipal}}</td>
<td>{{loanAccount.approvedPrincipal | FormatNumber:2}}</td>
<td>
<div class="checkbox form-group">
<label for="isSelected">
Expand All @@ -243,14 +243,14 @@ <h4 class="pull-left">{{'label.anchor.disburse.loans.by.cheques' | translate}}</
<td>
<div class="form-group" ng-show="loanAccount.isSelected">
<div class="input-group" style="width: 120px">
<input id="returnGuaranteeAmount" type="text" class="form-control" name="returnGuaranteeAmount" ng-value="calculateDiffWithZeroDefault(loanAccount.actualGuaranteeAmount, loanAccount.requiredGuaranteeAmount)" disabled>
<input id="returnGuaranteeAmount" type="text" class="form-control" name="returnGuaranteeAmount" ng-model="returnGuaranteeAmount" ng-value="calculateDiffWithZeroDefault(loanAccount.actualGuaranteeAmount, loanAccount.requiredGuaranteeAmount) | FormatNumber:2" disabled>
</div>
</div>
</td>
<td>
<div class="form-group" ng-show="loanAccount.isSelected">
<div class="input-group" style="width: 120px">
<input id="depositGuaranteeAmount" type="text" class="form-control" name="depositGuaranteeAmount" ng-value="calculateDepositAmount(loanAccount.requiredGuaranteeAmount, loanAccount.actualGuaranteeAmount)" disabled>
<input id="depositGuaranteeAmount" type="text" class="form-control" name="depositGuaranteeAmount" ng-model="depositGuaranteeAmount" ng-value="calculateDepositAmount(loanAccount.requiredGuaranteeAmount, loanAccount.actualGuaranteeAmount) | FormatNumber:2" disabled>
</div>
</div>
</td>
Expand Down
21 changes: 21 additions & 0 deletions app/views/organization/planningportfolios.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@
<div class="content">
<br>
<div class="clear"></div>
<div class="row">
<div class="col-sm-6">
<form ng-submit="searchByName()" class="form-horizontal">
<div class="pull-left">
<div class="form-group">
<div class="col-sm-6">
<div class="input-group" style="width: 400px">
<input data-ng-model="searchText" type="text"
placeholder="{{'label.input.searchByName' | translate}}"
class="form-control unstyled"/>
<span class="input-group-btn">
<button type="submit" class="btn btn-primary form-control" ng-disabled="!searchText">
<span class="fa fa-search"></span>
</button>
</span>
</div>
</div>
</div>
</div>
</form>
</div>
<div>
<table class="table">
<thead>
Expand Down
2 changes: 1 addition & 1 deletion app/views/organization/viewportfolioplanning.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ <h3><strong>{{ 'label.heading.portfolioHeader' | translate }}{{portfolio.name}}<
<td>{{planning.centerGroupId}}</td>
<td>{{planning.centerGroupName}}</td>
<td>{{'label.anchor.cobro' | translate}}</td>
<td>{{planning.totalOverdue |number}}</td>
<td>{{planning.totalRepayment |number}}</td>
<td>{{planning.totalOverdue |number}}</td>
<td>{{planning.numberOfClients}}</td>
</tr>
</tbody>
Expand Down
18 changes: 8 additions & 10 deletions app/views/prequalifications/prequalificationsGroups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,18 @@ <h4 class="pull-left">{{'label.anchor.prequalification.groups'| translate}}</h4>
</div>
</div>
<div class="col-md-6" ng-if="prequalificationType !='AGENCY_LEAD_PENDING_APPROVAL'">
<div class="control-label col-sm-6 text-white">
<div class="control-label col-sm-3 text-white">
<label>{{ 'label.input.status' | translate }}<span
class="required">*</span></label>
</div>
<div class="col-sm-6">
<select id="statusfilter" ng-change="getResultsPage(1)"
ng-model="formData.status" class="form-control"
ng-options="gpStatus.value as gpStatus.code|translate for gpStatus in groupStatusOptions "
value="{{gpStatus.id}}">
<option value="">{{'label.all' | translate}}</option>
</select>

<div class="col-sm-9">
<select id="statusfilter" ng-change="getResultsPage(1)"
ng-model="formData.status" class="form-control width170px"
ng-options="gpStatus.value as gpStatus.code|translate for gpStatus in groupStatusOptions "
value="{{gpStatus.id}}">
<option value="">{{'label.all' | translate}}</option>
</select>
</div>

</div>
</div>
</form>
Expand Down
Loading
Loading