SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Asset screen issue fixed

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-08-07 11:02:25 +05:30
parent 33456fda3a
commit 8f6561d726
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
application/views/addasset.php
View File

@ -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> <b>
<span for="DeliveryDate">Delivery Date</span> <span for="DeliveryDate">Delivery Date</span>
</b> </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> </div>
<div class="col-md-6"> <div class="col-md-6">
@ -412,11 +407,19 @@ $("#DeliveryDate").datepicker({
var id = $('#SelectMaterialCode').val(); var id = $('#SelectMaterialCode').val();
$.each(JSON.parse(data), function (i, item) { $.each(JSON.parse(data), function (i, item) {
if(id == item.LineItemNo){ if(id == item.LineItemNo){
// alert(item.MaterialCode);
// alert(item.DeliveryDate);
// alert(item.DateOfPurchase);
$('#DateOfPurchase').val(item.PODate); $('#DateOfPurchase').val(item.PODate);
$('#DeliveryDate').val(item.DeliveryDate);
if(item.DeliveryDate != null)
{
$('#DeliveryDate').val(item.DeliveryDate);
}
else
{
$('#DeliveryDate').val('');
}
$('#SupplierName').val(item.SupplierName); $('#SupplierName').val(item.SupplierName);
$('#SupID').val(item.SupplierID); $('#SupID').val(item.SupplierID);
$('#MaterialCode').val(item.MaterialCode); $('#MaterialCode').val(item.MaterialCode);
@ -430,11 +433,11 @@ $("#DeliveryDate").datepicker({
var date = new Date(item.DeliveryDate); var date = new Date(item.DeliveryDate);
var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
$("#DeliveryDate").val(date1); //$("#DeliveryDate").val(date1);
var date = new Date(item.PODate); var date = new Date(item.PODate);
var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
$("#DateOfPurchase").val(date3); $("#DateOfPurchase").val(date3);
} }

27
application/views/editOldasset.php
View File

@ -115,12 +115,6 @@ $(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(); var id = $('#SelectMaterialCode').val();
$.each(JSON.parse(data), function (i, item) { $.each(JSON.parse(data), function (i, item) {
if(id == item.LineItemNo){ if(id == item.LineItemNo){
// alert(item.MaterialCode);
// alert(item.DeliveryDate);
// alert(item.DateOfPurchase);
$('#DateOfPurchase').val(item.PODate); $('#DateOfPurchase').val(item.PODate);
$('#DeliveryDate').val(item.DeliveryDate); if(item.DeliveryDate != null)
{
$('#DeliveryDate').val(item.DeliveryDate);
}
else
{
$('#DeliveryDate').val('');
}
$('#SupplierName').val(item.SupplierName); $('#SupplierName').val(item.SupplierName);
$('#SupID').val(item.SupplierID); $('#SupID').val(item.SupplierID);
//alert(item.SupplierID);
$('#MaterialCode').val(item.MaterialCode); $('#MaterialCode').val(item.MaterialCode);
$('#UOM').val(item.UOM); $('#UOM').val(item.UOM);
$('#Quantity').val(item.Quantity); $('#Quantity').val(item.Quantity);
$('#depcode').val(item.Departmentcode); $('#depcode').val(item.Departmentcode);
$('#AssetDept').val(item.DepartmentName); $('#AssetDept').val(item.DepartmentName);
$('#PODescription').val(item.MaterialName); $('#PODescription').val(item.MaterialName);
//salert(item.TotalValue);
$('#Assetvalue').val(item.TotalValue); $('#Assetvalue').val(item.TotalValue);
var date = new Date(item.DeliveryDate); var date = new Date(item.DeliveryDate);
var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); var date1 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
$("#DeliveryDate").val(date1);
var date = new Date(item.PODate); var date = new Date(item.PODate);
var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear()); var date3 = (date.getDate()+ '/' + (date.getMonth() + 1)+ '/' + date.getFullYear());
$("#DateOfPurchase").val(date3); $("#DateOfPurchase").val(date3);