diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php
old mode 100755
new mode 100644
index 000b6880..629d1200
--- a/application/controllers/MRIRcontroller.php
+++ b/application/controllers/MRIRcontroller.php
@@ -47,13 +47,14 @@ class MRIRcontroller extends BaseController
         $this->loadViews("materialinspectionreport", $this->global,$data,NULL);
         
     }
-    /*FOR Displaying IGR Values in Materialinspection.php(view file) */
+    
+    /*FOR Displaying IGR Values in Materialinspectionreport.php(view file) */
       function igrdatavalues()
     {
 
             $IgrNo=  $_GET['IGRNO'];
 
-            print_r($IgrNo);
+            //print_r($IgrNo);
 
             $data['IGRDetails'] = $this->mrir_model->get_IGRs($IgrNo);
            
@@ -67,11 +68,16 @@ class MRIRcontroller extends BaseController
     /* FOR Edit MRIR Screen */
      function editmaterialinspectionreport()
     {
-        $this->global['pageTitle'] = 'Siddharth : Edit Material Inspection Report';
+    
         
-        $this->load->model('mrir_model');
+    $this->load->model('mrir_model');
+
+        $MrirNo =  $_GET['MRIRNO'];
+       // print_r($MrirNo);
                         
-        $data['IGRNOonly'] = $this->mrir_model->getIGRNOonly();       
+        $data['MRIRDetails'] = $this->mrir_model->get_MRIR_Values($MrirNo);
+
+        $this->global['pageTitle'] = 'Siddharth : Edit Material Inspection Report';       
 
         $this->loadViews("Editmaterialinspectionreport", $this->global,$data,NULL);
         
@@ -85,15 +91,15 @@ class MRIRcontroller extends BaseController
 
             $this->load->model('mrir_model');
                
-            $data['mrirdatas2'] = $this->mrir_model-> view_MRIR();
-            
+            $data['viewmrirdatas'] = $this->mrir_model-> view_MRIR();
+            //old name:mrirdatas2
             $this->global['pageTitle'] = 'Siddharth : View Material Inspection Report';
             //print_r( $data);
             $this->loadViews("viewmaterialinspectionreport", $this->global,$data,NULL);
     
     }
 
-    /* For Values are Stored in DB */
+    /* NEW Values TO Stored in DB (for insert operation) */
     function displaying_values() 
     {
         $this->load->model('mrir_model');
@@ -135,11 +141,10 @@ class MRIRcontroller extends BaseController
 
                             $QuantityAsPerInvoice = $this->input->post('ReceivedQuantity'.$i);
                             $Remarked = $this->input->post('Remarks'.$i); 
-                            $StoreIncharge = $this->session->userdata('name');
-                            $UpdatedBy = $this->session->userdata('userId');
-                    
-                            //this array to store the value in master table.. 
-                            $mrirdetailvalues = array('MRIRNO'=>$MRIRNO,'MaterialCode'=>$MaterialCode,'ActualQuantityReceived'=>$ActualQuantityReceived,'StoreInchargeID'=>$StoreIncharge,'Remarks'=>$Remarked,'UpdateBy'=>$UpdatedBy);
+                            $StoreIncharge = $this->session->userdata('userId');
+                            
+                            //this array to store the value in child table.. 
+                            $mrirdetailvalues = array('MRIRNO'=>$MRIRNO,'MaterialCode'=>$MaterialCode,'ActualQuantityReceived'=>$ActualQuantityReceived,'StoreInchargeID'=>$StoreIncharge,'Remarks'=>$Remarked);
                             //print_r($mrirvalues2);
                             //die(); 
                             $mrirdetails = $this->mrir_model->detail_mrir($mrirdetailvalues);      
@@ -149,8 +154,73 @@ class MRIRcontroller extends BaseController
 
  
     }
+    /* Values To Stored in DB (for update operation) */
+    function updated_values() 
+    {
+        //print_r("this is controller which is present in updated_value function ");
+       // die();
 
+        $this->load->model('mrir_model');
+        
+        $mrir_no = $this->input->post('MRIRNO');
+        //print_r($mrir_no);
+        //die(
+
+        $RowCount = $this->input->post('RowCount');
+        //echo $RowCount;
+
+        
+        $UPdateby=$this->session->userdata('userId');
+        $date = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
+        $UPdateon = $date->format('Y-m-d H:i:s');
    
+        //this array to store the updated value in master table..
+        $updatemastervalues = array('UpdateBY'=>$UPdateby,'UpdatedOn'=>$UPdateon);
+
+        $updatemaster  = $this->mrir_model->update_mrirmaster($updatemastervalues,$mrir_no);
+       //echo "Master affected rows";
+       // print_r($updatemaster);
+        //die();
+
+
+                    echo "outside for loop";
+                    for ($i = 1; $i <= $RowCount; $i++)
+                            {   
+                                echo "inside for loop";
+
+                                $acceptquantity=$this->input->post('AcceptQuantity'.$i);
+                                echo $acceptquantity;
+                                $rejectquantity=$this->input->post('RejectQuantity'.$i);
+                                echo $rejectquantity;
+                                $remark=$this->input->post('Remarks'.$i);
+                                echo "hi before remark";
+                                echo $remark;
+
+                                //die();
+                                $updateby=$this->session->userdata('userId');
+                                $date = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
+                                $updateon = $date->format('Y-m-d H:i:s');
+   
+                            //this array to store the update value in child table.. 
+                            $updatedetailvalues = array('UpdateBy'=>$updateby,'UpdatedOn'=>$updateon,'QuantityAccepted'=>$acceptquantity,'QuantityRejected'=>$rejectquantity,'Remarks'=>$remark);
+                            
+                            $updatedetails = $this->mrir_model->update_mrirdetail($updatedetailvalues,$mrir_no);      
+                             echo "Child affected rows";
+                           // print_r($updatemaster);
+                    
+                    }
+                   //print_r(alert($mrir_no.": successfully updated"));
+
+ 
+    }
+
+
+
+
+
+
+
+   /*in view screen we display values for modal (viewmaterialinspectionreport.php)*/
     function displaying_MRIRvalues()
     {
          $mrir = $this->input->post("mrirno");
diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php
old mode 100755
new mode 100644
index da9c0a9c..40409428
--- a/application/models/mrir_model.php
+++ b/application/models/mrir_model.php
@@ -70,12 +70,12 @@ class mrir_model extends CI_Model
         
     }
 
-
+    /* to get the value for modal in MRIR we using this function */
     function get_MRIRs($mrir)
     {
          $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity');
          $this->db->from ('T_MRIR_Master TMM'); 
-         $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO','left');;
+         $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO','left');
          $this->db->join ('T_MaterialMaster  MM','TMD.MaterialCode = MM.MaterialCode','left');
          $this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO=TMM.IGRNO','left');
          $this->db->join ('T_PurchaseOrder_Master  POMR ','IGRM.PONO=POMR.PONO','left');
@@ -86,29 +86,121 @@ class mrir_model extends CI_Model
          //$this->db->order_by('TMD.MRIRNO','asc');
 
 
-        // $this->db->from ('T_MRIR_Master TMM'); 
-        $query = $this->db->get();
+         // $this->db->from ('T_MRIR_Master TMM'); 
+         $query = $this->db->get();
          //print_r($this->db->last_query());
        
-        $result=$query->result();
-        //print_r($result);
-        return $result;
+         $result=$query->result();
+         //print_r($result);
+         return $result;
     
 
     }
-   
+
+    function get_MRIR_Values($MrirNo)
+    {
+      $this->db->distinct();
+     //$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity');
+      $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon,TMD.ActualQuantityReceived,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName');
+      $this->db->from ('T_MRIR_Master TMM'); 
+      $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO','left');
+      $this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO=TMM.IGRNO','left');
+      $this->db->join ('T_PurchaseOrder_Master  POMR ','IGRM.PONO=POMR.PONO','left');
+      $this->db->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO','left');
+      $this->db->join ('T_IGR_Details IGRD','IGRD.IGRNO= IGRM.IGRNO','left');
+      $this->db->join ('T_MaterialMaster  MM','IGRD.MaterialCode = MM.MaterialCode','left');
+      $this->db->join ('T_SupplierDetailsN SUPP','POMR.SupplierID=SUPP.SupplierID','left');
+      $this->db->join ('tbl_users user','user.userid=POMR.CreatedBy','left');
+      $this->db->join ('T_Employee_Details  ED','ED.EmpID = user.EmpID','left');
+      $this->db->where('TMM.MRIRNO',$MrirNo);
+      $query = $this->db->get();
+      $result = $query->result();           
+      return $result; 
+
+  }
+
+  function get_IGRs($IgrNo)
+  {
+          $this->db->distinct();
+          $this->db->select('IGRM.DeliveryChellanDate,IGRM.CreatedDate,IGRM.IGRNO,IGRM.VehicleNo,IGRM.DeliveryChellanOrInvoiceNo,IGRM.CourierNo,IGRM.PONO,IGRD.MaterialCode,IGRD.QuantityAsPerInvoice,POMR.ServiceDescription,POMR.PODate,POMR.DeliveryDate,POMR.CreatedBy,SUPP.SupplierName,SUPP.Address,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName');
+          //$this->db->select("DATE_FORMAT(IGRM.DeliveryChellanDate, '%d %m %Y') as DCdate");
+          $this->db->from('T_IGR_Master IGRM');
+          $this->db->join('T_PurchaseOrder_Master  POMR ','IGRM.PONO=POMR.PONO');
+          $this->db->join('T_IGR_Details IGRD','IGRM.IGRNO=IGRD.IGRNO');
+          $this->db->join('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO and IGRD.MaterialCode = POLT.MaterialCode');
+          $this->db->join('T_SupplierDetailsN SUPP','POMR.SupplierID=SUPP.SupplierID');
+          $this->db->join('T_MaterialMaster MM',' MM.MaterialCode=IGRD.MaterialCode');
+          $this->db->join ('tbl_users user','user.userid=POMR.CreatedBy','left');
+          $this->db->join ('T_Employee_Details  ED','ED.EmpID = user.EmpID','left');
+          $this->db->where('IGRM.IGRNO',$IgrNo);
+
+          $query = $this->db->get();
+          $result = $query->result();           
+          return $result;  
+
+      }
+
+
+
+
+
+      /* to display the value for view page in MRIR we using this function*/
      function view_MRIR()
      {
-         $this->db->distinct();
-          $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID');
+          $this->db->distinct();
+          $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.ReleasedBy,,ED1.FirstName as ReleasedbyName,
+ED.FirstName as UpdatedbyName');
           $this->db->from ('T_MRIR_Master TMM'); 
-          $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO','left');
-          $this->db->join ('T_IGR_Master IGRM','TMM.IGRNO=IGRM.IGRNO','left');
-          $this->db->join ('T_IGR_Details IGRD','IGRM.IGRNO=IGRD.IGRNO','left');
-          $this->db->order_by ('TMM.MRIRNO','asc');
-         $query = $this->db->get();
-        return $query->result();
+          $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO=TMD.MRIRNO');
+          $this->db->join ('T_IGR_Master IGRM','TMM.IGRNO=IGRM.IGRNO');
+          $this->db->join ('T_IGR_Details IGRD','IGRM.IGRNO=IGRD.IGRNO');
+          $this->db->join ('T_PurchaseOrder_Master POM','TMM.PONO=POM.PONO');
+          $this->db->join ('tbl_users user','user.userid=TMD.UpdateBY','left');
+          $this->db->join ('T_Employee_Details  ED','ED.EmpID = user.EmpID','left');
+          $this->db->join ('tbl_users user2','user2.userid = POM.ReleasedBy','left');
+          $this->db->join ('T_Employee_Details ED1','ED1.EmpID = user2.EmpID','left');
           
+          $this->db->order_by ('TMM.MRIRNO','asc');
+          $query = $this->db->get();
+          return $query->result();
+          
+    }
+
+
+
+    function update_mrirmaster($updatemastervalues,$mrir_no)
+    {
+      // print_r($updatemastervalues);
+      // echo $mrir_no;
+      // die();
+        $this->db->where('MRIRNO', $mrir_no);
+        $this->db->update('T_MRIR_Master', $updatemastervalues);
+        $affectedRows = $this->db->affected_rows();
+        // if(count($affectedRows>0))
+        // {
+        //   $subquery = "select max(MRIRNO) from T_MRIR_Master";
+        //   $result = $this->db->query($subquery);
+        //   //print_r($result->result());
+        //   //die();
+        // return $result->result();
+        // }
+        return $affectedRows;
+        
+      }
+
+        //return $afftectedRows;
+
+    
+
+    function update_mrirdetail($updatedetailvalues,$mrir_no)
+    {
+      // print_r($updatedetailvalues);
+      // echo $mrir_no;
+      // die();
+      $this->db->where('MRIRNO',$mrir_no);
+      $this->db->update('T_MRIR_Details',$updatedetailvalues);
+      $affectedRows = $this->db->affected_rows();
+      return $affectedRows;
     }
     
       
@@ -117,30 +209,28 @@ class mrir_model extends CI_Model
 
        
         $this->db->insert('T_MRIR_Master', $mrirmastervalues);  
-
         $insert_id = $this->db->affected_rows();         
           
         if($insert_id>0)
         {
         $subQuery = 'select max(MRIRNO) as MRIRNo from T_MRIR_Master';   
-          
         $query = $this->db->query($subQuery);
-        
         return $query->result();//_array();
         }
         
-    }
-    function detail_mrir($mrirdetailvalues)
-    {
+      }
 
