added modal form

api/v1/Customers/Delete.php

@@ -17,10 +17,56 @@ echo '<script>window.location.href="customers.php"</script>';
  	.deleteForm {
  		display: none;
  	}
+ 	.deleteCForm span{
+ 	 	color:red;
+  		margin-right: 5px;
+	}
+	form.deleteCForm.modal-content.animate {
+    width: 400px;
+    height: 280px;
+    margin-left: -15px;
+     background-color: #dfe3e6;
+	}
+	div#deleteForm {
+    width: 400px;
+    height: 280px;
+    border-radius: 0.5em;
+    margin-top: 100px;
+	}
+	.form-group.deleterow label{
+		height:20px;
+		margin-left: 80px;
+		margin-top: 52px;
+		margin-bottom: 30px;
+		color: #610e14;
+		font-size: 20px;
+	}
+	input.btn.btn-default.deleteCustomer {
+    background: radial-gradient(#0da3bb, #04161fc2);
+    color: #610e14;
+    font-family:-webkit-pictograph;
+    font-size: 18px;
+    margin-right: 20px;
+    width: 70px;
+	}
+	#deleteid{
+		margin-left:100px;
+	}
+
  </style>
-<div class="container deleteForm" id="deleteForm">
-	<form action="" method="post">
- 	<input type="number" name="deleteid" id="deleteid">
- 	<input type="submit" name="delete" value="OK" class="btn btn-danger">
+<div class="container deleteForm modal" id="deleteForm">
+	<form action="" method="post" class="modal-content animate deleteCForm">
+		<span onclick="document.getElementById('deleteForm').style.display='none'" class="close" title="Close PopUp">&times;</span>
+      	<div class="form-group deleterow">
+          <label>Are you sure want to delete?</label>
+      </div>
+ 		<input type="number" name="deleteid" id="deleteid">
+ 	<!-- <input type="submit" name="delete" value="OK" class="btn btn-danger"> -->
+	 	<div class="form-group">
+	            <div class="col-sm-offset-2 col-sm-10 Vsave"> 
+	                <input type="submit" name="delete" value="OK" class="btn btn-default deleteCustomer">
+	                <input type="button" class="btn btn-default cancel" value="Cancel" onclick="document.getElementById('deleteForm').style.display = 'none';">
+	            </div>
+	    </div>
  	</form>
 </div>

api/v1/Customers/Edit.php

@@ -22,21 +22,80 @@
    .editForm {
     display: none;
    }
