From c5321b7d3a6669cdee9a08f6555adba83c97c898 Mon Sep 17 00:00:00 2001 From: fiter-julius-oketayot <140818859+fiter-julius-oketayot@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:29:45 +0300 Subject: [PATCH 1/6] Improvements/FBR-615: Schedular Jobs Improvements (#337) --- app/global-translations/locale-en.json | 35 +++++++++++++++++++ app/global-translations/locale-es.json | 35 +++++++++++++++++++ .../system/SchedulerJobsController.js | 2 +- app/views/system/schedulerjobs.html | 8 ++--- app/views/system/viewschedulerjob.html | 4 +-- 5 files changed, 77 insertions(+), 7 deletions(-) diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index d4d2f6690c..402647184a 100644 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -5407,5 +5407,40 @@ "DaysInYearType.invalid": "Invalid", "DaysInMonthType.actual": "Actual", "DaysInMonthType.days360": "30 Days", + "update.loan.arrears.ageing": "Update Loan Arrears Ageing", + "apply.annual.fee.for.savings": "Apply Annual Fee For Savings", + "apply.holidays.to.loans": "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": "Update Accounting Running Balances", + "execute.standing.instruction": "Execute Standing Instruction", + "add.accrual.transactions": "Add Accrual Transactions", + "apply.penalty.to.overdue.loans": "Apply penalty to overdue loans", + "update.non.performing.assets": "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": "Add Periodic Accrual Transactions", + "recalculate.interest.for.loans": "Recalculate Interest For Loans", + "generate.mandatory.savings.schedule": "Generate Mandatory Savings Schedule", + "generate.loan.loss.provisioning": "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": "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": "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": "Disable Expired Prequalifications", + "import.batches.of.loan.repayments": "Import Batches of Loan Repayments", + "scheduler.status.active": "Active", + "scheduler.status.standby": "Standy", "----End---": "--End of file--- " } diff --git a/app/global-translations/locale-es.json b/app/global-translations/locale-es.json index 5cf05669d9..c111cf5b30 100644 --- a/app/global-translations/locale-es.json +++ b/app/global-translations/locale-es.json @@ -5028,5 +5028,40 @@ "DaysInYearType.days364": "364 días", "DaysInYearType.days365": "365 dias", "DaysInYearType.invalid": "Invalid", + "update.loan.arrears.ageing": "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": "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": "Actualizar saldos corrientes contables", + "execute.standing.instruction": "Ejecutar instrucción permanente", + "add.accrual.transactions": "Agregar transacciones de acumulación", + "apply.penalty.to.overdue.loans": "Aplicar penalización a préstamos vencidos", + "update.non.performing.assets": "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": "Agregar transacciones de acumulación periódica", + "recalculate.interest.for.loans": "Recalcular el interés de los préstamos", + "generate.mandatory.savings.schedule": "Generar Cronograma de Ahorro Obligatorio", + "generate.loan.loss.provisioning": "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": "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": "Actualizar detalles del saldo de prueba", + "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": "Deshabilitar precalificaciones vencidas", + "import.batches.of.loan.repayments": "Importar lotes de reembolsos de préstamos", + "scheduler.status.active": "Activo", + "scheduler.status.standby": "Apoyar", "----End---": "---Fin del archivo---" } diff --git a/app/scripts/controllers/system/SchedulerJobsController.js b/app/scripts/controllers/system/SchedulerJobsController.js index 08ad5f3324..e903ff0873 100644 --- a/app/scripts/controllers/system/SchedulerJobsController.js +++ b/app/scripts/controllers/system/SchedulerJobsController.js @@ -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) { diff --git a/app/views/system/schedulerjobs.html b/app/views/system/schedulerjobs.html index bb522813cd..659524ddfd 100644 --- a/app/views/system/schedulerjobs.html +++ b/app/views/system/schedulerjobs.html @@ -8,11 +8,11 @@
- +

{{'label.heading.schedulerstatus' | translate}} : {{schedulerstatus}}

{{'label.heading.schedulerstatus' | translate}} : {{schedulerstatus | translate}}

 - - + +
@@ -42,7 +42,7 @@ - {{job.displayName}} + {{job.displayNameCode | translate}} {{job.nextRunTime}} {{job.lastRunHistory.jobRunStartTime}} {{job.lastRunHistory.status}} diff --git a/app/views/system/viewschedulerjob.html b/app/views/system/viewschedulerjob.html index 6366aec019..6e0e9dfc9b 100644 --- a/app/views/system/viewschedulerjob.html +++ b/app/views/system/viewschedulerjob.html @@ -2,7 +2,7 @@
@@ -22,7 +22,7 @@ - + From ef59d8d269117253ef089648c31cdb272b753ee6 Mon Sep 17 00:00:00 2001 From: Muhimbura Brian Mart Date: Mon, 4 Mar 2024 22:03:06 +0300 Subject: [PATCH 2/6] Edit loan application validatoins --- .../loanAccount/EditLoanAccAppController.js | 8 +++--- app/views/loans/editloanaccount.html | 25 ++++++------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js index 0b0e933828..43df93e3af 100755 --- a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js +++ b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js @@ -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; @@ -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; @@ -309,6 +310,7 @@ scope.cancellationReasonOptions = data.cancellationReasonOptions || []; scope.facilitatorOptions = data.facilitatorOptions || []; scope.documentTypeOptions = data.documentTypeOptions || []; + scope.economicSectorOptions = data.economicSectorOptions || []; }); scope.previewClientLoanAccInfo = function () { diff --git a/app/views/loans/editloanaccount.html b/app/views/loans/editloanaccount.html index 761bcb431b..7816539158 100755 --- a/app/views/loans/editloanaccount.html +++ b/app/views/loans/editloanaccount.html @@ -7,7 +7,7 @@
  • {{'label.anchor.modifyloanapplication' | translate}}
    • -
    +
    {{ 'label.heading.editloanapplication' | translate }} @@ -698,10 +698,9 @@

    {{'label.heading.general' | translate}}

    *:
    @@ -723,10 +722,9 @@

    {{'label.heading.general' | translate}}

    *: @@ -739,7 +737,7 @@

    {{'label.heading.general' | translate}}

    @@ -778,11 +775,11 @@

    {{'label.heading.general' | translate}}

    @@ -930,7 +927,6 @@

    {{'label.heading.basic' | translate}}

    @@ -944,9 +940,8 @@

    {{'label.heading.basic' | translate}}

     @@ -1378,7 +1372,6 @@

    {{'label.heading.currentLoanDetails' | translate}}

    @@ -1433,7 +1426,6 @@

    {{'label.heading.currentLoanDetails' | translate}}

    @@ -1524,7 +1516,6 @@

    {{'label.heading.currentLoanDetails' | translate}}

    @@ -1539,7 +1530,6 @@

    {{'label.heading.currentLoanDetails' | translate}}

    @@ -1552,7 +1542,6 @@

    {{'label.heading.currentLoanDetails' | translate}}

    From 00458ea4c1d46fdea5dddd8503753f03cf61895d Mon Sep 17 00:00:00 2001 From: Muhimbura Brian Mart Date: Tue, 5 Mar 2024 11:56:21 +0300 Subject: [PATCH 3/6] new loan application current loans validation --- .../controllers/loanAccount/EditLoanAccAppController.js | 4 ++-- .../controllers/loanAccount/NewLoanAccAppController.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js index 43df93e3af..89ce9087ce 100755 --- a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js +++ b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js @@ -721,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); }); } diff --git a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js index eafea3fc0a..3d23d7985c 100755 --- a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js +++ b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js @@ -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); }); } From a2f6cb5e0badbca39c33f05574203ca755857fe5 Mon Sep 17 00:00:00 2001 From: fiter-julius-oketayot <140818859+fiter-julius-oketayot@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:47:11 +0300 Subject: [PATCH 4/6] Improvements/FBR-615: Schedular Jobs Improvements - V2 (#341) --- app/global-translations/locale-en.json | 32 +++++++++++-------- app/global-translations/locale-es.json | 32 +++++++++++-------- .../system/SchedulerJobsController.js | 4 +++ app/views/system/schedulerjobs.html | 4 ++- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 402647184a..be47a8776e 100644 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -5407,26 +5407,26 @@ "DaysInYearType.invalid": "Invalid", "DaysInMonthType.actual": "Actual", "DaysInMonthType.days360": "30 Days", - "update.loan.arrears.ageing": "Update Loan Arrears Ageing", + "update.loan.arrears.ageing": "4. Update Loan Arrears Ageing", "apply.annual.fee.for.savings": "Apply Annual Fee For Savings", - "apply.holidays.to.loans": "Apply Holidays To Loans", + "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": "Update Accounting Running Balances", + "update.accounting.running.balances": "10. Update Accounting Running Balances", "execute.standing.instruction": "Execute Standing Instruction", - "add.accrual.transactions": "Add Accrual Transactions", - "apply.penalty.to.overdue.loans": "Apply penalty to overdue loans", - "update.non.performing.assets": "Update Non Performing Assets", + "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": "Add Periodic Accrual Transactions", - "recalculate.interest.for.loans": "Recalculate Interest For Loans", + "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": "Generate Loan Loss Provisioning", + "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": "Add Accrual Transactions For Loans With Income Posted As Transactions", + "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", @@ -5434,13 +5434,19 @@ "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": "Update Trial Balance Details", + "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": "Disable Expired Prequalifications", - "import.batches.of.loan.repayments": "Import Batches of Loan Repayments", + "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--- " } diff --git a/app/global-translations/locale-es.json b/app/global-translations/locale-es.json index c111cf5b30..71010f1cb6 100644 --- a/app/global-translations/locale-es.json +++ b/app/global-translations/locale-es.json @@ -5028,26 +5028,26 @@ "DaysInYearType.days364": "364 días", "DaysInYearType.days365": "365 dias", "DaysInYearType.invalid": "Invalid", - "update.loan.arrears.ageing": "Actualizar la antigüedad de los atrasos en los préstamos", + "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": "Aplicar días festivos a préstamos", + "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": "Actualizar saldos corrientes contables", + "update.accounting.running.balances": "10. Actualizar saldos corrientes contables", "execute.standing.instruction": "Ejecutar instrucción permanente", - "add.accrual.transactions": "Agregar transacciones de acumulación", - "apply.penalty.to.overdue.loans": "Aplicar penalización a préstamos vencidos", - "update.non.performing.assets": "Actualizar activos improductivos", + "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": "Agregar transacciones de acumulación periódica", - "recalculate.interest.for.loans": "Recalcular el interés de los préstamos", + "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": "Generar provisiones para pérdidas crediticias", + "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": "Agregar transacciones de acumulación para préstamos con ingresos contabilizados como transacciones", + "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", @@ -5055,13 +5055,19 @@ "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": "Actualizar detalles del saldo de prueba", + "update.trial.balance.details": "11. Actualizar detalles del saldo de prueba", "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": "Deshabilitar precalificaciones vencidas", - "import.batches.of.loan.repayments": "Importar lotes de reembolsos de préstamos", + "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---" } diff --git a/app/scripts/controllers/system/SchedulerJobsController.js b/app/scripts/controllers/system/SchedulerJobsController.js index e903ff0873..f8647a903a 100644 --- a/app/scripts/controllers/system/SchedulerJobsController.js +++ b/app/scripts/controllers/system/SchedulerJobsController.js @@ -27,6 +27,10 @@ jobIdArray = _.uniq(jobIdArray); }; + scope.resolvePreviousRunStatus = function (status){ + return 'scheduler.job.last.run.history.' + status; + } + scope.errorLog = function (id){ scope.id = id; $uibModal.open({ diff --git a/app/views/system/schedulerjobs.html b/app/views/system/schedulerjobs.html index 659524ddfd..7384dca8d3 100644 --- a/app/views/system/schedulerjobs.html +++ b/app/views/system/schedulerjobs.html @@ -31,6 +31,7 @@     + @@ -42,10 +43,11 @@ + - + From 3d0b6aa5e112386aa4ae09c5b94e3d2de67d1e6b Mon Sep 17 00:00:00 2001 From: Leonardo Hildt <108893281+leonardohildt@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:59:17 -0300 Subject: [PATCH 5/6] Update locale-es.json (#342) --- app/global-translations/locale-es.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/global-translations/locale-es.json b/app/global-translations/locale-es.json index 71010f1cb6..d59f506c18 100644 --- a/app/global-translations/locale-es.json +++ b/app/global-translations/locale-es.json @@ -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", @@ -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", @@ -5055,7 +5055,7 @@ "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 saldo de prueba", + "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", From 58db336b927e785bf407d834062a2bbd66ae593c Mon Sep 17 00:00:00 2001 From: fiter-julius-oketayot <140818859+fiter-julius-oketayot@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:06:13 +0300 Subject: [PATCH 6/6] Bugs/FBR-597-FBR-596-FBR-576: Refactor Hard Policy Checks (#343) --- app/scripts/controllers/system/SchedulerJobsController.js | 7 +++++-- app/views/prequalifications/editgroup.html | 2 +- app/views/prequalifications/newgroup.html | 2 +- app/views/system/schedulerjobs.html | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/scripts/controllers/system/SchedulerJobsController.js b/app/scripts/controllers/system/SchedulerJobsController.js index f8647a903a..bcd1d2a724 100644 --- a/app/scripts/controllers/system/SchedulerJobsController.js +++ b/app/scripts/controllers/system/SchedulerJobsController.js @@ -20,15 +20,18 @@ } 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){ - return 'scheduler.job.last.run.history.' + status; + if(status){ + return 'scheduler.job.last.run.history.' + status; + } + return ''; } scope.errorLog = function (id){ diff --git a/app/views/prequalifications/editgroup.html b/app/views/prequalifications/editgroup.html index 47bce41ad5..b084339981 100644 --- a/app/views/prequalifications/editgroup.html +++ b/app/views/prequalifications/editgroup.html @@ -28,7 +28,7 @@ class="required">*:  - +
    {{ 'label.heading.jobname' | translate }}{{job.displayName}}{{job.displayNameCode | translate}}
    {{ 'label.heading.cronexpression' | translate }} - - @@ -762,10 +760,9 @@

    {{'label.heading.general' | translate}}

    *:     		- @@ -1034,7 +1029,6 @@

    {{'label.heading.contact.information' | translate}}
    {{'label.heading.execution.order' | translate}} {{'label.heading.name' | translate}} {{'label.heading.nextrun' | translate}} {{'label.heading.previousrun' | translate}}
    {{job.executionOrder}} {{job.displayNameCode | translate}} {{job.nextRunTime}} {{job.lastRunHistory.jobRunStartTime}}{{job.lastRunHistory.status}}{{resolvePreviousRunStatus(job.lastRunHistory.status) | translate}} {{job.currentlyRunning | YesOrNo}}
    - -
    {{job.executionOrder}} {{job.displayNameCode | translate}}