-            $this->db->insert('T_MRIR_Details',$mrirdetailvalues);        
-            $insert_id = $this->db->affected_rows();         
-            return $insert_id;
+      function detail_mrir($mrirdetailvalues)
+      {
 
-            
-    }
-    function mrir_detailtable($mrirdetailvalues)
-    {
+          $this->db->insert('T_MRIR_Details',$mrirdetailvalues);        
+          $insert_id = $this->db->affected_rows();         
+          return $insert_id;
+
+        }
+
+      function mrir_detailtable($mrirdetailvalues)
+      {
     
         $this->db->trans_start();
         //print_r($mrirvalue2);
@@ -149,37 +239,21 @@ class mrir_model extends CI_Model
         $this->db->trans_complete();      
         return $insert_id;
        
-    }
+      }
 
-     function get_IGRs($IgrNo)
-     {
-        $this->db->distinct();
-        $this->db->select('IGRM.DeliveryChellanDate,IGRM.CreatedDate,IGRM.IGRNO,IGRM.VehicleNo,IGRM.DeliveryChellanOrInvoiceNo,IGRM.CourierNo,IGRM.PONO,IGRD.MaterialCode,IGRD.QuantityAsPerInvoice,POMR.ServiceDescription,POMR.PODate,POMR.DeliveryDate,POMR.CreatedBy,SUPP.SupplierName,SUPP.Address,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity');
-        //$this->db->select("DATE_FORMAT(IGRM.DeliveryChellanDate, '%d %m %Y') as DCdate");
-        $this->db->from('T_IGR_Master IGRM');
-        $this->db->join('T_PurchaseOrder_Master  POMR ','IGRM.PONO=POMR.PONO');
-        $this->db->join('T_IGR_Details IGRD','IGRM.IGRNO=IGRD.IGRNO');
-        $this->db->join('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO and IGRD.MaterialCode = POLT.MaterialCode');
-        $this->db->join('T_SupplierDetailsN SUPP','POMR.SupplierID=SUPP.SupplierID');
-        $this->db->join('T_MaterialMaster MM',' MM.MaterialCode=IGRD.MaterialCode');
-        $this->db->where('IGRM.IGRNO',$IgrNo);
+      
 
-        $query = $this->db->get();
-        $result = $query->result();           
-       return $result;  
-
-     }
-
-
-     function getIGRNOonly(){
+      function getIGRNOonly()
+      {
         $this->db->select('IGRNO');
         $this->db->from('T_IGR_Master');
         $this->db->order_by('IGRNO', 'asc');
         $res=$this->db->get();
         return $res->result();
 
-     }
+     }}
+
+
 
