Skip to content

Commit

Permalink
Release/1.0.5 prepare (#52)
Browse files Browse the repository at this point in the history
* Create Prequalification group with members and view existing groups

* Create Prequalification group with members and view existing groups

* Create Prequalification group with members and view existing groups

* Migrate m_potfolio_center and center groups to m_group

* modify the lables on potfolio planning

* fix prequalification of new group creation details

* Fix Labels on prequalification

* Fix Labels on prequalification

* Fix Labels on prequalification

---------

Co-authored-by: Brian Muhimbura <brianmigel@gmail.com>
Co-authored-by: Leonardo Hildt <leonardo@fiter.io>
  • Loading branch information
3 people authored Jul 24, 2023
1 parent 6cd5508 commit f9535d6
Showing 18 changed files with 744 additions and 35 deletions.
15 changes: 15 additions & 0 deletions app/global-translations/locale-en.json
Original file line number Diff line number Diff line change
@@ -79,6 +79,7 @@
"label.heading.recurringaccoverview": "Recurring Deposits Overview",
"label.heading.members": "Members",
"label.heading.confirm": "Confirm",
"label.confirm.group.transfer": "Confirm Group Transfer",
"label.heading.attendance": "Attendance",
"label.heading.comments": "Comments",
"label.heading.id": "ID",
@@ -288,6 +289,7 @@
"label.input.disbursedamount": "Disbursed Amount",
"label.input.branchoffice": "Branch office",
"label.input.center": "Center",
"label.input.select.center": "Select Center",
"label.input.group": "Group",
"label.input.meetingcalendar": "Meeting calendar",
"label.input.total": "Total",
@@ -884,6 +886,7 @@
"label.heading.managemembers": "Manage Members",
"label.heading.associatenewmembers": "Associate New Members",
"label.heading.groupmembers": "Group Members",
"label.heading.add.groupmembers": "Add Group Members",
"label.heading.transferclientsbetweengroups": "Transfer Client between Groups",
"label.heading.destinationgroupdetails": "Destination Group Details",
"label.heading.nextmeetingon": "Next Meeting on",
@@ -1170,6 +1173,7 @@
"label.input.typification": "Typification",
"label.input.grouplocation": "Group Location",
"label.input.agencyid": "Agency ID",
"label.input.agency": "Select Agency",
"label.input.balance": "Balance",
"label.input.disbursementAmount": "Disbursement Amount",
"label.addtoblacklist": "Add To Blacklist",
@@ -1308,6 +1312,7 @@
"label.heading.reportcategory": "Report Category",
"label.heading.userreport": "User Report",
"label.heading.portfolio": "Portfolio",
"label.input.portfolio": "Select Portfolio",
"label.heading.balancesheet": "Balance Sheet",
"label.heading.incomes": "Incomes",
"label.heading.xbrl.report": "XBRL Report",
@@ -1536,6 +1541,7 @@
"label.anchor.reschedulerequest": "Reschedule Request",
"label.anchor.blacklistClient": "Blacklist Customer",
"label.anchor.prequalifications": "Prequalification of Credits",
"label.anchor.prequalification.details": "Prequalification Detils",
"#Inputs": "..",
"label.input.grouptotal": "Group total",
"label.input.centertotal": "Center total",
@@ -1544,6 +1550,8 @@
"label.input.collateraltype": "Collateral type",
"label.input.relationship": "Relationship",
"label.input.dob": "DOB",
"label.input.work.with.puente": "Already Work With Puente?",
"label.input.amount.requested": "Amount Requested",
"label.input.address": "Address",
"label.input.zip": "Zip",
"label.input.mobile": "Mobile",
@@ -1566,6 +1574,7 @@
"label.input.writeoffondate": "Write off on",
"label.input.closedondate": "Closed on",
"label.input.loanofficerunassigneddate": "Unassigned on",
"label.input.facilitator": "Facilitator",
"label.input.paymenttype": "Payment types",
"label.heading.paymenttypes": "Payment types",
"label.anchor.paymenttypes": "Payment types",
@@ -1605,6 +1614,7 @@
"label.input.isTopup": "Is Topup Loan",
"label.input.loanIdToClose": "Choose loan to close",
"label.input.typification": "Typification",
"label.input.prequalification.number": "Typification",
"blacklist.option.direct.sanitized": "direct sanitized",
"blacklist.option.indirect.sanitized": "Indirect sanitized",
"blacklist.option.deliquent": "Delinquent",
@@ -2036,6 +2046,8 @@
"label.anchor.sharesapplication": "Shares Application",
"label.anchor.viewshareaccount": "View Share Account",
"label.anchor.holdaccount": "Hold Account",
"label.anchor.prequalification.groups": "Prequalification Groups",
"label.heading.prequalificationnumber": "Prequalification Number",
"#Inputs": "..",
"label.input.charges": "Charges",
"label.input.chargecalculation": "Charge calculation",
@@ -2119,6 +2131,7 @@
"label.input.dividendperiodenddate": "Dividend Period End Date",
"label.input.dividendamount": "Dividend Amount",
"label.input.todaysprice": "Today's Price",
"label.input.addedBy": "Added By",
"#Buttons": "..",
"label.button.undo": "Undo",
"label.button.modifyapplication": "Modify Application",
@@ -4080,6 +4093,8 @@
"label.input.teller.cashier.amount": "Amount",
"label.input.teller.cashier.startDate": "From",
"label.input.teller.cashier.endDate": "To",
"label.input.from": "From",
"label.input.to": "To",
"label.input.teller.cashier.fullDay": "Full day?",
"label.input.teller.cashier.startTime": "From (time)",
"label.input.teller.cashier.endTime": "Till (time)",
25 changes: 19 additions & 6 deletions app/global-translations/locale-es.json
Original file line number Diff line number Diff line change
@@ -95,6 +95,7 @@
"label.heading.savingsaccoverview": "Resumen de cuenta de ahorros",
"label.heading.members": "Miembros",
"label.heading.confirm": "Confirmar",
"label.confirm.group.transfer": "confirmar transferencia de grupo",
"label.heading.attendance": "Asistencia",
"label.heading.comments": "Comentarios",
"label.heading.id": "Id.",
@@ -524,7 +525,7 @@
"label.heading.mifosxdashhome": "Página de inicio de MifosX",
"label.heading.recentactivities": "Actividades recientes",
"label.heading.frequentactivities": "Actividades frecuentes",
"label.heading.parentoffice": "Oficina matriz",
"label.heading.parentoffice": "Supervisión",
"label.heading.openedon": "Abierto el",
"label.heading.loantype": "Tipo de préstamo",
"label.heading.memberof": "Miembro de",
@@ -603,6 +604,7 @@
"label.anchor.keyboardshortcut": "Atajos de teclado",
"label.anchor.save": "Guardar",
"label.anchor.prequalifications": "Precalificación de Créditos",
"label.anchor.prequalification.details": "Detalles de precalificación",
"label.input.searchbyuser": "Búsqueda por usuario",
"label.input.clienttemplate": "Plantilla de cliente",
"label.input.loanaccounttemplate": "Plantillas de cuentas del préstamo",
@@ -618,6 +620,7 @@
"label.input.changelanguage": "Cambiar el idioma:",
"label.input.dpi": "DPI",
"label.input.nit": "NIT",
"label.input.prequalification.number": "número de precalificación",
"label.input.searchByNameDpi": "Buscar por nombre o DPI",
"label.addtoblacklist": "Agregar Persona",
"label.search.scope.all": "Todo",
@@ -828,6 +831,7 @@
"label.heading.center": "Centro",
"label.heading.attachmeeting": "Adjuntar reunión",
"label.heading.editmeeting": "Editar reunión",
"label.heading.add.groupmembers": "Añadir Miembros del grupo",
"label.menu.selectoffice": "Seleccionar oficina",
"label.menu.selectloanproducts": "Seleccionar productos de prestamos",
"label.menu.selectstaff": "Seleccionar personal",
@@ -855,6 +859,9 @@
"label.input.error": "Error",
"label.input.invaliddaterange": "Selecciona un intervalo de fechas válido",
"label.input.agencyid": "identificador de agencia",
"label.input.agency": "Seleccionar de agencia",
"label.input.work.with.puente": "Ya trabajo con Puente?",
"label.input.amount.requested": "Monto solicitada",
"label.button.creategroup": "Crear grupo",
"label.button.groupsavingapplication": "Grupo de solicitud de ahorro",
"label.button.grouploanapplication": "Grupo de solicitud de préstamo",
@@ -878,6 +885,7 @@
"label.selectgroup": "Seleccionar grupo",
"label.selectstaff": "Seleccionar personal",
"label.active": "Activo",
"label.input.facilitator": "Facilitador",
"label.selectshareproduct": "Seleccione Compartir Producto",
"groupingStatusType.pending": "Pendiente",
"groupingStatusType.active": "Activo",
@@ -1030,6 +1038,9 @@
"label.anchor.journalentries": "Entradas de Diario",
"label.anchor.viewjournalentries": "Ver Entradas de Diario",
"label.anchor.removeblacklist": "Eliminar de la lista negra",
"label.anchor.prequalification.groups": "Grupos de Precalificación",
"label.heading.prequalificationnumber": "Nombre de precalificación",
"label.input.addedBy": "Añadido por",
"label.input.accountingrulename": "Nombre de la regla de contabilidad",
"label.input.affectedentries": "Entradas afectadas",
"label.input.accountingrules": "Normas de contabilidad",
@@ -1196,7 +1207,7 @@
"label.input.portfolio": "Seleccionar de Cartera",
"label.input.typification": "Tipificación",
"label.input.year": "año",
"label.input.select.center": "Seleccionar de Center",
"label.input.select.center": "Seleccionar Centro",
"label.heading.balancesheet": "Balance general",
"label.heading.incomes": "Ingresos",
"label.heading.xbrl.report": "Informe XBRL",
@@ -2329,7 +2340,7 @@
"label.heading.repaymentsheduleto": "Reembolsos programados para",
"label.heading.todate": "A la fecha",
"label.heading.applicableoffices": "Oficinas aplicables",
"label.heading.namedecorated": "Nombre representativo",
"label.heading.namedecorated": "Cartera",
"label.heading.officeName": "Nombre de la oficina",
"label.heading.createtaxcomponent": "Crear Componente de Impuesto",
"label.heading.edittaxcomponent": "Editar Componente de Impuesto",
@@ -3789,6 +3800,8 @@
"label.input.teller.cashier.amount": "Monto",
"label.input.teller.cashier.startDate": "Desde",
"label.input.teller.cashier.endDate": "A",
"label.input.from": "Desde",
"label.input.to": "A",
"label.input.teller.cashier.fullDay": "Día completo?",
"label.input.teller.cashier.startTime": "Desde (hora)",
"label.input.teller.cashier.endTime": "Hasta (hora)",
@@ -4109,7 +4122,7 @@
"label.heading.loantransaction": "Transacción de préstamo",
"label.heading.reduction": "Reducción",
"label.button.reduction": "Reducción",
"label.heading.amountavailable": "Monto disponible",
"label.heading.amountavailable": "Monto disponible",
"label.heading.amountinhold": "Monto bloqueado",
"label.input.codigoCausal" : "Código Causal",
"label.heading.codigoAcrm" : "Cod.",
@@ -4120,15 +4133,15 @@
"label.heading.isDocument" : "Doc.",
"label.anchor.managemanagecauses" : "Causales",
"label.anchor.addcause" : "Nuevo causal",
"label.heading.addcause" : "Agregar causal",
"label.heading.addcause" : "Agregar causal",
"label.button.createcause" : "Nuevo causal",
"label.input.searchByCodeDesc" : "Buscar por código o descripción",
"label.heading.cause" : "Causal",
"label.input.codigoAcrm" : "Código",
"label.input.allowOverdraft" : "Permitir sobregiro",
"label.input.isCashOperation" : "Es operación en efectivo",
"label.input.operationType" : "Tipo de operación",
"label.input.sendAcrm" : "Enviar a CRM",
"label.input.sendAcrm" : "Enviar a CRM",
"label.input.shortDescription" : "Descripción corta",
"label.input.isDocument" : "Es documento",
"label.heading.editcause" : "Editar causal",
65 changes: 64 additions & 1 deletion app/scripts/controllers/centers/ViewCenterController.js
Original file line number Diff line number Diff line change
@@ -2,11 +2,13 @@
mifosX.controllers = _.extend(module, {
ViewCenterController: function (scope, routeParams, resourceFactory, location, route, http, $uibModal, dateFilter, API_VERSION, $sce, $rootScope) {

scope.center = [];
scope.center = {};
scope.staffData = {};
scope.formData = {};
scope.newCenter = {};
scope.report = false;
scope.hidePentahoReport = true;
scope.oldModalInstance = null;
resourceFactory.centerResource.get({centerId: routeParams.id, associations: 'groupMembers,collectionMeetingCalendar'}, function (data) {
scope.center = data;
scope.isClosedCenter = scope.center.status.value == 'Closed';
@@ -139,7 +141,68 @@
route.reload();
});
};

scope.transferGroup = function (group) {
scope.groupData = group

$uibModal.open({
templateUrl: 'transferGroupToCenter.html',
controller: TransferGroupCtrl,
});
}

scope.goToPage = function (path) {
location.path(path);
}

var TransferGroupCtrl = function ($scope, $uibModalInstance) {
$scope.group = scope.groupData;
$scope.availableCenters = [];
resourceFactory.centerResource.getAllCenters({
orderBy: 'name',
sortOrder: 'ASC'
}, function (data) {
$scope.availableCenters = data;
});

$scope.confirmTransfer = function (center) {
// $uibModalInstance.dismiss('cancel');
scope.oldModalInstance = $uibModalInstance;
scope.newCenter =center
$uibModal.open({
templateUrl: 'confirmTransfer.html',
controller: ConfirmTransferCtrl,
});
};
$scope.cancel = function () {
$uibModalInstance.dismiss('cancel');
};
}

var ConfirmTransferCtrl = function ($scope, $uibModalInstance) {
$scope.group = scope.groupData;
$scope.center = scope.center;
$scope.newCenter = scope.newCenter;
$scope.availableCenters = [];

$scope.transfer = function () {
let postData = {
toCenterId: $scope.newCenter.id,
groupId: $scope.group.id
};
resourceFactory.centerResource.transferGroup({centerId:$scope.center.id,anotherresource:"transfer"},postData, function (data) {
$uibModalInstance.close('activate');
scope.oldModalInstance.close('activate');
route.reload();
});
};
$scope.cancel = function () {
$uibModalInstance.dismiss('cancel');
};
}

}

});

