From 8e383cf62664556eebb0b9aa24a7cd4805796fd5 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbinfotech.com>
Date: Tue, 22 May 2018 14:58:28 +0530
Subject: [PATCH] date sorting

---
 application/views/AmendPOlist.php             |  5 +++-
 application/views/BatchcardHistListing.php    |  5 +++-
 application/views/POlist.php                  | 29 ++++++++++---------
 .../views/approvalstorerequisitionslip.php    |  4 +++
 application/views/assetListing.php            |  4 +++
 application/views/costListing.php             |  4 +++
 application/views/createPOfromRequistion.php  |  4 +++
 application/views/enquirylist.php             |  5 +++-
 application/views/income_expense_list.php     |  4 +++
 application/views/ncrlist.php                 |  4 +++
 application/views/poapproval_view.php         |  4 +++
 application/views/porelease_view.php          |  4 +++
 .../views/reportlist_inprocesstest.php        |  5 +++-
 application/views/reportmasterlist.php        |  4 +++
 application/views/requisitionlistapproval.php |  3 ++
 application/views/requisitionlisting.php      |  3 ++
 .../views/resinbatchcardreportlist.php        |  4 +++
 application/views/serviceporeport.php         |  5 +++-
 application/views/storerequisition.php        |  4 +++
 application/views/storerequisitionlisting.php |  4 +++
 application/views/storestatus.php             | 10 ++++++-
 application/views/viewinwardgateregister.php  |  4 +++
 22 files changed, 103 insertions(+), 19 deletions(-)

diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php
index d46b2229..a8f8706b 100755
--- a/application/views/AmendPOlist.php
+++ b/application/views/AmendPOlist.php
@@ -110,8 +110,11 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":3, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": false
     });
   });
-</script>
\ No newline at end of file
+</script>
+		<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
diff --git a/application/views/BatchcardHistListing.php b/application/views/BatchcardHistListing.php
index 2b3aa60e..1512974f 100755
--- a/application/views/BatchcardHistListing.php
+++ b/application/views/BatchcardHistListing.php
@@ -78,10 +78,13 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":9, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
      
     }); 
   });
   
-</script>
\ No newline at end of file
+</script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
diff --git a/application/views/POlist.php b/application/views/POlist.php
index f2579d39..3f549a30 100755
--- a/application/views/POlist.php
+++ b/application/views/POlist.php
@@ -1,4 +1,4 @@
- 
+
 <style>
    .pagination {
    margin:0px !important;
@@ -18,7 +18,7 @@
             </div>
             <!-- /.box-header -->
             <div class="box-body">
-              <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
+              <table id="dataTableHistoriek" class="table table-bordered table-hover editableTable" style="font-size:12px;">
                 <thead>
                 <tr style="background-color:#ddf">
 				<th>#</th>
@@ -102,16 +102,19 @@
     <!-- /.content -->
   </div>
   <!-- /.content-wrapper -->
-		  <script>
-  $(function () {
+  <script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+  
+		 <script>
+
+   $(function () {
     
-    $('#example1').DataTable({
-      "paging": true,
-      "lengthChange": true,
-      "searching": true,
-      "ordering": true,
-      "info": true,
-      "autoWidth": false
-    });
+     $('#dataTableHistoriek').DataTable({     
+    "paging" : true,
+    "ordering" : true,
+    "scrollCollapse" : true,
+    "searching" : true,
+    "columnDefs" : [{"targets":3, "type":"date-eu"}],
+    "bInfo": true
+});
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/application/views/approvalstorerequisitionslip.php b/application/views/approvalstorerequisitionslip.php
index 4af456e4..6c270830 100755
--- a/application/views/approvalstorerequisitionslip.php
+++ b/application/views/approvalstorerequisitionslip.php
@@ -393,9 +393,13 @@ $(function () {
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+	  "columnDefs" : [{"targets":2, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
 	   
     }); 
   });
 	</script>
+						<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/assetListing.php b/application/views/assetListing.php
index f048700f..2c12051b 100755
--- a/application/views/assetListing.php
+++ b/application/views/assetListing.php
@@ -81,6 +81,8 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":7, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
 	   
@@ -88,3 +90,5 @@
   });
 	
 </script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/costListing.php b/application/views/costListing.php
index 21fc3090..88f12338 100755
--- a/application/views/costListing.php
+++ b/application/views/costListing.php
@@ -79,6 +79,8 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":3, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
 	   
@@ -86,3 +88,5 @@
   });
 	
 </script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/createPOfromRequistion.php b/application/views/createPOfromRequistion.php
index 5788fccd..89dc7081 100755
--- a/application/views/createPOfromRequistion.php
+++ b/application/views/createPOfromRequistion.php
@@ -437,6 +437,8 @@ $(function () {
       "paging": true,
       "lengthChange": true,
       "searching": true,
+	  "columnDefs" : [{"targets":4, "type":"date-eu"}],
+
       "ordering": true,
       "info": true,
       "autoWidth": true
@@ -445,4 +447,6 @@ $(function () {
   });
 	
 	</script>
+	<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
 		  
diff --git a/application/views/enquirylist.php b/application/views/enquirylist.php
index 0589503d..b9f915a5 100644
--- a/application/views/enquirylist.php
+++ b/application/views/enquirylist.php
@@ -98,8 +98,11 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":1, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": false
     });
   });
