Index: src/main/webapp/app/src/repositories/sessionDashboardRepo.js =================================================================== diff -u -r9be10e67b29e171af92a4be0d17ae8766937423e -rdc55f8549dd60d91441f26901fc8e7dc7534e09e --- src/main/webapp/app/src/repositories/sessionDashboardRepo.js (.../sessionDashboardRepo.js) (revision 9be10e67b29e171af92a4be0d17ae8766937423e) +++ src/main/webapp/app/src/repositories/sessionDashboardRepo.js (.../sessionDashboardRepo.js) (revision dc55f8549dd60d91441f26901fc8e7dc7534e09e) @@ -42,6 +42,11 @@ rawParams.salesHistoryMax = filter.filterPanelEditting.salesHistoryMax; } + if (filter.filterPanel.isOnHand) { + rawParams.onHandMin = filter.filterPanelEditting.onHandMin; + rawParams.onHandMax = filter.filterPanelEditting.onHandMax; + } + if (selectedHierarchy != null) { rawParams.level = selectedHierarchy.level; rawParams.hierarchyId = selectedHierarchy.hierarchyId; Index: src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js =================================================================== diff -u -r13dcded0ad8a7558ed83b2f591ee527428a0adbd -rdc55f8549dd60d91441f26901fc8e7dc7534e09e --- src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js (.../sessionDashboardCtrl.js) (revision 13dcded0ad8a7558ed83b2f591ee527428a0adbd) +++ src/main/webapp/app/src/session/dashboard/sessionDashboardCtrl.js (.../sessionDashboardCtrl.js) (revision dc55f8549dd60d91441f26901fc8e7dc7534e09e) @@ -686,6 +686,9 @@ $scope.filter.filterPanelEditting.isSalesHistory = false; $scope.filter.filterPanelEditting.salesHistoryMin = null; $scope.filter.filterPanelEditting.salesHistoryMax = null; + $scope.filter.filterPanelEditting.isOnHand = false; + $scope.filter.filterPanelEditting.onHandMin = null; + $scope.filter.filterPanelEditting.onHandMax = null; $scope.filter.filterPanelEditting.isSelect="unreviewed"; $scope.vm.selectedLinesTwo = []; $scope.vm.selectedSitesTwo = []; @@ -737,21 +740,28 @@ $scope.filter.filterPanelEditting.selectedSites.includes(site); $scope.$watchGroup( - ['filter.filterPanelEditting.salesHistoryMin', 'filter.filterPanelEditting.salesHistoryMax'], + ['filter.filterPanelEditting.salesHistoryMin', 'filter.filterPanelEditting.salesHistoryMax','filter.filterPanelEditting.onHandMin', 'filter.filterPanelEditting.onHandMax'], (newValue, oldValue) => { - let [salesHistoryMin, salesHistoryMax] = newValue; + let [salesHistoryMin, salesHistoryMax,onHandMin, onHandMax ] = newValue; $("#btnConfirm").prop('disabled', false); - if((typeof(salesHistoryMin) === 'number' && typeof(salesHistoryMax)=== 'number') && salesHistoryMin > salesHistoryMax){ - toastr.error('Enter valid sales history value'); + const isSalesHistoryCondition = ((typeof(salesHistoryMin) === 'number' && typeof(salesHistoryMax)=== 'number') && salesHistoryMin > salesHistoryMax); + const isOnHandCondition = ((typeof(onHandMin) === 'number' && typeof(onHandMax)=== 'number') && onHandMin > onHandMax); + if(isSalesHistoryCondition || isOnHandCondition){ + const msg = isOnHandCondition ? "on hand" : "sales history"; + toastr.error(`Enter valid ${msg} value`); $("#btnConfirm").prop('disabled', true); } salesHistoryMin = salesHistoryMin === 0 ? 1 : salesHistoryMin; salesHistoryMax = salesHistoryMax === 0 ? 1 : salesHistoryMax; + onHandMin = onHandMin === 0 ? 1 : onHandMin; + onHandMax = onHandMax === 0 ? 1 : onHandMax; $scope.filter.filterPanelEditting.isSalesHistory = (salesHistoryMin || salesHistoryMax) || false; + $scope.filter.filterPanelEditting.isOnHand = (onHandMin || onHandMax) || false; } ) + + - $uibModalInstance.result.then( function () { $scope.filter.filterPanel = angular.copy( Index: src/main/webapp/app/src/session/dashboard/templates/sessionDashboardFilterPanel.html =================================================================== diff -u -r72401057ff16dc3196771dd5d541db0f3b1e3800 -rdc55f8549dd60d91441f26901fc8e7dc7534e09e --- src/main/webapp/app/src/session/dashboard/templates/sessionDashboardFilterPanel.html (.../sessionDashboardFilterPanel.html) (revision 72401057ff16dc3196771dd5d541db0f3b1e3800) +++ src/main/webapp/app/src/session/dashboard/templates/sessionDashboardFilterPanel.html (.../sessionDashboardFilterPanel.html) (revision dc55f8549dd60d91441f26901fc8e7dc7534e09e) @@ -48,7 +48,19 @@ to - + +
+
+
+ On Hand + + + to + + +