SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Available budget amount issue sorted out

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-09-01 16:54:07 +05:30
parent 615fc5c928
commit 37292c3b12
3 changed files with 39 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
application/views/editrequisitionform.php
View File

@ -12,7 +12,7 @@
$serviceSchedule='';
$servicePeriod='';
$noOfService='';
$strReqPOType = '';
if(!empty($ReqDetails))
{
@ -33,7 +33,11 @@ if(!empty($ReqDetails))
}
}
if(!empty($ReqPOType))
{
$strReqPOType = $ReqPOType;
}
?>
@ -513,11 +517,23 @@ $(function() {
$(".select2").select2();
var id = '<?php echo $CostCenterCode?>';
var ReqType = '<?php echo $ReqType?>';
var ReqType = '<?php echo $strReqPOType?>';
var urlval = '';
if(ReqType == '<?php echo IMPORT?>')
{
urlval="<?php echo base_url() ?>servicepurchaseorder/GetAvailableImportBudgetAmount?ReqType="+ReqType;
}
else
{
urlval ="<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType;
}
$.ajax({
data:{id:id},
type:"POST",
url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType,
type:"POST",
url:urlval,
success:function(data) {
if(data)
{
@ -547,14 +563,24 @@ $('#CostCenter').change(function() {
var id = $('#CostCenter').val();
$("#AvlBudgetAmount").val('');
var ReqType = $('#RequestType').val();
var ReqType = '<?php echo $strReqPOType?>';
var urlval = '';
if(ReqType == '<?php echo IMPORT?>')
{
urlval="<?php echo base_url() ?>servicepurchaseorder/GetAvailableImportBudgetAmount?ReqType="+ReqType;
}
else
{
urlval ="<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType;
}
if(id != '-1')
{
$('#content').loader('show');
$.ajax({
data:{id:id},
type:"POST",
url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType,
url:urlval,
success:function(data) {
if(data)
{
@ -587,44 +613,7 @@ $('#CostCenter').change(function() {
}
});
$('#RequestType').change(function()
{
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
$("#Description").val('');
$("#UOM").val('');
removeHiddenRows($('#Items').find('tr').length);
var id = $('#RequestType').val();
if(id != '-1')
{
$('#content').loader('show');
$.ajax({
data:{id:id},
dataType: 'json',
type:"POST",
url:"<?php echo base_url();?>requisitionform/getMaterialCode",
success:function(json) {
$('#content').loader('hide');
$("#drpMaterial").empty();
$("#drpMaterial").append(json.Material);
// $("#Description").val(json.MaterialName);
//$("#UOM").val(json.UOM);
}
});
//$('#content').loader('hide');
}
else
{
alert('Please select the RequestType');
return false;
}
});
$('#drpMaterial').change(function() {

61
application/views/requisitionlistapproval.php
View File

@ -17,64 +17,10 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<label>Requisition Status</label>
<div>
<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)
{
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">
<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">
<input type="hidden" name="FromDate" id="FromDate" />
<input type="hidden" name="ToDate" id="ToDate" />
<input type="submit" value="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>
</div>
</div>
@ -238,7 +184,7 @@
?>
<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" 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">Approve</option>
@ -435,6 +381,7 @@ $(function () {
"paging": true,
"lengthChange": true,
"searching": true,
"aaSorting": [[ 0, "desc" ]],
"ordering": true,
"info": true,
"autoWidth": true

1
application/views/requisitionlisting.php
View File

@ -140,6 +140,7 @@ span.highlight {
"lengthChange": true,
"searching": true,
"ordering": true,
"aaSorting": [[ 0, "desc" ]],
"info": true,
"autoWidth": true