-</script>
\ No newline at end of file
+</script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
diff --git a/application/views/income_expense_list.php b/application/views/income_expense_list.php
index 7202ca4c..0fcc26aa 100755
--- a/application/views/income_expense_list.php
+++ b/application/views/income_expense_list.php
@@ -92,9 +92,13 @@ $(function () {
       "searching": true,
 	   "aaSorting": [[ 0, "desc" ]],
       "ordering": true,
+	  "columnDefs" : [{"targets":1, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
 	   
     }); 
   });
 	</script>
+			<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/ncrlist.php b/application/views/ncrlist.php
index aa20dd02..58ff95cd 100644
--- a/application/views/ncrlist.php
+++ b/application/views/ncrlist.php
@@ -106,6 +106,8 @@
     <!-- /.content -->
   </div>
   <!-- /.content-wrapper -->
+  <script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
 		  <script>
   $(function () {
     
@@ -113,6 +115,8 @@
       "paging": true,
       "lengthChange": true,
       "searching": true,
+      "columnDefs" : [{"targets":2, "type":"date-eu"}],
+
       "ordering": true,
       "info": true,
       "autoWidth": false
diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php
index 78d43431..354b87c4 100755
--- a/application/views/poapproval_view.php
+++ b/application/views/poapproval_view.php
@@ -382,9 +382,13 @@ $(function () {
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+	  "columnDefs" : [{"targets":5, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
 	   
     }); 
   });
 	</script>
+	<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/porelease_view.php b/application/views/porelease_view.php
index e162584b..17ae3194 100755
--- a/application/views/porelease_view.php
+++ b/application/views/porelease_view.php
@@ -383,6 +383,8 @@ $(function () {
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+	  "columnDefs" : [{"targets":6, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
       //"data-sort-name":Status
@@ -390,3 +392,5 @@ $(function () {
     }); 
   });
 	</script>
+		<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/reportlist_inprocesstest.php b/application/views/reportlist_inprocesstest.php
index 26fa0347..5af418a7 100755
--- a/application/views/reportlist_inprocesstest.php
+++ b/application/views/reportlist_inprocesstest.php
@@ -126,7 +126,8 @@
   </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.11/sorting/date-eu.js"></script>
+
 <script type="text/javascript">
     $(function () {
   
@@ -134,6 +135,8 @@
       "paging": true,
       "lengthChange": true,
       "searching": true,
+      "columnDefs" : [{"targets":2, "type":"date-eu"}],
+
       "ordering": true,
      "aaSorting": [[ 0, "asc" ]],
       "info": true,
diff --git a/application/views/reportmasterlist.php b/application/views/reportmasterlist.php
index 17812a3b..196ec2ee 100755
--- a/application/views/reportmasterlist.php
+++ b/application/views/reportmasterlist.php
@@ -106,6 +106,8 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":2, "type":"date-eu"}],
+
      "aaSorting": [[ 0, "asc" ]],
       "info": true,
       "autoWidth": true,
@@ -115,3 +117,5 @@
   });
   
 </script>
+  			<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/requisitionlistapproval.php b/application/views/requisitionlistapproval.php
index 82800f39..0740e810 100755
--- a/application/views/requisitionlistapproval.php
+++ b/application/views/requisitionlistapproval.php
@@ -381,6 +381,8 @@ $(function () {
       "paging": true,
       "lengthChange": true,
       "searching": true,
+	  "columnDefs" : [{"targets":2, "type":"date-eu"}],
+
 	   "aaSorting": [[ 0, "desc" ]],
       "ordering": true,
       "info": true,
@@ -389,3 +391,4 @@ $(function () {
     }); 
   });
 	</script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
diff --git a/application/views/requisitionlisting.php b/application/views/requisitionlisting.php
index df6907f4..941a8ee0 100755
--- a/application/views/requisitionlisting.php
+++ b/application/views/requisitionlisting.php
@@ -132,6 +132,7 @@ span.highlight {
 				</div>
 				</section>
 				</div>
+				<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
 	<script>
 	$(function () {
   
@@ -140,6 +141,8 @@ span.highlight {
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+	  "columnDefs" : [{"targets":7, "type":"date-eu"}],
+
 	   "aaSorting": [[ 0, "desc" ]],
       "info": true,
       "autoWidth": true
diff --git a/application/views/resinbatchcardreportlist.php b/application/views/resinbatchcardreportlist.php
index 1cbb55bf..228d5bd4 100644
--- a/application/views/resinbatchcardreportlist.php
+++ b/application/views/resinbatchcardreportlist.php
@@ -100,6 +100,8 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":3, "type":"date-eu"}],
+
      "aaSorting": [[ 0, "asc" ]],
       "info": true,
       "autoWidth": true,
@@ -109,3 +111,5 @@
   });
   
 </script>
+<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php
index d8627a44..a212f590 100755
--- a/application/views/serviceporeport.php
+++ b/application/views/serviceporeport.php
@@ -163,8 +163,11 @@ $Adv='';
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+      "columnDefs" : [{"targets":13, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": false
     });
   });
-</script>
\ No newline at end of file
+</script>
+		<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
diff --git a/application/views/storerequisition.php b/application/views/storerequisition.php
index 0b9eeb62..e3fe5734 100755
--- a/application/views/storerequisition.php
+++ b/application/views/storerequisition.php
@@ -151,9 +151,13 @@ $ReqDate =  $dt->format('d-m-Y');  echo $ReqDate  ?>
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+	  "columnDefs" : [{"targets":5, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
 	   
     }); 
   });
 	</script>
+					<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/storerequisitionlisting.php b/application/views/storerequisitionlisting.php
index 471791fa..1111c01c 100755
--- a/application/views/storerequisitionlisting.php
+++ b/application/views/storerequisitionlisting.php
@@ -391,6 +391,8 @@ function(start, end, label) {
       "paging": true,
       "lengthChange": true,
       "searching": true,
+	  "columnDefs" : [{"targets":2, "type":"date-eu"}],
+
       "ordering": true,
       "info": true,
       "autoWidth": true
@@ -398,3 +400,5 @@ function(start, end, label) {
     }); 
   });
 	</script>