mifosX.ng.application.controller('ViewCenterController', ['$scope', '$routeParams', 'ResourceFactory', '$location', '$route', '$http', '$uibModal', 'dateFilter', 'API_VERSION', '$sce', '$rootScope', mifosX.controllers.ViewCenterController]).run(function ($log) {
1 change: 0 additions & 1 deletion app/scripts/controllers/client/EditClientController.js
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@
active: data.active,
accountNo: data.accountNo,
dpi: data.dpiNumber,
dpiNumber: data.dpiNumber,
oldCustomerNumber: data.oldCustomerNumber,
staffId: data.staffId,
externalId: data.externalId,
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
(function (module) {
mifosX.controllers = _.extend(module, {
NewGroupPrequalificatoinController: function (scope, routeParams, route, dateFilter, location, resourceFactory, http, $uibModal, API_VERSION, $timeout, $rootScope, Upload) {

scope.agenciesList = [];
scope.portfoliosList = [];
scope.centersList = [];
scope.groupsList = [];
scope.productsList = [];
scope.facilitators = [];
scope.yesNo = [{value: "YES", name: "Yes"}, {value: "NO", name: "No"}];
scope.restrictDate = new Date();
scope.formData = {};
scope.formData.members = [];
scope.membersForm = {};
scope.memberDetailsForm;

resourceFactory.prequalificationTemplateResource.get(function (data) {
scope.agenciesList = data.agencies
scope.centersList = data.centerData
scope.productsList = data.loanProducts
scope.facilitators = data.facilitators
});

scope.submit = function () {
this.formData.locale = scope.optlang.code;

resourceFactory.blacklistResource.save(this.formData, function (data) {
location.path('blacklist/' + data.resourceId + '/viewdetails');
});
}

scope.addMemberData = function () {
var reqDate = dateFilter(scope.membersForm.dob, scope.df);

scope.membersForm.dob = reqDate;
scope.membersForm['locale'] = scope.optlang.code;
scope.membersForm['dateFormat'] = scope.df;

scope.formData.members.push(scope.membersForm);
scope.membersForm = {}
scope.memberDetailsForm.$setUntouched();
scope.memberDetailsForm.$setPristine();

}

scope.requestPrequalification = function () {
console.log("submitting form data")
this.formData.locale = scope.optlang.code;
this.formData.dateFormat = scope.df;

// this.formData.members.forEach(function(member){
// member.locale = scope.optlang.code;
// member.dateFormat = scope.df;
// })
resourceFactory.prequalificationResource.save(this.formData, function (data) {
location.path('prequalification/' + data.resourceId + '/viewdetails');
});
}

}
});

mifosX.ng.application.controller('NewGroupPrequalificatoinController', ['$scope', '$routeParams', '$route', 'dateFilter', '$location', 'ResourceFactory', '$http', '$uibModal', 'API_VERSION', '$timeout', '$rootScope', 'Upload', mifosX.controllers.NewGroupPrequalificatoinController]).run(function ($log) {
$log.info("NewGroupPrequalificatoinController initialized");
});
}(mifosX.controllers || {}));
Loading

0 comments on commit f9535d6

Please sign in to comment.