+     form.form-horizontal.editCustomer.modal-content.animate {
+    width: 400px;
+    height: 280px;
+    margin-left: -15px;
+     background-color: #dfe3e6;
+}
+div#editForm {
+    width: 400px;
+    height: 280px;
+    border-radius: 0.5em;
+    margin-top: 100px;
+    
+}
+.form-group.rowRadio {
+    margin-left: 28px;
+     color: #610e14;
+}
+.form-group.erow2{
+  margin-left: 50px;
+}
+.form-group.erow2 input[type='text']{
+ border:1px solid grey;
+  border-radius: 0.5em;
+  height: 35px;
+  width: 250px;
+}
+.form-group.erow2 label{
+  color: #610e14;
+  font-family:-webkit-pictograph;
+}
+.editForm span{
+  color:red;
+  margin-right: 5px;
+}
+input.btn.btn-default.editSave {
+    background: radial-gradient(#0da3bb, #04161fc2);
+    color: #610e14;
+    font-family:-webkit-pictograph;
+    font-size: 18px;
+    margin-right: 20px;
+    width: 70px;
+}
+input.btn.btn-default.editCancel {
+    background: radial-gradient(#b71515eb, #ef0b0bdb);
+    color: #fff;
+    font-family:-webkit-pictograph;
+    font-size:18px;
+    width: 73px;
+}
+.form-group.editBtn {
+    margin-left: 30px;
+    margin-top: 45px;
+}
  </style>
-<div class="container editForm" id="editForm">
-    <form class="form-horizontal" action="" method="post">
+
+<div class="container editForm modal" id="editForm">
+    <form class="form-horizontal modal-content animate editCustomer" action="" method="post">
+      <span onclick="document.getElementById('editForm').style.display='none'" class="close" title="Close PopUp">&times;</span>
+       <div class="form-group row1">
+          <label>Edit Customer</label>
+      </div>
     <input type="number" name="id" id="id" hidden="hidden">
 
-    <div class="form-group">
-     <label class="control-label col-sm-2"> Name </label>
+    <div class="form-group erow2">
+     <label class="control-label col-sm-2"> Name: </label>
     <div class="col-sm-10"> 
       <input id="username" type="text" name="username">
     </div>
    </div>
 
-    <div class="form-group">
-     <label class="control-label col-sm-2"> Credit Sale</label>
-      <div class="col-sm-10"> 
+    <div class="form-group rowRadio">
+      <!-- <div class="col-md-1"></div> -->
+     <label class="control-label col-md-4">Credit Sale:</label>
+      <div class="col-md-8"> 
       <!-- <input id="creditSaleOn" type="checkbox" name="creditSale">
       <input id="creditSaleOff" type="checkbox" name="creditSale"> -->
       <input id="creditSaleOn" type="radio" name="creditSale" value="1"> Yes<br>
@@ -52,10 +111,10 @@
       <input id="number" type="text" name="number">
    </div>
   </div> -->
-  <div class="form-group">
+  <div class="form-group editBtn">
       <div class="col-sm-offset-2 col-sm-10"> 
-      <input type="submit" name="edit" value="Submit">
-      <input type="button" value="Cancel" onclick="document.getElementById('editForm').style.display = 'none';">
+    <input type="submit" name="edit" value="Save" class="btn btn-default editSave">
+    <input type="button" class="btn btn-default editCancel" value="Cancel" onclick="document.getElementById('editForm').style.display = 'none';">
     </div>
   </div>
     </form>

api/v1/Customers/addCustomer.php

@@ -2,19 +2,21 @@
   require "connectionDb.php";
     if (isset($_POST['addCustomer']) && isset($_POST['addusername']) ) {
    
-     $username = $_POST['addusername'];
-     echo $creditSale = ($_POST['addcreditSale']=='on') ? 1 : 0 ;
+     echo $username = $_POST['addusername'];
+     $creditSale = ($_POST['addcreditSale']=='on') ? 1 : 0 ;
 
     $db->exec("INSERT INTO customer (type,created_at,updated_at,name,credit_sale) VALUES ('',strftime('%Y-%m-%d %H:%M:%f000000+06:30', 'now', 'localtime'),strftime('%Y-%m-%d %H:%M:%f000000+06:30', 'now', 'localtime'),'$username','$creditSale');");
 
-    echo '<script>window.location.href="customers.php"</script>';
+    //echo '<script>window.location.href="customers.php"</script>';
+    }else {
+      // $_SESSION['error'] = "En"
     }
  ?>
  <style type="text/css">
    .addForm {
     display: none;
    }
-/*   form.form-horizontal.modal-content.animate {
+     form.form-horizontal.formCustomer.modal-content.animate {
     width: 400px;
     height: 280px;
     margin-left: -15px;
@@ -27,58 +29,80 @@ div#addForm {
     margin-top: 100px;
     
 }
-input.btn.btn-default {
+.form-group.row1{
+  height:20px;
+  margin-left: 150px;
+  margin-top: 20px;
+  margin-bottom: 30px;
+}
+.form-group.row1 label{
+  color: #610e14;
+  font-family:-webkit-pictograph;
+  font-size: 20px;
+}
+.addForm span{
+  color:red;
+  margin-right: 5px;
+}
+.form-group.row2{
+  margin-left: 50px;
+}
+.form-group.row2 label{
+  color: #610e14;
+  font-family:-webkit-pictograph;
+}
+.form-group.row2 input[type='text']{
+  border:1px solid grey;
+  border-radius: 0.5em;
+  height: 30px;
+}
+.form-group.row3{
+  margin-top: 30px;
+}
+.form-group.row3 label{
+  color: #610e14;
+  margin-left: 20px;
+  font-family:-webkit-pictograph;
+}
+.form-group.row3 input[type='checkbox']{
+  width: 20px;
+  height: 20px;
+}
+input.btn.btn-default.addCustomer {
     background: radial-gradient(#0da3bb, #04161fc2);
      color: #fff;
     font-family: -webkit-pictograph;
     font-size: 20px;
-    margin-top: -110px;
-    margin-left: 110px;
+    margin-top: 10px;
+    margin-left: 90px;
     width: 120px;
-}*/
+}
+
  </style>
-<div class="container addForm" id="addForm">
-    <form class="form-horizontal" action="" method="post">
-      <!-- <span onclick="document.getElementById('addForm').style.display='none'" class="close" title="Close PopUp" style="color:red;margin-right: 5px;">&times;</span> -->
-      <div class="form-group row" style="width: height:20px;margin-left: 150px;margin-top: 20px;margin-bottom: 30px;">
-          <label style="color: #610e14;font-family:-webkit-pictograph;font-size: 20px;">New Customer</label>
+<div class="container addForm modal" id="addForm">
+    <form class="form-horizontal modal-content animate formCustomer" action="#" method="post">
+      <span onclick="document.getElementById('addForm').style.display='none'" class="close" title="Close PopUp">&times;</span>
+      <div class="form-group row1">
+          <label>New Customer</label>
       </div>
-      <div class="form-group row" style="margin-left: 50px;" >
-        <label class="control-label col-md-2" style="color: #610e14;font-family:-webkit-pictograph;" > Name:&nbsp;&nbsp;&nbsp;&nbsp; </label>
+
+      <div class="form-group row2" >
+        <label class="control-label col-md-2"> Name:&nbsp;&nbsp;&nbsp;&nbsp; </label>
         <div class="col-md-3"> 
-          <input type="text" name="addusername" style="border:1px solid grey;border-radius: 0.5em;height: 30px;">
+          <input type="text" name="addusername" required="true">
         </div>
       </div>
-      <div class="form-group row" style="margin-top: 30px;">
+      <div class="form-group row3">
         <div class="col-md-1"></div>
-        <label class="control-label col-md-3" style="color: #610e14;margin-left: 20px;font-family:-webkit-pictograph;"> Credit Sale:</label>
+        <label class="control-label col-md-3"> Credit Sale:</label>
         <div class="col-md-3"> 
-          <input type="checkbox" name="addcreditSale" style="width: 20px;height: 20px;color: red;">
+          <input type="checkbox" name="addcreditSale">
         </div>
       </div>
       <div class="form-group">        
-        <div class="col-sm-offset-2 col-sm-10">
-          <input type="submit" class="btn btn-default" value="Save" name="addCustomer">
-        </div>
+          <div class="col-sm-offset-2 col-sm-10">
+            <input type="submit" class="btn btn-default addCustomer" value="Save" name="addCustomer">
+            </div>
       </div>
     </form>
-</div>
-<!-- <div id="modal-wrapper addForm" class="modal addForm">
-  
-  <form class="modal-content animate" action="/action_page.php">
-        
-    <div class="imgcontainer">
-      <span onclick="document.getElementById('modal-wrapper').style.display='none'" class="close" title="Close PopUp">&times;</span>
-      <img src="dist/img/profile.jpg" alt="Avatar" class="avatar">
-      <h3 style="text-align:center">New Customer</h3>
-    </div>
-
-    <div class="container">
-      <label>Customer Name:</label><input type="text" placeholder="Enter name" name="uname"><br>
-      <input type="checkbox" style="margin:26px 30px;"> Credit Sale<br>
-     <button type="submit" style="margin-left: 150px;">Save</button>
-    </div>
-    
-  </form>
-  
-</div> -->
+</div>

api/v1/Customers/addVehicle.php

@@ -14,11 +14,11 @@
  	.addVehicleForm {
  		display: none;
  	}
-/*     form.form-horizontal.modal-content.animate {
+      form.form-horizontal.vehicleForm.modal-content.animate {
     width: 400px;
     height: 280px;
     margin-left: -15px;
-     background-color: #dfe3e6;
+    background-color: #dfe3e6;
 }
 div#addVForm {
     width: 400px;
@@ -27,15 +27,19 @@ div#addVForm {
     margin-top: 100px;
     
 }
-input[type="submit"].btn.btn-default {
+.vehicleForm span{
+  color:red;
+  margin-right: 5px;
+}
+input[type="submit"].btn.btn-default.saveNumber {
     background: radial-gradient(#0da3bb, #04161fc2);
     color: #610e14;
     font-family:-webkit-pictograph;
     font-size: 18px;
-    margin-right: -84px;
+    margin-right: 20px;
     width: 70px;
 }
-input[type="button"].btn.btn-default {
+input[type="button"].btn.btn-default.cancel {
     background: radial-gradient(#b71515eb, #ef0b0bdb);
     color: #fff;
     font-family:-webkit-pictograph;
@@ -43,28 +47,43 @@ input[type="button"].btn.btn-default {
     width: 73px;
 }
 
-.col-sm-offset-2.col-sm-10 {
-    margin-top: 95px;
-    margin-left: 30px;
-}*/
+.col-sm-offset-2.col-sm-10.Vsave {
+    margin-top: 75px;
+    margin-left: 120px;
+}
+.form-group.vrow1 label{
+    height:20px;
+    margin-left: 100px;
+    margin-top:20px;
+    margin-bottom:30px;
+    color: #610e14;
+    font-family:-webkit-pictograph;
+    font-size: 20px;
+}
+.form-group.vrow2{
+    margin-left: 50px;
+}
+.form-group.vrow2 label{
+    color: #610e14;font-family:-webkit-pictograph;
+}
 </style>
-<div class="container addVehicleForm" id="addVForm">
-    <form class="form-horizontal" action="" method="post">
-        <!-- <span onclick="document.getElementById('addVForm').style.display='none'" class="close" title="Close PopUp" style="color:red;margin-right: 5px;">&times;</span> -->
-        <div class="form-group" style="width: height:20px;margin-left: 150px;margin-top:20px;margin-bottom:30px;">
-            <label style="color: #610e14;font-family:-webkit-pictograph;font-size: 20px;">New Vehicle</label>
+<div class="container addVehicleForm modal" id="addVForm">
+    <form class="form-horizontal vehicleForm modal-content animate" action="" method="post">
+        <span onclick="document.getElementById('addVForm').style.display='none'" class="close" title="Close PopUp">&times;</span>
+        <div class="form-group vrow1">
+            <label style="">New Vehicle</label>
         </div>
-        <div class="form-group" style="margin-left: 50px;">
-            <label class="control-label col-sm-2" style="color: #610e14;font-family:-webkit-pictograph;"> Number </label>
+        <div class="form-group vrow2">
+            <label class="control-label col-sm-2"> Number: </label>
             <div class="col-sm-10"> 
-        		<input type="text" name="number">
+                <input type="text" name="number" required="true">
             </div>
         </div>
         <div class="form-group">
-            <div class="col-sm-offset-2 col-sm-10"> 
-        		<input type="submit" class="btn btn-default" name="saveNumber" value="Save">
-        		<input type="button" class="btn btn-default cancel" value="Cancel" onclick="document.getElementById('addVForm').style.display = 'none';">
-    		</div>
-    	</div>
-	</form>
+            <div class="col-sm-offset-2 col-sm-10 Vsave"> 
+                <input type="submit" class="btn btn-default saveNumber" name="saveNumber" value="Save">
+                <input type="button" class="btn btn-default cancel" value="Cancel" onclick="document.getElementById('addVForm').style.display = 'none';">
+            </div>
+        </div>
+    </form>
 </div>

api/v1/Customers/customers.txt

@@ -47,8 +47,8 @@
         },
         {
             "Customer_Id": 14,
-            "Name": "Si Thu Mg",
-            "Credit_Sale": "Yes"
+            "Name": "Si Thu Mg Mg",
+            "Credit_Sale": "No"
         },
         {
             "Customer_Id": 15,
@@ -509,6 +509,21 @@
             "Customer_Id": 114,
             "Name": "Aung Kyaw",
             "Credit_Sale": "Yes"
+        },
+        {
+            "Customer_Id": 116,
+            "Name": "Sai Sai",
+            "Credit_Sale": "Yes"
+        },
+        {
+            "Customer_Id": 117,
+            "Name": "J Fire",
+            "Credit_Sale": "Yes"
+        },
+        {
+            "Customer_Id": 118,
+            "Name": "Hlwan Paing",
+            "Credit_Sale": "Yes"
         }
     ]
 }