-}
 
 ?>
\ No newline at end of file
diff --git a/application/views/Editmaterialinspectionreport.php b/application/views/Editmaterialinspectionreport.php
old mode 100755
new mode 100644
index 0db033db..f014eecf
--- a/application/views/Editmaterialinspectionreport.php
+++ b/application/views/Editmaterialinspectionreport.php
@@ -1,34 +1,49 @@
-<?php 
+<?php
+$MRIRNO="";
+$mrirdate=""; 
 $IGRNO="";
+$igrdate="";
 $PONO="";
+$podate="";
+$PORasiedbyName="";
 $VehicleNo="";
 $CourierNo="";
 $DeliveryChellanOrInvoiceNo="";
 $SupplierName="";
-$DeliveryChellanDate="";
+$dcdate="";
 $Address=""; 
 $CreatedBy="";
-$PODate="";
 $ServiceDescription="";
+$RowCount = 0;
 
-if(!empty($IGRDetails))
+if(!empty($MRIRDetails))
 {
 
-    foreach ($IGRDetails as $IGR)
+    foreach ($MRIRDetails as $MRIR)
     {
-    	$IGRNO = $IGR->IGRNO;
-    	$PONO = $IGR->PONO;
-    	$VehicleNo = $IGR->VehicleNo;
-		$CourierNo= $IGR->CourierNo;
-		$DeliveryChellanOrInvoiceNo=$IGR->DeliveryChellanOrInvoiceNo;
-		$SupplierName=$IGR->SupplierName;
-		$DeliveryChellanDate=$IGR->DeliveryChellanDate;
-		$Address=$IGR->Address;
-		$CreatedBy=$IGR->CreatedBy;
-		$PODate=$IGR->PODate;
-		$ServiceDescription=$IGR->ServiceDescription;
-
-
+    	$MRIRNO = $MRIR->MRIRNO;
+    	$MRIRDate=$MRIR->CreatedDate;
+    	$mrir_date = strtotime( $MRIRDate );
+		$mrirdate = date( 'd/m/Y', $mrir_date );
+    	$IGRNO = $MRIR->IGRNO;
+    	$IGRDate = $MRIR->Createdon;
+    	$igr_date = strtotime( $IGRDate );
+		$igrdate = date( 'd/m/Y', $igr_date );
+    	$PONO = $MRIR->PONO;
+    	$PODate=$MRIR->PODate;
+    	$PORasiedbyName=$MRIR->FirstName;	
+    	$po_date = strtotime( $PODate );
+		$podate = date( 'd/m/Y', $po_date );
+    	$VehicleNo = $MRIR->VehicleNo;
+		$CourierNo= $MRIR->CourierNo;
+		$DeliveryChellanOrInvoiceNo=$MRIR->DeliveryChellanOrInvoiceNo;
+		$SupplierName=$MRIR->SupplierName;
+		$DeliveryChellanDate=$MRIR->DeliveryChellanDate;
+		$dc_date = strtotime( $DeliveryChellanDate );
+		$dcdate = date( 'd/m/Y', $dc_date );
+		$Address=$MRIR->Address;
+		//$CreatedBy=$MRIR->CreatedBy;
+		$ServiceDescription=$MRIR->ServiceDescription;
 		
     }
 }
@@ -43,9 +58,6 @@ if(!empty($IGRDetails))
 		
  });//ready closed.
  </script>
- 
-<script src="<?php echo base_url()?>assets/lib/jquery.tabletojson.js"></script>
-<script src="<?php echo base_url()?>assets/lib/jquery.tabletojson.min.js"></script>
 
 
  <style>
@@ -73,52 +85,62 @@ if(!empty($IGRDetails))
       
       <?php
                      $attributes = array('class' => 'form-label-left MRIR ','name'  => 'MRIR','id'  => 'MRIR');
-                        //$this->config->base_url().'/MRIRscreen/generateMRIR/',$attributes
-                        echo form_open($this->config->base_url().'/MRIRscreen/generateMRIR/',$attributes); ?>  	  	 
+                        echo form_open($this->config->base_url().'/MRIRcontroller/generateMRIR/',$attributes); ?>  	  	 
     </section>    
     <section class="content"><br/>  
 	<div class="row">
 		<div class="col-md-9">
 		<div class="col-md-12">
 			<div class="col-md-4">
