diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php
index a727aff6..79cc86f9 100644
--- a/application/views/editrequisitionform.php
+++ b/application/views/editrequisitionform.php
@@ -1,4 +1,39 @@
+<?php
+        $ReqNo = '';
+        $ReqType = '';
+        $Requestedby = '';
+        $FirstName ='';
+		$Designation ='';
+		$DepartmentName = '';
+		//print_r($MaterialCode);
+		$flag = 1;
+		$Test =  $MaterialCode[0]->UOM;
+		$item = null;
+		foreach($MaterialCode as $struct) {
+			if ($Test == $struct->UOM) {
+        $item = $struct;
+        break;
+    }
+	}
+		print_r($item);
+        echo $item->UOM;
+		
+if(!empty($ReqDetails))
+{
+    foreach ($ReqDetails as $Req)
+    {
+		$ReqNo = $Req->ReqNo;
+        $ReqType = $Req->ReqType;
+        $Requestedby = $Req->Requestedby;
+        $FirstName =$Req->FirstName;
+		$Designation =$Req->Designation;
+		$DepartmentName = $Req->DepartmentName;
+						
+    }
+}
 
+
+?>
 <style>
             .table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
             </style>
@@ -26,7 +61,7 @@
 			<div class="form-group">
 				  
 				<?php
-                                         $data = array('name' => 'RequestType','value' => set_value('ConfigValue'),'id'=>'RequestTypee',  'class' => 'form-control' ,'readonly' => 'true');
+                                         $data = array('name' => 'RequestType','value' => set_value('RequestType',$ReqType),'id'=>'RequestType',  'class' => 'form-control' ,'readonly' => 'true');
                                         echo form_input($data);
 										
                                         ?>  
@@ -38,7 +73,7 @@
 			<div class="form-group">
 			 
 				<?php
-                                         $data = array('name' => 'EmpID','value' => set_value('EmpID'),'id'=>'EmpID',  'class' => 'form-control' ,'readonly' => 'true');
+                                         $data = array('name' => 'EmpID','value' => set_value('EmpID',$FirstName),'id'=>'EmpID',  'class' => 'form-control' ,'readonly' => 'true');
                                         echo form_input($data);
 										
                                         ?>  
@@ -49,7 +84,7 @@
 		 <label>Department Name</label>
 		 	<div class="form-group">
 									<?php
-                                         $data = array('name' => 'DeptName','value' => set_value('DeptName'),'id'=>'DeptName',  'class' => 'form-control' ,'readonly' => 'true');
+                                         $data = array('name' => 'DeptName','value' => set_value('DeptName',$DepartmentName),'id'=>'DeptName',  'class' => 'form-control' ,'readonly' => 'true');
                                         echo form_input($data);
                                         ?>   
                                 </div>
@@ -58,7 +93,7 @@
 		 <label>Designation</label>
 		 	<div class="form-group">
 									<?php
-                                         $data = array('name' => 'Designation','value' => set_value('Designation'),'id'=>'Designation',  'class' => 'form-control' ,'readonly' => 'true');
+                                         $data = array('name' => 'Designation','value' => set_value('Designation',$Designation),'id'=>'Designation',  'class' => 'form-control' ,'readonly' => 'true');
                                         echo form_input($data);
                                         ?>   
                                 </div>
@@ -70,10 +105,22 @@
 		 <label>Cost Center Name</label>
 		 
 				<div class="form-group">
-									<?php
-                                         $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>   
+									 <?php
+				$Costs = array("-1"=>'Select Cost Center Name');
+				//print_r(  $options);		
+												
+					if(!empty($CostCenter))
+										{
+									    foreach ($CostCenter as $SID):
+                                         // echo $SID->ConfigValue;
+									   	  $Costs[$SID->CostCenterCode] =  $SID->CostCenterCode .'-'. $SID->CostCenterName ;
+
+										endforeach;
+											
+										}
+				echo form_dropdown('CostCenter', $Costs,set_value('CostCenter'),'id="CostCenter"' ,'class = "form-control"');
+
+		?> 
                                 </div> 
 			</div>
 		  