api/v1/Customers/customersDetails.php

@@ -58,13 +58,14 @@ $(document).ready(function() {
                 "className":      'delete',
                 "orderable":      false,
                 "data":           null,
-                "defaultContent": 'Delete'
+                "defaultContent": '<button class="btn btn-danger" style="width:40px;height:31px;"><i class="fa fa-trash-o"></i></button>',
+
             },
             {
                 "className":      'edit',
                 "orderable":      false,
                 "data":           null,
-                "defaultContent": 'Edit'
+                "defaultContent": '<button class="btn btn-info" style="width:40px;height:31px;"><i class="far fa-edit"><i></button>'
             },
             { "data": "Customer_Id" },
             { "data": "Name",

api/v1/Customers/deleteVehicle.php

@@ -11,16 +11,52 @@ $db->exec($del);
 
     echo '<script>window.location.href="customers.php"</script>';
 }
-
  ?>
  <style type="text/css">
  	.deleteVForm {
  		display: none;
  	}
+ 	.deleteVForm span{
+ 	 	color:red;
+  		margin-right: 5px;
+	}
+	form.deleteVehicleForm.modal-content.animate {
+    width: 400px;
+    height: 280px;
+    margin-left: -15px;
+     background-color: #dfe3e6;
+	}
+	div#deleteVForm {
+    width: 400px;
+    height: 280px;
+    border-radius: 0.5em;
+    margin-top: 100px;
+	}
+		input.btn.btn-default.deleteVehicle {
+    background: radial-gradient(#0da3bb, #04161fc2);
+    color: #610e14;
+    font-family:-webkit-pictograph;
+    font-size: 18px;
+    margin-right: 20px;
+    width: 70px;
+	}
+	#deleteVid{
+		margin-left:100px;
+	}
+
  </style>