-				<label for="IGRNO">Inward Gate Register Number</label>
+					<label for="MRIRNO">Material Receipt And Inspection Report No</label>
+                                        <div class="form-group">
+                                        	 <?php
+												 $data = array('name' => 'MRIRNO','value' => set_value('MRIRNO',$MRIRNO),'id'=>'MRIRNO',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
+											?>
+                                       
+                     </div>
+            </div> 
+            <div class="col-md-4">   
+                    <label for="MRIRDate">Material Receipt And Inspection Report Date</label>
+                                        <div class="form-group">
+                                        	 <?php
+												 $data = array('name' => 'MRIRDate','value' => set_value('MRIRDate',$mrirdate),'id'=>'MRIRDate',  'class' => 'form-control' ,'readonly' => 'true');
+												echo form_input($data);
+											?>
+                                       
+                     </div>  
+            </div> 
+            </div>  
+            <div class="col-md-12"> 
+			<div class="col-md-4">
+					<label for="IGRNO">Inward Gate Register Number</label>
                                         <div class="form-group">
                                         	 <?php
 												 $data = array('name' => 'IGRNO','value' => set_value('IGRNO',$IGRNO),'id'=>'IGRNO',  'class' => 'form-control' ,'readonly' => 'true');
 												echo form_input($data);
-
-
-											?>
+												?>
                                        
-                     </div>      
-			</div>
-			<div class="col-md-4">
-				<label for="IGRNO">Inward Gate Register Date</label>
+                     </div>
+            </div>
+            <div class="col-md-4">
+				<label for="IGRDate">Inward Gate Register Date</label>
                                         <div class="form-group">
                                         	<?php
-												 $data = array('name' => 'IGRNO','value' => set_value('IGRNO',$IGRNO),'id'=>'IGRNO',  'class' => 'form-control' ,'readonly' => 'true');
+												 $data = array('name' => 'IGRDate','value' => set_value('IGRDate',$igrdate),'id'=>'IGRDate',  'class' => 'form-control' ,'readonly' => 'true');
 												echo form_input($data);
 												?>
 
                                         </div>
-                           
-			</div>
-			<div class="col-md-4">
-				<label for="SupplierName">Supplier Name </label>
-											<div class="form-group">
-												<?php
-												 $data = array('name' => 'SupplierName','value' => set_value('SupplierName',$SupplierName),'id'=>'SupplierName',  'class' => 'form-control' ,'readonly' => 'true');
-												 echo form_input($data);
-												?> 
-
-											</div>
-			</div>
+                           </div>
+			<!--</div>-->
+			
 			</div>
 		<div class="col-md-12">
 			<div class="col-md-4">
-				
-                                        <label for="PONO">Purchase Order Number</label>
-                                        <div class="form-group"><?php
+				<label for="PONO">Purchase Order Number</label>
+                                        <div class="form-group">
+                                        	<?php
 												 $data = array('name' => 'PONO','value' => set_value('PONO',$PONO),'id'=>'PONO',  'class' => 'form-control' ,'readonly' => 'true');
 												echo form_input($data);
 												?>
@@ -128,18 +150,19 @@ if(!empty($IGRDetails))
 				<label for="PODate">Purchase Order Date</label>
 										<div class="from-group">
 											<?php
-													 $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate',  'class' => 'form-control' ,'readonly' => 'true'); 
+													 $data = array('name' => 'PODate','value' => set_value('PODate',$podate),'id'=>'PODate',  'class' => 'form-control' ,'readonly' => 'true'); 
 													echo form_input($data);
 													?>
 												</div>
 			</div>
 			<div class="col-md-4">
-				<label for="CreatedBy">Purchase Order Raised By</label>
-										<div class="from-group"><?php
-													 $data = array('name' => 'CreatedBy','value' => set_value('CreatedBy',$CreatedBy),'id'=>'CreatedBy',  'class' => 'form-control' ,'readonly' => 'true');
+				<label for="PORasiedbyName">Purchase Order Raised By</label>
+										<div class="from-group">
+											<?php
+													 $data = array('name' => 'PORasiedbyName','value' => set_value('PORasiedbyName',$PORasiedbyName),'id'=>'PORasiedbyName',  'class' => 'form-control' ,'readonly' => 'true');
 													echo form_input($data);
 													?>
-								</div>
+										</div>
 			</div>
 			 
 		</div>
@@ -148,52 +171,64 @@ if(!empty($IGRDetails))
 				<label for="DeliveryChellanOrInvoiceNo">Delivery Challan  / Invoice Number</label>
 											<div class="form-group">
 												<?php
-
-												 $data = array('name' => 'DeliveryChellanOrInvoiceNo','value' => set_value('DeliveryChellanOrInvoiceNo',$DeliveryChellanOrInvoiceNo),'id'=>'DeliveryChellanOrInvoiceNo',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
+													 $data = array('name' => 'DeliveryChellanOrInvoiceNo','value' => set_value('DeliveryChellanOrInvoiceNo',$DeliveryChellanOrInvoiceNo),'id'=>'DeliveryChellanOrInvoiceNo',  'class' => 'form-control num' ,'readonly' => 'true');
+													echo form_input($data);
 												?>  
 											</div>
 			</div>
 			<div class="col-md-4">
-			 <label for="DeliveryChellanDate">Delivery Challan / Invoice Date </label>
-											<div class="form-group"><?php 
-											$data = array('type'=>'date','name' => 'DeliveryChellanDate','value' => set_value('DeliveryChellanDate',$DeliveryChellanDate),'id'=>'DeliveryChellanDate',  'class' => 'form-control','readonly' => 'true');
-						
+			 	<label for="DeliveryChellanDate">Delivery Challan / Invoice Date </label>
+											<div class="form-group">
+												<?php 
+													$data = array('type'=>'date','name' => 'DeliveryChellanDate','value' => set_value('DeliveryChellanDate',$dcdate),'id'=>'DeliveryChellanDate',  'class' => 'form-control','readonly' => 'true');
 												echo form_input($data);
-												?></div>
+												?>
+											</div>
 			</div>
 			<div class="col-md-4">
-			<label>Store Incharge</label>
+				<label>Store Incharge</label>
+										<div class="form-group">
 										 
 											<?php
 												 $data = array('name' => 'StoreIncharge','value' => set_value('StoreInchargeID',$name),'id'=>'StoreIncharge',  'class' => 'form-control' ,'readonly' => 'true');
 												echo form_input($data);
 
 											?> 
+										</div>
 			</div>
-			</div>
+		</div>
 		<div class="col-md-12">
 			<div class="col-md-4">
 				  <label for="VehicleNo">Vehicle Number</label>
-                                        <div class="form-group">
+                                <div class="form-group">
                                         <?php
-							 $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo',$VehicleNo),'id'=>'VehicleNo',  'class' => 'form-control num', 'required'=>'true' ,'readonly' => 'true','align' => 'left');
-							echo form_input($data);
-							?>
+							 				$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo',$VehicleNo),'id'=>'VehicleNo',  'class' => 'form-control num', 'required'=>'true' ,'readonly' => 'true','align' => 'left');
+											echo form_input($data);
+										?>
 							 </div>
 			</div>
 			<div class="col-md-4">
 			 <label for="CourierNo">Courier Number</label>
-                                        <div class="form-group"><?php
-							 $data = array('name' => 'CourierNo','value' => set_value('CourierNo',$CourierNo),'id'=>'CourierNo',  'class' => 'form-control num', 'required'=>'true' ,'readonly' => 'true');
-							echo form_input($data);
-							?>
+                            <div class="form-group">
+                            	<?php
+										 $data = array('name' => 'CourierNo','value' => set_value('CourierNo',$CourierNo),'id'=>'CourierNo',  'class' => 'form-control num', 'required'=>'true' ,'readonly' => 'true');
+										echo form_input($data);
+								?>
 							 </div>
 			</div>
-			 
-		</div>
 		</div>
+	</div>
 		<div class="col-md-3">
+			<div class="col-md-12">
+				<label for="SupplierName">Supplier Name </label>
+											<div class="form-group">
+												<?php
+												 $data = array('name' => 'SupplierName','value' => set_value('SupplierName',$SupplierName),'id'=>'SupplierName',  'class' => 'form-control' ,'readonly' => 'true');
+												 echo form_input($data);
+												?> 
+
+											</div>
+			</div>
 		<div class="col-md-12">
 			<label for="Address">Supplier Address</label>
 									<div class="form-group">
@@ -205,6 +240,7 @@ if(!empty($IGRDetails))
 			</div>
 		<div class="col-md-12">
 				<label for="Address">Service Description</label>
+		
 									<div class="form-group">
 										<?php
 													 $data = array('name' => 'Address','value' => set_value('Address',$Address),'id'=>'Address',  'class' => 'form-control' ,'readonly' => 'true' , 'rows'=>'4' ,'columns'=> '3');
@@ -221,10 +257,10 @@ if(!empty($IGRDetails))
 						<tr>
 						<th>S.NO</th> 
 						  <th>Item Code</th>
-						  <th>Material</th>
+						  <th>Material Name</th>
 						  <th>UOM</th>
 						  <th>Ordered Quantity</th>
-						  <th>Adviced Quantity as per the Challan</th>
+						  <th>Adviced Quantity</th>
 						  <th>Actual Quantity Received</th>
 						  <th>Accepted Quantity</th> 
 						  <th>Rejected Quantity</th >
@@ -232,38 +268,50 @@ if(!empty($IGRDetails))
 						</tr>
 					</thead>
 					<tbody id="tbleAppend">
-						<?php $SNo =1;
+						<?php $SNo = 0;
                               
-                              if(!empty($IGRDetails))
+                              if(!empty($MRIRDetails))
                                
                                {
                                    
-                                    foreach($IGRDetails as $record)
+                                    foreach($MRIRDetails as $record)
                                     {
+                                    	$SNo  =$SNo + 1;
+                                    	//print_r($MRIRDetails);
                                        
 							              
                             ?> 
-                        <tr>					    
-							<td><?php echo $SNo?></td> 
-							<td><?php echo $record->MaterialCode?></td>
-							<td><?php echo $record->MaterialName?></td>
-							<td><?php echo $record->UOM?></td>
-							<td class="num"><?php echo $record->Quantity?></td>
-							<td class="num"><?php echo $record->QuantityAsPerInvoice?></td>
-							<td class="num"><input type="text"></td>
-							<td class="num"><input type="text"></td>						 
-							<td><input type="text"></td>
-						</tr>
-						<?php 
-						$SNo++;
+                        <tr>
+					    <td><?php echo $SNo?></td> 
+						<td><?php echo $record->MaterialCode?></td>
+						<input type="hidden" name="<?php echo 'MaterialCode'.$SNo ?>" id="<?php echo 'MaterialCode'.$SNo ?>"  value=" <?php echo $record->MaterialCode ?> "/>
+						<td><?php echo $record->MaterialName?></td>
+						<td><?php echo $record->UOM?></td>
+						<td class="num"><?php echo $record->Quantity?></td>
+						<td class="num"><?php echo $record->QuantityAsPerInvoice?></td>
+						<input type="hidden" name="<?php echo 'QuantityAsPerInvoice'.$SNo ?>" id="<?php echo 'QuantityAsPerInvoice'.$SNo ?>" />
+						<td class="num"><?php echo $record->ActualQuantityReceived ?></td>
+						<input type="hidden" name="<?php echo 'ActualQuantityReceived'.$SNo ?>" id="<?php echo 'ActualQuantityReceived'.$SNo ?>" value=""/>
+						<td class="num"><input type="text" id="<?php echo 'AcceptQuantity'.$SNo;?>" name="<?php echo 'AcceptQuantity'.$SNo;?>" onchange="setaccept('<?php echo $SNo;?>');"></td>
+						<input type="hidden" name="<?php echo 'AcceptQuantity'.$SNo ?>" id="<?php echo 'AcceptQuantity'.$SNo ?>" value=""/>
+						<td class="num"><input type="text" id="<?php echo 'RejectQuantity'.$SNo;?>" name="<?php echo 'RejectQuantity'.$SNo;?>" onchange="setreject('<?php echo $SNo;?>');"></td>
+						<input type="hidden" name="<?php echo 'RejectQuantity'.$SNo ?>" id="<?php echo 'RejectQuantity'.$SNo ?>" value=""/>
+						<td class="num"><input type="text" id="<?php echo 'Remark'.$SNo ?>" name="<?php echo 'Remark'.$SNo ?>" onchange="setremark('<?php echo $SNo;?>');"></td>
+						<input type="hidden" name="<?php echo 'Remarks'.$SNo ?>" id="<?php echo 'Remarks'.$SNo ?>" />
+						</tr> 
+                        <?php 
+						// $SNo++;
 							
-					} }
+					} 
+				}
+					$RowCount = $SNo;
 
 					 ?>						
 					</tbody>					
 				</table>
 				<div class="col-md-1 col-md-offset-10">			 
