diff --git a/application/views/addasset.php b/application/views/addasset.php
index 0d28a9e4..d45b4e47 100644
--- a/application/views/addasset.php
+++ b/application/views/addasset.php
@@ -31,14 +31,23 @@ $(function() {
 	 
 });
 
- 
+ function isNumberKey(evt)
+       {
+          var charCode = (evt.which) ? evt.which : evt.keyCode;
+          if (charCode != 46 && charCode > 31 
+            && (charCode < 48 || charCode > 57))
+             return false;
+
+          return true;
+       }
+	  
 </script>
 
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Asset Details</center>
+        <center>Siddharth Industries - Add Asset Details</center>
         
       </h1>
     </section>
@@ -53,13 +62,11 @@ $(function() {
             <div class="col-md-12">
               <!-- general form elements -->
                 
-                
-                
                 <div class="box box-primary">
                    
                     <!-- form start -->
                     
-                    <form role="form" id="addUser" action="<?php echo base_url() ?>addNewasset" method="post" role="form">
+                    <form role="form" id="addAsset" action="<?php echo base_url() ?>addNewasset" method="post">
 
                         <div class="box-body">
                             <div class="row">                        							
@@ -67,19 +74,18 @@ $(function() {
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Asset_Name">Asset Name</span>
-                                        <input type="text" class="form-control required" id="Asset_Name" name="Asset_Name">
+                                        <input type="text" class="form-control required"   required style="text-transform:uppercase;" id="AssetName" name="AssetName"  value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>">
 										</div>
                                     </div>
                                     
                                 </div>
-                                
-                            
+                                                           
                             
 							<div class="col-md-3">                                
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Description">Description</span>
-                                        <input type="text" class="form-control required" id="Description" name="Description">
+                                        <input type="text" class="form-control required" id="Description"  required name="Description" value="<?php echo isset($_POST['Description']) ? $_POST['Description'] : '' ?>">
                                     </div>
                                     </div>
                                     
@@ -88,16 +94,26 @@ $(function() {
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Department">Department</span>
-                                        <select class="form-control required" id="Department" name="Department">
-                                            <option>Department</option>
+                                        <select class="form-control required" id="Department" name="Department" >
+                                            <option value="-1"  >Select Department</option>
                                             <?php
-                                            if(!empty($Department))
+                                            if(!empty($DepartmentList))
                                             {
-                                                foreach ($Department as $SID)
+                                                foreach ($DepartmentList as $DEP)
                                                 {
-                                                    ?>
-                                                    <option value="<?php echo $SID->ConfigValue ?>"><?php echo $SID->ConfigValue ?></option>
-                                                    <?php
+													$DepartmentId = $DEP->DEPCode;
+                                                  													
+													if ($_POST['Department'] == $DepartmentId) 
+													{
+
+												echo "<option value=\"".$DepartmentId."\" selected=\"selected\">".$DepartmentId.' -  '. $DEP->DepartmentName."</option>"; 
+													}
+													else 
+													{
+													echo "<option value=\"".$DepartmentId."\">".$DepartmentId.' -  '. $DEP->DepartmentName ."</option>";       
+													}						
+													
+                                                    
                                                 }
                                             }
                                             ?>
@@ -110,7 +126,7 @@ $(function() {
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Location">Location</span>
-                                        <input type="text" class="form-control required" id="Location" name="Location">
+                                        <input type="text" class="form-control required"  required id="Location" name="Location" value= "<?php echo isset($_POST['Location']) ? $_POST['Location'] : '' ?>">
                                     </div>
                                     </div>
                                     
@@ -118,8 +134,8 @@ $(function() {
 								<div class="col-md-3">                                
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="AssetOwner">Asset Owner</span>
-                                        <input type="text" class="form-control required" id="User" name="User">
+                                        <span for="AssetOwner">Asset User</span>
+                                        <input type="text" class="form-control required" required id="User" name="User" value= "<?php echo isset($_POST['User']) ? $_POST['User'] : '' ?>">
                                     </div>
                                     </div>
                                     
@@ -127,16 +143,26 @@ $(function() {
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <span for="SupplierName">Supplier Name</span>
-                                        <select class="form-control required" id="SupplierName" name="SupplierName">
-                                            <option >Select Supplier Name</option>
+										
+                                        <select class="form-control required"  id="SupplierName" name="SupplierName">
+                                            <option value="-1">Select Supplier Name</option>
                                             <?php
-                                            if(!empty($SupplierName))
+                                            if(!empty($SupplierList))
                                             {
-                                                foreach ($SupplierName as $SID)
+                                                foreach ($SupplierList as $SID)
                                                 {
-                                                    ?>
-                                                    <option value="<?php echo $SID->SupplierName; ?>"><?php echo $SID->SupplierID ?> - <?php echo $SID->SupplierName ?></option>
-                                                    <?php
+                                                   												
+													$SupplierId = $SID->SupplierID;
+                                                  													
+													if ($_POST['SupplierName'] == $SupplierId) 
+													{
+
+												echo "<option value=\"".$SupplierId."\" selected=\"selected\">".$SupplierId.' -  '. $SID->SupplierName."</option>"; 
+													}
+													else 
+													{
+													echo "<option value=\"".$SupplierId."\">".$SupplierId.' -  '. $SID->SupplierName ."</option>";       
+													}
                                                 }
                                             }
                                             ?>
@@ -147,14 +173,14 @@ $(function() {
                                    
                                         <div class="form-group">
                                         <span for="DateOfPurchase">Date Of Purchase</span>
-                                        <input  id="DateOfPurchase" required name="DateOfPurchase"  onkeypress="return false;"  maxlength="10"  class="form-control">
+                                        <input  id="DateOfPurchase" required name="DateOfPurchase"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DateOfPurchase']) ? $_POST['DateOfPurchase'] : '' ?>">
                                     </div>
                                     </div>
                                 
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <span for="DateOfCommission">Date Of Commission</span>
-										<input  id="DateOfCommission" required name="DateOfCommission"  onkeypress="return false;"  maxlength="10"  class="form-control">
+										<input  id="DateOfCommission" required name="DateOfCommission"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DateOfCommission']) ? $_POST['DateOfCommission'] : '' ?>">
 
 										</div>
                                 </div>
@@ -163,7 +189,7 @@ $(function() {
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <span for="Assetvalue">Asset Value</span>
-                                        <input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" maxlength="255">
+                                        <input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" required onkeypress="return isNumberKey(event)" title="Please Enter currency value" maxlength="255" value= "<?php echo isset($_POST['Assetvalue']) ? $_POST['Assetvalue'] : '' ?>">
                                         
                                     </div>
                                 
@@ -173,17 +199,26 @@ $(function() {
                                     <div class="form-group">
                                         <span for="AssetStatus">Asset Status</span>
                                         <select class="form-control required" id="AssetStatus" name="AssetStatus">
-                                            <option >Select Asset Status</option>
+                                            <option value="-1" >Select Asset Status</option>
                                             <?php
                                             if(!empty($AssetStatus))
                                             {
                                                 foreach ($AssetStatus as $SID)
                                                 {
-                                                    ?>
-                                                    <option value="<?php echo $SID->AssetStatus; ?>"> <?php echo $SID->AssetStatus ?></option>
-                                                    <?php
+													$AssetValue = $SID->ConfigValue;
+                                                  													
+													if ($_POST['AssetStatus'] == $AssetValue) 
+													{
+
+												echo "<option value=\"".$AssetValue."\" selected=\"selected\">".$AssetValue."</option>"; 
+													}
+													else 
+													{
+													echo "<option value=\"".$AssetValue."\">".$AssetValue."</option>";       
+													}
                                                 }
                                             }
+											   
                                             ?>
                                         </select>
                                     </div>
@@ -193,12 +228,12 @@ $(function() {
                                     <div class="form-group">
                                         <span for="Remarks">Remarks</span>
                                          
-                                        <input type="text" class="form-control required" id="Remarks" name="Remarks" maxlength="500">
+                                        <input type="text" class="form-control required"  id="Remarks" name="Remarks" maxlength="500" value= "<?php echo isset($_POST['Remarks']) ? $_POST['Remarks'] : '' ?>">
                                     </div>
                                 
 								</div>
 								<div class="col-md-3">
-								<input type="checkbox" id="isactive" name="isactive" onclick="checkactive"> IsActive
+								<input type="checkbox" id="isactive" name="isactive"  <?php echo (isset($_POST['isactive']) ? 'checked' : '') ?>> IsActive
 								</div>
 						</div><!-- /.box-body -->
     
diff --git a/application/views/assetListing.php b/application/views/assetListing.php
index 15eddd61..4592bc1c 100644
--- a/application/views/assetListing.php
+++ b/application/views/assetListing.php
@@ -43,19 +43,18 @@ speed:500
                 </div><!-- /.box-header -->
                 <div class="box-body table-responsive no-padding tableSorter">
                   <table class="table table-hover">
-                    <tr>
+                    <tr bgcolor="steelblue">
                       <th>Asset Code</th>
                       <th>Asset Name</th>
                       <th>Description</th>
-                      <th>Department</th>
+                      <th>Department Code</th>
                       <th>Location</th>
-                      <th>User</th>
-                      <th>Supplier Name</th>
+                      <th>Asset User</th>
+                      <th>Supplier ID</th>
                       <th>Date Of Purchase</th>
-                      <th>Asset Value</th>
-                      
-                      <th>Create Date</th>
-                      <th>Action</th>
+                      <th>Asset Value</th>                      
+                      <th>Asset Status</th>
+                     
                       
                     </tr>
                     <?php
@@ -65,24 +64,20 @@ speed:500
                         {
                     ?>
                     <tr>
-                      <td><?php echo $record->Asset_Code ?></td>
-                      <td><?php echo $record->Asset_Name ?></td>
+					<td><u><a   href="<?php echo base_url().'assetdetails/editOldasset/?AssetID='.$record->AssetCode; ?>" data-toggle="tooltip" title="<?php echo $record->AssetCode; ?>  -  Click here to view Asset details"><?php echo $record->AssetCode ?>
+                      <td><?php echo $record->AssetName ?></td>
                       <td><?php echo $record->Description ?></td>
-                      <td><?php echo $record->Department ?></td>
+                      <td><?php echo $record->DEPCode ?></td>
                       <td><?php echo $record->Location ?></td>
-                      <td><?php echo $record->User ?></td>
-                      <td><?php echo $record->SupplierName ?></td>
-                      <td><?php echo $record->DateOfPurchase ?></td>
-                      
-                      <td><?php echo $record->AssetValue ?></td>
-                      
-                      <td><?php echo $record->CreatedDate ?></td>
-                      
-                      <td>
-                          <a href="<?php echo base_url().'assetdetails/editOldasset/'.$record->Asset_Code; ?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
-						  <a href="<?php echo base_url().'assetdetails/viewasset/'.$record->Asset_Code; ?>"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
-                         <!-- <a href="#" data-userid="<?php echo $record->userId; ?>" class="deleteUser"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>-->
-                      </td>
+                      <td><?php echo $record->UserName ?></td>
+                      <td><?php echo $record->SupplierCode ?></td>
+                      <td><?php
+					  $dtpurchase = new DateTime($record->DateOfPurchase);
+						$DOPurchase =  $dtpurchase ->format('Y-m-d');
+  					  echo $DOPurchase ?></td>                      
+                      <td><?php echo number_format($record->AssetValue, 2); ?></td>                      
+                      <td><?php echo $record->AssetStatus ?></td>                 
+                     
                     </tr>
                     <?php
                         }
diff --git a/application/views/editOldasset.php b/application/views/editOldasset.php
index fa240a66..1502fa58 100644
--- a/application/views/editOldasset.php
+++ b/application/views/editOldasset.php
@@ -1,46 +1,106 @@
 <?php
 
-$Asset_Code = '';
-$Asset_Name = '';
+$AssetCode = '';
+$AssetName = '';
 $Description = '';
 $Department = '';
 $Location = '';
 $User = '';
 $SupplierName = '';
-$DateOfPurchase = '';
-$DateOfCommission = '';
+$DOPurchase = '';
+$DOCommission = '';
 $AssetValue = '';
-$Createdby = '';
-$Remarks ='';
-
-
-if(!empty($asset))
+$AssetStatus = '';
+$IsActive ='';
+$Remarks = '';
+$DepartmentName ='';
+$SupplierCode = '';
+if(!empty($assetList))
 {
-    foreach ($asset as $uf)
+    foreach ($assetList as $Asset)
     {
-        $Asset_Code = $uf->Asset_Code;
-        $Asset_Name = $uf->Asset_Name;
-        $Description = $uf->Description;
-		$Department = $uf->Department;
-        $Location = $uf->Location;
-        $User = $uf->User;
-        $SupplierName = $uf->SupplierName;
-        $DateOfPurchase = $uf->DateOfPurchase;
-        $DateOfCommission = $uf->DateOfCommission;
-        $Createdby = $uf->Createdby;
-        $AssetValue = $uf->AssetValue;
-        $Remarks = $uf->Remarks;
+        $AssetCode = $Asset->AssetCode;
+        $AssetName = $Asset->AssetName;
+        $Description = $Asset->Description;
+		$Department = $Asset->DEPCode ;
+		$DepartmentName = $Asset->DepartmentName;
+        $Location = $Asset->Location;
+        $User = $Asset->UserName;
+        $SupplierName = $Asset->SupplierName;
+		$SupplierCode = $Asset->SupplierCode;
+        $DateOfPurchase = $Asset->DateOfPurchase;
+        $DateOfCommission = $Asset->DateOfCommison;
+        $AssetValue = $Asset->AssetValue;
+        $AssetStatus = $Asset->AssetStatus;
+		
+        $Remarks = $Asset->Remarks;
+		 $chk =  $Asset->IsActive;
+		 
+		 if($chk == 1)
+		 {
+			 $IsActive = 'checked';
+		 }
+		 else
+		 {
+			 $IsActive = '';
+		 }
+		 
+		 if($DateOfPurchase != '')
+		{
+			$dtpurchase = new DateTime($DateOfPurchase);
+			$DOPurchase =  $dtpurchase ->format('Y-m-d');
+		}
+		 if($DateOfCommission != '')
+		{
+			$dtCommission = new DateTime($DateOfCommission);
+			$DOCommission =  $dtCommission ->format('Y-m-d');
+		}
     }
 }
 
 
 ?>
-<script>
-function demo(){
-	alert("Update this records");
-	
-}
+<script> 
 
+$(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;
+	
+  
+	  $("#DateOfCommission").datepicker({
+	minDate : new Date(year-SIAStartYear,1,1),
+	maxDate :'now',
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
+
+
+
+});
+ $("#DateOfPurchase").datepicker({
+	minDate : new Date(year-SIAStartYear,1,1),
+	maxDate :'now',
+	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true
+
+
+});
+	 
+	 
+});
+
+ function isNumberKey(evt)
+       {
+          var charCode = (evt.which) ? evt.which : evt.keyCode;
+          if (charCode != 46 && charCode > 31 
+            && (charCode < 48 || charCode > 57))
+             return false;
+
+          return true;
+       }
 </script>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
@@ -60,14 +120,11 @@ function demo(){
             <!-- left column -->
             <div class="col-md-12">
               <!-- general form elements -->
-                
-                
-                
                 <div class="box box-primary">
                      
                     <!-- form start -->
                     
-                    <form role="form" id="addUser" action="<?php echo base_url() ?>addNewasset" method="post" role="form">
+                    <form role="form" id="addUser" action="<?php echo base_url() ?>editasset" method="post">
 
                         <div class="box-body">
                             <div class="row">                        							
@@ -75,7 +132,9 @@ function demo(){
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="Asset_Name">Asset Name</span>
-                                        <input type="text" class="form-control required" id="Asset_Name" name="Asset_Name" value="<?php echo $Asset_Name;?>">
+										
+                                        <input type="text" class="form-control required" id="AssetName" name="AssetName" value="<?php echo $AssetName;?>" style="text-transform:uppercase;">
+										 <input type="hidden" name="AssetCode" id="AssetCode"  class="form-control" readonly  value="<?php echo $AssetCode;?>">   
 										</div>
                                     </div>
                                     
@@ -98,14 +157,14 @@ function demo(){
                                         <div class="form-group">
                                         <span for="Department">Department</span>
                                         <select class="form-control required" id="Department" name="Department">
-                                            <option>Department</option>
+                                            <option value="<?php echo $Department; ?>"><?php echo $Department.' - '.$DepartmentName; ?></option>
                                             <?php
-                                            if(!empty($Department))
+                                            if(!empty($DepartmentList))
                                             {
-                                                foreach ($Department as $SID)
+                                                foreach ($DepartmentList as $SID)
                                                 {
                                                     ?>
-                                                    <option value="<?php echo $SID->ConfigValue ?>"><?php echo $SID->ConfigValue ?></option>
+                                                    <option value="<?php echo $SID->DEPCode ?>"><?php echo $SID->DEPCode.' - '. $SID->DepartmentName;?></option>
                                                     <?php
                                                 }
                                             }
@@ -128,7 +187,7 @@ function demo(){
 								<div class="col-md-3">                                
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="AssetOwner">Asset Owner</span>
+                                        <span for="AssetOwner">Asset User Name</span>
                                         <input type="text" class="form-control required" id="User" name="User" value="<?php echo $User;?>">
                                     </div>
                                     </div>
@@ -138,14 +197,14 @@ function demo(){
                                     <div class="form-group">
                                         <span for="SupplierName">Supplier Name</span>
                                         <select class="form-control required" id="SupplierName" name="SupplierName">
-                                            <option >Select Supplier Name</option>
-                                            <?php
-                                            if(!empty($SupplierName))
+                                            <option value="<?php echo $SupplierCode;?>"><?php echo $SupplierCode.' - '.$SupplierName;?></option>
+                                            <?php 
+                                            if(!empty($SupplierList))
                                             {
-                                                foreach ($SupplierName as $SID)
+                                                foreach ($SupplierList as $SID)
                                                 {
                                                     ?>
-                                                    <option value="<?php echo $SID->SupplierName; ?>"><?php echo $SID->SupplierID ?> - <?php echo $SID->SupplierName ?></option>
+                                                    <option value="<?php echo $SID->SupplierID; ?>"><?php echo $SID->SupplierID.' - '.$SID->SupplierName ;?></option>
                                                     <?php
                                                 }
                                             }
@@ -157,14 +216,14 @@ function demo(){
                                    
                                         <div class="form-group">
                                         <span for="DateOfPurchase">Date Of Purchase</span>
-                                        <input  id="DateOfPurchase" required name="DateOfPurchase"  onkeypress="return false;"  maxlength="10"  class="form-control" value="<?php echo $DateOfPurchase; ?>">
+                                        <input  id="DateOfPurchase" required name="DateOfPurchase"  onkeypress="return false;"  maxlength="10"  class="form-control" value="<?php echo $DOPurchase; ?>">
                                     </div>
                                     </div>
                                 
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <span for="DateOfCommission">Date Of Commission</span>
-										<input  id="DateOfCommission" required name="DateOfCommission"  onkeypress="return false;"  maxlength="10"  class="form-control" value="<?php echo $DateOfCommission;?>">
+										<input  id="DateOfCommission" required name="DateOfCommission"  onkeypress="return false;"  maxlength="10"  class="form-control" value="<?php echo $DOCommission;?>">
 
 										</div>
                                 </div>
@@ -173,7 +232,7 @@ function demo(){
 								<div class="col-md-3">
                                     <div class="form-group">
                                         <span for="Assetvalue">Asset Value</span>
-                                        <input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" maxlength="255"  value="<?php echo $AssetValue;?>">
+                                        <input type="text" class="form-control required" id="Assetvalue" name="Assetvalue" onkeypress="return isNumberKey(event)" maxlength="255"  value="<?php echo $AssetValue;?>">
                                         
                                     </div>
                                 
@@ -183,14 +242,14 @@ function demo(){
                                     <div class="form-group">
                                         <span for="AssetStatus">Asset Status</span>
                                         <select class="form-control required" id="AssetStatus" name="AssetStatus">
-                                            <option >Select Asset Status</option>
+                                            <option   value="<?php echo $AssetStatus; ?>"><?php echo $AssetStatus; ?></option>
                                             <?php
-                                            if(!empty($AssetStatus))
+                                            if(!empty($AssetStatusList))
                                             {
-                                                foreach ($AssetStatus as $SID)
+                                                foreach ($AssetStatusList as $SID)
                                                 {
                                                     ?>
-                                                    <option value="<?php echo $SID->AssetStatus; ?>"> <?php echo $SID->AssetStatus ?></option>
+                                                    <option value="<?php echo $SID->ConfigValue; ?>"> <?php echo $SID->ConfigValue ?></option>
                                                     <?php
                                                 }
                                             }
@@ -203,12 +262,12 @@ function demo(){
                                     <div class="form-group">
                                         <span for="Remarks">Remarks</span>
                                          
-                                        <input type="text" class="form-control required" id="Remarks" name="Remarks" maxlength="500" value="<?php echo $SID->Remarks; ?>">
+                                        <input type="text" class="form-control required" id="Remarks" name="Remarks" maxlength="500" value="<?php echo $Remarks; ?>">
                                     </div>
                                 
 								</div>
 								<div class="col-md-3">
-								<input type="checkbox" id="isactive" name="isactive" onclick="checkactive"> IsActive
+								<input type="checkbox" id="isactive" name="isactive" <?php echo $IsActive ?> > IsActive
 								</div>
 						</div><!-- /.box-body -->