SIA/siddharth_application
1
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-27 12:44:11 +05:30
parent de3a40ad3a
commit 76840b5420
9 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/emergencypurchaseorder.php
View File

@ -135,8 +135,9 @@ class emergencypurchaseorder extends BaseController
$ServiceWorkStatus=$this->input->post('workStatus');
$ServiceScheduleType = $this->input->post('ScheduleType');
$ServiceScheduleOptions = $this->input->post('ServiceOptions');
$ServiceServiceNo = $this->input->post('ServiceNo');
$ServiceScheduleOptions = $this->input->post('ScheduleType');
//$ServiceServiceNo = $this->input->post('ServiceNo');
$ServiceServiceNo = 1;
$ModeOfShipment=$this->input->post('emergmodeofshipment');
$SupplierReference=$this->input->post('emergsupplierreference');
$SuppliersOfferNo=$this->input->post('emergsupplierofferno');

12
application/controllers/requisitionform.php
View File

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

11
application/views/EditservicePurchaseorder.php
View File

@ -1152,7 +1152,7 @@ $(document).ready(function () {
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div>
<?php
$data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control','readonly' => 'true' );
@ -1422,7 +1422,7 @@ $(document).ready(function () {
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div>
<?php
$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' ,'readonly' => 'true');
@ -1695,7 +1695,7 @@ $(document).ready(function () {
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div>
<?php
$data = array('name' => 'ViewFrequency','value' => set_value('ViewFrequency'),'id'=>'ViewFrequency', 'class' => 'form-control' ,'readonly' => 'true');
@ -1963,7 +1963,7 @@ $(document).ready(function () {
<input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
<input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
<input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency.'-'.$FrequencyNo; ?>" />
<input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" />
<input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'ItemDescription'.$index ?>" id="<?php echo 'ItemDescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
@ -2966,7 +2966,7 @@ for(i=2;i<=rows;i++){
$("#deptName").val(obj.DepartmentName);
$("#CostCenter").val(obj.CostCenterCode);
if(obj.Service_Period!='' && obj.Service_Period!=null){
$("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
$("#Frequency").val(obj.Service_Period);
$("#FrequencyNo").val(obj.NumberOfService);
}
@ -3232,3 +3232,4 @@ $('#insuranceNo').val('');

21
application/views/alterpurchaseorder.php
View File

@ -2815,7 +2815,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div class="form-group">
<?php
@ -3814,7 +3814,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div class="form-group">
<?php
@ -5893,7 +5893,7 @@ function populateValueMainFormForDeleteItem(rowid)
$('#ServiceNo').val(1);
}
else{
$('#FrequencyChange').val($('#ServiceOptions').val()+' - '+$('#ServiceNo').val());
$('#FrequencyChange').val($('#ScheduleType').val());
}
}
@ -6411,7 +6411,7 @@ function populateValueMainFormForDeleteItem(rowid)
}
else{
$('#EditFrequencyChange').val($('#Frequency'+userid).val()+' - '+$('#FrequencyValue'+userid).val());
$('#EditFrequencyChange').val($('#FrequencySchedule'+userid).val());
}
@ -7481,10 +7481,10 @@ document.getElementById('NoServices').style.display = 'none';
$('#ServiceNo').val(1);
}
else{
document.getElementById('ServicePeriodOption').style.display = 'block';
document.getElementById('NoServices').style.display = 'block';
document.getElementById('ServicePeriodOption').style.display = 'none';
document.getElementById('NoServices').style.display = 'none';
document.getElementById('ServiceNo').value = 1;
//$('#Frequency').val($('#ServiceOptions').val()+' - ' + $('#ServiceNo').val());
//$('#Frequency').val($('#ServiceOptions').val());
//$('#FrequencyNo').val($('#ServiceNo').val());
}
@ -7500,10 +7500,10 @@ document.getElementById('EditServiceNo').value = 1;
//$('#EditServiceNo').val('');
}
else{
document.getElementById('EditServicePeriodOption').style.display = 'block';
document.getElementById('EditNoServices').style.display = 'block';
document.getElementById('EditServicePeriodOption').style.display = 'none';
document.getElementById('EditNoServices').style.display = 'none';
//$('#EditFrequency').val($('#EditServiceOptions').val()+' - ' + $('#ServiceNo').val());
//$('#EditFrequency').val($('#EditServiceOptions').val());
//$('#FrequencyNo').val($('#EditServiceNo').val());
@ -7602,3 +7602,4 @@ $("#PaymentMethod").change(function() {

5
application/views/editServiceAmendPO.php
View File

@ -1158,7 +1158,7 @@ $(document).ready(function () {
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div>
<?php
$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' ,'readonly' => 'true');
@ -1649,7 +1649,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$("#EditFrequencyNo").val(1);
}
else{
$('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
$('#EditFrequency').val($('#Frequency'+userid).val());
$("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
}
@ -2281,3 +2281,4 @@ $("#PaymentTerms").change(function() {
});
</script>

11
application/views/editrequisitionform.php
View File

@ -55,8 +55,8 @@ if(!empty($ReqPOType))
}
else{
document.getElementById('DisplayScheduleDiv').style.display = 'block';
document.getElementById('ServicePeriodOption').style.display = 'block';
document.getElementById('NoServices').style.display = 'block';
document.getElementById('ServicePeriodOption').style.display = 'none';
document.getElementById('NoServices').style.display = 'none';
}
@ -65,7 +65,7 @@ if(!empty($ReqPOType))
}
else
{
document.getElementById('DisplayScheduleDiv').style.display = 'none';
document.getElementById('DisplayScheduleDiv').style.display = 'block';
document.getElementById('ServicePeriodOption').style.display = 'none';
document.getElementById('NoServices').style.display = 'none';
@ -1022,10 +1022,11 @@ document.getElementById('NoServices').style.display = 'none';
}
else{
document.getElementById('ServicePeriodOption').style.display = 'block';
document.getElementById('NoServices').style.display = 'block';
document.getElementById('ServicePeriodOption').style.display = 'none';
document.getElementById('NoServices').style.display = 'none';
}
});
</script>

10
application/views/requisitionform.php
View File

@ -1,4 +1,3 @@
<?php
$EmpID = "";
$Designation = "";
@ -9,7 +8,7 @@ if(!empty($Emp))
{
foreach ($Emp as $Emp)
{
$EmpID = $Emp->EmpID ;
$EmpID = $Emp->EmpID;
$FirstName = $Emp->FirstName ;
$Designation = $Emp->Designation;
$DepartmentName =$Emp->DepartmentName;
@ -607,7 +606,7 @@ function Save()
else{
var serviceSchedule='';
var servicePeriod='';
var noOfService='';
noOfService='';
}
$('#content').loader('show');
$.ajax({
@ -906,10 +905,11 @@ document.getElementById('NoServices').style.display = 'none';
$('#ServiceNo').val('');
}
else{
document.getElementById('ServicePeriodOption').style.display = 'block';
document.getElementById('NoServices').style.display = 'block';
document.getElementById('ServicePeriodOption').style.display = 'none';
document.getElementById('NoServices').style.display = 'none';
document.getElementById('ServiceNo').value = 1;
}
});
</script>

2
application/views/requisitionlisting.php
View File

@ -85,7 +85,7 @@ span.highlight {
<th>Requisition Type</th>
<th>Tot No.OfLineItem </th>
<th>Po CreatedLineItem</th>
<th>Partical PoCreatedLineItem</th>
<th>Partially PoCreatedLineItem</th>
<th>NewLine Item</th>
<th>Status</th>
<th>Requisted Date</th>

7
application/views/servicePurchaseorder.php
View File

@ -204,7 +204,7 @@ $("#txtBasicValue").val('');
$("#deptName").val(obj.DepartmentName);
$("#CostCenter").val(obj.CostCenterCode);
if(obj.Service_Period!='' && obj.Service_Period!=null){
$("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
$("#Frequency").val(obj.Service_Period);
$("#FrequencyNo").val(obj.NumberOfService);
}
@ -1050,7 +1050,7 @@ function clearEditTaxField()
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div>
<?php
$data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control' ,'readonly' => 'true');
@ -1324,7 +1324,7 @@ function clearEditTaxField()
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<label>Service Schedule Type</label>
<div>
<?php
$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control','readonly' => 'true' );
@ -2511,3 +2511,4 @@ $('#insuranceNo').val('');