Merge pull request #228 from Shrutihindocha/master

improvements to return sheet
dbca-wa · Dec 18, 2023 · 8237bb5 · 8237bb5
2 parents cb12ad9 + 0d20a20
commit 8237bb5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -11,5 +11,5 @@
 		   "--hostname","wildlifecompliance-dev"
 		   ],
 	"forwardPorts": [9051,9052,9053,9054,9055,9056,9057,9058,9059],
-	"initializeCommand" : "${localEnv:HOME}/docker-scripts-dev/windows_vbox/postgres_docker_load.sh && ${localEnv:HOME}/docker-scripts-dev/windows_vbox/ledger_docker_load.sh "
+	"initializeCommand" : "${localEnv:HOME}/docker-scripts-dev/windows_vbox/postgres_docker_load.sh"
 }
diff --git a/.../frontend/wildlifecompliance/src/components/external/returns/enter_return_sheet_entry.vue b/.../frontend/wildlifecompliance/src/components/external/returns/enter_return_sheet_entry.vue
@@ -48,7 +48,7 @@
                                 <label class="control-label pull-left" >Quantity:</label>
                             </div>
                             <div class="col-md-3">
-                                <input type='text' v-model='entryQty' >
+                                <input type='number' v-model='entryQty' >
                             </div>
                         </div>
                         <div class="row">
@@ -329,6 +329,13 @@ export default {
           this.missing_fields.push(missing_field)
           is_valid = false;
         }
+        if (this.entryActivity === '0') {
+          const missing_field = {
+            label: 'Activity',
+          }
+          this.missing_fields.push(missing_field)
+          is_valid = false;
+        }
         this.highlightMissingFields();
         var top = ($('#error').offset() || { "top": NaN }).top;
         $('html, body').animate({
@@ -470,9 +477,12 @@ export default {
 
               if (this.isStock(self.entryActivity)) { // Initial Stock entries aggregate from Current Stock.
                   rows[i].total = parseInt(rows[i].total) + (parseInt(self.entryQty) - parseInt(self.currentStock));
-              } else {
+              } else if (self.entryActivity.includes('in') ) {
                   rows[i].total = parseInt(rows[i].total) + (parseInt(self.entryQty) - parseInt(self.initialQty))
               }
+              else if (self.entryActivity.includes('out')) {
+                  rows[i].total = parseInt(rows[i].total) - (parseInt(self.entryQty) - parseInt(self.initialQty))
+              }
           }
         }
         self.species_cache[self.returns.sheet_species] = rows;