fix(test and server): Fix the end to end test and the server side log…

…ic to filter stock movement by
Third-Culture-Software · Aug 15, 2017 · 5c0cd27 · 5c0cd27
1 parent 98f1f27
commit 5c0cd27
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/client/src/modules/stock/entry/entry.js b/client/src/modules/stock/entry/entry.js
@@ -345,7 +345,7 @@ function StockEntryController(Depots, Inventory, Notify,
       .then(function (document) {
         vm.Stock.store.clear();
         vm.movement = {};
-        ReceiptModal.stockEntryDepotReceipt(document.uuid, bhConstants.flux.FROM_OTHER_DEPOT);
+        ReceiptModal.stockEntryDepotReceipt(document.uuid, true);
       })
       .catch(Notify.handleError);
   }

diff --git a/server/controllers/stock/core.js b/server/controllers/stock/core.js
@@ -71,12 +71,13 @@ function getLots(sqlQuery, parameters, finalClauseParameter) {
         JOIN stock_movement m ON m.lot_uuid = l.uuid AND m.flux_id = ${flux.FROM_PURCHASE} 
         JOIN depot d ON d.uuid = m.depot_uuid 
     `;
-  db.convert(params, ['uuid', 'depot_uuid', 'lot_uuid', 'inventory_uuid']);
+  db.convert(params, ['uuid', 'depot_uuid', 'lot_uuid', 'inventory_uuid', 'document_uuid']);
   const filters = new FilterParser(params, { autoParseStatements : false });
 
   filters.equals('uuid', 'uuid', 'l');
   filters.equals('depot_text', 'text', 'd');
   filters.equals('depot_uuid', 'depot_uuid', 'm');
+  filters.equals('document_uuid', 'document_uuid', 'm');
   filters.equals('lot_uuid', 'lot_uuid', 'm');
   filters.equals('inventory_uuid', 'uuid', 'i');
   filters.equals('text', 'text', 'i');

diff --git a/test/end-to-end/stock/stock.adjustment.spec.js b/test/end-to-end/stock/stock.adjustment.spec.js
@@ -52,4 +52,4 @@ function StockAdjustmentTests() {
   });
 }
 
-describe('Stock Adustment Test', StockAdjustmentTests);
+describe('Stock Adjustment Test', StockAdjustmentTests);
diff --git a/test/end-to-end/stock/stock.entry.spec.js b/test/end-to-end/stock/stock.entry.spec.js
@@ -69,7 +69,7 @@ function StockExiTests() {
 
   it('Should entry stock from a transfer reception', () => {
     // select the movement
-    page.setTransfer(0);
+    page.setTransfer(1);
 
     page.setDate(new Date());
 

diff --git a/test/end-to-end/stock/stock.movements.spec.js b/test/end-to-end/stock/stock.movements.spec.js
@@ -80,37 +80,37 @@ function StockMovementsRegistryTests() {
     FU.buttons.search();
     FU.uiSelect('$ctrl.bundle.flux_id', 'Commande d\'achat');
     FU.modal.submit();
-    GU.expectRowCount(gridId, 22 + depotGroupingRow);
+    GU.expectRowCount(gridId, 23 + depotGroupingRow);
 
     // to patient 
     FU.buttons.search();
     FU.uiSelect('$ctrl.bundle.flux_id', 'Vers un patient');
     FU.modal.submit();
-    GU.expectRowCount(gridId, 22 + depotGroupingRow);
+    GU.expectRowCount(gridId, 23 + depotGroupingRow);
 
     // to depot 
     FU.buttons.search();
     FU.uiSelect('$ctrl.bundle.flux_id', 'Vers un depot');
     FU.modal.submit();
-    GU.expectRowCount(gridId, 22 + depotGroupingRow);
+    GU.expectRowCount(gridId, 23 + depotGroupingRow);
 
     // from depot
     FU.buttons.search();
     FU.uiSelect('$ctrl.bundle.flux_id', 'En provenance d\'un depot');
     FU.modal.submit();
-    GU.expectRowCount(gridId, 22 + depotGroupingRow);
+    GU.expectRowCount(gridId, 23 + depotGroupingRow);
 
     // positive adjustment
     FU.buttons.search();
     FU.uiSelect('$ctrl.bundle.flux_id', 'Ajustement (Positif)');
     FU.modal.submit();
-    GU.expectRowCount(gridId, 22 + depotGroupingRow);
+    GU.expectRowCount(gridId, 23 + depotGroupingRow);
 
     // negative adjustment
     FU.buttons.search();
     FU.uiSelect('$ctrl.bundle.flux_id', 'Ajustement (Negatif)');
     FU.modal.submit();
-    GU.expectRowCount(gridId, 22 + depotGroupingRow);
+    GU.expectRowCount(gridId, 23 + depotGroupingRow);
 
     // clear filters
     FU.buttons.clear();