From de12f4e157d40411ea5597c9c693596f1cdac198 Mon Sep 17 00:00:00 2001
From: venbatechnologies <venbatechnologies@gmail.com>
Date: Fri, 16 Mar 2018 15:52:06 +0530
Subject: [PATCH] report

---
 application/config/routes.php         |  2 +-
 application/controllers/user.php      |  9 ++++--
 application/views/deliver_perform.php | 44 ++++++++++++++++++++++-----
 application/views/reportslink.php     |  2 +-
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 350149a3..5084d3d4 100755
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -296,4 +296,4 @@ $route['ncrlist'] = "purchaseorder/Nonconfirmativelist";
 /* Location: ./application/config/routes.php */
 
 
-$route['DeliverPerformance']="user/deliver_perform";
+$route['DeliveryPerformance']="user/deliver_perform";
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 1a107d81..cfa7b712 100755
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -1380,10 +1380,10 @@ function Adduserdepartment()
 
 function deliver_perform()
 {
-   // if ($this->input->post('btn_submit')) { 
+   
   
     $this->global['pageTitle'] = 'Siddharth : Delivery Performance';
-
+     if ($this->input->post('btn_submit')) { 
 
     $ab=$this->input->post('financialyear');
     
@@ -1398,6 +1398,9 @@ function deliver_perform()
       $data['per']=$this->user_model->deliver_perform($fa,$aa,$m);
      
     //  // print_r( $data['spurchse']);
+ }
+
+     $data['fy']=$this->user_model->fincalYear();
       
      $this->loadviews("deliver_perform",$this->global,$data,NULL);
       
@@ -1407,7 +1410,7 @@ function deliver_perform()
 
 
 
-// }
+
 
 }
 }
diff --git a/application/views/deliver_perform.php b/application/views/deliver_perform.php
index 07ab776a..75795ad5 100644
--- a/application/views/deliver_perform.php
+++ b/application/views/deliver_perform.php
@@ -146,17 +146,17 @@
                     </thead>
 				    <tbody>
 				       <?php if(!empty($per)){
-					  $tr3=0;
-					  $tr4=0; 
-					  $last = $this->uri->total_segments();
-		               $ab=$this->uri->segment($last);
+					  $tr1=0;
+					  $tr2=0; 
+					  // $last = $this->uri->total_segments();
+		     //           $ab=$this->uri->segment($last);
 		               $i=0;
 					   foreach($per as $rel)
 					    {				
 					   ?> 
 					  <tr>
                       
-						<td style="text-align:right"><span><?php echo  ++$i;?></span></td>
+						<td style="text-align:left;"><span><?php echo  ++$i;?></span></td>
 						   <td ><?php  
                 $itemdate=date("d-m-Y",strtotime($rel->invoice_date_created));
                 echo $itemdate;
@@ -172,12 +172,12 @@
               <td style="text-align:center;"><?php echo ($rel->invoice_number); ?></td> 
 
 
-                   <td class="amount"><?php
-                  
+                   <td class="amount" style="text-align:right;"><?php
+                    $tr1= $tr1 + round($rel->qty);
                   echo number_format(round($rel->qty));
                ?></td>
                 
-                <td class="amount"><?php
+                <td class="amount" style="text-align:right;"><?php
                   $tr2= $tr2 + round($rel->qty);
                   echo number_format(round($rel->qty));
                 ?></td>
@@ -200,6 +200,34 @@
 					  ?>
 			        </tbody>
 					<tfoot  width="100%">
+
+                         
+						   <td><strong>&nbsp</strong></td>
+						   <td><strong>&nbsp</strong></td>
+						   <td><strong>&nbsp</strong></td>
+						     <td><strong>Total</strong></td>
+						   <td><strong>&nbsp</strong></td>
+						   
+							<td class="amount" style="text-align:right"><strong>
+								 <?php 
+								 {
+								 echo $tr1;
+								
+								  } 
+								 ?>  
+								</strong>	 
+								</td>  
+								<td class="amount" style="text-align:right"><strong>
+								 <?php 
+								 {
+								 echo $tr2;
+								
+								  } 
+								 ?>  
+								</strong>	 
+								</td> 
+								<td><strong>&nbsp</strong></td>
+						 
 					
 					 </tfoot>
 					  <?php
diff --git a/application/views/reportslink.php b/application/views/reportslink.php
index 62529df3..09bacd90 100755
--- a/application/views/reportslink.php
+++ b/application/views/reportslink.php
@@ -45,7 +45,7 @@
             <a href="<?php echo base_url(); ?>Report_cumulative_raw" target="_blank" >Cumulative Report - Category Wise-Inward<p class="uk-text uk-margin-remove"></p></a>
            <a href="<?php echo base_url(); ?>Report_consolidate_category" target="_blank" >Consolidate Report - Category Wise-Inward<p class="uk-text-meta uk-margin-remove"></p></a>
 
-           <a href="<?php echo base_url(); ?>DeliverPerformance" target="_blank" > Report - DeliverPerformances<p class="uk-text-meta uk-margin-remove"></p></a>
+           <a href="<?php echo base_url(); ?>DeliveryPerformance" target="_blank" > Report - DeliveryPerformance<p class="uk-text-meta uk-margin-remove"></p></a>
       </div>
     
 </div>