Skip to content

Commit

Permalink
Blacklist changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianMuhimbura committed Jul 7, 2023
1 parent 96725a4 commit e127ded
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 17 deletions.
4 changes: 4 additions & 0 deletions app/global-translations/locale-es.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,7 @@
"label.input.additionalinformation": "Información adicional",
"label.input.changelanguage": "Cambiar el idioma:",
"label.input.dpi": "DPI",
"label.input.nit": "NIT",
"label.input.searchByNameDpi": "Buscar por nombre o DPI",
"label.addtoblacklist": "Agregar Persona",
"label.search.scope.all": "Todo",
Expand Down Expand Up @@ -700,6 +701,7 @@
"label.input.reactivationdate": "Fecha de reactivación",
"label.input.withdrawaldate": "Fecha de retiro",
"label.input.withdrawalreason": "Razón de retiro",
"label.input.reasons": "Razón",
"label.input.clientName": "Nombre del cliente",
"label.input.clientId": "Id. del cliente",
"label.input.reopeneddate": "ReAbrir Fecha",
Expand Down Expand Up @@ -2945,6 +2947,8 @@
"label.input.principal": "Principal",
"label.input.principalamount": "Monto principal",
"label.input.totalinstallmentamount": "Monto de importe",
"label.input.disbursementAmount": "monto del desembolso",
"label.input.balance": "Saldo Saneado",
"label.input.minimum": "Mínimo",
"label.input.maximum": "Máximo",
"label.input.default": "Predeterminado",
Expand Down
1 change: 0 additions & 1 deletion app/scripts/controllers/blacklist/BlacklistController.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
var items = resourceFactory.blacklistResource.getAllBlacklistClients({
offset: ((pageNumber - 1) * scope.clientsPerPage),
limit: scope.clientsPerPage,
status: scope.showInactive? 'INACTIVE' : 'ACTIVE',
searchText:scope.searchText
}, function (data) {
scope.totalClients = data.totalFilteredRecords;
Expand Down
14 changes: 7 additions & 7 deletions app/views/blacklist/blacklist.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ <h4 class="pull-left">Blacklisted Clients</h4>
</div>

<div class="col-sm-3">
<div class="checkbox">
<label for="showAll">
<input type="checkbox" id="showAll" name="showAll" ng-model="showAll" ng-change="getActiveInactive()">
&nbsp;{{'label.button.showinactive' | translate }}
</label>
</div>
<!-- <div class="checkbox">-->
<!-- <label for="showAll">-->
<!-- <input type="checkbox" id="showAll" name="showAll" ng-model="showAll" ng-change="getActiveInactive()">-->
<!-- &nbsp;{{'label.button.showinactive' | translate }}-->
<!-- </label>-->
<!-- </div>-->
</div>
<div class="col-sm-3">
<a href="#/blacklist/createblacklist" class="btn btn-primary pull-right" has-permission='ADD_BLACKLIST'><i
Expand Down Expand Up @@ -64,7 +64,7 @@ <h4 class="pull-left">Blacklisted Clients</h4>
</thead>

<tbody>
<tr dir-paginate="client in blacklist | orderBy:'id':reverse | filter:filterText | itemsPerPage: clientsPerPage" class="pointer-main"
<tr dir-paginate="client in blacklist | itemsPerPage: clientsPerPage" class="pointer-main"
total-items="totalClients" pagination-id="blacklist" ng-show="client.status.code != 'clientStatusType.closed' || showClosed">
<td class="pointer" data-ng-click="routeTo('/viewclient/'+client.id)">{{client.clientName}}</td>
<td class="pointer">{{client.dpi}}</td>
Expand Down
18 changes: 9 additions & 9 deletions app/views/blacklist/removeblacklist.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,34 @@ <h4 class="pull-left">Details</h4>
<hr/>
<div class="col-sm-6">
<div class="alert alert-info">
<span>Client Name<span class="pull-right">{{client.clientName}}</span></span>
<span>{{'label.input.clientName'| translate}}<span class="pull-right">{{client.clientName}}</span></span>
</div>
<div class="alert alert-info">
<span>D.P.I<span class="pull-right">{{client.dpi}}</span></span>
<span>{{'label.input.dpi'|translate}}<span class="pull-right">{{client.dpi}}</span></span>
</div>
<div class="alert alert-info">
<span>NIT<span class="pull-right">{{client.nit}}</span></span>
<span>{{'label.input.nit'|translate}}<span class="pull-right">{{client.nit}}</span></span>
</div>
<div class="alert alert-info">
<span>Product Code<span class="pull-right">{{client.productCode}}</span></span>
<span>{{'label.input.product'| translate}}<span class="pull-right">{{client.productCode}}</span></span>
</div>
<div class="alert alert-info">
<span>Description<span class="pull-right">{{client.description}}</span></span>
<span>{{'label.input.description'|translate}}<span class="pull-right">{{client.description}}</span></span>
</div>

</div>
<div class="col-sm-6">
<div class="alert alert-info">
<span>Reason<span class="pull-right">{{client.description}}</span></span>
<span>{{'label.input.reasons'| translate}}<span class="pull-right">{{client.typification.description|translate}}</span></span>
</div>
<div class="alert alert-info">
<span>Agency Id<span class="pull-right">{{client.agencyId}}</span></span>
<span>{{'label.input.agencyid'|translate}}<span class="pull-right">{{client.agencyId}}</span></span>
</div>
<div class="alert alert-info">
<span>Disbursement Amount<span class="pull-right">{{client.disbursementAmount}}</span></span>
<span>{{'label.input.disbursementAmount'|translate}}<span class="pull-right">{{client.disbursementAmount}}</span></span>
</div>
<div class="alert alert-info">
<span>Balance<span class="pull-right">{{client.balance}}</span></span>
<span>{{'label.input.balance'| translate}}<span class="pull-right">{{client.balance}}</span></span>
</div>
</div>
</div>
Expand Down

0 comments on commit e127ded

Please sign in to comment.