diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php
index e7f3a97a..b709be63 100755
--- a/app/Controllers/Inwardgateregister.php
+++ b/app/Controllers/Inwardgateregister.php
@@ -691,6 +691,7 @@ function viewIGRDetails()
   $IGRNO = $this->request->getPost('id');
   
   $data['details'] =  $this->inwardgateregister_model->viewigr($IGRNO);
+
   $TaxInPercentage = 0;
   for ($i = 0; $i < count($data['details']); $i++) {
     $details = $data['details'][$i];
diff --git a/app/Views/editdepartment.php b/app/Views/editdepartment.php
index 11a4fc50..88fb7515 100755
--- a/app/Views/editdepartment.php
+++ b/app/Views/editdepartment.php
@@ -186,6 +186,12 @@ $("#deptBtnId").on('click',function(){
     let depCode =$("#DEPCode").val();
     let headDepCode = $("#HeadDept").val();
 
+
+    if(departmentName.length<1){
+            alert(`Department Name cannot be empty..!!`);
+            return;
+        }
+
     $('#loader').show();
     $.ajax({
         type:"POST",
diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php
index c73bcc47..adebd413 100755
--- a/app/Views/viewinwardgateregister.php
+++ b/app/Views/viewinwardgateregister.php
@@ -1273,8 +1273,9 @@
 									'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' ;
 									
 
+									let regex = /gas/i;
 
-									if(item.MaterialCategory == "gas"){
+									if(regex.test(item.MaterialCategory) ){
 										$('#gasShortageHeader').show();
 										$('#gasShortageListHeader').show();
 										trIGRHTML += '<td style="width: 25px;"><a target="_blank" data-toggle="modal" data-target="#gasShortageCalculator" title="gas Shortage Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-gas-pump" style="text-align: center;"></i></a> </td>' ;
@@ -2461,8 +2462,17 @@
 <script>
 	$(document).ready(function(){
 		$('#gasShortageCalculator').on("hide.bs.modal", function(e){ 
+
 			$('#invoiceNoId').val(' '); 
-			$('#fullCylinderDateId').val(" "); 
+			$('#fullCylinderDateId').val(" ");
+			$('#emptyCylinderDateId').val(" ");
+			$('#cylinderNoId').val(" ");
+			$('#grossWeightId').val(" ");
+			$('#tareWeightId').val(" ");
+			$('#actualWeightId').val(" ");
+			$('#netWeightId').val(" ");
+			$('#shortageId').val(" ");
+
 		});
 	});
 </script>
@@ -2535,9 +2545,16 @@
 <!-- while closing edit gas shortage modal -->
 <script>
 	$(document).ready(function(){
-		$('#gasShortageCalculator').on("hide.bs.modal", function(e){ 
+		$('#editGasShortageCalculator').on("hide.bs.modal", function(e){ 
 			$('#editInvoiceNoId').val(' '); 
 			$('#editFullCylinderDateId').val(" "); 
+			$('#editEmptyCylinderDateId').val(" ");
+			$('#editCylinderNoId').val(" ");
+			$('#editGrossWeightId').val(" ");
+			$('#editTareWeightId').val(" ");
+			$('#editActualWeightId').val(" ");
+			$('#editNetWeightId').val(" ");
+			$('#editShortageId').val(" ");
 		});
 	});
 </script>
@@ -2572,6 +2589,8 @@
 						console.log(response.data);
 
 						let data = response.data ;
+						console.log("gas shortage list");
+						console.log(data);
 						let tableData = '';
 
 									data.forEach((val) => {							
@@ -2601,7 +2620,7 @@
 
 									// Assuming you have a table with ID "gasShortageTable"
 									$("#gasShortageTable tbody").html(tableData);
-
+									
 
 
 					} else {