Merge branch 'fiter/fb/dev' into release/1.0.27-prepare

# Conflicts:
#	app/scripts/controllers/loanAccount/NewLoanAccAppController.js

app/global-translations/locale-en.json

@@ -2248,6 +2248,8 @@
   "label.input.routingcode": "Routing code",
   "label.input.receiptnumber": "Receipt#",
   "label.input.banknumber": "Bank#",
+  "label.input.billnumber": "Bill Number",
+  "label.heading.billnumber": "Bill Number",
   "label.input.loanofficer": "Loan officer",
   "label.input.chargepaymentby": "Charge payment by",
   "label.input.duedate": "Due date",
@@ -5353,5 +5355,7 @@
   "label.heading.list.of.clients": "List of Clients",
   "label.heading.list.of.groups": "List of Groups",
   "label.heading.list.of.centers": "List of Centers",
+  "label.view.principalpaymentdetail": "Principal Payment",
+  "label.view.interestspayment": "Interest Payment",
   "----End---": "--End of file--- "
 }

app/global-translations/locale-es.json

@@ -4975,5 +4975,9 @@
 	"label.heading.list.of.clients": "Lista de Clientes",
 	"label.heading.list.of.groups": "Lista de Grupos",
 	"label.heading.list.of.centers": "Lista de Centros",
+	"label.input.billnumber": "Número de factura",
+	"label.heading.billnumber": "Número de factura",
+	"label.view.principalpaymentdetail": "Pago principal",
+	"label.view.interestspayment": "Pago de intereses",
 	"----End---": "---Fin del archivo---"
 }

app/scripts/controllers/client/CreateClientController.js

@@ -63,6 +63,9 @@
                 scope.housingTypeOptions = data.housingTypeOptions;
                 scope.departamentoOptions = data.departamentoOptions;
                 scope.municipioOptions = data.municipioOptions;
+                scope.maritalStatusOptions = data.maritalStatusOptions;
+                scope.jobTypeOptions = data.jobTypeOptions;
+                scope.educationLevelOptions = data.educationLevelOptions;
                 scope.economicSectorOptions = data.economicSectorData;
                 scope.economicActivities = data.economicActivityData;
                 scope.formData.publicServices = [];
@@ -123,7 +126,7 @@
                            scope.addressTypes = data.address[0].addressTypeIdOptions;
                            scope.countryOptions = data.address[0].countryIdOptions;
                            scope.stateOptions = data.address[0].stateProvinceIdOptions;
