From 8effb72313c1f301eea1067fb32946ecafdbabb3 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 25 Jun 2018 16:11:50 +0530
Subject: [PATCH] issues fixes in ria

---
 application/controllers/servicepurchaseorder.php |  1 -
 application/models/configmodel.php               | 15 ++++++++-------
 application/views/AmendPOlist.php                | 12 +++++++-----
 application/views/assetListing.php               |  6 ++++--
 application/views/configlisting.php              | 12 ++++++++++--
 application/views/costListing.php                |  4 +++-
 application/views/income_expense_list.php        |  7 ++++---
 .../views/statusofservicepurchaseorder.php       | 16 +++++++++++++++-
 application/views/storerequisition.php           |  9 +++++----
 application/views/viewIGRDetails.php             |  3 +--
 10 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php
index d1d97a44..47a839ec 100644
--- a/application/controllers/servicepurchaseorder.php
+++ b/application/controllers/servicepurchaseorder.php
@@ -83,7 +83,6 @@ class servicepurchaseorder extends BaseController
 				
 					
 					$HTML.="<tr  id='".$SNo."'>
-							<td align='left'>".$SNo."</td>
 							<td align='left'>". $ReqNo."</td> 													
 							<td align='left'>".$Reqedby."</td>	
 							<td align='left'>".$ReqDate."</td>	
diff --git a/application/models/configmodel.php b/application/models/configmodel.php
index a3e9d549..c8fd6bc0 100644
--- a/application/models/configmodel.php
+++ b/application/models/configmodel.php
@@ -8,13 +8,14 @@ class configmodel extends CI_Model
      * @return array $result : result of the query(returns config information)
      */
     function Configlisting()
