Rename Monthly Inventory to Movement

This commit is contained in:
2016-09-20 09:31:56 -04:00
parent 916c1f0f59
commit 4f561dac11
14 changed files with 79 additions and 56 deletions
@@ -1,12 +0,0 @@
(function () {
'use strict';
window.app.controller('MonthlyInventoryReportController', MonthlyInventoryReportController);
MonthlyInventoryReportController.$inject = ['$scope', 'reportSvc'];
function MonthlyInventoryReportController($scope, reportSvc) {
var vm = this;
vm.loadData = reportSvc.loadMonthlyInventoryData;
vm.monthlyInventoryData = reportSvc.monthlyInventoryData;
}
})();
@@ -0,0 +1,12 @@
(function () {
'use strict';
window.app.controller('MovementReportController', MovementReportController);
MovementReportController.$inject = ['$scope', 'reportSvc'];
function MovementReportController($scope, reportSvc) {
var vm = this;
vm.loadData = reportSvc.loadMovementData;
vm.movementData = reportSvc.movementData;
}
})();
@@ -1,11 +1,11 @@
(function() {
'use strict';
window.app.directive('monthlyInventoryReport', monthlyInventoryReport);
function monthlyInventoryReport() {
window.app.directive('movementReport', movementReport);
function movementReport() {
return {
scope: { monthlyInventoryData: "=" },
templateUrl: '/report/template/monthlyInventoryReport.tmpl.cshtml',
scope: { movementData: "=" },
templateUrl: '/report/template/movementReport.tmpl.cshtml',
controller: controller,
controllerAs: 'vm'
}
@@ -14,7 +14,7 @@
controller.$inject = ['$scope', '$uibModal', 'inventorySvc'];
function controller($scope, $uibModal, inventorySvc) {
var vm = this;
vm.monthlyInventoryData = $scope.monthlyInventoryData;
vm.movementData = $scope.movementData;
vm.editInventory = function (inventoryId) {
inventorySvc.find(inventoryId)
+6 -6
View File
@@ -4,13 +4,13 @@
reportSvc.$inject = ['$http'];
function reportSvc($http) {
var distributionData = [];
var monthlyInventoryData = {};
var movementData = {};
var svc = {
distributionData: distributionData,
loadDistributionReport: loadDistributionReport,
monthlyInventoryData: monthlyInventoryData,
loadMonthlyInventoryData: loadMonthlyInventoryData
movementData: movementData,
loadMovementData: loadMovementData
};
return svc;
@@ -22,10 +22,10 @@
});
}
function loadMonthlyInventoryData(query) {
return $http.post('/Report/MonthlyInventory', query)
function loadMovementData(query) {
return $http.post('/Report/Movement', query)
.success(function (data) {
angular.copy(data, monthlyInventoryData);
angular.copy(data, movementData);
});
}
}
@@ -13,7 +13,7 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="item in vm.monthlyInventoryData.items | orderBy:'inventoryType.name'">
<tr ng-repeat="item in vm.movementData.items | orderBy:'inventoryType.name'">
@*<td><a href="" ng-click="vm.editInventory(item.inventory.id)"><i class="fa fa-edit"></i></a> </td>*@
<td>{{item.inventoryType.name}}</td>
<td>{{item.inventoryType.unitsPerCase}} / {{item.inventoryType.containerType}}</td>
@@ -16,7 +16,6 @@
class="form-control"
bs-datepicker="" />
</div>
</div>
</div>
</div>