-                       
+
                     resourceFactory.addressFieldConfiguration.get({entity:entityname},function(data){
 
                         for(var i=0;i<data.length;i++)

app/scripts/controllers/client/EditClientController.js

@@ -20,6 +20,9 @@
                 scope.clientNonPersonConstitutionOptions = data.clientNonPersonConstitutionOptions;
                 scope.clientNonPersonMainBusinessLineOptions = data.clientNonPersonMainBusinessLineOptions;
                 scope.clientLegalFormOptions = data.clientLegalFormOptions;
+                scope.maritalStatusOptions = data.maritalStatusOptions;
+                scope.jobTypeOptions = data.jobTypeOptions;
+                scope.educationLevelOptions = data.educationLevelOptions;
                 scope.officeId = data.officeId;
                 scope.formData = {
                     firstname: data.firstname,
@@ -40,6 +43,10 @@
                     savingsProductId: data.savingsProductId,
                     genderId: data.gender.id,
                     fullname: data.fullname,
+                    maritalStatusId: data.maritalStatus,
+                    jobType: data.jobType,
+                    nit: data.nit,
+                    educationLevelId: data.educationLevel,
                     clientNonPersonDetails : {
                         incorpNumber: data.clientNonPersonDetails.incorpNumber,
                         remarks: data.clientNonPersonDetails.remarks

app/scripts/controllers/loanAccount/LoanAccountActionsController.js

@@ -12,6 +12,7 @@
             scope.restrictDate = new Date();
             // Transaction UI Related
             scope.isTransaction = false;
+            scope.isRepaymentTransaction = false;
             scope.showPaymentDetails = false;
             scope.paymentTypes = [];
             scope.form = {};
@@ -207,6 +208,9 @@
                         if (data.paymentTypeOptions.length > 0) {
                             scope.formData.paymentTypeId = data.paymentTypeOptions[0].id;
                         }
+                        if(data.bankAccounts && data.bankAccounts.length > 0){
+                            scope.bankAccounts = data.bankAccounts;
+                        }
                         scope.formData.transactionAmount = data.amount;
                         scope.formData[scope.modelName] = new Date(data.date) || new Date();
                         if(data.penaltyChargesPortion>0){
@@ -219,6 +223,7 @@
                     scope.title = 'label.heading.loanrepayments';
                     scope.labelName = 'label.input.transactiondate';
                     scope.isTransaction = true;
+                    scope.isRepaymentTransaction = true;
                     scope.showAmountField = true;
                     scope.taskPermissionName = 'REPAYMENT_LOAN';
                     break;

app/scripts/controllers/loanAccount/NewLoanAccAppController.js

@@ -43,6 +43,7 @@
             ];
 
             scope.date.first = new Date();
+            scope.date.fifth = new Date();
 
             if (scope.clientId) {
                 scope.inparams.clientId = routeParams.clientId;
@@ -140,10 +141,15 @@
                  scope.formData.maidenName = data.detailData.maidenName;
                  scope.formData.nationality = data.detailData.nationality;
                  scope.formData.language = data.detailData.languages;
-                  scope.clientHousingType = data.clientContactInformation.housingType;
+                 scope.formData.occupancyClassification = Number(data.detailData.economicSector);
+                 scope.clientHousingType = data.clientContactInformation.housingType;
                  scope.date.sixth = new Date(data.dateOfBirth);
                  scope.formData.phoneNumber = data.mobileNo;
                  scope.formData.dpi = data.dpiNumber;
+                 scope.formData.nit = data.nit;
+                 scope.formData.jobType = data.jobType;
+                 scope.formData.educationLevel = data.educationLevel;
+                 scope.formData.maritalStatus = data.maritalStatus;
                  scope.formData.yearsInCommunity = data.clientContactInformation.communityYears;
               });
             }
@@ -263,6 +269,7 @@
 
                     }
                     scope.classificationOptions = data.classificationOptions || [];
+                    scope.economicSectorOptions = data.economicSectorOptions || [];
                     scope.jobTypeOptions = data.jobTypeOptions || [];
                     scope.educationLevelOptions = data.educationLevelOptions || [];
                     scope.maritalStatusOptions = data.maritalStatusOptions || [];

app/scripts/controllers/prequalification/PrequalificationDetailsAnalysisController.js

@@ -74,11 +74,23 @@
                     return 'NA';
                 }
             }
