Add support for shipment containers

Third-Culture-Software · Jul 22, 2022 · 2082421 · 2082421
1 parent 37eef8e
commit 2082421
Show file tree

Hide file tree

Showing 28 changed files with 1,147 additions and 132 deletions.
diff --git a/client/src/i18n/en/form.json b/client/src/i18n/en/form.json
@@ -574,7 +574,7 @@
             "LOOKUP_BY_ID": "By ID",
             "LOOKUP_BY_NAME": "By Name",
             "LOSS_ACCOUNT": "Loss Account",
-            "LOT": "Lot / Batch number",
+            "LOT": "Lot / Batch",
             "MALE": "Male",
             "MANUFACTURER_BRAND": "Manufacturer brand",
             "MANUFACTURER_MODEL": "Manufacturer model",
@@ -930,6 +930,7 @@
             "CHOICE_FILTER": "Choice Filter",
             "CODE": "Enter code",
             "CONDITION": "Condition",
+            "CONTAINER": "Container",
             "COUNTRY": "Enter country",
             "CREDITOR": "Enter creditor",
             "CURRENCY": "Select currency",

diff --git a/client/src/i18n/en/shipment.json b/client/src/i18n/en/shipment.json
@@ -1,9 +1,33 @@
 {
   "SHIPMENT" : {
+    "ASSIGN_LOTS": "Assign lots",
+    "ASSIGN_LOTS_TOOLTIP": "Assign the selected lots to this container",
     "AUTHORIZED": "Authorized",
     "ANTICIPATED_DELIVERY_DATE": "Anticipated delivery date",
     "BARCODE": "Shipment Barcode",
     "COMPLETE_SHIPMENT" : "Mark shipment as complete",
+    "CONTAINER": "Container",
+    "CONTAINERS": "Containers",
+    "CONTAINER_TYPE": "Container Type",
+    "CONTAINER_TYPES": {
+      "BALE":    "bale",
+      "BOTTLE":  "bottle",
+      "BOX":     "box",
+      "BUNDLE":  "bundle",
+      "CAN":     "can",
+      "CARTON":  "carton",
+      "CONTAINER": "container",
+      "CRATE":   "crate",
+      "KIT":     "kit",
+      "PACKAGE": "package",
+      "PACKET":  "packet",
+      "PAIR":    "pair",
+      "PALLET":  "pallet",
+      "PIECES":  "pieces",
+      "REAM":    "ream",
+      "SACK":    "sack",
+      "SET":     "set"
+    },
     "CREATE": "Create",
     "CREATED": "Shipment successfully created",
     "CREATED_BY": "Created by",
@@ -21,6 +45,7 @@
     "DOES_SHIPMENT_EXIST_HELP": "Please provide the reference of a shipment that is ready to ship.",
     "DUELY_RECEIVED_BY": "Duely received by",
     "EDIT": "Edit",
+    "EDIT_CONTAINER": "Edit Container",
     "EDIT_SHIPMENT": "Edit Shipment",
     "ENTER_SHIPMENT_PROGRESS": "Please enter the shipment progress status.  Include the current shipment location if it has changed.",
     "ENTER_SHIPMENT_PROGRESS_HELP_TEXT": "Ex. RECEPTION - IMA GOMA WAREHOUSE, GOMA",
@@ -49,6 +74,7 @@
     "MARK_READY_TO_SHIP_MESSAGE2": "(You will no longer be able to make changes to it.)",
 
     "NAME_FUNCTION_SIGNATURE": "(name, function, signature)",
+    "NEW_CONTAINER": "New Container",
     "NEW_LOCATION": "New Location",
     "NEW_SHIPMENT": "New Shipment",
     "NOT_DEFINED": "Not Defined",
@@ -63,6 +89,7 @@
     "RECEIVER": "Receiver",
     "REFERENCE": "Reference",
     "REQUISITION": "Requisition",
+    "SELECT_CONTAINER_TYPE" : "Select Container Type",
     "SHIPMENTS": "Shipments",
     "SHIPMENT_CREATED": "Shipment created",
     "SHIPMENT_DATE": "Expedition",
@@ -74,6 +101,7 @@
     "STOCK_ENTRY_PARTIAL": "Partial stock entry for shipment performed",
     "STOCK_EXITED_DONE": "Stock exit performed for the shipment",
     "STOCK_REFERENCE": "Stock Reference",
+    "SUCCESFULLY_CREATED_CONTAINER": "Successfully created a new container",
     "TITLE" : "Shipment",
     "TOTAL_COST": "Total cost",
     "TOTAL_QUANTITY": "Total quantity",

diff --git a/client/src/i18n/en/table.json b/client/src/i18n/en/table.json
@@ -149,7 +149,7 @@
             "LISTS": "Registered price list",
             "LOADING": "Fetching data from the server.",
             "LOCKED": "Locked",
-            "LOT": "Lot/ Batch number",
+            "LOT": "Lot / Batch",
             "LONGITUDE": "Longitude",
             "LATITUDE": "Latitude",
             "MANUAL_DISTRIBUTION": "Manual distributions",

diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json
@@ -931,6 +931,7 @@
             "CODE": "Entrer le code",
             "COUNTRY": "Entrer le nom du pays",
             "CONDITION": "Condition",
+            "CONTAINER": "Conteneur",
             "CREDITOR": "Entrer un Créditeur",
             "CURRENCY": "Sélectionner la monnaie",
             "DEBTOR": "Entrer un Débiteur",

diff --git a/client/src/i18n/fr/shipment.json b/client/src/i18n/fr/shipment.json
@@ -1,9 +1,33 @@
 {
   "SHIPMENT" : {
+    "ASSIGN_LOTS": "Assigner des lots",
+    "ASSIGN_LOTS_TOOLTIP": "Assigner les lots sélectionnés à ce conteneur",
     "AUTHORIZED": "Autorisé",
     "ANTICIPATED_DELIVERY_DATE": "Date de livraison previsionnelle",
     "BARCODE": "Code-barre de l'expédition",
     "COMPLETE_SHIPMENT" : "Marquez l'expédition comme complète",
+    "CONTAINER": "Conteneur",
+    "CONTAINERS": "Conteneurs",
+    "CONTAINER_TYPE": "Type de conteneur",
+    "CONTAINER_TYPES" : {
+      "BALE":     "ballot",
+      "BOTTLE":   "flacon",
+      "BOX":      "boite",
+      "BUNDLE":   "botte",
+      "CAN":      "bidon",
+      "CARTON":   "carton",
+      "CONTAINER": "conteneur",
+      "CRATE":    "caisse",
+      "KIT":      "kit",
+      "PACKAGE":  "colis",
+      "PACKET":   "paquet",
+      "PAIR":     "paire",
+      "PALLET":   "pallet",
+      "PIECES":   "pieces",
+      "REAM":     "ramme",
+      "SACK":     "sac",
+      "SET":      "jeu"
+    },
     "CREATE": "Créer",
     "CREATED": "Expédition créee avec succès",
     "CREATED_BY": "Crée par",
@@ -21,6 +45,7 @@
     "DOES_SHIPMENT_EXIST_HELP": "Veuillez renseigner la référence de l'expédition prête",
     "DUELY_RECEIVED_BY": "Pour réception conformé",
     "EDIT": "Editer",
+    "EDIT_CONTAINER": "Modifier conteneur",
     "EDIT_SHIPMENT": "Modifier expédition",
     "ENTER_SHIPMENT_PROGRESS": "Veuillez entrer l'etat de progression de l'expédition avec sa localisation actuelle",
     "ENTER_SHIPMENT_PROGRESS_HELP_TEXT": "Ex. RECEPTION - IMA GOMA WAREHOUSE, GOMA",
@@ -49,6 +74,7 @@
     "MARK_READY_TO_SHIP_MESSAGE2": "(Vous ne pourrez plus y effectuer de modifications.)",
 
     "NAME_FUNCTION_SIGNATURE": "(nom, fonction, signature)",
+    "NEW_CONTAINER": "Nouveau conteneur",
     "NEW_LOCATION": "Nouvelle localisation",
     "NEW_SHIPMENT": "Nouvelle expédition",
     "NOT_DEFINED": "Non-défini",
@@ -63,6 +89,7 @@
     "RECEIVER": "Récepteur",
     "REFERENCE": "Reférence",
     "REQUISITION": "Requisition",
+    "SELECT_CONTAINER_TYPE" : "Sélectionner le type de conteneur",
     "SHIPMENTS": "Expéditions",
     "SHIPMENT_CREATED": "Expédition créée",
     "SHIPMENT_DATE": "Date de l'expédition",
@@ -74,6 +101,7 @@
     "STOCK_ENTRY_PARTIAL": "Entrée en stock partielle pour l'expédition effectuée",
     "STOCK_EXITED_DONE": "Sortie de stock effectuée pour l'expédition",
     "STOCK_REFERENCE": "Stock Reférence",
+    "SUCCESFULLY_CREATED_CONTAINER": "Création d'un nouveau conteneur réussie avec succès",
     "TITLE" : "Expedition",
     "TOTAL_COST": "Côut total",
     "TOTAL_QUANTITY": "Quantité totale",

diff --git a/client/src/js/components/bhAddItem.js b/client/src/js/components/bhAddItem.js
@@ -5,6 +5,7 @@ angular.module('bhima.components')
     bindings    : {
       callback    : '&',
       disable     : '<?',
+      label       : '<?',
     },
   });
 
@@ -21,6 +22,10 @@ function addItemController() {
     // default value for incrementation
     $ctrl.itemIncrement = 1;
 
+    if (!angular.isDefined($ctrl.label)) {
+      $ctrl.label = 'FORM.BUTTONS.ADD';
+    }
+
     if (!angular.isDefined($ctrl.disable)) {
       $ctrl.disable = false;
     }

diff --git a/client/src/js/services/grid/GridGrouping.js b/client/src/js/services/grid/GridGrouping.js
@@ -181,8 +181,8 @@ function GridGroupingService(GridAggregators, uiGridGroupingConstants, Session,
 
     /**
      * contains the number of selected rows
-     * TODO : create a separate service to handle selection functionnality of the grid as grouping
-     * and selection are differents
+     * TODO : create a separate service to handle selection functionality of the grid as grouping
+     * and selection are different
      */
     this.selectedRowCount = 0;
     this.getSelectedGroups = getSelectedGroups.bind(this);

diff --git a/client/src/modules/shipment/create-shipment.html b/client/src/modules/shipment/create-shipment.html
@@ -44,6 +44,7 @@
 
       <!-- date and note -->
       <div class="row">
+
         <div class="col-md-4">
           <!-- shipment title -->
           <bh-input-text
@@ -82,7 +83,7 @@
 
           <!-- note -->
           <div class="form-group"
-            ng-class="{ 'has-error' : ShipmentForm.$submitted && ShipmentForm.description.$invalid }">
+               ng-class="{ 'has-error' : ShipmentForm.$submitted && ShipmentForm.description.$invalid }">
             <label class="control-label">
               <span translate>FORM.LABELS.NOTES</span>
             </label>
@@ -97,6 +98,10 @@
             </div>
           </div>
 
+        </div> <!-- end col-md-4 -->
+
+        <div class="col-md-4">
+
           <div class="form-group" ng-class="{ 'has-error' : ShipmentForm.$submitted && ShipmentForm.receiver.$invalid }">
             <label class="control-label" translate>SHIPMENT.RECEIVER</label>
             <div>
@@ -126,12 +131,10 @@
               </div>
             </div>
           </div>
-        </div>
 
-        <div class="col-md-4">
           <!-- message panel to display actions the user needs to take -->
-          <div class="form-group" style="min-height: 12em;">
-            <label class="control-label" translate>STOCK.PENDING_ACTIONS</label>
+          <div class="form-group" style="min-height: 12em; border: 1px solid #D8D8D8; color: #888;">
+            <label class="control-label"><i translate>STOCK.PENDING_ACTIONS</i></label>
 
             <p
               style="padding-top:0"
@@ -159,28 +162,32 @@
             </p>
 
           </div>
-        </div>
 
-        <div ng-if="!CreateShipCtrl.existingShipmentUuid && CreateShipCtrl.alreadyAllocated.length" class="col-md-4">
-          <div class="form-group">
-            <div class="alert alert-warning" style="margin: 0;">
-              <span translate>SHIPMENT.EXISTING_ASSETS_IN_OTHER_SHIPMENT</span>
-            </div>
-            <div style="max-height: 200px; overflow-y: auto; margin: 0;">
-              <table class="table table-condensed table-bordered">
-                <tr>
-                  <th translate>SHIPMENT.TITLE</th>
-                  <th translate>ASSET.TITLE</th>
-                </tr>
-                <tr ng-repeat="item in CreateShipCtrl.alreadyAllocated track by item.uuid">
-                  <td><a ng-click="CreateShipCtrl.getOverview(item.shipment_uuid)" href>{{ item.reference }}</a></td>
-                  <td>{{ item.inventory_code + ' - ' + item.inventory_text + ' (' + item.lot_label + ')'}}</td>
-                </tr>
-              </table>
+        </div> <!-- end col-md-4 -->
+
+        <div class="col-md-4">
+          <div ng-if="!CreateShipCtrl.existingShipmentUuid && CreateShipCtrl.alreadyAllocated.length" >
+            <div class="form-group">
+              <div class="alert alert-warning" style="margin: 0;">
+                <span translate>SHIPMENT.EXISTING_ASSETS_IN_OTHER_SHIPMENT</span>
+              </div>
+              <div style="max-height: 200px; overflow-y: auto; margin: 0;">
+                <table class="table table-condensed table-bordered">
+                  <tr>
+                    <th translate>SHIPMENT.TITLE</th>
+                    <th translate>ASSET.TITLE</th>
+                  </tr>
+                  <tr ng-repeat="item in CreateShipCtrl.alreadyAllocated track by item.uuid">
+                    <td><a ng-click="CreateShipCtrl.getOverview(item.shipment_uuid)" href>{{ item.reference }}</a></td>
+                    <td>{{ item.inventory_code + ' - ' + item.inventory_text + ' (' + item.lot_label + ')'}}</td>
+                  </tr>
+                </table>
+              </div>
             </div>
           </div>
         </div>
-      </div>
+
+      </div>  <!-- end row -->
 
       <!-- not available messages -->
       <div ng-if="CreateShipCtrl.inventoryNotAvailable.length" class="row">
@@ -207,9 +214,71 @@ <h4 translate>STOCK.PRODUCT_NOT_AVAILABLE</h4>
             <div class="grid-toolbar-item">
               <button class="btn btn-default" type="button" style="margin-left: 5px; vertical-align: middle;"
                 ng-click="CreateShipCtrl.getLotByBarcode()">
-                <span class="fa fa-plus-circle"></span> <span translate>BARCODE.SCAN</span> <span class="fa fa-barcode"></span>
+                <span class="fa fa-plus-circle"></span>
+                <span translate>BARCODE.SCAN_LOT_BARCODE</span>
+                <span class="fa fa-barcode"></span>
               </button>
             </div>
+
+            <div class="grid-toolbar-item" style="margin-left: 2em;">
+              <span class="input-group-btn">
+                <button
+                  id="btn-new-container"
+                  type="button"
+                  class="btn btn-default"
+                  ng-click="CreateShipCtrl.newContainer()">
+                  <i class="fa fa-plus-circle"></i> <span translate>SHIPMENT.NEW_CONTAINER</span>
+                </button>
+              </span>
+            </div>
+
+            <div ng-if="CreateShipCtrl.containers.length" class="grid-toolbar-item" style="margin-left: 1em;">
+              <div uib-dropdown dropdown-append-to-body data-action="open-menu">
+                <a class="btn btn-default" uib-dropdown-toggle>
+                  <span class="fa fa-bars"></span>
+                  <span class="hidden-xs" translate>SHIPMENT.CONTAINERS</span>
+                  <span class="caret"></span>
+                </a>
+
+                <ul uib-dropdown-menu role="menu" class="dropdown-menu-right" style="border: 3px double #CCC;">
+                  <li>
+                    <table class="table table-condensed" style="margin-bottom: 0.2em;">
+                      <thead>
+                        <tr>
+                          <th translate>FORM.LABELS.LABEL</th>
+                          <th translate>FORM.LABELS.TYPE</th>
+                          <th></th>
+                          <th></th>
+                          <th></th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr ng-repeat="cont in CreateShipCtrl.containers">
+                          <td>{{cont.label}}</td>
+                          <td>{{cont.container_type}}</td>
+                          <td>
+                            <a href ng-click="CreateShipCtrl.editContainer(cont)">
+                              <span class="fa fa-edit"></span> <span translate>FORM.LABELS.EDIT</span>
+                            </a>
+                          </td>
+                          <td style="margin-right: 2em;">
+                            <a href ng-click="CreateShipCtrl.assignShippingItems(cont)"
+                               uib-tooltip="{{ 'SHIPMENT.ASSIGN_LOTS_TOOLTIP' | translate }}" tooltip-placement="bottom">
+                              <i class="fa fa-check-square-o"></i> <span translate>SHIPMENT.ASSIGN_LOTS</span>
+                            </a>
+                          </td>
+                          <td>
+                            <a href ng-click="CreateShipCtrl.deleteContainer(cont)">
+                              <span class="text-danger"><i class="fa fa-trash"></i> <span translate>FORM.BUTTONS.DELETE</span></span>
+                            </a>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -250,5 +319,4 @@ <h4 translate>STOCK.PRODUCT_NOT_AVAILABLE</h4>
       </div>
     </form>
   </div>
-  <br />
 </div>