From 5338ec266a494e7d0695d3d1bd9383f09ae2fea6 Mon Sep 17 00:00:00 2001
From: velz2020 <velmurugan.s@venbainfotech.com>
Date: Sat, 6 Jan 2018 17:08:53 +0530
Subject: [PATCH] FILE UPLOAD IN QAD ERROR RESLOVED

---
 application/controllers/quality.php           | 11 ++++++++--
 application/views/inward_report_create.php    |  2 +-
 application/views/qualityreport.php           |  4 ++++
 application/views/reportmasterlist.php        | 20 ++++++++++++++++++-
 application/views/reportmasterlist_inward.php | 18 +++++++++++++++++
 5 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/application/controllers/quality.php b/application/controllers/quality.php
index 0fc472ae..672f2e39 100755
--- a/application/controllers/quality.php
+++ b/application/controllers/quality.php
@@ -361,10 +361,10 @@ class quality extends BaseController
 
 			}
 		$masterreportdata = array('igrno'=>$igrno,'igrlineitemno'=>$igrlineitemno,'batchdate'=>$report_date,'createdby'=>$createby,'createdon'=>$createdon,'approvedby'=>$approver,'chartdata'=>$chart,'document'=>$document);
+		//print_r($masterreportdata);die;
 		$MASTERID = $this->quality_model->saveMasterTestData($masterreportdata);
 		
 		
-		
 		    
 		foreach($testphpdata as $data)
 		{
@@ -474,7 +474,14 @@ class quality extends BaseController
 		        $pathinfo = pathinfo($_FILES['rfile']['name']);
                 $config['upload_path'] = 'uploads/QAD/';
                 $config['allowed_types'] = '*';
-                $config['file_name'] = $_FILES['rfile']['name'];
+				$filename = $_FILES['rfile']['name'];
+				$ext = end(explode('.',$filename));
+				
+				$ext = strtolower($ext);
+				$fn = 'qad' . date('Y-m-d') . time() . '.' . $ext;
+				//print_r($fn);die();
+				$config['file_name'] = $fn;
+				//echo $config['file_name'];
                 $this->load->library('upload',$config);
                 $this->upload->initialize($config);
                 
diff --git a/application/views/inward_report_create.php b/application/views/inward_report_create.php
index 06248b5a..892ec557 100755
--- a/application/views/inward_report_create.php
+++ b/application/views/inward_report_create.php
@@ -786,7 +786,7 @@ function calculateMaster(id)
 					//dataType:"json",{param1:testreportdata,param2:testloidata,param3:testafsdata,param4:igrno,param5:igrlineitemno,param6:approvedby,param7:fullQuality,param8:report_date},
 					type:"POST",
 					url:"<?php echo base_url() ?>quality/saveInwardTestReportData", 
-					async : false,
+					//async : false,
 					cache : false,
 					contentType : false,
 					processData : false,
diff --git a/application/views/qualityreport.php b/application/views/qualityreport.php
index 5ce33c22..a709b37e 100755
--- a/application/views/qualityreport.php
+++ b/application/views/qualityreport.php
@@ -672,6 +672,10 @@ function calculateMaster(id)
 					//dataType:"json",{param1:testreportdata,param2:testloidata,param3:testafsdata,param4:invoiceno,param5:batchno,param6:approvedby,param7:fullQuality}
 					type:"POST",
 					url:"<?php echo base_url() ?>quality/saveTestReportData", 
+					//async : false,
+					cache : false,
+					contentType : false,
+					processData : false,
 					success:function(data) {
 							    if(data){
 								alert(data);
diff --git a/application/views/reportmasterlist.php b/application/views/reportmasterlist.php
index 34d45d53..17812a3b 100755
--- a/application/views/reportmasterlist.php
+++ b/application/views/reportmasterlist.php
@@ -75,7 +75,7 @@
 						?>	
 						 <tr> <td><a href="<?php echo base_url()?>quality/viewIndReport/<?php echo $data->testreport_id ?>"><?php echo $data->testreport_id?></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 						 <?php if(!empty($data->document)){?>
-						 <a href="<?php echo base_url()?>uploads/QAD/<?php echo $data->document ?>"><span class="fa fa-file-o"></span></a>
+						 <a target="_blank" href="<?php echo base_url()?>uploads/QAD/<?php echo $data->document ?>"><span class="fa fa-file-o"></span></a>
 						 <?php }?>
 						 </td> <td><?php echo $data->invoiceid?></td> <td style="text-align:right;"><?php echo date_format(date_create($data->batchdate),'d-m-Y');?></td><td><?php echo $data->product_name;?></td><td><?php echo $data->client_name;?></td></tr> 
 						<?php	
@@ -97,3 +97,21 @@
         </div>
     </section>
 </div>
+<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+<script type="text/javascript">
+    $(function () {
+  
+    $('#testspecifications').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+     "aaSorting": [[ 0, "asc" ]],
+      "info": true,
+      "autoWidth": true,
+	  
+     
+    }); 
+  });
+  
+</script>
diff --git a/application/views/reportmasterlist_inward.php b/application/views/reportmasterlist_inward.php
index 410b3bce..2df54f59 100755
--- a/application/views/reportmasterlist_inward.php
+++ b/application/views/reportmasterlist_inward.php
@@ -86,3 +86,21 @@
         </div>
     </section>
 </div>
+<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
+<script type="text/javascript">
+    $(function () {
+  
+    $('#testspecifications').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+     "aaSorting": [[ 0, "asc" ]],
+      "info": true,
+      "autoWidth": true,
+	  
+     
+    }); 
+  });
+  
+</script>