-						<a class="btn btn-primary" type="submit" onclick="savemrir()">Update MRIR</a>
+						<a class="btn btn-primary" type="submit" onclick="updatemrir()">Update MRIR</a>
+						<input type="hidden" name="RowCount" id="RowCount " value="<?php echo $RowCount ?>" />
 				</div>
 		</div> 
 			
@@ -288,3 +336,53 @@ if(!empty($IGRDetails))
   });
 
   </script>
+  <script>
+
+function setaccept(rowId)
+{
+	//alert(rowId);
+	var accept = parseFloat($('#AcceptQuantity'+rowId).val());
+	//alert(accept);
+}
+
+function setreject(rowId)
+{
+	//alert(rowId);
+	var reject = parseFloat($('#RejectQuantity'+rowId).val());
+	//alert(reject);
+}
+
+function setremark(rowId)
+{	//alert(rowId);
+	var remark = ($('#Remark'+rowId).val());
+	//alert(remark);
+
+}
+</script>
+<script>
+function updatemrir()
+ { 
+ 	//alert("update function worked ");
+ 	$.ajax({
+ 		data:$('.MRIR').serialize(),
+ 		type:"POST",
+ 		url:"<?php echo base_url() ?>MRIRcontroller/updated_values",
+
+ 		success:function(data){
+ 			//alert("success function worked ");
+ 			 if(data){
+ 			 	//alert("if function")
+ 			 	//alert(data);
+ 			 	alert("value updated");
+			 }
+ 			 else
+ 			 {
+ 			 	alert("value not updated");
+ 			 }
+
+ 		}//success function closed
+
+ 	});//ajax function closed
+ }//update function closed
+
+</script>
\ No newline at end of file
diff --git a/application/views/materialinspectionreport.php b/application/views/materialinspectionreport.php
old mode 100755
new mode 100644
index 5e2cbc0e..804844df
--- a/application/views/materialinspectionreport.php
+++ b/application/views/materialinspectionreport.php
@@ -8,7 +8,7 @@ $SupplierName="";
 $DeliveryChellanDate="";
 $dcdate="";
 $Address=""; 
