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

QA - Release/1.0.28 prepare #344

Merged
merged 10 commits into from
Mar 6, 2024
Merged

QA - Release/1.0.28 prepare #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c5321b7
Improvements/FBR-615: Schedular Jobs Improvements (#337)
fiter-julius-oketayot Mar 4, 2024
ef59d8d
Edit loan application validatoins
BrianMuhimbura Mar 4, 2024
62125e5
Merge pull request #339 from fiterlatam/fix/FBR-614
BrianMuhimbura Mar 4, 2024
00458ea
new loan application current loans validation
BrianMuhimbura Mar 5, 2024
7aa4f89
Merge branch 'fiter/fb/dev' of https://github.com/fiterlatam/communit…
BrianMuhimbura Mar 5, 2024
a2f6cb5
Improvements/FBR-615: Schedular Jobs Improvements - V2 (#341)
fiter-julius-oketayot Mar 5, 2024
edadbe7
Merge pull request #340 from fiterlatam/fix/FBR-590
BrianMuhimbura Mar 5, 2024
3d0b6aa
Update locale-es.json (#342)
leonardohildt Mar 5, 2024
58db336
Bugs/FBR-597-FBR-596-FBR-576: Refactor Hard Policy Checks (#343)
fiter-julius-oketayot Mar 6, 2024
fee05b4
Merge branch 'fiter/fb/dev' into release/1.0.28-prepare
fiter-julius-oketayot Mar 6, 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
41 changes: 41 additions & 0 deletions app/global-translations/locale-en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5407,5 +5407,46 @@
"DaysInYearType.invalid": "Invalid",
"DaysInMonthType.actual": "Actual",
"DaysInMonthType.days360": "30 Days",
"update.loan.arrears.ageing": "4. Update Loan Arrears Ageing",
"apply.annual.fee.for.savings": "Apply Annual Fee For Savings",
"apply.holidays.to.loans": "1. Apply Holidays To Loans",
"post.interest.for.savings": "Post Interest For Savings",
"transfer.fee.for.loans.from.savings": "Transfer Fee For Loans From Savings",
"pay.due.savings.charges": "Pay Due Savings Charges",
"update.accounting.running.balances": "10. Update Accounting Running Balances",
"execute.standing.instruction": "Execute Standing Instruction",
"add.accrual.transactions": "6. Add Accrual Transactions",
"apply.penalty.to.overdue.loans": "2. Apply penalty to overdue loans",
"update.non.performing.assets": "3. Update Non Performing Assets",
"transfer.interest.to.savings": "Transfer Interest To Savings",
"update.deposit.accounts.maturity.details": "Update Deposit Accounts Maturity details",
"add.periodic.accrual.transactions": "8. Add Periodic Accrual Transactions",
"recalculate.interest.for.loans": "5. Recalculate Interest For Loans",
"generate.mandatory.savings.schedule": "Generate Mandatory Savings Schedule",
"generate.loan.loss.provisioning": "9. Generate Loan Loss Provisioning",
"post.dividends.for.shares": "Post Dividends For Shares",
"update.savings.dormant.accounts": "Update Savings Dormant Accounts",
"add.accrual.transactions.for.loans.with.income.posted.as.transactions": "7. Add Accrual Transactions For Loans With Income Posted As Transactions",
"execute.report.mailing.jobs": "Execute Report Mailing Jobs",
"update.sms.outbound.with.campaign.message": "Update SMS Outbound with Campaign Message",
"send.messages.to.sms.gateway": "Send Messages to SMS Gateway",
"get.delivery.reports.from.sms.gateway": "Get Delivery Reports from SMS Gateway",
"execute.email": "Execute Email",
"update.email.outbound.with.campaign.message": "Update Email Outbound with campaign message",
"generate.adhocclient.schedule": "Generate AdhocClient Schedule",
"update.trial.balance.details": "11. Update Trial Balance Details",
"execute.all.dirty.jobs": "Execute All Dirty Jobs",
"increase.business.date.by.1.day": "Increase Business Date by 1 day",
"increase.cob.date.by.1.day": "Increase COB Date by 1 day",
"disable.expired.prequalifications": "12. Disable Expired Prequalifications",
"import.batches.of.loan.repayments": "13. Import Batches of Loan Repayments",
"scheduler.status.active": "Active",
"scheduler.status.standby": "Standy",
"scheduler.job.last.run.history.success": "Success",
"scheduler.job.last.run.history.failed": "Failed",
"scheduler.job.last.run.history.pending": "Failed",
"scheduler.job.last.run.history.error": "Error",
"scheduler.job.last.run.history.invalid": "invalid",
"label.heading.execution.order": "Execution Order",
"----End---": "--End of file--- "
}
47 changes: 44 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 @@ -4519,7 +4519,7 @@
"label.button.prequalification.submitToReview": "Enviar a Revisión",
"label.button.prequalification.sendToAnalysis": "Enviar a Unidad de Analisis",
"label.button.prequalification.sendtoexception": "Enviar a Aprobación por Excepción",
"label.button.hardpolicyvalidations": "Ver validaciones de políticas estrictas",
"label.button.hardpolicyvalidations": "Ver validaciones de políticas duras",
"label.category.newclient": "Categorización de clienta nueva",
"label.category.recurringcustomer": "Categorización de clienta recurrente",
"label.category.increasepercentage": "Porcentaje de incremento",
Expand Down Expand Up @@ -4551,8 +4551,8 @@
"label.heading.groupcredit.prequalification": "Precalificación de crédito grupal",
"label.heading.editgroup.prequalification": "Editar precalificación",
"label.heading.view.prequalification": "Ver Precalificación",
"label.heading.group.hard.policies": "Políticas estrictas del grupo",
"label.heading.members.hard.policies": "Políticas estrictas para los miembros",
"label.heading.group.hard.policies": "Políticas duras del grupo",
"label.heading.members.hard.policies": "Políticas duras para los miembros",
"label.anchor.bankcheques": "Cheques bancarios",
"label.view.bankcheques": "Gestionar cheques bancarios",
"label.heading.chequebatch": "lote de cheques bancarios",
Expand Down Expand Up @@ -5028,5 +5028,46 @@
"DaysInYearType.days364": "364 días",
"DaysInYearType.days365": "365 dias",
"DaysInYearType.invalid": "Invalid",
"update.loan.arrears.ageing": "4. Actualizar la antigüedad de los atrasos en los préstamos",
"apply.annual.fee.for.savings": "Aplicar tarifa anual para ahorros",
"apply.holidays.to.loans": "1. Aplicar días festivos a préstamos",
"post.interest.for.savings": "Publicar intereses para ahorros",
"transfer.fee.for.loans.from.savings": "Tarifa de transferencia para préstamos de ahorros",
"pay.due.savings.charges": "Pagar los cargos de ahorro adeudados",
"update.accounting.running.balances": "10. Actualizar saldos corrientes contables",
"execute.standing.instruction": "Ejecutar instrucción permanente",
"add.accrual.transactions": "6. Agregar transacciones de acumulación",
"apply.penalty.to.overdue.loans": "2. Aplicar penalización a préstamos vencidos",
"update.non.performing.assets": "3. Actualizar activos improductivos",
"transfer.interest.to.savings": "Transferir intereses a ahorros",
"update.deposit.accounts.maturity.details": "Actualizar detalles de vencimiento de cuentas de depósito",
"add.periodic.accrual.transactions": "8. Agregar transacciones de acumulación periódica",
"recalculate.interest.for.loans": "5. Recalcular el interés de los préstamos",
"generate.mandatory.savings.schedule": "Generar Cronograma de Ahorro Obligatorio",
"generate.loan.loss.provisioning": "9. Generar provisiones para pérdidas crediticias",
"post.dividends.for.shares": "Publicar dividendos para acciones",
"update.savings.dormant.accounts": "Actualizar cuentas de ahorro inactivas",
"add.accrual.transactions.for.loans.with.income.posted.as.transactions": "7. Agregar transacciones de acumulación para préstamos con ingresos contabilizados como transacciones",
"execute.report.mailing.jobs": "Ejecutar trabajos de envío de informes",
"update.sms.outbound.with.campaign.message": "Actualizar SMS salientes con mensaje de campaña",
"send.messages.to.sms.gateway": "Enviar mensajes a la puerta de enlace SMS",
"get.delivery.reports.from.sms.gateway": "Obtenga informes de entrega desde SMS Gateway",
"execute.email": "Ejecutar correo electrónico",
"update.email.outbound.with.campaign.message": "Actualizar correo electrónico saliente con mensaje de campaña",
"generate.adhocclient.schedule": "Generar programación AdhocClient",
"update.trial.balance.details": "11. Actualizar detalles del balance general",
"execute.all.dirty.jobs": "Ejecutar todos los trabajos sucios",
"increase.business.date.by.1.day": "Aumentar la fecha comercial en 1 día",
"increase.cob.date.by.1.day": "Aumentar la fecha COB en 1 día",
"disable.expired.prequalifications": "12. Deshabilitar precalificaciones vencidas",
"import.batches.of.loan.repayments": "13. Importar lotes de reembolsos de préstamos",
"scheduler.status.active": "Activo",
"scheduler.status.standby": "Apoyar",
"scheduler.job.last.run.history.success": "Éxito",
"scheduler.job.last.run.history.failed": "Fallido",
"scheduler.job.last.run.history.pending": "Pendiente",
"scheduler.job.last.run.history.error": "Error",
"scheduler.job.last.run.history.invalid": "Inválido",
"label.heading.execution.order": "Orden de ejecución",
"----End---": "---Fin del archivo---"
}
12 changes: 7 additions & 5 deletions app/scripts/controllers/loanAccount/EditLoanAccAppController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
}, function (data) {
scope.loanaccountinfo = data;
if (data.groupLoanAdditionalData) {
scope.formData.dateRequested=new Date(data.groupLoanAdditionalData.dateRequested) || new Date();
scope.formData.dateOfBirth=new Date(data.groupLoanAdditionalData.dateOfBirth) || new Date();
scope.formData.dateRequested=new Date(data.timeline.submittedOnDate) || new Date();
scope.formData.dateOfBirth=data.groupLoanAdditionalData.dateOfBirth? new Date(data.groupLoanAdditionalData.dateOfBirth) : new Date();
scope.formData.loanCycleCompleted=data.groupLoanAdditionalData.loanCycleCompleted;
scope.formData.earlyCancellationReason=data.groupLoanAdditionalData.earlyCancellationReason;
scope.formData.sourceOfFunds=data.groupLoanAdditionalData.sourceOfFunds;
scope.formData.clientLoanRequestNumber=data.groupLoanAdditionalData.clientLoanRequestNumber;
scope.formData.clientLoanRequestNumber=data.contractNo;
scope.formData.position=data.groupLoanAdditionalData.position;
scope.formData.facilitator=data.groupLoanAdditionalData.facilitatorId;
scope.formData.fullName=data.groupLoanAdditionalData.fullName;
Expand Down Expand Up @@ -128,6 +128,7 @@
scope.formData.clientId = scope.clientId;
resourceFactory.clientResource.get({clientId: scope.clientId}, function (clientData) {
scope.clientData = clientData;
scope.formData.dpi = clientData.dpiNumber;
scope.prequalificationOptions = clientData.clientPrequalifications;
if (scope.loanaccountinfo.prequalificationData && scope.loanaccountinfo.prequalificationData.id) {
scope.formData.prequalificationId = scope.loanaccountinfo.prequalificationData.id;
Expand Down Expand Up @@ -309,6 +310,7 @@
scope.cancellationReasonOptions = data.cancellationReasonOptions || [];
scope.facilitatorOptions = data.facilitatorOptions || [];
scope.documentTypeOptions = data.documentTypeOptions || [];
scope.economicSectorOptions = data.economicSectorOptions || [];
});

scope.previewClientLoanAccInfo = function () {
Expand Down Expand Up @@ -719,8 +721,8 @@
scope.formData.totalExternalLoanAmount = 0;
scope.formData.totalInstallments = 0;
angular.forEach(scope.currentLoans, function (currentLoan, index) {
scope.formData.totalExternalLoanAmount += currentLoan.totalLoanBalance;
scope.formData.totalInstallments += currentLoan.charges;
scope.formData.totalExternalLoanAmount += Number(currentLoan.totalLoanBalance?currentLoan.totalLoanBalance:0);
scope.formData.totalInstallments += Number(currentLoan.charges?currentLoan.charges:0);
});
}

Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/loanAccount/NewLoanAccAppController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@
scope.formData.totalExternalLoanAmount = 0;
scope.formData.totalInstallments = 0;
angular.forEach(scope.currentLoans, function (currentLoan, index) {
scope.formData.totalExternalLoanAmount += currentLoan.totalLoanBalance;
scope.formData.totalInstallments += currentLoan.charges;
scope.formData.totalExternalLoanAmount += Number(currentLoan.totalLoanBalance?currentLoan.totalLoanBalance:0);
scope.formData.totalInstallments += Number(currentLoan.charges?currentLoan.charges:0);
});
}

Expand Down
11 changes: 9 additions & 2 deletions app/scripts/controllers/system/SchedulerJobsController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
});

resourceFactory.schedulerResource.get(function (data) {
scope.schedulerstatus = data.active === true ? 'Active' : 'Standby';
scope.schedulerstatus = data.active === true ? 'scheduler.status.active' : 'scheduler.status.standby';
});

scope.selectAll = function (selectAll) {
Expand All @@ -20,13 +20,20 @@
} else {
for (var i = 0; i < scope.jobs.length; i++) {
jobIdArray = _.without(jobIdArray,scope.jobs[i].jobId);
scope.jobs[i].checkbox = false;
}
scope.jobs[i].checkbox = false;
}

jobIdArray = _.uniq(jobIdArray);
};

scope.resolvePreviousRunStatus = function (status){
if(status){
return 'scheduler.job.last.run.history.' + status;
}
return '';
}

scope.errorLog = function (id){
scope.id = id;
$uibModal.open({
Expand Down
Loading
Loading