-            scope.policyCheckColor = function (redValidationCount) {
-                if (redValidationCount > 0) {
+            scope.policyCheckColor = function (member) {
+                if (member.redValidationCount > 0) {
                     return 'text-danger';
+                }else if(member.orangeValidationCount > 0||member.yellowValidationCount > 0){
+                    return 'text-warning';
+                }else{
+                    return 'text-success'
+                }
+            }
+            scope.policyCountColor = function (member) {
+                if (member.redValidationCount > 0) {
+                    return member.redValidationCount;
+                }else if(member.orangeValidationCount > 0||member.yellowValidationCount > 0){
+                    return Number(member.orangeValidationCount)+Number(member.yellowValidationCount);
+                }else{
+                    return '0'
                 }
-                return 'text-success'
             }
             scope.validateHardPolicy = function () {
                 resourceFactory.prequalificationChecklistResource.validate({prequalificationId: routeParams.groupId}, {}, function (data) {

app/scripts/controllers/prequalification/PrequalificationDetailsController.js

@@ -114,11 +114,24 @@
                 }
             }
 
-            scope.policyCheckColor = function (redValidationCount) {
-                if (redValidationCount > 0) {
+            scope.policyCheckColor = function (member) {
+                if (member.redValidationCount > 0) {
                     return 'text-danger';
+                }else if(member.orangeValidationCount > 0){
+                    return 'text-warning';
+                }else{
+                    return 'text-success'
+                }
+            }
+
+            scope.policyCountColor = function (member) {
+                if (member.redValidationCount > 0) {
+                    return member.redValidationCount;
+                }else if(member.orangeValidationCount > 0||member.yellowValidationCount > 0){
+                    return Number(member.orangeValidationCount)+Number(member.yellowValidationCount);
+                }else{
+                    return '0'
                 }
-                return 'text-success'
             }
 
             scope.requestForUpdates = function () {

app/views/clients/createclient.html

@@ -232,14 +232,26 @@
                                        ng-pattern="/^[0-9]+$/" class="form-control" required/>
                             </div>
                             <div class="col-sm-2">
-                        <span ng-show="createclientform.dpi.$invalid && createclientform.dpi.$dirty">
-                           <small class="required" ng-show="createclientform.dpi.$error.pattern">
-                              {{'label.mustbenumeric' | translate}}
-                           </small>
-                        </span>
+                            <span ng-show="createclientform.dpi.$invalid && createclientform.dpi.$dirty">
+                                <small class="required" ng-show="createclientform.dpi.$error.pattern">
+                                    {{'label.mustbenumeric' | translate}}
+                                </small>
+                            </span>
                                 <form-validate valattributeform="createclientform" valattribute="dpi"/>
                             </div>
                         </div>
+
+                        <div class="form-group">
+                            <label class="control-label col-sm-2" for="nit">{{'label.input.nit' |
+                            translate}}<span class="required">*</span></label>
+                            <div class="col-sm-3">
+                                <input type="text" id="nit" name="nit" ng-model="formData.nit"
+                                        class="form-control" required/>
+                            </div>
+                            <div class="col-sm-2">
+                                <form-validate valattributeform="createclientform" valattribute="nit"/>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="control-label col-sm-2"
                                    ng-hide="showNonPersonOptions">{{'label.input.dateofbirth' |
@@ -297,9 +309,9 @@
                             </div>
                             <label class="control-label col-sm-2">{{'label.input.clientclassification' | translate}}</label>
                             <div class="col-sm-3">
-                                <select id="clientClassificationId" ng-model="formData.clientClassificationId"
+                                <select id="clientClassificationId" ng-model="formData.jobType"
                                         class="form-control"
-                                        ng-options="clientClassification.id as clientClassification.name for clientClassification in clientClassificationOptions"
+                                        ng-options="clientClassification.id as clientClassification.description for clientClassification in jobTypeOptions"
                                         value="{{clientClassification.id}}">
                                     <option value="">--{{'label.menu.clientclassification' | translate}}--</option>
                                 </select>
@@ -435,21 +447,25 @@
 
                         <div class="form-group">
                             <label class="control-label col-sm-2"
-                                   for="civilstatus">{{'label.input.civilstatus' |
+                                   for="maritalStatus">{{'label.input.civilstatus' |
                             translate}}</label>
                             <div class="col-sm-3">
-                                <input type="text" id="civilstatus" name="civilstatus"
-                                       ng-model="formData.civilStatus"
-                                       class="form-control"/>
+                                <select ng-model="formData.maritalStatusId" id="maritalStatus"
+                                        ng-options="status.id as status.description for status in maritalStatusOptions"
+                                        value="{{status.id}}" class="form-control">
+                                    <option value="">{{'label.selectone' | translate}}</option>
+                                </select>
                             </div>
 
                             <label class="control-label col-sm-2"
                                    for="education">{{'label.input.education' |
                             translate}}</label>
                             <div class="col-sm-3">
-                                <input type="text" id="education" name="education"
-                                       ng-model="formData.educationLevel"
-                                       class="form-control"/>
+                                <select ng-model="formData.educationLevelId" id="education"
+                                        ng-options="level.id as level.description for level in educationLevelOptions"
+                                        value="{{level.id}}" class="form-control">
+                                    <option value="">{{'label.selectone' | translate}}</option>
+                                </select>
                             </div>
                         </div>
                         <div class="form-group">

app/views/clients/editclient.html

@@ -13,7 +13,7 @@
 	        <div class="form-group">
 	            <label class="control-label col-sm-2">{{ 'label.heading.office' | translate }}:<span
 	                    class="required">*</span></label>
-	
+
 	            <div class="col-sm-3">
 	                <select chosen="offices" id="officeId" ng-model="officeId"  class="form-control"
 	                        ng-options="office.id as office.name for office in offices" value="{{office.id}}"
@@ -174,7 +174,7 @@
 			</div>
 	        <div class="form-group">
 	            <label class="control-label col-sm-2">{{ 'label.input.accno' | translate }}:</label>
-	
+
 	            <div class="col-sm-3">
 	                <input id="accountNo" type="text" ng-model="formData.accountNo" class="form-control" disabled="disabled">
 	            </div>
@@ -186,6 +186,14 @@
 	                <input id="dpi" type="text" ng-model="formData.dpi" class="form-control">
 	            </div>
 	        </div>
+
+			<div class="form-group">
+	            <label class="control-label col-sm-2">{{ 'label.input.nit' | translate }}:</label>
+
+	            <div class="col-sm-3">
+	                <input id="nit" type="text" ng-model="formData.nit" class="form-control">
+	            </div>
+	        </div>
 			<div class="form-group">
 	            <label class="control-label col-sm-2">{{ 'label.input.old.customer.number' | translate }}:</label>
 
@@ -195,14 +203,14 @@
 	        </div>
 			<div class="form-group">
 			    <label class="control-label col-sm-2">{{ 'label.input.externalid' | translate }}:</label>
-			
+
 			    <div class="col-sm-3">
 			        <input id="externalId" type="text" ng-model="formData.externalId" class="form-control">
 			    </div>
 			</div>
 	        <div class="form-group">
 	            <label class="control-label col-sm-2" for="mobileNo">{{'label.input.mobilenumber' | translate}}</label>
-	
+
 	            <div class="col-sm-3">
 	                <input id="mobileNo" name="mobileNo" ng-model="formData.mobileNo" ng-pattern="/^[0-9]+$/" class="form-control"/>
 	            </div>
@@ -217,7 +225,7 @@
 			<div class="form-group">
 				<label class="control-label col-sm-2" ng-hide="showNonPersonOptions">{{'label.input.dateofbirth' | translate}}</label>
 				<label class="control-label col-sm-2" ng-show="showNonPersonOptions">{{'label.input.incorporationdate' | translate}}</label>
-			
+
 			    <div class="col-sm-3">
 			        <input id="dateofbirth" type="text" name="dateofbirth" datepicker-pop="dd MMMM yyyy"
 			               ng-model="date.dateOfBirth" is-open="opened1" min="minDate" max="restrictDate"  class="form-control"/>
@@ -260,8 +268,8 @@
 				<label class="control-label col-sm-2">{{'label.input.clientclassification' | translate}}</label>
 
 				<div class="col-sm-3">
-					<select id="clientClassificationId" ng-model="formData.clientClassificationId"  class="form-control"
-							ng-options="clientClassification.id as clientClassification.name for clientClassification in clientClassificationOptions" value="{{clientClassification.id}}">
+					<select id="clientClassificationId" ng-model="formData.jobType"  class="form-control"
+							ng-options="clientClassification.id as clientClassification.description for clientClassification in jobTypeOptions" value="{{clientClassification.id}}">
 						<option value="">--{{'label.menu.clientclassification' | translate}}--</option>
 					</select>
 				</div>
@@ -332,7 +340,7 @@
 	            <div class="form-group" data-ng-switch-when="1">
 	                <label class="control-label col-sm-2">{{'label.input.activationdate' | translate}}:<span
 	                        class="required">*</span></label>
-	
+
 	                <div class="col-sm-3">
 	                    <input id="activationDate" type="text" datepicker-pop="dd MMMM yyyy"
 	                           ng-model="date.activationDate" is-open="opened" min="'2000-01-01'"
@@ -695,21 +703,25 @@ <h3><strong>{{ 'label.heading.contact.information' | translate }}</strong>&nbsp<
 
 					<div class="form-group">
 						<label class="control-label col-sm-2"
-							   for="civilstatus">{{'label.input.civilstatus' |
+							   for="maritalStatus">{{'label.input.civilstatus' |
 						translate}}</label>
 						<div class="col-sm-3">
-							<input type="text" id="civilstatus" name="civilstatus"
-								   ng-model="formData.civilStatus"
-								   class="form-control"/>
+							<select ng-model="formData.maritalStatusId" id="maritalStatus"
+									ng-options="status.id as status.description for status in maritalStatusOptions"
+									value="{{status.id}}" class="form-control">
+								<option value="">{{'label.selectone' | translate}}</option>
+							</select>
 						</div>
 
 						<label class="control-label col-sm-2"
 							   for="education">{{'label.input.education' |
 						translate}}</label>
 						<div class="col-sm-3">
-							<input type="text" id="education" name="education"
-								   ng-model="formData.educationLevel"
-								   class="form-control"/>
+							<select ng-model="formData.educationLevelId" id="education"
+									ng-options="level.id as level.description for level in educationLevelOptions"
+									value="{{level.id}}" class="form-control">
+								<option value="">{{'label.selectone' | translate}}</option>
+							</select>
 						</div>
 					</div>
 					<div class="form-group">
@@ -788,7 +800,7 @@ <h3><strong>{{ 'label.heading.contact.information' | translate }}</strong>&nbsp<
 	            </a>
 	            <button id="saveedit" type="submit" class="btn btn-primary" has-permission='UPDATE_CLIENT' ng-click="submit()" >{{'label.button.save' | translate}}</button>
 	        </div>
-	
+
 	    </fieldset>
 	</div>
 </form>