@@ -116,9 +163,9 @@
 						$options = array("0"=>'Material Code');     
 						//print_r(  $options);
 						
-						if(!empty($MaterialList))
+						if(!empty($MaterialCode))
 						{
-						foreach ($MaterialList as $MID):
+						foreach ($MaterialCode as $MID):
 						  
 					   
 						  $options[$MID->MaterialCode] =  $MID->MaterialCode.' '.' - '.' '.$MID->MaterialName;
@@ -251,8 +298,31 @@
       </tr>
     </thead>
     <tbody id="tempAppend">
-       
-     
+<?php
+                    if(!empty($LineItem))
+                    { 
+				        $index = 1;
+                        foreach($LineItem as $record)
+                        {
+                    ?>
+							<tr  id="<?php echo $index ; ?>">
+							<td align="left"><?php echo $index ; ?></td> 
+					<td align="left"><?php echo $record->MaterialCode ; ?></td>
+					<td align="left"><?php echo $record->MaterialName ; ?></td>
+ 
+					<td align="left"><?php echo $record->UOM ; ?></td>
+  
+					<td align="left"><?php echo $record->Quantity ; ?></td>
+
+						
+						<td>
+                          <a   data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->MaterialCode ; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $record->MaterialCode  ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
+						 
+						  
+                      </td>
+</tr>
+						<?php $index = $index + 1;  }
+					}?>
     </tbody>
 	
   </table>
@@ -291,46 +361,7 @@ $(function() {
     //Initialize Select2 Elements
     $(".select2").select2();
 	
-	 $('#EmpID').change(function() {
-     var ReqType = $('#RequestType').val();
-	 if(ReqType == "-1")
-	 {
-		 alert('Please select the Request Type');
-		 return false;
-	 }
-		var id = $('#EmpID').val();
-
-		if(id != '-1')
-		{
-			$('#content').loader('show');
-
-			$.ajax({
-			data:{id:id},
-			dataType: 'json',
-			type:"POST",
-			url:"<?php echo base_url();?>requisitionform/GetSelectedEmpDetails?ReqType="+ReqType,
-			success:function(json) {		
-			   $('#content').loader('hide'); 
-				//alert(json.Cost);
-				$("#DeptName").val(json.emp[0]['DepartmentName']);
-				$("#Designation").val(json.emp[0]['Designation']);				
-			
-				$("#CostCenter").empty();
-				$("#CostCenter").append(json.Cost);
-				//$("#AvlBudgetAmount").val(json.AvlAmount);				
-						
-		      }
-			  
-			});	
-			
-		}
-		else
-		{
-			alert('Please select the Employee details');
-			return false;
-		}
-  
-});
+	 
 
 $('#CostCenter').change(function() {
     
@@ -402,11 +433,13 @@ $('#CostCenter').change(function() {
 });
 $('#MaterialCode').change(function() {
     
+	var x = '<?php echo json_encode($MaterialCode); ?>';
+	alert(x);
  var id = $('#MaterialCode').val(); 
 
 $("#Description").val('');	
 $("#UOM").val('');	
-		if(id != '-1')
+		/*if(id != '-1')
 		{
 			$('#content').loader('show');
 
@@ -429,9 +462,9 @@ $("#UOM").val('');
 		{
 			alert('Please select the RequestType');
 			return false;
-		}
+		}*/
   
-});
+}); 
 
 
 });
diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php
index 547fc860..b7918514 100644
--- a/application/views/requisitionform.php
+++ b/application/views/requisitionform.php
@@ -30,7 +30,7 @@ if(!empty($Emp))
 		   <?php
                       $attributes = array('class' => 'form-label-left requistion ','name'  => 'requistion','id'  => 'requistion');
                         
-                        echo form_open($this->config->base_url().'addNewcost/',$attributes); ?>
+                        echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?>
 	 <div class="row">
 	 <div class="col-md-12">
 		 <div class="col-md-3">
@@ -508,7 +508,7 @@ for (step = 1; step < rowcount; step++) {
 function Save()
 {  
 
- var id = 'Draft'; 
+ var id = '<?php echo REQ_DRAFT;?>'
 	if(validate())
 		{ 	
 			$('#content').loader('show');
@@ -524,7 +524,7 @@ function Save()
 				$('#txtRowCount').val('');
 				$('#txtDeletedRow').val('');
 				
-				window.location =	baseurl + 'Requisition';
+				window.location =	"Requisition";
 			
 			}
 			else
@@ -694,7 +694,7 @@ $('.EditClick').click(function(){
  });
   $(".requistion").submit(function(e) {
         
-		var id= "Pending Approval";
+		var id='<?php echo REQ_PENDING_APPROVAL;?>'
 		e.preventDefault();
 		if(validate())
 		{
diff --git a/application/views/requisitionlistapproval.php b/application/views/requisitionlistapproval.php
index bd98410f..21908d02 100644
--- a/application/views/requisitionlistapproval.php
+++ b/application/views/requisitionlistapproval.php
@@ -1,25 +1,7 @@
+<?php 
+ //print_r($AppList); 
+?>
 
-<!--<script>
- 
-	 $(function () { 
-	$("td").dblclick(function () {
-	 var OriginalContent = $(this).text();
-	  $(this).addClass("cellEditing");
-	   $(this).html("<input type='text' value='" + OriginalContent + "' />");
-	    $(this).children().first().focus(); 
-	    $(this).children().first().keypress(function (e) { 
-	    	if (e.which == 13) {
-	    	 var newContent = $(this).val();
-	    	  $(this).parent().text(newContent); 
-	    	  $(this).parent().removeClass("cellEditing");
-	    	   } });
-	    	    $(this).children().first().blur(function(){
-	    	     $(this).parent().text(OriginalContent);
-	    	      $(this).parent().removeClass("cellEditing");
-	    	       });
-	    	        });
-	    	         });
-</script>-->
 <style>
             .table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
 			
@@ -28,59 +10,71 @@
     
  
 	 <section class="content">
-	  
+	 
 	 <div>
          <center><b><h2>Requisition Approval List </h2></b></center>
+		  <?php
+                      $attributes = array('class' => 'form-label-left Approve ','name'  => 'Approve','id'  => 'Approve');
+                        
+                        echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?>
          <div class="container-fluid">
 	 <div class="row">
 	   <div class="col-md-12">
 		<div class="col-md-3">
 		<label>Requisition Status</label>
 			<div>
-				 <?php
-				$options = array("0"=>'Select Requisition Status');
-				//print_r(  $options);
-				
-				if(!empty($Requeststatus))
-				{
-				foreach ($Requeststatus as $SID):
-				  
-			   
-				  $options[$SID->ConfigValue] =  $SID->ConfigValue;
+			
+				 	  <select class="form-control required" id="RequisitionStatus" name="RequisitionStatus" >
+                                            <option value="-1"  >Select Status</option>
+                                            <?php
+                                            if(!empty($Status))
+                                            {
+                                                foreach ($Status as $DEP)
+                                                {
+													$StatusCode = $DEP->StatusCode;
+                                                  													
+													if ($_POST['RequisitionStatus'] == $StatusCode) 
+													{
 
-				endforeach;
-				}										
-	
-				echo form_dropdown('RequisitionStatus', $options,set_value('RequisitionStatus'),'id="RequisitionStatus"' ,'class = "form-control required"','required="true"');
-
-				?>
-				 
+												echo "<option value=\"".$StatusCode."\" selected=\"selected\">".$StatusCode.' -  '. $DEP->StatusName."</option>"; 
+													}
+													else 
+													{
+													echo "<option value=\"".$StatusCode."\">".$StatusCode.' -  '. $DEP->StatusName ."</option>";       
+													}											
+                                                    
+                                                }
+                                            }
+                                            ?>
+                                        </select>
 			</div>
 		</div>
-		
-	  
 		<div class="col-md-3">
-		<label>From Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'FromDate','value' => set_value('FromDate'),'id'=>'FromDate',  'class' => 'form-control datePicker' ,'required' => 'true');
-						echo form_input($data);
-						?>   
-					</div>
-		</div>
-		<div class="col-md-3">
-		<label>To Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'ToDate','value' => set_value('ToDate'),'id'=>'ToDate',  'class' => 'form-control datePicker' ,'required' => 'true');
-						echo form_input($data);
-						?>   
-					</div>
-		</div>
+		 <div class="form-group">
+                <label>Date range:</label>
+
+                <div class="input-group">
+                  <div class="input-group-addon">
+                    <i class="fa fa-calendar"></i>
+                  </div>
+                  <input type="text" class="form-control pull-right" id="SearchDate" value="<?php echo isset($_POST['SearchDate']) ? $_POST['SearchDate'] : '' ?>" name="SearchDate">
+                </div>
+                <!-- /.input group -->
+              </div>
+	   </div>
+	
 		<div class="col-md-3">
 		<label>&nbsp;&nbsp;</label>
 					<div class="form-group">
-		  <button type="button" class="btn btn-primary">Search</button>&nbsp;<button type="button" class="btn btn-primary">Clear</button></div>  
+					 <input type="hidden" name="FromDate" id="FromDate" />
+					<input type="hidden" name="ToDate" id="ToDate" />
+					 <input type="submit"  class="btn btn-primary" >
+					 <!--  <input type="Reset"  class="btn btn-primary" >
+					  
+					 <!-- <button type="button" class="close" data-dismiss="modal">&times;</button>
+     					<!--<a  class="btn btn-info" onclick="Search()"  >Search</a> -->
+					 <a  class="btn btn-primary" onclick="Reset()"  >Clear</a>
+		 </div>  
 		 
 			
 	   </div>	 
@@ -108,7 +102,7 @@
 						 <label>Request Type</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
+										 $data = array('name' => 'ReqType','value' => set_value('ReqType'),'id'=>'ReqType',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -118,7 +112,7 @@
 						   <label>Requested By</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
+										 $data = array('name' => 'ReqBy','value' => set_value('ReqBy'),'id'=>'ReqBy',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -127,7 +121,7 @@
 						   <label>Desigination</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
+										 $data = array('name' => 'Desigination','value' => set_value('Desigination'),'id'=>'Desigination',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -139,7 +133,7 @@
 						 <label>Requisition Date</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
+										 $data = array('name' => 'ReqDate','value' => set_value('ReqDate'),'id'=>'ReqDate',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -148,17 +142,23 @@
 						  <div class="col-md-4">
 						   <label>Cost Center Name</label>
 									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
+												
+ <?php
+						$options = array("0"=>'Select Cost Center');     
+						//print_r(  $options);
+						
+														
+			
+						echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+
+						?>						 										
 									</div>
 						 </div>
 						  <div class="col-md-4">
 						   <label>Available Budget Amount</label>
 									<div class="form-group">
 												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'readonly' => 'true');
+										 $data = array('name' => 'AvlBudgetAmount','value' => set_value('AvlBudgetAmount'),'id'=>'AvlBudgetAmount',  'class' => 'form-control' ,'readonly' => 'true');
 										echo form_input($data);
 										?>   
 									</div>
@@ -174,7 +174,7 @@
     <thead style="background-color:#fff">
       <tr>
 	     
-         <th>S No</th>
+         <th>SNo</th>
          <th>Item Code</th>
          <th>Item Description</th>
        <th>UOM</th>
@@ -182,24 +182,8 @@
         
       </tr>
     </thead>
-    <tbody>
-      <tr>
-	   
-        <td> 1 </td>
-        <td contenteditable = "true">R001</td>
-        <td>Wasted Sand</td>
-		<td>Ton</td>
-		<td>100</td>
-		 
-      </tr>
-      <tr>
-	   
-        <td> 2 </td>
-        <td>R002</td>
-        <td>Resin</td>
-		 <td>Liter</td>
-		<td>200</td>
-      </tr>
+    <tbody id="tbleAppend">
+     
        
     </tbody>
 	
@@ -208,19 +192,10 @@
 		 </div>
 		 
 			</div>
-			<div class="modal-footer"> <div class="col-md-4"> <label >Remarks :</label></div>
-			 <div class="col-md-8">
-						
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'required' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-								 
-			 <button type="button" class="btn btn-default" value="submit">Approve</button>
+			<div class="modal-footer"> <div class="col-md-12"> 
 			 
-			  <button type="reset" class="btn btn-default" value="reset">Reject</button></div>
+			 <a  class="btn btn-info" data-dismiss="modal"  value="Cancel">Ok</a>
+			  </div>
 			</div>
 		  </div>
 		 </form>
@@ -229,64 +204,67 @@
 	</div>
   
   
-   <table class="table table-bordered  editableTable" style="border:1px solid #333">
+    <table id="mytable" class="table table-bordred table-striped editableTable" style="border:1px solid #333" > 
   <div align="right" style="padding-right:10px">
-     
+     <div id="content" > </div> 
   <div class="modal fade"  role="dialog">
 		
     <thead style="background-color:#fff">
       <tr>
 	     
          <th>Requisition Number</th>
-         <th>Requisition Date</th>
-         <th>Status</th>
-		 <th>Remarks</th>
-       
-        
+         <th>Requisited By</th>
+         <th>Requisited Date</th>
+		 <th>Status</th>         
+         <th>Remarks</th>
+		  <th>Action</th>
       </tr>
     </thead>
-    <tbody>
-      <tr>
-	   
-        <td><a data-toggle="modal" data-target="#myModal"><u>REQ000001</u></a></td>
-        <td>2/3/2017</td>
-       <td data-name="sel">
-						    <select name="status">        				        
-    					        <option value="1">Pending</option>
-        				        <option value="2">Approval</option>
+    <tbody id="ApprovalList">
+     
+	    <?php
+                    if(!empty($AppList))
+                    {
+						$index = 0;
+                        foreach($AppList as $record)
+                        {
+							$index = $index +1;
+                    ?> 
+					<tr id="<?php echo $index ?>" >
+						<td><a data-toggle="modal" data-target="#myModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>" ><u><?php echo $record->ReqNo ?></u></a></td>
+						<td><?php echo $record->Requestedby ?></td>
+						<td><?php echo $record->CreatedDate ?></td>
+						<td><?php echo $record->StatusName ?></td>
+						<?php if (($record->Status)  !=  REQ_APPROVED  &&($record->Status) != REQ_REJECTED)
+						{ 
+						
+						?>
+						<td contenteditable="true"><input type="text" id="Remarks<?php echo $index ?>" name="Remarks<?php echo $index ?>"class="form-control" maxlength="100"></td>
+						<td data-name="sel" contenteditable="true" id="Action<?php echo $index ?>" onchange="saveToDatabase(this,'question','<?php echo $record->ReqNo ; ?>','<?php echo $index ; ?>')">
+						    <select name="status<?php echo $index ?>" id="status<?php echo $index ?>">        				        
+    					        <option value="1">Select Action</option>
+        				        <option value="2">Approve</option>
         				        <option value="3">Reject</option>
 						    </select>
 						</td>
-		<td contenteditable="true">Need to get quick</td>
-		 
-      </tr>
-      <tr>
-	   
-        <td><a data-toggle="modal" data-target="#myModal"><u>REQ000001</u></a></td>
-        <td>5/4/2017</td>
-         <td data-name="sel">
-						    <select name="status">        				        
-    					        <option value="1">Pending</option>
-        				        <option value="2">Approval</option>
-        				        <option value="3">Reject</option>
-						    </select>
-						</td>
-		<td contenteditable="true">Need to get quick</td>
-		 
-      </tr>
-      <tr>
-	  
-        <td><a data-toggle="modal" data-target="#myModal"><u>REQ000001</u></a></td>
-        <td>9/4/2017</td>
-         <td data-name="sel">
-						    <select name="status">        				        
-    					        <option value="1">Pending</option>
-        				        <option value="2">Approval</option>
-        				        <option value="3">Reject</option>
-						    </select>
-						</td>
-		 <td contenteditable="true">Need to get quick</td>
-      </tr>
+						<?php 
+						  }
+						  else
+						  {
+						?>
+						   <td><?php echo $record->Comments ?></td>
+						   <td><?php echo $record->StatusName ?></td>
+						<?php 	      
+						
+						  }
+						  ?>
+						  </tr>
+						<?php
+                        }
+                    }
+                    ?>
+    
+     
     </tbody>
 	
   </table>
@@ -301,15 +279,193 @@
 </div>
 
 <script> 
-
+	var startDate = '';
+	 var endDate = '';
+function Search()
+{
+	var stat = $('#RequisitionStatus').val();
+	st = '';
+	var val = $('#SearchDate').val();
+	DataColl = [];
+	DataColl[0] = startDate;
+	DataColl[1] = endDate;
+	if(stat != '-1')
+	{
+		st =stat;
+	}
+	DataColl[2] = st;
 	
-$(function() {
-    $( ".datePicker" ).datepicker({ dateFormat: 'dd/mm/yy' });
+	$('#content').loader('show');
+		    $.ajax({ 
+			data:{id:DataColl},
+			type:"POST",
+			//dataType: 'json',
+			url:"<?php echo base_url() ?>requisitionform/SearchRequistList",
+			//success:function(json) {
+				success:function(data) {
+				$('#content').loader('hide');
+				alert(data);
+				/*$("#ReqType").val(json.Requist[0]['ReqType']);	
+				$("#ReqBy").val(json.Requist[0]['Requestedby']);
+				 $("#ReqDate").val(json.Requist[0]['CreatedDate']);
+		        $("#Desigination").val(json.Requist[0]['Designation']);
+				$("#CostCenter").empty();
+				$("#CostCenter").append(json.Cost);
+				
+				$("#tbleAppend").empty();
+				$("#tbleAppend").append(json.Items);	*/		
+		
+		}
+  
+}); 
+	//
+}
 
+function Reset()
+{
+	 $('#RequisitionStatus').val("-1");
+	 $('#SearchDate').val('');
+}
+$("#myModal").on("shown.bs.modal", function(e) {
+    var  ReqId = $(e.relatedTarget).data('userid');
+	//alert(ReqId);
+	$('#content').loader('show');
+		    $.ajax({ 
+			data:{id:ReqId},
+			type:"POST",
+			dataType: 'json',
+			url:"<?php echo base_url() ?>requisitionform/ViewRequest",
+			success:function(json) {
+				$('#content').loader('hide');
+				//alert(data);
+				$("#ReqType").val(json.Requist[0]['ReqType']);	
+				$("#ReqBy").val(json.Requist[0]['Requestedby']);
+				 $("#ReqDate").val(json.Requist[0]['CreatedDate']);
+		        $("#Desigination").val(json.Requist[0]['Designation']);
+				$("#CostCenter").empty();
+				$("#CostCenter").append(json.Cost);
+				
+				$("#tbleAppend").empty();
+				$("#tbleAppend").append(json.Items);			
+		
+		}
+  
+}); 
+	
+});
+
+$('#CostCenter').change(function() {
+    
+ var id = $('#CostCenter').val();
+ $("#AvlBudgetAmount").val('');
+ var ReqType = $('#ReqType').val();
+		if(id != '-1')
+		{
+			$('#content').loader('show');
+
+			$.ajax({
+			data:{id:id},
+			dataType: 'json',
+			type:"POST",
+			url:"<?php echo base_url();?>requisitionform/getAvailableBudAmount?ReqType="+ReqType,
+			success:function(json) {		
+			$('#content').loader('hide');
+			$("#AvlBudgetAmount").val(json.Cost[0]['BudgetAmount']);			
+						
+		      }
+			  
+			});	
+			
+		}
+		else
+		{
+			alert('Please select the Employee details');
+			return false;
+		}
+  
+});
+
+function saveToDatabase(editableObj,column,ReqId,Index) {
+	
+	
+	var id = $('#Remarks'+Index).val();
+	var Status = $('#status'+Index).val();
+	var StatusCode = '<?php echo REQ_APPROVED; ?>';
+	if(Status == '3')
+	{
+		StatusCode = '<?php echo REQ_REJECTED; ?>';
+	}
+	var Remarks = $('#Remarks'+Index).val();
+	if(Remarks == '')
+	{
+		alert('Please enter remarks');
+		$('#status'+Index).val('1'); 
+		return;	
+		
+	}
+		
+			$('#content').loader('show');
+		    $.ajax({ 
+			data:{id:id},
+			type:"POST",
+			url:"<?php echo base_url() ?>requisitionform/ApproveRequest?Status="+StatusCode+"&ReqNo="+ReqId,
+			success:function(data) {
+			if(data)
+			{
+				$('#content').loader('hide'); 
+				 alert(data);
+				 location.reload();		 
+			}
+			else
+			{
+				alert("Error");	
+			}			
+		
+		}
+  
+}); 
+
+
+}
+	
+$(function() {	
+	var d = new Date();
+
+	var month = d.getMonth();
+	var day = d.getDate();
+	var year = d.getFullYear()  ;
+	var SIAStartYear = year - 2015;
+	var mindt = year-70;
+	var maxdt =  year-15;
+    $( ".datePicker" ).datepicker(
+	{ 
+	 	minDate : new Date(year-SIAStartYear,1,1),
+		maxDate :'now',
+		dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,	  
+	}
+	);
+    //$('#SearchDate').daterangepicker(  	);
     //Initialize Select2 Elements
     $(".select2").select2();
 	
+	$('#SearchDate').daterangepicker(
+{
+    locale: {
+      format: 'DD-MM-YYYY'
+    },
+   
+	 showDropdowns: true
+}, 
+function(start, end, label) {
 	
+	 startDate = start.format('DD-MM-YYYY');
+	  endDate = end.format('DD-MM-YYYY');
+	    $('#FromDate').val(startDate);
+	   $('#ToDate').val(endDate);
+	 
+	
+    //alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY'));
+});
 
 
 	
diff --git a/application/views/requisitionlisting.php b/application/views/requisitionlisting.php
index c2466c8a..652228a4 100644
--- a/application/views/requisitionlisting.php
+++ b/application/views/requisitionlisting.php
@@ -55,9 +55,9 @@ speed:500
 				  
                     <tr bgcolor="steelblue">
                       <th>Requisition No</th>
-					  <th>Requisition Date</th>   					   
+					  <th>Requisition Type</th>   					   
 					  <th>Status</th>
-					  <th>CreatedDate</th>					  
+					  <th>Requisted Date</th>					  
 					  <th>Action</th>						 						                       
                     </tr> 
 							 <?php
@@ -69,9 +69,9 @@ speed:500
                     <tr>
 					<td><?php echo $record->ReqNo ?></td>                     
 					<td><?php echo $record->ReqType ?></td>                     
-					<td><?php echo $record->Status ?></td>                     
+					<td><?php echo $record->StatusName ?></td>                     
 					<td><?php echo $record->CreatedDate ?></td>                     
-					<td><i class="fa fa-pencil" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i></td>                     
+					<td>   <a  	 data-toggle="tooltip"  href="<?php echo base_url().'EditRequisition?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Asset details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#'  class="link" "   id="Del" ><span class="glyphicon glyphicon-trash"></span></a> </td>            
                     </tr>
 					
                  <?php