diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index be4a5cb2..22c4b9e8 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -4167,11 +4167,12 @@ function addloadfile() $new_file_name =$_FILES['file']['name']; - $file = $this->purchaseorder_model->getfies($pono); + $files = $this->purchaseorder_model->getfies($pono); -$fcount=0; - foreach ($file as $value) +$fcount = 0; + + foreach ($files as $value) { $lastfile = $value->FilePath; @@ -4179,8 +4180,8 @@ $fcount=0; if($lastfile == $new_file_name) { - $fcount++; - echo 'File name already Exist'; + $fcount ++; + } } @@ -4191,12 +4192,16 @@ $fcount=0; { $Picture = $this->adfile(); $filelist =array('PONO'=>$pono,'IGRNO'=>$igr,'FilePath'=>$Picture); - $uploadfile = $this->purchaseorder_model->insertfile($filelist); + $uploadfiles = $this->purchaseorder_model->insertfile($filelist); } - if($uploadfile > 0){ + if($uploadfiles > 0){ echo "file updated successfully!"; } + else + { + echo "File name already Exist"; + } } diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index 93187f53..b7c18806 100644 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -6,7 +6,7 @@ require APPPATH . '/libraries/BaseController.php'; /** * Class : purchaseorder (PurchaseorderController) - * User Class to control all user related operations. + * User Class to control all user related operations. * @author : VenbaMail Mali * @version : 1.1 * @since : 15 Feb 2016 @@ -665,21 +665,12 @@ function uploadfile() $new_file_name =$_FILES['file']['name']; - //echo $new_file_name;die; - // if(!empty($new_file_name)) - // { - // $Picture = $this->adfile(); - // } - // else - // { - // $Picture =''; - // } -//echo $Picture;die; - $file = $this->purchaseorder_model->getfies($pono); + + $files = $this->purchaseorder_model->getfies($pono); -$fcount=0; +$fcount = 0; - foreach ($file as $value) + foreach ($files as $value) { $lastfile = $value->FilePath; @@ -698,15 +689,10 @@ $upfile=''; if($fcount == 0) { $Picture = $this->adfile(); + $filelist =array('PONO'=>$pono,'FilePath'=>$Picture); $upfile = $this->purchaseorder_model->insertfile($filelist); } - - - - - - if($upfile > 0){ echo "file updated successfully!"; } diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php index a8f8706b..e2486dc0 100755 --- a/application/views/AmendPOlist.php +++ b/application/views/AmendPOlist.php @@ -111,6 +111,7 @@ "searching": true, "ordering": true, "columnDefs" : [{"targets":3, "type":"date-eu"}], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": false diff --git a/application/views/BatchcardHistListing.php b/application/views/BatchcardHistListing.php index 1512974f..5b47abc0 100755 --- a/application/views/BatchcardHistListing.php +++ b/application/views/BatchcardHistListing.php @@ -79,7 +79,7 @@ "searching": true, "ordering": true, "columnDefs" : [{"targets":9, "type":"date-eu"}], - + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/MaterialIssueList.php b/application/views/MaterialIssueList.php index b9d4ff6d..51ee998d 100755 --- a/application/views/MaterialIssueList.php +++ b/application/views/MaterialIssueList.php @@ -257,6 +257,7 @@ "lengthChange": true, "searching": true, "ordering": true, + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/POlist.php b/application/views/POlist.php index 283e4b2a..4cedc9cd 100755 --- a/application/views/POlist.php +++ b/application/views/POlist.php @@ -113,6 +113,7 @@ "paging" : true, "ordering" : true, "scrollCollapse" : true, + "aaSorting": [[ 0, "desc" ]], "searching" : true, // "columnDefs" : [{"targets":3, "type":"date-eu"}], "bInfo": true diff --git a/application/views/Report_Material_Master_SupplierWise.php b/application/views/Report_Material_Master_SupplierWise.php index 1c772c4b..8e1ee661 100755 --- a/application/views/Report_Material_Master_SupplierWise.php +++ b/application/views/Report_Material_Master_SupplierWise.php @@ -113,6 +113,7 @@ if(!empty($mms)) $(document).ready(function() { $.fn.dataTable.moment( 'DD-MM-YYYY' ); table = $('#cc').DataTable( { + "aaSorting": [[ 0, "desc" ]], "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>>", @@ -121,6 +122,7 @@ $(document).ready(function() { { extend: 'excelHtml5', footer: 'true', + //messageTop: $('h3').text(), title: 'Report - Material Master - SupplierWise', exportOptions: { diff --git a/application/views/approvalstorerequisitionslip.php b/application/views/approvalstorerequisitionslip.php index 6c270830..a9ee5406 100755 --- a/application/views/approvalstorerequisitionslip.php +++ b/application/views/approvalstorerequisitionslip.php @@ -394,7 +394,7 @@ $(function () { "searching": true, "ordering": true, "columnDefs" : [{"targets":2, "type":"date-eu"}], - + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/assetListing.php b/application/views/assetListing.php index 2c12051b..cfea9786 100755 --- a/application/views/assetListing.php +++ b/application/views/assetListing.php @@ -82,7 +82,7 @@ "searching": true, "ordering": true, "columnDefs" : [{"targets":7, "type":"date-eu"}], - + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/batchcard_stockdetails.php b/application/views/batchcard_stockdetails.php index cabddc88..3a42ad2e 100755 --- a/application/views/batchcard_stockdetails.php +++ b/application/views/batchcard_stockdetails.php @@ -333,7 +333,7 @@ else "lengthChange": true, "searching": true, "ordering": false, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true, diff --git a/application/views/configlisting.php b/application/views/configlisting.php index 0b91cf47..8e96a2fd 100755 --- a/application/views/configlisting.php +++ b/application/views/configlisting.php @@ -38,7 +38,11 @@ Config_ID?> ConfigName ?> Comments ?> - CreatedDate?> + CreatedDate?> + +         @@ -65,7 +69,8 @@ "lengthChange": true, "searching": true, "ordering": true, - "info": true, + "aaSorting": [[ 0, "desc" ]], + "info": true, "autoWidth": true }); diff --git a/application/views/costListing.php b/application/views/costListing.php index 88f12338..f53431de 100755 --- a/application/views/costListing.php +++ b/application/views/costListing.php @@ -40,7 +40,7 @@ CostCenterName ?> FirstName ?> - CreatedDate); echo $date->format('d-m-Y'); ?> @@ -80,7 +80,7 @@ "searching": true, "ordering": true, "columnDefs" : [{"targets":3, "type":"date-eu"}], - + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/dailyBatchCardListing.php b/application/views/dailyBatchCardListing.php index e90c4393..4b6838f2 100755 --- a/application/views/dailyBatchCardListing.php +++ b/application/views/dailyBatchCardListing.php @@ -866,9 +866,10 @@ $(function(){ "scrollY": 500, "scrollX": true, "ordering": false, + "aaSorting": [[ 0, "desc" ]], "info": false, "paging": true, - "searching": false + "searching": true } ); diff --git a/application/views/enquirylist.php b/application/views/enquirylist.php index b9f915a5..4725751e 100644 --- a/application/views/enquirylist.php +++ b/application/views/enquirylist.php @@ -99,7 +99,7 @@ "searching": true, "ordering": true, "columnDefs" : [{"targets":1, "type":"date-eu"}], - + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": false }); diff --git a/application/views/hourlybatchcardlisting.php b/application/views/hourlybatchcardlisting.php index f6c54467..13394aff 100755 --- a/application/views/hourlybatchcardlisting.php +++ b/application/views/hourlybatchcardlisting.php @@ -278,7 +278,7 @@ "lengthChange": true, "searching": true, "ordering": false, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true, diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php index b082068c..fcbf65ee 100755 --- a/application/views/issueStoreRequistion.php +++ b/application/views/issueStoreRequistion.php @@ -491,6 +491,7 @@ function Redirect() "lengthChange": true, "searching": true, "ordering": true, + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/loanreports.php b/application/views/loanreports.php index e63c6a8d..2aeedda2 100755 --- a/application/views/loanreports.php +++ b/application/views/loanreports.php @@ -397,7 +397,7 @@ "lengthChange": true, "searching": true, "ordering": true, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true @@ -413,7 +413,7 @@ "lengthChange": true, "searching": true, "ordering": false, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/monthlyListing.php b/application/views/monthlyListing.php index e5ccb55a..3b6619c1 100755 --- a/application/views/monthlyListing.php +++ b/application/views/monthlyListing.php @@ -55,7 +55,7 @@ speed:500 Month Year Employee Id - Employee Name + Employee Name LOP Days OT Hours Worked in Hrs Loan Recovered in ₹ diff --git a/application/views/newinprocessreport.php b/application/views/newinprocessreport.php index 24ff5c0a..9f187931 100755 --- a/application/views/newinprocessreport.php +++ b/application/views/newinprocessreport.php @@ -485,7 +485,7 @@ th{ "lengthChange": true, "searching": true, "ordering": true, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/newnissaninprocessreport.php b/application/views/newnissaninprocessreport.php index 77531fa1..88cbbde0 100755 --- a/application/views/newnissaninprocessreport.php +++ b/application/views/newnissaninprocessreport.php @@ -709,7 +709,7 @@ th{ "lengthChange": true, "searching": true, "ordering": true, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/ogrlist.php b/application/views/ogrlist.php index 2fc8f6cf..4306bcd6 100644 --- a/application/views/ogrlist.php +++ b/application/views/ogrlist.php @@ -93,6 +93,7 @@ "lengthChange": true, "searching": true, "ordering": true, + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": false }); diff --git a/application/views/reportlist_inprocesstest.php b/application/views/reportlist_inprocesstest.php index 5af418a7..5116c7d7 100755 --- a/application/views/reportlist_inprocesstest.php +++ b/application/views/reportlist_inprocesstest.php @@ -138,7 +138,7 @@ "columnDefs" : [{"targets":2, "type":"date-eu"}], "ordering": true, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true, diff --git a/application/views/reportmasterlist.php b/application/views/reportmasterlist.php index 196ec2ee..8e8e0dcc 100755 --- a/application/views/reportmasterlist.php +++ b/application/views/reportmasterlist.php @@ -108,7 +108,7 @@ "ordering": true, "columnDefs" : [{"targets":2, "type":"date-eu"}], - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true, diff --git a/application/views/reportmasterlist_inward.php b/application/views/reportmasterlist_inward.php index 2df54f59..b1b41420 100755 --- a/application/views/reportmasterlist_inward.php +++ b/application/views/reportmasterlist_inward.php @@ -95,7 +95,7 @@ "lengthChange": true, "searching": true, "ordering": true, - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true, diff --git a/application/views/resinbatchcardreportlist.php b/application/views/resinbatchcardreportlist.php index 228d5bd4..574a4952 100644 --- a/application/views/resinbatchcardreportlist.php +++ b/application/views/resinbatchcardreportlist.php @@ -102,7 +102,7 @@ "ordering": true, "columnDefs" : [{"targets":3, "type":"date-eu"}], - "aaSorting": [[ 0, "asc" ]], + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true, diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php index a212f590..04583c90 100755 --- a/application/views/serviceporeport.php +++ b/application/views/serviceporeport.php @@ -164,7 +164,7 @@ $Adv=''; "searching": true, "ordering": true, "columnDefs" : [{"targets":13, "type":"date-eu"}], - + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": false }); diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php index 4f498101..36f9b5b2 100755 --- a/application/views/viewIGRDetails.php +++ b/application/views/viewIGRDetails.php @@ -241,6 +241,7 @@ "lengthChange": true, "searching": true, "ordering": true, + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/viewinwardgateregister.php b/application/views/viewinwardgateregister.php index 8ce86147..1e89c90c 100755 --- a/application/views/viewinwardgateregister.php +++ b/application/views/viewinwardgateregister.php @@ -233,7 +233,7 @@ "searching": true, "ordering": true, "columnDefs" : [{"targets":5, "type":"date-eu"}], - + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true diff --git a/application/views/viewmaterialinspectionreport.php b/application/views/viewmaterialinspectionreport.php index e927b038..57927b18 100755 --- a/application/views/viewmaterialinspectionreport.php +++ b/application/views/viewmaterialinspectionreport.php @@ -95,6 +95,7 @@ "lengthChange": true, "searching": true, "ordering": true, + "aaSorting": [[ 0, "desc" ]], "info": true, "autoWidth": true