diff --git a/application/helpers/cias_helper.php b/application/helpers/cias_helper.php index 7a6df371..fad59cdf 100755 --- a/application/helpers/cias_helper.php +++ b/application/helpers/cias_helper.php @@ -51,7 +51,7 @@ if(!function_exists('verifyHashedPassword')) { $CI = &get_instance(); $CI->load->database(); - + $CI->db->reconnect(); $CI->db->where('Created_BY',$user); $CI->db->where('Status',1); return $CI->db->get('T_fav_add')->result(); diff --git a/application/views/Advancelisting.php b/application/views/Advancelisting.php index d51cd629..debcecd8 100644 --- a/application/views/Advancelisting.php +++ b/application/views/Advancelisting.php @@ -81,19 +81,21 @@ - + + - + + diff --git a/application/views/MaterialHistory.php b/application/views/MaterialHistory.php index 94375abe..58ee2efa 100644 --- a/application/views/MaterialHistory.php +++ b/application/views/MaterialHistory.php @@ -210,6 +210,8 @@ table.dataTable thead > tr > td.sorting { + + + @@ -364,18 +365,20 @@ $.fn.dataTable.moment( 'DD-MM-YYYY' ); "language": { "emptyTable":"
Data Not Found !
" }, - "aaSorting": [[ 3, "desc" ]], - "autoWidth": false, + "aaSorting": [[ 2, "desc" ]], + "autoWidth": false, orderCellsTop: true, + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", buttons: [ { + extend: 'excelHtml5', footer: 'true', - messageTop: 'Report Purchase-Inward', + messageTop: 'Report Attachment-Inward', title: $('h3').text(), exportOptions: { columns: ':visible' diff --git a/application/views/Report_openorder.php b/application/views/Report_openorder.php index e55ccdd7..4a5f5808 100755 --- a/application/views/Report_openorder.php +++ b/application/views/Report_openorder.php @@ -253,7 +253,11 @@ $(document).ready(function() { "language": { "emptyTable": "
Data Not Found !
" }, - "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + + "aaSorting": [[ 2, "desc" ]], + "autoWidth": false, + orderCellsTop: true, + + "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", buttons: [ diff --git a/application/views/Report_pending_purchase.php b/application/views/Report_pending_purchase.php index a4ba0958..b1a94236 100755 --- a/application/views/Report_pending_purchase.php +++ b/application/views/Report_pending_purchase.php @@ -399,7 +399,7 @@ $(document).ready(function() { "language": { "emptyTable": "
Data Not Found !
" }, - "aaSorting": [[ 3, "desc" ]], + "aaSorting": [[ 1, "desc" ]], "autoWidth": false, orderCellsTop: true, "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + diff --git a/application/views/Report_purchase.php b/application/views/Report_purchase.php index fd930ec2..c79136a4 100755 --- a/application/views/Report_purchase.php +++ b/application/views/Report_purchase.php @@ -505,6 +505,9 @@ $(document).ready(function() { "language": { "emptyTable": "
Data Not Found !
" }, + "aaSorting": [[ 1, "desc" ]], + "autoWidth": false, + orderCellsTop: true, "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php index 0395ced5..9c65502d 100755 --- a/application/views/Report_purchase_inward.php +++ b/application/views/Report_purchase_inward.php @@ -516,6 +516,7 @@ table.dataTable thead > tr > td.sorting { + - + diff --git a/application/views/bankamountpaid.php b/application/views/bankamountpaid.php index 5a4c37c0..5f7c3d2f 100644 --- a/application/views/bankamountpaid.php +++ b/application/views/bankamountpaid.php @@ -195,10 +195,16 @@ if(!empty($amountpaid)) + + + + + + - + + diff --git a/application/views/hourlybatchcardlisting.php b/application/views/hourlybatchcardlisting.php index 13394aff..7e0ab4cf 100755 --- a/application/views/hourlybatchcardlisting.php +++ b/application/views/hourlybatchcardlisting.php @@ -270,9 +270,10 @@ + - + + + - - + + diff --git a/application/views/porelease_view.php b/application/views/porelease_view.php index 17ae3194..8eeb83ac 100755 --- a/application/views/porelease_view.php +++ b/application/views/porelease_view.php @@ -378,12 +378,15 @@ $(function () { "autoWidth": false }); +$.fn.dataTable.moment( 'DD-MM-YYYY' ); $('#Requisition').DataTable({ "paging": true, "lengthChange": true, "searching": true, "ordering": true, - "columnDefs" : [{"targets":6, "type":"date-eu"}], + "aaSorting": [[ 6, "desc" ]], + + // "columnDefs" : [{"targets":6, "type":"date-eu"}], "info": true, "autoWidth": true @@ -392,5 +395,6 @@ $(function () { }); }); - - + + \ No newline at end of file diff --git a/application/views/report_pendingreqst.php b/application/views/report_pendingreqst.php index 3f2b127b..2dda6641 100755 --- a/application/views/report_pendingreqst.php +++ b/application/views/report_pendingreqst.php @@ -229,18 +229,22 @@ + + - + + + - + diff --git a/application/views/resinbatchcardreportlist.php b/application/views/resinbatchcardreportlist.php index 574a4952..99e32a50 100644 --- a/application/views/resinbatchcardreportlist.php +++ b/application/views/resinbatchcardreportlist.php @@ -94,15 +94,15 @@ - + + diff --git a/application/views/salarycostforproduction.php b/application/views/salarycostforproduction.php index 491e4fcb..8208338c 100644 --- a/application/views/salarycostforproduction.php +++ b/application/views/salarycostforproduction.php @@ -315,7 +315,7 @@ th{ $.fn.dataTable.moment( 'DD-MM-YYYY' ); table = $('#testreport').DataTable( { - "aaSorting": [[ 3, "desc" ]], + "aaSorting": [[ 1, "desc" ]], "autoWidth": false, orderCellsTop: true, diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php index 04583c90..11fe3944 100755 --- a/application/views/serviceporeport.php +++ b/application/views/serviceporeport.php @@ -155,19 +155,21 @@ $Adv=''; + - + diff --git a/application/views/storerequisitionlisting.php b/application/views/storerequisitionlisting.php index 33b07cd6..ad2c9b1c 100755 --- a/application/views/storerequisitionlisting.php +++ b/application/views/storerequisitionlisting.php @@ -386,20 +386,21 @@ function(start, end, label) { }); $(function () { - + $.fn.dataTable.moment( 'DD-MM-YYYY' ); $('#Requisition').DataTable({ "paging": true, "lengthChange": true, "searching": true, - "columnDefs" : [{"targets":2, "type":"date-eu"}], + // "columnDefs" : [{"targets":2, "type":"date-eu"}], "ordering": true, - "aaSorting": [[ 0, "desc" ]], + "aaSorting": [[ 3, "desc" ]], "info": true, "autoWidth": true }); }); - - + + diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php index 36f9b5b2..dea5c514 100755 --- a/application/views/viewIGRDetails.php +++ b/application/views/viewIGRDetails.php @@ -232,16 +232,20 @@ + + - + + +