MRIR Issue Item

This commit is contained in:
gandhimathi Bharathirajan 2017-08-01 17:35:21 +05:30
parent d2573708aa
commit d64785829c

View File

@ -70,7 +70,7 @@
$index = $index +1; $index = $index +1;
?> ?>
<tr id="<?php echo $index ?>" > <tr id="<?php echo $index ?>" >
<td><a data-toggle="modal" data-target="#myModal" data-id="<%=index%>" data-userid="<?php echo $record->PONO ?>" ><u><?php echo $record->PONO ?></u></a></td> <td><?php echo $record->PONO ?></td>
<td><?php echo $record->ReqNo ?></td> <td><?php echo $record->ReqNo ?></td>
<td><?php echo $record->FirstName ?></td> <td><?php echo $record->FirstName ?></td>
<td><?php echo $record->DepartmentName ?></td> <td><?php echo $record->DepartmentName ?></td>
@ -84,18 +84,35 @@
<td><?php echo $record->RequestedQty ?></td> <td><?php echo $record->RequestedQty ?></td>
<td><?php echo $record->OrderedQuantity ?></td> <td><?php echo $record->OrderedQuantity ?></td>
<td><?php echo $record->AcceptedQty ?></td> <td><?php echo $record->AcceptedQty; ?> </td>
<td contenteditable="true"><input type="text" id="Remarks<?php echo $index ?>" name="Remarks<?php echo $index ?>"class="form-control" maxlength="100"></td>
<?php if($record->ReqStatus != REQ_DELIVERED) { ?>
<td contenteditable="true"><input type="text" id="Remarks<?php echo $index ?>" name="Remarks<?php echo $index ?>"class="form-control" maxlength="100" value="<?php echo $record->Remarks ?>"></td>
<td data-name="sel" contenteditable="true" id="Action<?php echo $index ?>" onchange="saveToDatabase(this,'question','<?php echo $record->ReqNo ; ?>','<?php echo $index ; ?>')"> <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">Ready For Dispatch</option>
<option value="3">Dispatched</option>
</select>
</td>
<select name="status<?php echo $index ?>" id="status<?php echo $index ?>">
<option value="<?php echo $record->ReqStatus; ?>"><?php echo $record->StatusName; ?></option>
<?php
if(!empty($status))
{
foreach ($status as $rl)
{
if($rl->StatusCode != $record->ReqStatus) { ?>
<option value="<?php echo $rl->StatusCode ?>"><?php echo $rl->StatusName ?></option>
<?php }
}
}
?>
</select>
</td>
<?php } else {?>
<td><?php echo $record->Remarks; ?> </td>
<td><?php echo $record->StatusName; ?> </td>
<?php } ?>
</tr> </tr>
<?php <?php
} }
@ -164,33 +181,34 @@ $("#myModal").on("shown.bs.modal", function(e) {
function saveToDatabase(editableObj,column,ReqId,Index) { function saveToDatabase(editableObj,column,ReqId,Index) {
var tr= document.getElementById(Index);
var Actulqty = 0.0;
var cellval = tr.cells;
Actulqty = parseFloat(cellval[6].innerHTML);
var id = $('#Remarks'+Index).val(); var id = $('#Remarks'+Index).val();
var Status = $('#status'+Index).val(); var StatusCode = $('#status'+Index).val();
var StatusCode = '<?php echo REQ_APPROVED; ?>';
var strMsg = 'Do you want to Approve the Requisition?';
if(Status == '3')
{
StatusCode = '<?php echo REQ_REJECTED; ?>';
strMsg = 'Do you want to Reject the Requisition?'
}
var Remarks = $('#Remarks'+Index).val(); var Remarks = $('#Remarks'+Index).val();
if(Status == '3' && Remarks == '') var MaterialCode = cellval[5].innerHTML;
{ var ReqNo = cellval[1].innerHTML;
alert('Please enter remarks'); var Sendvalues = [];
$('#status'+Index).val('1'); Sendvalues[0] = StatusCode;
return false; Sendvalues[1] = MaterialCode;
Sendvalues[2] = ReqNo;
} Sendvalues[3] = Remarks;
//alert(MaterialCode);
var answer = confirm(strMsg); alert(StatusCode);
if (answer)
{
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:{id:id}, data:{id:Sendvalues},
type:"POST", type:"POST",
url:"<?php echo base_url() ?>requisitionform/ApproveRequest?Status="+StatusCode+"&ReqNo="+ReqId, url:"<?php echo base_url() ?>MRIRcontroller/UpdateReqItemStatus",
success:function(data) { success:function(data) {
if(data) if(data)
{ {
@ -203,18 +221,14 @@ function saveToDatabase(editableObj,column,ReqId,Index) {
alert("Error"); alert("Error");
} }
} }
}); });
}
else
{
return;
} }
}
$(function() { $(function() {
var d = new Date(); var d = new Date();