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

service po requistion level new changes done

Browse Source
This commit is contained in:
gandhimathi 2017-09-28 16:30:46 +05:30
parent 80cd0a9593
commit 61c3a700eb
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/controllers/requisitionform.php
View File

@ -356,8 +356,9 @@ class requisitionform extends BaseController
$comma_separated = explode(':', $DeletedRow); $comma_separated = explode(':', $DeletedRow);
$serviceSchedule = $this->input->post('serviceSchedule'); $serviceSchedule = $this->input->post('serviceSchedule');
$servicePeriod = $this->input->post('servicePeriod'); $servicePeriod = $this->input->post('serviceSchedule');
$noOfService = $this->input->post('noOfService'); // $noOfService = $this->input->post('noOfService');
$noOfService = 1;
$IsExists = $this->requistion_model->RequistionIsExists($Requestedby); $IsExists = $this->requistion_model->RequistionIsExists($Requestedby);
// print_r($IsExists); // print_r($IsExists);
@ -440,8 +441,9 @@ class requisitionform extends BaseController
$DeletedRow = $this->input->post('txtDeletedRow'); $DeletedRow = $this->input->post('txtDeletedRow');
$RowCount = $this->input->post('txtRowCount'); $RowCount = $this->input->post('txtRowCount');
$serviceSchedule = $this->input->post('serviceSchedule'); $serviceSchedule = $this->input->post('serviceSchedule');
$servicePeriod = $this->input->post('servicePeriod'); $servicePeriod = $this->input->post('serviceSchedule');
$noOfService = $this->input->post('noOfService'); // $noOfService = $this->input->post('noOfService');
$noOfService = 1;
if(strlen($Status) > 1) if(strlen($Status) > 1)
{ {
$Request = array( 'Status'=>$Status,'CreatedDate'=>$updatedDate,'CreatedBy'=>$UpdatedBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod); $Request = array( 'Status'=>$Status,'CreatedDate'=>$updatedDate,'CreatedBy'=>$UpdatedBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
@ -664,4 +666,4 @@ class requisitionform extends BaseController
} }
} }
?> ?>

10
application/views/alterpurchaseorder.php
View File

@ -6346,9 +6346,10 @@ function populateValueMainFormForDeleteItem(rowid)
*/ */
function clearServiceModalFields() function clearServiceModalFields()
{ {
// To reset the Modal controls // To reset the Modal controls
$('#ServiceMaterialCode').val("0") ; $('#ServiceMaterialCode').val("0");
$("#ServiceDescription").val(''); $("#ServiceDescription").val('');
$('#ServiceUOM').val(''); $('#ServiceUOM').val('');
$('#ServiceQuantity').val(''); $('#ServiceQuantity').val('');
@ -6734,7 +6735,7 @@ $('#content').loader('hide');
$.each(JSON.parse(materialData), function (index, value) { $.each(JSON.parse(materialData), function (index, value) {
if (value.MaterialCode==materialCode) { if (value.MaterialCode==materialCode) {
$("#ServiceMaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) ); // $("#ServiceMaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
} }
@ -7481,8 +7482,8 @@ document.getElementById('NoServices').style.display = 'none';
$('#ServiceNo').val(1); $('#ServiceNo').val(1);
} }
else{ else{
document.getElementById('ServicePeriodOption').style.display = 'block'; document.getElementById('ServicePeriodOption').style.display = 'none';
document.getElementById('NoServices').style.display = 'block'; document.getElementById('NoServices').style.display = 'none';
document.getElementById('ServiceNo').value = 1; document.getElementById('ServiceNo').value = 1;
//$('#Frequency').val($('#ServiceOptions').val()+' - ' + $('#ServiceNo').val()); //$('#Frequency').val($('#ServiceOptions').val()+' - ' + $('#ServiceNo').val());
//$('#FrequencyNo').val($('#ServiceNo').val()); //$('#FrequencyNo').val($('#ServiceNo').val());
@ -7602,3 +7603,4 @@ $("#PaymentMethod").change(function() {