+							<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
diff --git a/application/views/storestatus.php b/application/views/storestatus.php
index a301639a..ef26ef6c 100755
--- a/application/views/storestatus.php
+++ b/application/views/storestatus.php
@@ -582,6 +582,7 @@ function validate()
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+	  "columnDefs" : [{"targets":6, "type":"date-eu"}],
       "info": true,
       "autoWidth": false
     });
@@ -590,12 +591,19 @@ function validate()
       "lengthChange": false,
       "searching": false,
       "ordering": false,
+	//   "columnDefs" : [{"targets":6, "type":"date-eu"}],
+
       "info": false,
       "autoWidth": false
     });
   });
 
-</script><script type="text/javascript">
+
+</script>
+  <script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
+
+<script type="text/javascript">
 	 $(document).ready(function(){
 $("#MaterialCode").select2();
 //$("#StockAvail").select2();
diff --git a/application/views/viewinwardgateregister.php b/application/views/viewinwardgateregister.php
index 93e9ae75..378c80d1 100755
--- a/application/views/viewinwardgateregister.php
+++ b/application/views/viewinwardgateregister.php
@@ -209,12 +209,16 @@
       "lengthChange": true,
       "searching": true,
       "ordering": true,
+	  "columnDefs" : [{"targets":5, "type":"date-eu"}],
+
       "info": true,
       "autoWidth": true
 	   
     }); 
   });
   </script>
+  			<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
+
 <script>
 $("#Igrshow").on("shown.bs.modal", function(e) {
 	var  igr = $(e.relatedTarget).data('userid');