Skip to content

Commit

Permalink
OAM-123: adjust solution with the be, changes to enable testing
Browse files Browse the repository at this point in the history
  • Loading branch information
olewandowski1 committed May 17, 2024
1 parent 0f7c227 commit 5dec2d8
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 352 deletions.
115 changes: 0 additions & 115 deletions src/admin-lot-edit/admin-lot-edit.controller.js

This file was deleted.

126 changes: 0 additions & 126 deletions src/admin-lot-edit/admin-lot-edit.controller.spec.js

This file was deleted.

35 changes: 0 additions & 35 deletions src/admin-lot-edit/admin-lot-edit.module.js

This file was deleted.

46 changes: 0 additions & 46 deletions src/admin-lot-edit/admin-lot-edit.routes.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/admin-lot-edit/lot-edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ <h1>{{'adminLotEdit.editLot.title' | message:({lot: vm.lot.lotCode})}}</h1>
</div>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion src/admin-lot-edit/messages_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"adminLotEdit.save.success": "Lot saved successfully",
"adminLotEdit.save.failure": "Failed to save lot",
"adminLotEdit.quarantined": "Quarantined"
}
}
11 changes: 4 additions & 7 deletions src/admin-lot-list/admin-lot-list.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,16 @@
showInNavigation: true,
label: 'adminLotList.lots',
// ANGOLASUP-715: Filtering by lot code
url: '/lots?orderableId&quarantined&expirationDateFrom&expirationDateTo&lotCode&page&size&sort',
url: '/lots?orderableId&expirationDateFrom&expirationDateTo&lotCode&page&size&sort',
// ANGOLASUP-715: Ends here
controller: 'LotListController',
templateUrl: 'admin-lot-list/lot-list.html',
controllerAs: 'vm',
accessRights: [ADMINISTRATION_RIGHTS.LOTS_MANAGE],
resolve: {
paginatedLots: function($q, $stateParams, paginationService, lotService) {
return paginationService.registerUrl($stateParams, function() {
if ($stateParams.quarantined === undefined) {
$stateParams.quarantined = 'true';
}

var params = angular.copy($stateParams);
return paginationService.registerUrl($stateParams, function(stateParams) {
var params = angular.copy(stateParams);

params.tradeItemIdIgnored = true;

Expand Down Expand Up @@ -68,6 +64,7 @@
? noProductMsg
: orderable.fullProductName,
lotCode: lot.lotCode,
quarantined: lot.quarantined,
expirationDate: lot.expirationDate,
manufacturedDate: lot.manufactureDate,
id: lot.id
Expand Down
Loading

0 comments on commit 5dec2d8

Please sign in to comment.