RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_costCenter : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-06-25 07:18:56 +00:00
parent 3789823c23
commit 4e0de35c2d
3 changed files with 90 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/CostCenter.php
View File

@ -87,7 +87,6 @@ class CostCenter extends BaseController
*/ */
function saveCostCenter() function saveCostCenter()
{ {
// $this->validator->setRules([ // $this->validator->setRules([
// 'CostName' => 'trim|required', // 'CostName' => 'trim|required',
// 'CostCode' => 'trim|required', // 'CostCode' => 'trim|required',
@ -104,7 +103,8 @@ class CostCenter extends BaseController
$CreateBy = $this->session->get('userId'); $CreateBy = $this->session->get('userId');
$SelectedDepartment = $this->request->getPost('txtSelectedDepartment'); $SelectedDepartment = $this->request->getPost('txtSelectedDepartment');
$ApproverName = $this->request->getPost('ApprovedBy'); // $ApproverName = $this->request->getPost('ApprovedBy');
$ApproverName = $this->session->get('EmpID');
$comma_separated = explode(':', (string)$SelectedDepartment); $comma_separated = explode(':', (string)$SelectedDepartment);
// $comma_separated = $this->costcenter_model->getDepartment(); // $comma_separated = $this->costcenter_model->getDepartment();
// print_r($comma_separated);die; // print_r($comma_separated);die;
@ -243,7 +243,11 @@ class CostCenter extends BaseController
$SelectedDepartment = (string)$this->request->getPost('txtSelectedDepartment'); $SelectedDepartment = (string)$this->request->getPost('txtSelectedDepartment');
$ApproverName = $this->request->getPost('ApprovedBy'); // $ApproverName = $this->request->getPost('ApprovedBy');
// $ApproverName = $this->session->get('EmpID');
$ApproverName = NULL;
$comma_separated = []; $comma_separated = [];
print_r(strlen($SelectedDepartment)); print_r(strlen($SelectedDepartment));
if(strlen($SelectedDepartment)>0) if(strlen($SelectedDepartment)>0)

101
app/Views/addCostCenter.php
View File

@ -162,9 +162,9 @@ $(function() {
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="CostName">Approved By </label><font color="Red">*</font> <!-- <label for="CostName">Approved By </label><font color="Red">*</font> -->
<div class="form-group"> <!-- <div class="form-group"> -->
<?php <?php
$options = array("-1"=>'Select Approver'); $options = array("-1"=>'Select Approver');
@ -180,10 +180,10 @@ $(function() {
endforeach; endforeach;
} }
echo form_dropdown('ApprovedBy',$options,set_value('ApprovedBy'),'id="ApprovedBy"', 'class = "form-control "'); ?> // echo form_dropdown('ApprovedBy',$options,set_value('ApprovedBy'),'id="ApprovedBy"', 'class = "form-control "'); ?>
</div> <!-- </div> -->
</div> </div>
</div> </div>
@ -257,18 +257,18 @@ $(function() {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-3 col-md-offset-2"> <!-- <div class="col-md-3 col-md-offset-2"> -->
Budget Amount : <!-- Budget Amount : -->
</div> <!-- </div> -->
<div class="col-md-5"> <!-- <div class="col-md-5"> -->
<input class="form-control" onkeypress="return isNumberKey(event);" name="AddAmout" class="form-control" id="AddAmout" type="text"> <input class="form-control" onkeypress="return isNumberKey(event);" name="AddAmout" class="form-control" id="AddAmout" type="hidden" value=0>
</div> <!-- </div> -->
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-3 col-md-offset-2">
@ -302,7 +302,7 @@ $(function() {
<th>Budget Type</th> <th>Budget Type</th>
<th>Budget Year</th> <th>Budget Year</th>
<th>Budget Amount</th> <!-- <th>Budget Amount</th> -->
<th>Remarks</th> <th>Remarks</th>
<th>Action</th> <th>Action</th>
</thead> </thead>
@ -361,21 +361,21 @@ $(function() {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-3 col-md-offset-2"> <!-- <div class="col-md-3 col-md-offset-2">
Budget Amount : Budget Amount :
</div> </div> -->
<div class="col-md-5"> <!-- <div class="col-md-5"> -->
<?php <?php
$data = array('name' => 'EditAmout', 'value' => set_value('EditAmout'),'id'=>'EditAmout', 'class' => 'form-control','onkeypress'=>'return isNumberKey(event);'); $data = array('name' => 'EditAmout', 'value' => set_value('EditAmout'),'id'=>'EditAmout', 'class' => 'form-control','onkeypress'=>'return isNumberKey(event);');
echo form_input($data); echo form_hidden($data);
?> ?>
</div> <!-- </div> -->
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-3 col-md-offset-2">
@ -462,8 +462,7 @@ $(function() {
<td align="left"><%=BudgetType%></td> <td align="left"><%=BudgetType%></td>
<td align="left"><%=BudgetYear%></td> <td align="left"><%=BudgetYear%></td>
<td align="left" style="display: none;"><%=BudgetAmount%></td>
<td align="left"><%=BudgetAmount%></td>
<td align="left"><%=Remarks%></td> <td align="left"><%=Remarks%></td>
<td> <td>
@ -494,12 +493,12 @@ function OpenModal()
$('#selectDistriList').focus(); $('#selectDistriList').focus();
return false; return false;
} }
else if($('#ApprovedBy').val() == "-1") // else if($('#ApprovedBy').val() == "-1")
{ // {
alert('Please Select the Approver'); // alert('Please Select the Approver');
$('#ApprovedBy').focus(); // $('#ApprovedBy').focus();
return false; // return false;
} // }
else else
{ {
$('#addbudgetmodel').modal('show'); $('#addbudgetmodel').modal('show');
@ -514,7 +513,7 @@ $("#Edit").on("shown.bs.modal", function(e) {
$('#Editbudget').val($('#BudgetTable tr:eq('+ userid +') td:eq(0)').text()); $('#Editbudget').val($('#BudgetTable tr:eq('+ userid +') td:eq(0)').text());
$('#EditYear').val($('#BudgetTable tr:eq('+ userid +') td:eq(1)').text()); $('#EditYear').val($('#BudgetTable tr:eq('+ userid +') td:eq(1)').text());
$('#EditAmout').val($('#BudgetTable tr:eq('+ userid +') td:eq(2)').text()); $('#EditAmout').val($('#BudgetTable tr:eq('+ userid +') td:eq(2)').text()).hide();
$('#EditRemarks').val($('#BudgetTable tr:eq('+ userid +') td:eq(3)').text()); $('#EditRemarks').val($('#BudgetTable tr:eq('+ userid +') td:eq(3)').text());
}); });
@ -536,11 +535,11 @@ var iflag = 0;
alert('Please Enter the Budget Year'); alert('Please Enter the Budget Year');
//return; //return;
} }
if(document.getElementById('AddAmout').value == '' ) // if(document.getElementById('AddAmout').value == '' )
{ // {
alert('Please Enter the Budget Amount'); // alert('Please Enter the Budget Amount');
// return; // // return;
} // }
if ($("#Addbudget option:selected").val() !='-1' && $('#AddYear').val() != '0' && $('#AddAmout').val() != '' ) if ($("#Addbudget option:selected").val() !='-1' && $('#AddYear').val() != '0' && $('#AddAmout').val() != '' )
@ -550,7 +549,7 @@ var iflag = 0;
var temp = index; var temp = index;
var BudType = $("#Addbudget option:selected").val(); var BudType = $("#Addbudget option:selected").val();
var BudYear = $("#AddYear").val(); var BudYear = $("#AddYear").val();
var BudAmount = $("#AddAmout").val(); var BudAmount = $("#AddAmout").val() ? $("#AddAmout").val() : 0;
//$('#Addbudget option[value='+BudType+']').remove(); //$('#Addbudget option[value='+BudType+']').remove();
var BudRemarks = $('#AddRemarks').val(); var BudRemarks = $('#AddRemarks').val();
$('#AddYear').val(''); $('#AddYear').val('');
@ -626,11 +625,11 @@ $('.tempClickEdit').click(function(){
alert('Please Enter the Budget Year'); alert('Please Enter the Budget Year');
//return; //return;
} }
if(document.getElementById('EditAmout').value == '' ) // if(document.getElementById('EditAmout').value == '' )
{ // {
alert('Please Enter the Budget Amount'); // alert('Please Enter the Budget Amount');
// return; // // return;
} // }
if ( $('#EditAmout').val() != '' && $('#EditYear').val() != '' ) if ( $('#EditAmout').val() != '' && $('#EditYear').val() != '' )
@ -644,11 +643,11 @@ $('.tempClickEdit').click(function(){
$('#BudgetTable tr:eq('+ temp +') td:eq(1)').text(BudYear); $('#BudgetTable tr:eq('+ temp +') td:eq(1)').text(BudYear);
$('#BudgetTable tr:eq('+ temp +') td:eq(2)').text(BudAmount); $('#BudgetTable tr:eq('+ temp +') td:eq(2)').text(BudAmount).hide();
$('#BudgetTable tr:eq('+ temp +') td:eq(3)').text(BudRemarks); $('#BudgetTable tr:eq('+ temp +') td:eq(3)').text(BudRemarks);
$('#BudgetYear'+temp).val(BudYear); $('#BudgetYear'+temp).val(BudYear);
$('#BudgetAmount'+temp).val(BudAmount); $('#BudgetAmount'+temp).val(BudAmount).hide();
$('#Remarks'+temp).val(BudRemarks); $('#Remarks'+temp).val(BudRemarks);
@ -857,11 +856,11 @@ function validate()
alert('Please Add Budget'); alert('Please Add Budget');
return false; return false;
} }
else if($("option:selected", $("#ApprovedBy")).val() == '-1') // else if($("option:selected", $("#ApprovedBy")).val() == '-1')
{ // {
alert('Please Select Approver Names'); // alert('Please Select Approver Names');
return false; // return false;
} // }
else else
{ {
return true; return true;

67
app/Views/editCostCenter.php
View File

@ -237,7 +237,7 @@ for ($i = 1; $i < 5; $i++) {
</div> </div>
</div> </div>
<div class="col-md-3 "> <!-- <div class="col-md-3 ">
<label for="CostName">Approved By </label> <label for="CostName">Approved By </label>
<font color="Red">*</font> <font color="Red">*</font>
@ -256,12 +256,12 @@ for ($i = 1; $i < 5; $i++) {
endforeach; endforeach;
} }
echo form_dropdown('ApprovedBy', $Approved, set_value('ApprovedBy'), 'id="ApprovedBy"', 'class = "form-control "'); ?> // echo form_dropdown('ApprovedBy', $Approved, set_value('ApprovedBy'), 'id="ApprovedBy"', 'class = "form-control "'); ?>
</div> </div>
</div> </div> -->
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -402,18 +402,18 @@ for ($i = 1; $i < 5; $i++) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-3 col-md-offset-2"> <!-- <div class="col-md-3 col-md-offset-2">
Budget Amount : Budget Amount :
</div> </div> -->
<div class="col-md-5"> <!-- <div class="col-md-5"> -->
<input class="form-control" onkeypress="return isNumberKey(event);" name="AddAmout" class="form-control" id="AddAmout" type="text"> <input class="form-control" onkeypress="return isNumberKey(event);" name="AddAmout" class="form-control" id="AddAmout" type="hidden" value=0>
</div> <!-- </div> -->
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-3 col-md-offset-2">
@ -447,7 +447,7 @@ for ($i = 1; $i < 5; $i++) {
<th>Budget Type</th> <th>Budget Type</th>
<th>Budget Year</th> <th>Budget Year</th>
<th>Budget Amount</th> <!-- <th>Budget Amount</th> -->
<th>Remarks</th> <th>Remarks</th>
<th>Action</th> <th>Action</th>
</thead> </thead>
@ -544,21 +544,21 @@ for ($i = 1; $i < 5; $i++) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-3 col-md-offset-2"> <!-- <div class="col-md-3 col-md-offset-2">
Budget Amount : Budget Amount :
</div> </div> -->
<div class="col-md-5"> <!-- <div class="col-md-5"> -->
<?php <?php
$data = array('name' => 'EditAmout', 'value' => set_value('EditAmout'), 'id' => 'EditAmout', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);'); $data = array('name' => 'EditAmout', 'value' => set_value('EditAmout'), 'id' => 'EditAmout', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data); echo form_hidden($data);
?> ?>
</div> <!-- </div> -->
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-3 col-md-offset-2">
@ -661,10 +661,10 @@ for ($i = 1; $i < 5; $i++) {
alert('Please Enter the Budget Year'); alert('Please Enter the Budget Year');
//return; //return;
} }
if (document.getElementById('AddAmout').value == '') { // if (document.getElementById('AddAmout').value == '') {
alert('Please Enter the Budget Amount'); // alert('Please Enter the Budget Amount');
// return; // // return;
} // }
if ($("#Addbudget option:selected").val() != '-1' && $('#AddYear').val() != '0' && $('#AddAmout').val() != '') { if ($("#Addbudget option:selected").val() != '-1' && $('#AddYear').val() != '0' && $('#AddAmout').val() != '') {
@ -756,10 +756,10 @@ for ($i = 1; $i < 5; $i++) {
alert('Please Enter the Budget Year'); alert('Please Enter the Budget Year');
//return; //return;
} }
if (document.getElementById('EditAmout').value == '') { // if (document.getElementById('EditAmout').value == '') {
alert('Please Enter the Budget Amount'); // alert('Please Enter the Budget Amount');
// return; // // return;
} // }
if ($('#EditAmout').val() != '' && $('#EditYear').val() != '') { if ($('#EditAmout').val() != '' && $('#EditYear').val() != '') {
@ -1006,13 +1006,12 @@ for ($i = 1; $i < 5; $i++) {
alert('Please Add Budget'); alert('Please Add Budget');
return false; return false;
} }
else */ else if ($("option:selected", $("#ApprovedBy")).val() == '-1') {
if ($("option:selected", $("#ApprovedBy")).val() == '-1') {
alert('Please Select Approver Names'); alert('Please Select Approver Names');
return false; return false;
} else { } else {
return true; return true;
} }*/
return true
} }
</script> </script>