-   {
-       $this->db->select('Config.Config_ID, Config.ConfigName ,Config.Comments,Config.CreatedDate');
-       $this->db->from('T_ConfigMaster as Config');   
-       $query = $this->db->get();      
-       $result = $query->result();  
-       return $result;
-   }
+    {
+        $this->db->select('Config.Config_ID, Config.ConfigName ,Config.Comments,Config.CreatedDate');
+        $this->db->from('T_ConfigMaster as Config');
+        $this->db->order_by('Config.CreatedDate','desc');
+        $query = $this->db->get();      
+        $result = $query->result();  
+        return $result;
+    }
 
 
 	/**
diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php
index 7429198d..2eff24c5 100644
--- a/application/views/AmendPOlist.php
+++ b/application/views/AmendPOlist.php
@@ -23,7 +23,7 @@
               <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
                 <thead>
                 <tr style="background-color:#ad9271">
-				<th>#</th>
+				<!-- <th>#</th> -->
 				<th>PONO#</th>	
 				<th>PO Type</th>
 				<th>PO Date</th>
@@ -45,7 +45,7 @@
 							$index = $index + 1;
                     ?>
                <tr id="<?php echo $index ; ?>">
-					<td align="left"><?php echo $index ; ?></td> 
+					<!-- <td align="left"><?php echo $index ; ?></td>  -->
 					<td><?php echo $record->PONO ?></td> 
 					<td><?php echo $record->ReqType ?></td> 
 					<td align="right"><?php  $Pdt =	new DateTime($record->PODate);
@@ -103,16 +103,18 @@
     <!-- /.content -->
   </div>
   <!-- /.content-wrapper -->
-		  <script>
+  <script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
+	<script>
   $(function () {
-    
+    $.fn.dataTable.moment( 'DD-MM-YYYY' );
     $('#example1').DataTable({
       "paging": true,
       "lengthChange": true,
       "searching": true,
       "ordering": true,
       "info": true,
-      "autoWidth": false
+      "autoWidth": false,
+      "aaSorting": [[ 2, "desc" ]],
     });
   });
 </script>
\ No newline at end of file
diff --git a/application/views/assetListing.php b/application/views/assetListing.php
index cd24c862..e152fddd 100644
--- a/application/views/assetListing.php
+++ b/application/views/assetListing.php
@@ -73,17 +73,19 @@
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
   <script type="text/javascript">
    
 	$(function () {
-   
+    $.fn.dataTable.moment( 'DD-MM-YYYY' );
     $('#datatable').DataTable({
       "paging": true,
       "lengthChange": true,
       "searching": true,
       "ordering": true,
       "info": true,
-      "autoWidth": true
+      "autoWidth": true,
+      "aaSorting": [[ 7, "desc" ]]
 	   
     }); 
   });
diff --git a/application/views/configlisting.php b/application/views/configlisting.php
index 0819eb72..9c4ba38e 100644
--- a/application/views/configlisting.php
+++ b/application/views/configlisting.php
@@ -39,7 +39,13 @@
 						 <td><?php echo $record->Config_ID?></td>
                          <td><?php echo $record->ConfigName ?></td>
                          <td><?php echo $record->Comments  ?> </td>
-                         <td><?php echo $record->CreatedDate?></td> 
+                         <!-- <td><?php //echo $record->CreatedDate?></td>  -->
+                         <?php if(date('d-m-Y',strtotime($record->CreatedDate))=="30-11--0001"){
+                               $cdate =  '00-00-0000';
+                            }else{
+                               $cdate =  date('d-m-Y',strtotime($record->CreatedDate));
+                            } ?>
+                         <td align="right"><?php  echo $cdate;?> </td>
 						 <td><a href="<?php echo base_url().'configurationctrl/editOldconfig?ConfigID='.$record->Config_ID; ?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
 						  <a><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a></td> 
                      
@@ -57,16 +63,18 @@
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
   <script type="text/javascript">
    
 	$(function () {
-   
+        $.fn.dataTable.moment( 'DD-MM-YYYY' );
     $('#configtable').DataTable({
       "paging": true,
       "lengthChange": true,
       "searching": true,
       "ordering": true,
       "info": true,
+      "aaSorting": [[ 3, "desc" ]],
       "autoWidth": true
 	   
     }); 
diff --git a/application/views/costListing.php b/application/views/costListing.php
index 30913de9..9b81d12d 100644
--- a/application/views/costListing.php
+++ b/application/views/costListing.php
@@ -71,16 +71,18 @@
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
   <script type="text/javascript">
    
 	$(function () {
-   
+    $.fn.dataTable.moment( 'DD-MM-YYYY' );
     $('#datatable').DataTable({
       "paging": true,
       "lengthChange": true,
       "searching": true,
       "ordering": true,
       "info": true,
+      "aaSorting": [[ 3, "desc" ]],
       "autoWidth": true
 	   
     }); 
diff --git a/application/views/income_expense_list.php b/application/views/income_expense_list.php
index 83fe536f..d769a1ae 100755
--- a/application/views/income_expense_list.php
+++ b/application/views/income_expense_list.php
@@ -110,16 +110,17 @@
 </section>
 </div>
 
-
+<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 <script> 
 $(function () {
    
-   
+  $.fn.dataTable.moment( 'DD-MM-YYYY' );
     $('#inexlist').DataTable({
+      
       "paging": true,
       "lengthChange": true,
       "searching": true,
-	    "aaSorting": [[ 0, "desc" ]],
+	    "aaSorting": [[ 1, "desc" ]],
       "ordering": true,
       "info": true,
       "autoWidth": true
diff --git a/application/views/statusofservicepurchaseorder.php b/application/views/statusofservicepurchaseorder.php
index 7282d8c0..a0af359e 100644
--- a/application/views/statusofservicepurchaseorder.php
+++ b/application/views/statusofservicepurchaseorder.php
@@ -112,7 +112,7 @@
 				<table id="StatusTable"  class="table table-bordered table-hover editabletable IGR_Line" style="background-color:#fff;font-size:12px;">
 					<thead style="background-color:#ddf">
 						<tr>
-						  <th>S.NO</th>		
+						  <!-- <th>S.NO</th>		 -->
 						<th>Req No</th>	
 						<th>Req By</th>
 						<th>Req Date</th>
@@ -139,8 +139,22 @@
 				</div>
 			
 			</div> 
+			<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
 			 <script>
 		 $(function () { 
+
+  $.fn.dataTable.moment( 'DD-MM-YYYY' );
+
+    $('#Inwardgateregistertable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "aaSorting": [[ 2, "desc" ]],
+      "info": true,
+      "autoWidth": true
+  });
+
 $('#PONO').change(function() {
 	 $("#tblAppend").empty();  
 	 
diff --git a/application/views/storerequisition.php b/application/views/storerequisition.php
index 3c3f024f..1962c4e0 100644
--- a/application/views/storerequisition.php
+++ b/application/views/storerequisition.php
@@ -179,10 +179,9 @@ span.highlight {
 
 					<td align="right"><?php   $dt = new DateTime($record->ReqDate);
 
-$ReqDate =  $dt->format('d-m-Y');  echo $ReqDate  ?> 
-
+											  $ReqDate =  $dt->format('d-m-Y');  echo $ReqDate  ?> 
                     
-
+					</td>
                    
 
 					<td>   <a  	 data-toggle="tooltip"  href="<?php echo base_url().'EditStoreRequisition?StoreReqNo='.$record->StoreReqNo; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->StoreReqNo; ?>  -  Click here to view addstorerequisitionslip"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip"  onclick="DeleteRow('<?php echo $record->StoreReqNo; ?>' )"   ><span class="glyphicon glyphicon-trash" title="<?php echo $record->StoreReqNo; ?>  -  Click here to Delete Requisition details"></span></a> </td>   
@@ -294,7 +293,7 @@ $ReqDate =  $dt->format('d-m-Y');  echo $ReqDate  ?>
 	$(function () {
 
   
-
+  $.fn.dataTable.moment( 'DD-MM-YYYY' );
     $('#Requisition').DataTable({
 
       "paging": true,
@@ -307,6 +306,8 @@ $ReqDate =  $dt->format('d-m-Y');  echo $ReqDate  ?>
 
       "info": true,
 
+	  "aaSorting": [[ 5, "desc" ]],
+
       "autoWidth": true
 
 	   
diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php
index 31a0083c..37837833 100644
--- a/application/views/viewIGRDetails.php
+++ b/application/views/viewIGRDetails.php
@@ -223,7 +223,7 @@
 							<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
 								<thead  style="background-color:#ddf">
 									<tr>								 
-										<th>SNo</th>
+										<!-- <th>SNo</th> -->
 										<th>Item Code</th>
 										<th>Item Description</th>
 										<th>UOM</th>
@@ -341,7 +341,6 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
 			 
 								i=i+1;
 									trHTML += '<tr>' +
-										'<td align="right">' + i + '</td>' +
 										'<td name="MaterialName" id="MaterialCode" onchange="test('+i+')">' + item.MaterialCode + '</td>' +
 										'<td>' + item.MaterialName + '</td>' +
 										'<td name="UOM">' + item.UOM + '</td>' +