From 8f6561d72635e8c1434ec516e951559f4d7889c1 Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Mon, 7 Aug 2017 11:02:25 +0530
Subject: [PATCH] Asset screen issue fixed

---
 application/views/addasset.php     | 33 ++++++++++++++++--------------
 application/views/editOldasset.php | 29 +++++++++++++-------------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/application/views/addasset.php b/application/views/addasset.php
index f59b162a..85590949 100755
--- a/application/views/addasset.php
+++ b/application/views/addasset.php
@@ -30,11 +30,6 @@ $(function() {
 
 
 });
-$("#DeliveryDate").datepicker({
-	minDate : new Date(year-SIAStartYear,1,1),
-	maxDate :'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
-});
 
 	 
 	 
@@ -234,7 +229,7 @@ $("#DeliveryDate").datepicker({
 								 <b>
                                         <span for="DeliveryDate">Delivery Date</span>
                                  </b>
-                                        <input  id="DeliveryDate" readonly name="DeliveryDate"  onkeypress="return false;"  maxlength="10"  class="form-control" value= "<?php echo isset($_POST['DeliveryDate']) ? $_POST['DeliveryDate'] : '' ?>">
+                                        <input  id="DeliveryDate" readonly name="DeliveryDate"  maxlength="10"  class="form-control" >
                                     </div>
 								</div>
 								<div class="col-md-6">
@@ -412,11 +407,19 @@ $("#DeliveryDate").datepicker({
 							var id = $('#SelectMaterialCode').val();
 					 $.each(JSON.parse(data), function (i, item) {
 							 if(id == item.LineItemNo){
-								// alert(item.MaterialCode);
-								 // alert(item.DeliveryDate);
-								 // alert(item.DateOfPurchase);
+								
 								 $('#DateOfPurchase').val(item.PODate);
-								$('#DeliveryDate').val(item.DeliveryDate);
+								 
+								 if(item.DeliveryDate  != null)
+								 {
+									$('#DeliveryDate').val(item.DeliveryDate);
+									
+								 }
+								 else
+								 {
+									$('#DeliveryDate').val(''); 
+									
+								 }
 								 $('#SupplierName').val(item.SupplierName);
 								$('#SupID').val(item.SupplierID);
 								 $('#MaterialCode').val(item.MaterialCode);
@@ -430,11 +433,11 @@ $("#DeliveryDate").datepicker({
 								 
 								 var date = new Date(item.DeliveryDate);
              
-             var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
-             $("#DeliveryDate").val(date1);
-			 var date = new Date(item.PODate);
-             var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
-             $("#DateOfPurchase").val(date3);
+								var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
+								//$("#DeliveryDate").val(date1);
+								var date = new Date(item.PODate);
+								var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
+								$("#DateOfPurchase").val(date3);
 							 }
 							
 						 
diff --git a/application/views/editOldasset.php b/application/views/editOldasset.php
index c8fb9e44..add11013 100755
--- a/application/views/editOldasset.php
+++ b/application/views/editOldasset.php
@@ -115,13 +115,7 @@ $(function() {
 
 
 });
-$("#DeliveryDate").datepicker({
-	minDate : new Date(year-SIAStartYear,1,1),
-	maxDate :'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
-});
-
-	 
+ 
 	 
 });
 
@@ -486,27 +480,34 @@ $("#DeliveryDate").datepicker({
 							var id = $('#SelectMaterialCode').val();
 					 $.each(JSON.parse(data), function (i, item) {
 							 if(id == item.LineItemNo){
-								// alert(item.MaterialCode);
-								 // alert(item.DeliveryDate);
-								 // alert(item.DateOfPurchase);
+								
 								 $('#DateOfPurchase').val(item.PODate);
-								$('#DeliveryDate').val(item.DeliveryDate);
+								 if(item.DeliveryDate  != null)
+								 {
+									$('#DeliveryDate').val(item.DeliveryDate);
+									
+								 }
+								 else
+								 {
+									$('#DeliveryDate').val(''); 
+									
+								 }
 								 $('#SupplierName').val(item.SupplierName);
 								$('#SupID').val(item.SupplierID);
-								//alert(item.SupplierID);
+								
 								 $('#MaterialCode').val(item.MaterialCode);
 								 $('#UOM').val(item.UOM);
 								 $('#Quantity').val(item.Quantity);
 								 $('#depcode').val(item.Departmentcode);
 								 $('#AssetDept').val(item.DepartmentName);
 								 $('#PODescription').val(item.MaterialName);
-								 //salert(item.TotalValue);
+								 
 								 $('#Assetvalue').val(item.TotalValue);
 								 
 								 var date = new Date(item.DeliveryDate);
              
              var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
-             $("#DeliveryDate").val(date1);
+            
 			 var date = new Date(item.PODate);
              var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
              $("#DateOfPurchase").val(date3);