From 08a321ff738cc9c0899d0539192fc12a36ffbdff Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 4 Jan 2018 18:07:57 +0530
Subject: [PATCH] requisition description

---
 application/controllers/requisitionform.php | 13 ++++++++++-
 application/views/editrequisitionform.php   | 25 +++++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index f41d666d..0007d51d 100755
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -136,7 +136,18 @@ class requisitionform extends BaseController
            //print_r($POType);
           // echo 'ReqType'.$ReqPOType;
            $data['ReqPOType'] =  $ReqPOType =='' ? $ReqType:$ReqPOType;          
-           $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);             
+           $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);
+          // print_r($data['LineItem']);
+            $data['description']='';
+           foreach($data['LineItem'] as $line)
+           {
+             $description= $line->MaterialDescription;
+             //echo $description;
+
+           }
+           
+           
+
            $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);  
            $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType);
           $data['ServiceOption'] = $this->requistion_model->getConfigValue('C022');
diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php
index 84bbf2ba..db1580c9 100755
--- a/application/views/editrequisitionform.php
+++ b/application/views/editrequisitionform.php
@@ -33,6 +33,12 @@ if(!empty($ReqDetails))
 
     }
 }
+
+
+$description='';
+
+
+
 if(!empty($ReqPOType))
 {
     
@@ -462,7 +468,13 @@ if(!empty($ReqPOType))
 							 <input type="hidden" name="<?php echo 'te'.$index ?>" id="<?php echo 'tes'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
 							   
 					<td align="left"><?php echo $record->MaterialCode ; ?></td>
+					<?php if ($materialdesc == ''){?>
 					<td align="left"><?php echo $record->MaterialName ; ?></td>
+					<?php }
+					else{?>
+
+                    <td align="left"><?php echo $record->MaterialDescription; ; ?></td>
+					<?php }?>
  
 					<td align="left"><?php echo $record->UOM ; ?></td>
   
@@ -474,6 +486,8 @@ if(!empty($ReqPOType))
 						 
 						  
                       </td>
+
+                 
 </tr>
 						<?php $RowCount  = $index;  }
 						?>
@@ -1046,19 +1060,22 @@ $("#EditItem").on("shown.bs.modal", function(e) {
      var check=cellval[2].innerHTML;
      var upcheck= check.toUpperCase();
 
-     var decs= <?php echo json_encode($materialdesc, JSON_PRETTY_PRINT) ?>;
+    // var decs= <?php echo json_encode($materialdesc, JSON_PRETTY_PRINT) ?>;
      //alert(decs)
+     //var desc= cellval[8].innerHTML
+    
+               //alert(desc)
 
      if(upcheck=='SERVICE')
      {
-     	$('#EditotherDescription').show();
-     	$('#EditotherD').val(decs)
+     	$('#EditotherDescription').hide();
+     	
      }
 
      else
      {
      	$('#EditotherDescription').hide();
-     	$('#EditotherD').val('')
+     	
 
      }