-$CreatedBy="";
+$PORasiedbyName="";
 $PODate="";
 $podate="";
 $IGRDate="";
@@ -31,7 +31,7 @@ if(!empty($IGRDetails))
 		$dc_date = strtotime( $DeliveryChellanDate );
 		$dcdate = date( 'd/m/Y', $dc_date );
 		$Address=$IGR->Address;
-		$CreatedBy=$IGR->CreatedBy;		
+		$PORasiedbyName=$IGR->FirstName;		
 		$PODate=$IGR->PODate;
 		$po_date = strtotime( $PODate );
 		$podate = date( 'd/m/Y', $po_date );
@@ -136,9 +136,9 @@ if(!empty($IGRDetails))
 												</div>
 			</div>
 			<div class="col-md-4">
-				<label for="CreatedBy">Purchase Order Raised By</label>
+				<label for="PORasiedbyName">Purchase Order Raised By</label>
 										<div class="from-group"><?php
-													 $data = array('name' => 'CreatedBy','value' => set_value('CreatedBy',$CreatedBy),'id'=>'CreatedBy',  'class' => 'form-control' ,'readonly' => 'true');
+													 $data = array('name' => 'PORasiedbyName','value' => set_value('PORasiedbyName',$PORasiedbyName),'id'=>'PORasiedbyName',  'class' => 'form-control' ,'readonly' => 'true');
 													echo form_input($data);
 													?>
 										</div>
@@ -254,7 +254,7 @@ if(!empty($IGRDetails))
 
 					    <td><?php echo $SNo?></td> 
 						<td><?php echo $record->MaterialCode?></td>
-						<input type="text" name="<?php echo 'MaterialCode'.$SNo ?>" id="<?php echo 'MaterialCode'.$SNo ?>"  value=" <?php echo $record->MaterialCode ?> "/>
+						<input type="hidden" name="<?php echo 'MaterialCode'.$SNo ?>" id="<?php echo 'MaterialCode'.$SNo ?>"  value=" <?php echo $record->MaterialCode ?> "/>
 						<td><?php echo $record->MaterialName?></td>
 						<td><?php echo $record->UOM?></td>
 						<td class="num"><?php echo $record->Quantity?></td>
@@ -268,7 +268,8 @@ if(!empty($IGRDetails))
 						<?php 
 						
 							
-					} echo $SNo; }
+					} //echo $SNo; 
+				}
 
 					$RowCount = $SNo;
 
diff --git a/application/views/viewmaterialinspectionreport.php b/application/views/viewmaterialinspectionreport.php
old mode 100755
new mode 100644
index d8da8b6b..ed8429c1
--- a/application/views/viewmaterialinspectionreport.php
+++ b/application/views/viewmaterialinspectionreport.php
@@ -1,13 +1,12 @@
+<?php 
+ $mrirno = '';
+	foreach($viewmrirdatas as $MD)
+ $mrirno =  $MD->MRIRNO;
+?>
+ 
 
- <script>
 