-<div class="container deleteVForm" id="deleteVForm">
-	<form action="" method="post">
- 	<input type="number" name="deleteVid" id="deleteVid">
- 	<input type="submit" name="delete" value="OK" class="btn btn-danger">
+<div class="container deleteVForm modal" id="deleteVForm">
+	<form action="" method="post" class="modal-content animate deleteVehicleForm">
+		<span onclick="document.getElementById('deleteVForm').style.display='none'" class="close" title="Close PopUp">&times;</span>
+      	<div class="form-group deleterow">
+          <label>Are you sure want to delete?</label>
+      	</div>
+ 		<input type="number" name="deleteVid" id="deleteVid">
+	 	<div class="form-group">
+		    <div class="col-sm-offset-2 col-sm-10 Vsave"> 
+		        <input type="submit" name="delete" value="OK" class="btn btn-default deleteVehicle">
+		        <input type="button" class="btn btn-default cancel" value="Cancel" onclick="document.getElementById('deleteVForm').style.display = 'none';">
+		    </div>
+		</div>
  	</form>
 </div>

api/v1/Customers/editVehicle.php

@@ -17,21 +17,78 @@
  	.editVehicleForm {
  		display: none;
  	}
+ 	.editVehicleForm span{
+ 	 	color:red;
+  		margin-right: 5px;
+	}
+	form.form-horizontal.editVehicle.modal-content.animate {
+    width: 400px;
+    height: 280px;
+    margin-left: -15px;
+     background-color: #dfe3e6;
+	}
+	div#editVForm {
+    width: 400px;
+    height: 280px;
+    border-radius: 0.5em;
+    margin-top: 100px;
+	}
+	.form-group.Veditrow1{
+  margin-left: 50px;
+}
+.form-group.Veditrow1 input[type='text']{
+  border:1px solid grey;
+  border-radius: 0.5em;
+  height: 35px;
+  width: 150px;
+  font-size: 14px;
+  font-weight: bold;
+ color: #337ab7;
+ text-align:center;
+ margin-left: 15px;
+}
+.form-group.Veditrow1 label{
+  color: #610e14;
+  font-family:-webkit-pictograph;
+  font-size: 15px;
+}
+input.btn.btn-default.editVSave {
+    background: radial-gradient(#0da3bb, #04161fc2);
+    color: #610e14;
+    font-family:-webkit-pictograph;
+    font-size: 18px;
+    margin-right: 20px;
+    width: 70px;
+}
+input.btn.btn-default.editVCancel {
+    background: radial-gradient(#b71515eb, #ef0b0bdb);
+    color: #fff;
+    font-family:-webkit-pictograph;
+    font-size:18px;
+    width: 78px;
+}
+.form-group.editVBtn {
+    margin-left: 30px;
+    margin-top: 50px;
+}
 </style>
-<div class="container editVehicleForm" id="editVForm">
-<form class="form-horizontal" action="" method="post">
+<div class="container editVehicleForm modal" id="editVForm">
+<form class="form-horizontal modal-content animate editVehicle" action="" method="post">
+	 <span onclick="document.getElementById('editVForm').style.display='none'" class="close" title="Close PopUp">&times;</span>
+	  <div class="form-group row1">
+          <label>Edit Vehicle</label>
+      </div>
 	<input type="text" name="id" id="vehicle_id" hidden="hidden">
-    <div class="form-group">
-     <label class="control-label col-sm-2"> Number </label>
-    <div class="col-sm-10"> 
-      
+    <div class="form-group Veditrow1">
+     <label class="control-label col-sm-3">Number: </label>
+    <div class="col-sm-9"> 
 		<input type="text" name="number" id="number">
     </div>
    </div>
-    <div class="form-group">
+    <div class="form-group editVBtn">
     	<div class="col-sm-offset-2 col-sm-10"> 
-		<input type="submit" name="saveNumber" value="Save">
-		<input type="button" value="Cancel" onclick="document.getElementById('editVForm').style.display = 'none';">
+		<input type="submit" name="saveNumber" class="btn btn-default editVSave" value="Save">
+		<input type="button" value="Cancel" class="btn btn-default editVCancel" onclick="document.getElementById('editVForm').style.display = 'none';">
 		</div>
 	</div>
 	</form>

api/v1/Customers/vehicles.txt

@@ -2,11 +2,8 @@
     "data": [
         {
             "Customer_Id": 14,
-            "Id": 37,
-            "Number": "5Y\/0992"
-            "Customer_Id": 9,
-            "Id": 31,
-            "Number": "4N-9707"
+            "Id": 42,
+            "Number": "5A\/1113"
         }
     ]
 }

api/v1/Customers/vehiclesDetails.php

@@ -1,8 +1,9 @@
 <button class="btn btn-primary" onclick="document.getElementById('addVForm').style.display = 'block';document.getElementById('addForm').style.display = 'none';document.getElementById('editForm').style.display = 'none';document.getElementById('editVForm').style.display = 'none';document.getElementById('deleteForm').style.display = 'none';document.getElementById('deleteVForm').style.display = 'none';"> Add Vehicle </button>
 <table id="vehicle" class="table display table-striped table-bordered table-hover table-sm" cellspacing="0" width="100%">
       <thead>
-        <tr>
-            <th colspan="4"><?php echo $_COOKIE['customerName']; ?></th>
+        <tr style="color:white;">
+            <th colspan="1" style="background: #5d8a4c;">Customer</th>
+            <th style="background: #5d8a4c;font-family:'Lobster', helvetica,;" colspan="3" ><?php echo $_COOKIE['customerName']; ?></th>
         </tr>
         <tr>
           <th></th>

api/v1/ShiftPumpReport/shiftPumpData.txt

@@ -1,123 +1,123 @@
 {
     "data": [
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 1,
             "Grade_Name": "Diesel      ",
-            "Open_Volume": 178451675,
-            "Close_Volume": 178863990,
+            "Open_Volume": 176788155,
+            "Close_Volume": 177169927,
             "Price": 1015,
-            "Sale_Total": 412315,
-            "Money_Total": 418499725
+            "Sale_Total": 381772,
+            "Money_Total": 387498580
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 2,
             "Grade_Name": "Diesel      ",
-            "Open_Volume": 97552035,
-            "Close_Volume": 97888675,
+            "Open_Volume": 96366956,
+            "Close_Volume": 96927864,
             "Price": 1015,
-            "Sale_Total": 336640,
-            "Money_Total": 341689600
+            "Sale_Total": 560908,
+            "Money_Total": 569321620
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 3,
             "Grade_Name": "Diesel      ",
-            "Open_Volume": 84659396,
-            "Close_Volume": 85043636,
+            "Open_Volume": 83009153,
+            "Close_Volume": 83339696,
             "Price": 1015,
-            "Sale_Total": 384240,
-            "Money_Total": 390003600
+            "Sale_Total": 330543,
+            "Money_Total": 335501145
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 4,
             "Grade_Name": "Diesel      ",
-            "Open_Volume": 86953359,
-            "Close_Volume": 87172080,
+            "Open_Volume": 85756242,
+            "Close_Volume": 85999102,
             "Price": 1015,
-            "Sale_Total": 218721,
-            "Money_Total": 222001815
+            "Sale_Total": 242860,
+            "Money_Total": 246502900
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 5,
             "Grade_Name": "Diesel      ",
-            "Open_Volume": 22089794,
-            "Close_Volume": 22358756,
+            "Open_Volume": 21699668,
+            "Close_Volume": 21857302,
             "Price": 1015,
-            "Sale_Total": 268962,
-            "Money_Total": 272996430
+            "Sale_Total": 157634,
+            "Money_Total": 159998510
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 5,
             "Grade_Name": "92 RON      ",
-            "Open_Volume": 77963883,
-            "Close_Volume": 78476635,
+            "Open_Volume": 76716260,
+            "Close_Volume": 77293625,
             "Price": 965,
-            "Sale_Total": 512752,
-            "Money_Total": 494805680
+            "Sale_Total": 577365,
+            "Money_Total": 557157225
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 6,
             "Grade_Name": "Diesel      ",
-            "Open_Volume": 16900610,
-            "Close_Volume": 16998636,
+            "Open_Volume": 16365243,
+            "Close_Volume": 16395482,
             "Price": 1015,
-            "Sale_Total": 98026,
-            "Money_Total": 99496390
+            "Sale_Total": 30239,
+            "Money_Total": 30692585
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 6,
             "Grade_Name": "92 RON      ",
-            "Open_Volume": 32194665,
-            "Close_Volume": 32440783,
+            "Open_Volume": 31601916,
+            "Close_Volume": 31780163,
             "Price": 965,
-            "Sale_Total": 246118,
-            "Money_Total": 237503870
+            "Sale_Total": 178247,
+            "Money_Total": 172008355
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 7,
             "Grade_Name": "Diesel      ",
             "Open_Volume": 2771300,
@@ -127,235 +127,235 @@
             "Money_Total": 0
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 8,
             "Grade_Name": "Diesel      ",
-            "Open_Volume": 17560054,
-            "Close_Volume": 17813260,
+            "Open_Volume": 17315192,
+            "Close_Volume": 17316668,
             "Price": 1015,
-            "Sale_Total": 253206,
-            "Money_Total": 257004090
+            "Sale_Total": 1476,
+            "Money_Total": 1498140
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 9,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 154847105,
-            "Close_Volume": 155383025,
+            "Open_Volume": 152485806,
+            "Close_Volume": 152796484,
             "Price": 1030,
-            "Sale_Total": 535920,
-            "Money_Total": 551997600
+            "Sale_Total": 310678,
+            "Money_Total": 319998340
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 10,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 168023233,
-            "Close_Volume": 168650421,
+            "Open_Volume": 165128966,
+            "Close_Volume": 166049937,
             "Price": 1030,
-            "Sale_Total": 627188,
-            "Money_Total": 646003640
+            "Sale_Total": 920971,
+            "Money_Total": 948600130
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 11,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 106102066,
-            "Close_Volume": 106568905,
+            "Open_Volume": 104422981,
+            "Close_Volume": 104782207,
             "Price": 1030,
-            "Sale_Total": 466839,
-            "Money_Total": 480844170
+            "Sale_Total": 359226,
+            "Money_Total": 370002780
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 12,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 79398507,
-            "Close_Volume": 80130543,
+            "Open_Volume": 78485852,
+            "Close_Volume": 78582939,
             "Price": 1030,
-            "Sale_Total": 732036,
-            "Money_Total": 753997080
+            "Sale_Total": 97087,
+            "Money_Total": 99999610
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 13,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 39155572,
-            "Close_Volume": 40150677,
+            "Open_Volume": 37141972,
+            "Close_Volume": 37701201,
             "Price": 1030,
-            "Sale_Total": 995105,
-            "Money_Total": 1024958150
+            "Sale_Total": 559229,
+            "Money_Total": 576005870
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 13,
             "Grade_Name": "95 RON      ",
-            "Open_Volume": 22955904,
-            "Close_Volume": 23149997,
+            "Open_Volume": 22698768,
+            "Close_Volume": 22772656,
             "Price": 1015,
-            "Sale_Total": 194093,
-            "Money_Total": 197004395
+            "Sale_Total": 73888,
+            "Money_Total": 74996320
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 14,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 14521000,
-            "Close_Volume": 14880229,
+            "Open_Volume": 14231096,
+            "Close_Volume": 14263136,
             "Price": 1030,
-            "Sale_Total": 359229,
-            "Money_Total": 370005870
+            "Sale_Total": 32040,
+            "Money_Total": 33001200
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 14,
             "Grade_Name": "95 RON      ",
-            "Open_Volume": 12260742,
-            "Close_Volume": 12359754,
+            "Open_Volume": 12059099,
+            "Close_Volume": 12202434,
             "Price": 1015,
-            "Sale_Total": 99012,
-            "Money_Total": 100497180
+            "Sale_Total": 143335,
+            "Money_Total": 145485025
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 15,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 18707273,
-            "Close_Volume": 19134452,
+            "Open_Volume": 17887852,
+            "Close_Volume": 18120867,
             "Price": 1030,
-            "Sale_Total": 427179,
-            "Money_Total": 439994370
+            "Sale_Total": 233015,
+            "Money_Total": 240005450
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 16,
             "Grade_Name": "P\/Diesel    ",
-            "Open_Volume": 20105357,
-            "Close_Volume": 20764252,
+            "Open_Volume": 17251162,
+            "Close_Volume": 18206555,
             "Price": 1030,
-            "Sale_Total": 658895,
-            "Money_Total": 678661850
+            "Sale_Total": 955393,
+            "Money_Total": 984054790
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 17,
             "Grade_Name": "92 RON      ",
-            "Open_Volume": 257322268,
-            "Close_Volume": 258085066,
+            "Open_Volume": 255404986,
+            "Close_Volume": 256097756,
             "Price": 965,
-            "Sale_Total": 762798,
-            "Money_Total": 736100070
+            "Sale_Total": 692770,
+            "Money_Total": 668523050
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 18,
             "Grade_Name": "92 RON      ",
-            "Open_Volume": 34356485,
-            "Close_Volume": 34475656,
+            "Open_Volume": 34230686,
+            "Close_Volume": 34310886,
             "Price": 965,
-            "Sale_Total": 119171,
-            "Money_Total": 115000015
+            "Sale_Total": 80200,
+            "Money_Total": 77393000
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 19,
             "Grade_Name": "92 RON      ",
-            "Open_Volume": 251897506,
-            "Close_Volume": 252468206,
+            "Open_Volume": 250472086,
+            "Close_Volume": 251019856,
             "Price": 965,
-            "Sale_Total": 570700,
-            "Money_Total": 550725500
+            "Sale_Total": 547770,
+            "Money_Total": 528598050
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 20,
             "Grade_Name": "92 RON      ",
-            "Open_Volume": 22221641,
-            "Close_Volume": 22287938,
+            "Open_Volume": 22080134,
+            "Close_Volume": 22221641,
             "Price": 965,
-            "Sale_Total": 66297,
-            "Money_Total": 63976605
+            "Sale_Total": 141507,
+            "Money_Total": 136554255
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 21,
             "Grade_Name": "95 RON      ",
-            "Open_Volume": 62665110,
-            "Close_Volume": 62892275,
+            "Open_Volume": 62244693,
+            "Close_Volume": 62423983,
             "Price": 1015,
-            "Sale_Total": 227165,
-            "Money_Total": 230572475
+            "Sale_Total": 179290,
+            "Money_Total": 181979350
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 22,
             "Grade_Name": "95 RON      ",
             "Open_Volume": 4305056,
@@ -365,25 +365,25 @@
             "Money_Total": 0
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 23,
             "Grade_Name": "95 RON      ",
-            "Open_Volume": 53439369,
-            "Close_Volume": 53574245,
+            "Open_Volume": 53125215,
+            "Close_Volume": 53245295,
             "Price": 1015,
-            "Sale_Total": 134876,
-            "Money_Total": 136899140
+            "Sale_Total": 120080,
+            "Money_Total": 121881200
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 588,
+            "Date": "2019_05_08",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-08 12:32:53 AM",
+            "Close_Date": "2019-May-08 12:30:33 PM",
             "Fp_Id": 24,
             "Grade_Name": "95 RON      ",
             "Open_Volume": 3524528,

api/v1/ShiftSaleReport/shiftSaleView.php

@@ -26,7 +26,7 @@
 $(document).ready(function() {
     var table = $('#example').DataTable( {
         "ajax": "api/v1/ShiftSaleReport/shiftSaleData.txt",
-         "dom": 'Bfrtip',
+         "dom": 'lBfrtip',
         "buttons": [
             'copy',
             'csv',
@@ -47,8 +47,8 @@ $(document).ready(function() {
         "columns": [
             { "data": "Fp_Id" },
             { "data": "Grade_Name" },
-            { "data": "Open_Date"},
             { "data": "Close_Date" },
+            { "data": "Open_Date"},
             { "data": "Price" },
             { "data": "Volume" },
             { "data": "Amount" },

api/v1/ShiftTankReport/shiftTankData.txt

@@ -1,124 +1,124 @@
 {
     "data": [
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 1,
             "Product_Text": "P\/Diesel",
-            "Open_Vol": 27330.5,
-            "Close_Vol": 22476.5,
+            "Open_Vol": 9528.7998046875,
+            "Close_Vol": 9571.599609375,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 1521.9000244140625,
-            "Close_Level": 1302.4000244140625
+            "Open_Level": 686.7999877929688,
+            "Close_Level": 689
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 2,
             "Product_Text": "P\/Diesel",
-            "Open_Vol": 3616.60009765625,
-            "Close_Vol": 3658.5,
+            "Open_Vol": 29653.80078125,
+            "Close_Vol": 25934.5,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 351.6000061035156,
-            "Close_Level": 354.3999938964844
+            "Open_Level": 1635.4000244140625,
+            "Close_Level": 1468.0999755859375
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 3,
             "Product_Text": "Diesel",
-            "Open_Vol": 24324.900390625,
-            "Close_Vol": 22247.900390625,
+            "Open_Vol": 9294.7001953125,
+            "Close_Vol": 7907.60009765625,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 1371.800048828125,
-            "Close_Level": 1279.199951171875
+            "Open_Level": 666,
+            "Close_Level": 591.9000244140625
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 4,
             "Product_Text": "Diesel",
-            "Open_Vol": 4947.10009765625,
-            "Close_Vol": 5045.5,
+            "Open_Vol": 5625.7001953125,
+            "Close_Vol": 29581.599609375,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 432.70001220703125,
-            "Close_Level": 438.70001220703125
+            "Open_Level": 473.5,
+            "Close_Level": 1631.199951171875
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 5,
             "Product_Text": "92 RON",
-            "Open_Vol": 18954.69921875,
-            "Close_Vol": 18953.5,
+            "Open_Vol": 10690.7998046875,
+            "Close_Vol": 8595.5,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 2060.5,
-            "Close_Level": 2060.300048828125
+            "Open_Level": 1283.5999755859375,
+            "Close_Level": 1087.5999755859375
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 6,
             "Product_Text": "92 RON",
-            "Open_Vol": 10627.7001953125,
-            "Close_Vol": 8249.400390625,
+            "Open_Vol": 5139.60009765625,
+            "Close_Vol": 21580.5,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 1259.4000244140625,
-            "Close_Level": 1042.4000244140625
+            "Open_Level": 741,
+            "Close_Level": 2282.89990234375
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 7,
             "Product_Text": "95 RON",
-            "Open_Vol": 12111.2001953125,
-            "Close_Vol": 11575.7998046875,
+            "Open_Vol": 9451.599609375,
+            "Close_Vol": 9104.7001953125,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 1390,
-            "Close_Level": 1341.800048828125
+            "Open_Level": 1148.5999755859375,
+            "Close_Level": 1116.9000244140625
         },
         {
-            "Shift_Id": 592,
-            "Date": "2019_05_10",
+            "Shift_Id": 602,
+            "Date": "2019_05_15",
             "Number": 1,
-            "Open_Date": "2019-May-10 12:43:57 AM",
-            "Close_Date": "2019-May-10 12:34:43 PM",
+            "Open_Date": "2019-May-15 12:36:56 AM",
+            "Close_Date": "2019-May-15 12:34:16 PM",
             "Tank_Id": 8,
             "Product_Text": "95 RON",
-            "Open_Vol": 5926,
-            "Close_Vol": 5796.7001953125,
+            "Open_Vol": 5168.7998046875,
+            "Close_Vol": 5042.60009765625,
             "Open_Water_Vol": 0,
             "Close_Water_Vol": 0,
-            "Open_Level": 829.2000122070312,
-            "Close_Level": 815.7000122070312
+            "Open_Level": 751.7000122070312,
+            "Close_Level": 738.5
         }
     ]
 }

api/v1/ShiftTankReport/shiftTankView.php

@@ -56,8 +56,8 @@ $(document).ready(function() {
         "columns": [
             { "data": "Tank_Id" },
             { "data": "Product_Text" },
-            { "data": "Open_Date"},
             { "data": "Close_Date" },
+            { "data": "Open_Date"},
             { "data": "Open_Vol" },
             { "data": "Close_Vol" },
             { "data": "Open_Water_Vol" },

api/v1/Suppliers/addSupplier.php

@@ -6,7 +6,7 @@
 
     $db->exec("INSERT INTO supplier (type,created_at,updated_at,name) VALUES ('',datetime('now', 'localtime'),datetime('now', 'localtime'),'$sname');");
 
-    echo '<script>window.location.href="index.php"</script>';
+    echo '<script>window.location.href="suppliers.php"</script>';
     }
  ?>
 <style type="text/css">

api/v1/Suppliers/supplierDetails.php

@@ -48,8 +48,8 @@ $(document).ready(function() {
     $('#supplier tbody').on('click', 'td.delete', function () {
         var tr = $(this).closest('tr');
         var row = table.row( tr );
-        var username = table.row( this ).data()['Name'];
-        var id = table.row( this ).data()['Customer_Id'];
+        var username = row.data()['Name'];
+        var id = row.data()['Customer_Id'];
         document.getElementById('deleteid').value = id;
 
         document.getElementById('deleteForm').style.display = 'block';
@@ -62,9 +62,9 @@ $(document).ready(function() {
         var tr = $(this).closest('tr');
         var row = table.row( tr );
 
-        var username = table.row( this ).data()['Name'];
-        var creditSale = table.row( this ).data()['Credit_Sale'];
-        var id = table.row( this ).data()['Customer_Id'];
+        var username = row.data()['Name'];
+        var creditSale = row.data()['Credit_Sale'];
+        var id = row.data()['Customer_Id'];
 
         document.getElementById('username').value = username;
         document.getElementById('id').value = id;

dist/css/style.css

@@ -88,9 +88,13 @@ body #form .form-group .input-group i {
 section.sidebar {
     height: 100vh;
     background: #c1cbd0;
+    /*background: radial-gradient(#89ebfb, #00000094);*/
 }
 nav.navbar.navbar-static-top {
-    background: #3cb9bb;
+    /*background: #0f8882;*/
+    /*background: #2465af;*/
+    height: 56px;
+    background:radial-gradient(#0da3bb, #04161fc2);
 }
 .main-header .logo {
     background: #367fa9;
@@ -101,7 +105,9 @@ a.sidebar-toggle {
 }
 
 ul.treeview-menu {
-    background: #4c5857;
+    /*background: #4c5857;*/
+       /* background: radial-gradient(#89ebfb, #00000094);*/
+    background: #fff;
     border-radius: 0.5em;
     margin-left: 12px;
     margin-right: 10px;
@@ -138,7 +144,7 @@ a.collapse-item {
 	}
   li.exit a {
     text-decoration: none;
-    color: #3cb9bb;
+    color: #009688;
 }
 .navbar-custom-menu>.navbar-nav>li {
     position: relative;
@@ -163,11 +169,10 @@ a.collapse-item {
 }
 li.treeview a{
   text-decoration: none;
+  color:#009688;
 }
-
 li.active.treeview.menu-open>a {
     color: white;
-
 }
 .treeview{
   font-weight:bold;
@@ -226,4 +231,8 @@ a.dropdown-toggle.mind:hover,a.dropdown-toggle.mind:focus {
 }
 aside.main-sidebar {
     position: fixed;
-}
+}
+li.active >a {
+     color: white; 
+    background: #009688;
+}

header.php

@@ -114,6 +114,19 @@ return($newDate." ".$time[0]);
 tr.shown td.details-control {
     background: url('resources/details_close.png') no-repeat center center;
 }
+td.delete{
+  color:red;
+}
+td.delete i{
+  /*color: red;*/
+  font-size: 20px;
+}
+td.edit {
+  color: rebeccapurple;
+}
+td.edit i{
+  font-size: 15px;
+}
 </style>
 <style type="text/css">
   #example {
@@ -187,9 +200,5 @@ iframe {
     /*border:1px solid green;*/
     /*overflow: hidden;*/
 }
-li.active >a{
-  /*color: white;*/
-  background: #009688;
-}
 </style>
 </head>

index.php

@@ -1,3 +1,4 @@
+<?php
 session_start();
 ?>
 <!DOCTYPE html>
@@ -25,7 +26,8 @@ session_start();
     .imgcontainer {
       text-align: center;
       margin: 24px 0 12px 0;
-      background:#5eeae7;
+      /*background:#5eeae7;*/
+      background: radial-gradient(#0bddff, #00000094);
       height:200px;
       margin-top:0px;
     }
@@ -196,18 +198,6 @@ session_start();
     </script>
   </body>
 </html>
-<?php include "header.php" ?>
-
-<body class="hold-transition skin-blue sidebar-mini">
-  <div>
-  	<?php include("nav.php"); ?>
-	<div class="content-wrapper navbar navbar-static-top">
-		<br>
-	  <iframe  src="home.php" id="loadFrame"></iframe>
-
-</div>
-
-</div>
 <script type="text/javascript">
 	function changePages(fileLocation) {
 

nav.php

@@ -1,3 +1,12 @@
+<style type="text/css">
+  @media screen and (min-width: 1500px) {
+  div.forward {
+   margin-right: 280px;
+   font-size: 15px;
+  }
+}
+
+</style>
 <header class="main-header">
    
     <!-- Header Navbar: style can be found in header.less -->
@@ -7,12 +16,12 @@
         <span class="sr-only">Toggle navigation</span>
       </a>
 
-      <div class="navbar-custom-menu">
-        <ul class="nav navbar-nav"> 
-          <li><center>
-    <div class="" style="margin-top: 10px;font-size:35px;color:#fff;font-family:'Lobster', helvetica, arial;margin-right:200px;">
-      Forward Station Server
-    </div></center></li>
+      <!-- <div class="navbar-custom-menu"> -->
+        <ul class="nav navbar-nav pull-right"> 
+          <li>
+    <div class="forward" style="font-size:25px;color:#fff;font-family:'Lobster', helvetica, arial;">Forward Station Server
+    </div></li>
+    <li style="width: 120px;"></li>
           <li class="dropdown user user-menu pull-right">
             <a href="#" class="dropdown-toggle mind" data-toggle="dropdown">
               <img src="dist/img/profile.jpg" class="user-image" alt="User Image">
@@ -40,7 +49,7 @@
             </ul>
           </li>
         </ul>
-      </div>
+      <!-- </div> -->
     </nav>
   </header>
   <!-- Left side column. contains the logo and sidebar -->
@@ -55,14 +64,14 @@
           <p style="color: #1fb9bb;margin-top: 10px;font-size:25px;font-family: 'Lobster', helvetica, arial;">Autoleum</p>
         </div>
       </div>
-      <ul class="sidebar-menu" data-widget="tree" style="background:#c1cbd0;" id="mainNavMenu">
+      <ul class="sidebar-menu" data-widget="tree" style="" id="mainNavMenu">
         <!-- <li class="header">MAIN NAVIGATION</li> -->
         <br>
         <li class="active treeview" >
           <a href="#"  style="margin-bottom: 20px;">
             <i class="fa fa-calculator " style="font-size: 21px;"></i>&nbsp; &nbsp;&nbsp; <span>Operations</span>
             <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
-          </a>
+          </a>  
           <ul class="treeview-menu" id="mainSubMenu">
             <li style="margin-top: 20px;"><a href="#" class="collapse-item" onclick="changePages('shifts.php');">  <i class="far fa-calendar-alt" style="font-size:15px;"></i>&nbsp; Shifts</a></li>
             <li> <a href="#" class="collapse-item" onclick="changePages('sales.php');"><i class="fa fa-industry">  </i>&nbsp; Sales</a></li>
@@ -71,14 +80,8 @@
             <li><a href="#" class="collapse-item" onclick="changePages('deliveries.php');">
               <i class="fas fa-truck"></i>&nbsp; Deliveries</a></li>
             <li> <a href="#" class="collapse-item" onclick="changePages('about.php');">
-              <i class="fas fa-award"></i>&nbsp; About</a></li>   
-          <ul class="treeview-menu">
-            <li style="margin-top: 20px;"><a href="shifts.php" class="collapse-item"><i class="far fa-calendar-alt" style="font-size:15px;"></i>&nbsp; Shifts</a></li>
-            <li> <a href="#" class="collapse-item" onclick="changePages('sales.php');"><i class="fa fa-industry"></i>&nbsp; Sales</a></li>
-           <li><a href="#" class="collapse-item" onclick="changePages('updatePrices.php');"><i class="fas fa-money-check-alt"></i>&nbsp; Update Prices</a></li>
-            <li><a href="#" class="collapse-item" onclick="changePages('deliveries.php');"><i class="fas fa-truck"></i>&nbsp; Deliveries</a></li>
-            <li> <a href="#" class="collapse-item" onclick="changePages('about.php');"><i class="fas fa-award"></i>&nbsp; About</a></li>   
-          </ul>
+              <i class="fas fa-award"></i>&nbsp; About</a></li>
+          </ul>   
         </li>
         <li class="treeview">
           <a href="#">