-  
-	// For table 
-	(function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-9'i><'col-sm-3'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
-b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
-f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
-collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
- </script>
+ 
  
  <style>
     .modal
@@ -35,26 +34,27 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 				<table id="MRIRtable"  class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
 					<thead style="background-color:#ddf">
 						<tr>
-						  <th>S.NO</th>
-						  <th>MRIR NO</th>
-						  <th>IGR NO</th>
-						  <th>PO NO</th>					  
-						  <th>Invoice NO</th> 
-						  <th>Invoice Date</th>
-						  <th>Vechicle NO / Courier NO</th>
-						  <th>Store Incharge</th>
-						  <th>Quality Incharge</th>
-						  <th>Plant Incharge</th>
+							<th>S.NO</th>
+							<th>MRIR NO</th>
+							<th>IGR NO</th>
+							<th>PO NO</th>	
+							<th>PO Department</th>
+							<th>PO Raised By</th>
+							<th>Invoice NO</th> 
+							<th>Invoice Date</th>
+							<th>Vehicle NO</th>
+							<th>Courier NO</th>
+							<th>Updated By</th>
+							<th>Action</th>
 						  						  
 						</tr>
 					</thead>
 					<tbody>
-
-						 <?php 
-                               if(!empty($mrirdatas2))
+					 <?php 
+                               if(!empty($viewmrirdatas))
                                  {
                                  	$Index=0;
-                                        foreach($mrirdatas2 as $d)
+                                        foreach($viewmrirdatas as $d)
                                         {
                                         	$Index= $Index+1;
                     ?>
@@ -62,195 +62,52 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
 					<tr id="<?php echo $Index ?>">
 
 						<td align="right"><?php echo $Index ?></td>
-					   	<td><a data-toggle="modal" data-target="#materialreport" data-userid="<?php echo $d->MRIRNO ?>" data-id="<%=Index%>" data-dismiss="modal" ><?php echo $d->MRIRNO ?> </a></td>
+					   	<td><?php echo $d->MRIRNO ?></td>
 						<td><?php echo $d->IGRNO ?></td>
 						<td><?php echo $d->PONO ?></td>
+						<td><?php echo $d->POType ?></td>
+						<td><?php echo $d->ReleasedbyName ?></td>
 						<td align="right"><?php echo $d->DeliveryChellanOrInvoiceNo ?></td>
 						<td align="right"><?php
                                   $date = new DateTime($d->DeliveryChellanDate);
                                   echo $date->format('d/m/Y'); ?></td>
 						<td><?php echo $d->VehicleNo ?></td>
-						<td><?php echo $d->StoreInchargeID ?></td>
-						<!--<td><?php echo $d->QualityInchargeID ?></td>-->
-						<!--<td><?php echo $d->PlantInchargeID ?></td>-->
+						<td><?php echo $d->CourierNo ?></td>
+						<td><?php echo $d->UpdatedbyName ?></td>
+						<td>
+						  <a href="<?php echo base_url().'MRIRcontroller/editmaterialinspectionreport?MRIRNO='.$d->MRIRNO; ?>"><button style="font-size:12px" id="generated" name="generated">Edit MRIR <i class="fa fa-pencil"></i></button></a></td>
 					</tr>
 					<?php
 				}} ?>
+					
+					<!-- <tr>
+						<td>sampledata</td>
+						<td>MRIR0001</td>
+						<td>IGR001</td>
+						<td>PO0035</td> 
+						<td>Finance</td>
+						<td>Raja</td>
+						<td class="num">INV00348</td>
+						<td class="num">10/6/2017</td>
+						<td class="num">TN 32 U 3534</td>
+						<td></td>
+						<td>Ravi</td>
+						 <td>
+						 <a href="<?php echo base_url(); ?>MRIRcontroller/editmaterialinspectionreport"><button style="font-size:12px" id="generated" name="generated">Edit MRIR <i class="fa fa-pencil"></i></button></a>
+						 </td>
+					</tr> -->
 					</tbody>					
 				</table>
 			</div> 
 		</div>
         </div>  
-			 <div id="content1">
-			<div class="modal fade" id="materialreport" role="dialog">
-				<div class="modal-dialog">
-					<!-- Modal content-->
-					<form>
-						<div class="modal-content" style="width:900px;">
-							<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
-								<button type="button" class="close" data-dismiss="modal">&times;</button>
-								<center><h4>Material Recepit And Inspection Report</h4></center> 
-							</div>
-							<div class="col-md-12"> 
-								<div class="col-md-3">
-							 	<label>IGR Number :</label>
-								</div>	
-								<div class="col-md-3"> 
-									<?php
-
-												 $data = array('name' => 'IGRNO','value' => set_value('IGRNO'),'id'=>'IGRNO',  'class' => 'form-control','readonly'=>'true');
-												echo form_input($data);echo"<br>";
-												?>
-									
-									
-								</div>
-								<div class="col-md-3">
-								<label>	Purchase Order Number:</label>
-								</div>
-								<div class="col-md-3">
-									 <?php
-									 
-												 $data = array('name' => 'PONO','value' => set_value('PONO'),'id'=>'PONO',  'class' => 'form-control','readonly'=>'true');
-												echo form_input($data);echo"<br>";
-												?>
-									
-									
-								</div>
-							</div> 
-							<div class="col-md-12"> 
-								<div class="col-md-3">
-							 	<label>Invoice Number :</label>
-								</div>	
-								<div class="col-md-3">
-									 <?php
-									 
-												 $data = array('name' => 'DeliveryChellanOrInvoiceNo','value' => set_value('DeliveryChellanOrInvoiceNo'),'id'=>'DeliveryChellanOrInvoiceNo',  'class' => 'form-control','readonly'=>'true');
-												echo form_input($data);echo"<br>";
-												?>
-									
-								</div>
-								<div class="col-md-3">
-								<label>Invoice Date:</label>
-								</div>
-								<div class="col-md-3">
-									<?php
-									
-												 $data = array('name' => 'DeliveryChellanDate','value' => set_value('DeliveryChellanDate'),'id'=>'DeliveryChellanDate',  'class' => 'form-control','readonly'=>'true');
-												echo form_input($data);echo"<br>";
-												?>
-									
-								</div>
-							</div> 
-							 <div class="col-md-12">								
-								<div class="col-md-3">
-								<label>Vechicle Number :</label> 
-								</div>
-								<div class="col-md-3">
-									<?php
-												 $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'),'id'=>'VehicleNo',  'class' => 'form-control','readonly'=>'true');
-												echo form_input($data);echo"<br>";
-												?>
-									 
-								</div>
-								<div class="col-md-3">
-								<label>Delivery Date :</label>
-								</div>
-								<div class="col-md-3">
-									<?php
-												 $data = array('name' => 'DeliveryDate','value' => set_value('DeliveryDate'),'id'=>'DeliveryDate',  'class' => 'form-control','readonly'=>'true');
-												echo form_input($data);echo"<br>";
-												?>
-								
-								</div>
-							</div>
-							 
-							<div class="col-md-12">								
-								<div class="col-md-3">
-								<label>Supplier and Address :</label> 
-								</div>
-								<div class="col-md-3">
-									<?php
-												 $data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'SupplierName',  'class' => 'form-control','readonly'=>'true');
-												 echo form_input($data); echo"<br>";
-												 $data = array('name' => 'Address','value' => set_value('Address'),'id'=>'Address','class' =>'form-control','rows' => '4','cols' => '50','style' => 'width:100%' ,'readonly'=>'true');
-												 echo form_textarea($data); echo"<br>";
-
-												?>
-									
-								</div>
-								<div class="col-md-3">
-								<label>Comments Of Special Instructions :</label>
-								</div>
-								<div class="col-md-3">
-									 <?php
-												 $data = array('name' => 'Remarks','value' => set_value('Remarks'),'id'=>'Remarks',  'class' => 'form-control','readonly'=>'true');
-												echo form_input($data); echo"<br>";
-												?>
-									
-								</div>
-							</div>
-							 
-							<div>
-							<!-- Table to show the line item of po -->
-							<table class="table table-bordered" id="mytable">
-								<thead>
-									<tr>								 
-										<th>SNo</th>
-										 <th>Item Code</th>
-										<th>Item Description</th>
-										<th>UOM</th>
-										<th>Ordred Quantity</th>
-										<th>Received Quantity as per the Challan</th>
-										<th>Received Quantity</th>	
-										<th>Accepted Quantity</th>
-										<th>Rejected Quantity</th>
-										<th>Remarks</th>									
-									</tr> 
-								</thead>								
-								<tbody id="tbleAppend">
-									
-								</tbody> 
-								</table>
-							<div class="col-md-12">
-								<div class="col-md-4">
-								<label>Store Incharge :</label> 
-								 <?php
-									          $data = array('name' => 'StoreIncharge1','value' => set_value('StoreInchargeID'),'id'=>'StoreIncharge',  'class' => 'form-control','readonly'=>'true');
-									          echo form_input($data);
-									          ?>   
-								</div>
-								<div class="col-md-4">
-								<!--<label>Quality Incharge :</label>-->
-								<?php
-												 $data = array('name' => 'QualityIncharge1','value' => set_value('QualityInchargeID'),'id'=>'QualityIncharge',  'class' => 'form-control','readonly'=>'true');
-												echo form_hidden($data);
-												?> 
-								</div>
-								<div class="col-md-4">
-								<!--<label>Plant Incharge :</label>--> 
-								<?php
-												 $data = array('name' => 'PlantIncharge1','value' => set_value('PlantInchargeID'),'id'=>'PlantIncharge',  'class' => 'form-control','readonly'=>'true');
-												echo form_hidden($data);
-												?>  
-
-								</div>
-							</div>	
-							</div> 
-							<div class="modal-footer">
-								<a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>
-			</div><!--id div closed-->	
-			 
+			  		 
 		</section>
 	</div>
  <script>
 <!-- script for table , It works under the datatable plugin-->
  $(function () { 
-    $('#MRIRtable').DataTable({
+    $('#Inwardgateregistertable').DataTable({
       "paging": true,
       "lengthChange": true,
       "searching": true,
@@ -259,143 +116,6 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
       "autoWidth": true
 	   
     }); 
- });
- </script>
-  <script>
-   $("#materialreport").on("shown.bs.modal", function(e) {
-   	alert("inside model popup");
-   		
-   	var  MRIRNO = $(e.relatedTarget).data('userid');
-   	
-   	alert(MRIRNO);
-   	//$('#content1').loader('show');
-   	        $("#IGRNO").val('');
-	        $("#PONO").val('');
-	        $("#DeliveryChellanOrInvoiceNo").val('');
-	        $("#DeliveryChellanDate").val('');
-			$("#VehicleNo").val('');
-			//$("#CourierNo").val('');
-			$('#DeliveryDate').val('');
-			$("#SupplierName").val('');
-			$("#Address").val('');
-			$('#Remarks1').val('');
-	        $("#tableid").empty();
-	        $("#StoreIncharge").val('');
-	        $("#PlantIncharge").val('');
-	        $("#QualityIncharge").val('');
-	       
-	        
-	  //       //alert("HAI");
-	  //  //      $("#content").load('show');
-
-	        $.ajax({
-	         	data:{mrirno:MRIRNO},
-		         type:"POST",
-		         //datatype:"json",
-		         url:"<?php echo base_url() ?>MRIRscreen/displaying_MRIRvalues",
-		
-		        success:function(data){	
-		         		alert(data);
-			
-					// var obj = $.parseJSON(data);
-							// alert(obj.IGRNO);
-
-					// var data = $.parseJSON(json);
-						// alert(JSON.stringify(data));
-						// alert(json);
-
-
-					// $("#IGRNO").val(data)
-					// $("#IGRNO").val(data.result[0]['IGRNO']);
-					            
-					// alert(data.result[0]['IGRNO']);
-					// $("#PONO").val(json.data[0][])
-					// $("#IGRNO").val(json.other[0]['IGRNO']);
-
-
-					// $("#PONO").val(data.result[0]['PONO']);
-					// $("#VehicleNo").val(data.result[0]['VehicleNo']);
-					// $("#CourierNo").val(data.result[0]['CourierNo']);
-					// $("#DeliveryChellanOrInvoiceNo").val(data.result[0]['DeliveryChellanOrInvoiceNo']);
-					// $("#SupplierName").val(data.result[0]['SupplierName']);
-					// $("#DeliveryChellanDate").val(data.result[0]['DeliveryChellanDate']);
-					// $("#Address").val(data.result[0]['Address']);
-					// $("#DeliveryDate").val(data.result[0]['DeliveryDate']);
-					// $('#Remarks1').val(data.result[0]['ServiceDescription']);
-					// $("#tbleAppend").val(data.result2[0]);
-					// $("#StoreIncharge").val(data.result[0]['StoreInchargeID']);
-					// $("#PlantIncharge").val(data.result[0]['PlantInchargeID']);
-					// $("#QualityIncharge").val(data.result[0]['QualityInchargeID']);
-					// $("#tbleAppend").val(data.result2);
-					// alert(data.result2[0]['MaterialCode']);
-					// var tb="<tr><td>SAMPLE</td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>5</td><td>6</td><td>7</td><td>8</td></tr>"; 
-	        	var tble='';
-	         	//var obj=JSON.stringify(data); 
-	          	var obj = $.parseJSON(data);
-	           //var obj = JSON.parse(data);
-
-	           			alert(obj);
-	           			
-						  // $("#DeliveryDate").val(new DateTime(item.DeliveryDate)->format('d.m.Y'));
-	           			//alert(tb);
-	           			//var dt = new DateTime(item.DeliveryDate);
-	           			var d;
-
-	           			var dout;
-	          $.each(obj,function (i,item) {
-	          	alert("inside each");
-	          	//var dt = new DateTime(item.DeliveryDate);
-	          	//alert(dt);
-	          	//d = item.DeliveryDate;
-                //dout = Date.parse(d);
-                //$("#date").text(); 
-
-
-		          			$("#IGRNO").val(item.IGRNO);
-		          			//alert(item.IGRNO);
-		          			$("#PONO").val(item.PONO);
-		 	 					//alert(PONO);
-		 	 				$("#DeliveryChellanOrInvoiceNo").val(item.DeliveryChellanOrInvoiceNo);
-		 	 				 var dcd = new Date(item.DeliveryChellanDate);
-	 						 alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
-        					 var dcd2 = (dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
-		 	 				$("#DeliveryChellanDate").val(dcd2);
-				 			$("#VehicleNo").val(item.VehicleNo);
-				 			//$("#CourierNo").val(item.CourierNo);
-				 			var ddate = new Date(item.DeliveryDate);
-	 						//alert(dd.getDate()+ '.' + (dd.getMonth() + 1)+ '.' + dd.getFullYear());
-            				var ddate2 = (ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear()); 
-                            //$("#DeliveryDate").val(dout.toString('M-d-yyyy'));
-				 			$("#DeliveryDate").val(ddate2);
-			 				$("#SupplierName").val(item.SupplierName);
-				 			$("#Address").val(item.Address);
-							$('#Remarks').val(item.ServiceDescription);
-							$("#StoreIncharge").val(item.StoreInchargeID);
-							$("#PlantIncharge").val(item.PlantInchargeID);
-							$("#QualityIncharge").val(item.QualityInchargeID);
-
-							i=i+1;
-
-							tble += '<tr><td>'+i+
-										'</td><td>'+item.MaterialCode+
-										'</td><td>'+item.MaterialName+
-										'</td><td>'+item.UOM+
-										'</td><td>'+item.Quantity+
-										'</td><td>'+item.ReceivedQuantity+
-										'</td><td>'+item.ActualQuantityReceived+
-										'</td><td>'+item.QuantityAccepted+
-										'</td><td>'+item.QuantityRejected+
-										'</td><td>'+item.Remarks1+
-										'</td></tr>';
-
-
-			 			});//each loop closed
-							$("#tbleAppend").empty();
-
- 		 				$("#mytable > tbody").append(tble);
- 		 			}// function closed
-			 });//ajax closed
-    });//modal closed
-
-   </script>
-
+  });
+  </script> 
+ 
\ No newline at end of file