From f856dc734a9fc588f96c0c3435ce1322028be103 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 10 Aug 2017 09:42:04 +0530 Subject: [PATCH] cost center issues fixed --- application/controllers/CostCenter.php | 24 ++++++++++++------- application/models/costcenter_model.php | 28 ++++++++++++++++++++++ application/views/editOldcost.php | 31 ++++++++++++++++++------- 3 files changed, 66 insertions(+), 17 deletions(-) diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php index d449fd58..43a2ed9a 100755 --- a/application/controllers/CostCenter.php +++ b/application/controllers/CostCenter.php @@ -183,14 +183,16 @@ class CostCenter extends BaseController function GetBudgetForYear() { + //$id = $this->input->post('id'); $BudYear = $_GET['BudYear']; $CostCenterID = $_GET['CostCode']; $result = $this->costcenter_model->GetCostCenterBudgetByYear($CostCenterID, $BudYear); $BudList = $this->costcenter_model->GetCostBudgetTypeByYear($CostCenterID,'C004', $BudYear); + $HTML=""; $HTML2=""; - $index = 1; + $index = 0; // $HTML2 = $BudList[0]['ConfigValue']; //if($BudList->num_rows() > 0){ for ($j = 0; $j < count($BudList); $j++) @@ -201,6 +203,7 @@ class CostCenter extends BaseController for ($i = 0; $i < count($result); $i++) { + $index = $index + 1; $BudgetType = $result[$i]['BudgetType']; $BudgetYear = $result[$i]['BudgetYear']; $BudgetAmount = $result[$i]['BudgetAmount']; @@ -221,7 +224,7 @@ class CostCenter extends BaseController     "; - $index = $index + 1; + } $HTML.=""; @@ -293,20 +296,25 @@ class CostCenter extends BaseController } $RowCount = $this->input->post('txtRowCount'); - //$BudgetType = $this->input->post('BudgetType2'); - //echo $BudgetType; + for ($i = 1; $i <= $RowCount; $i++) { $BudgetType = $this->input->post('BudgetType'.$i); $BudgetYear = $this->input->post('BudgetYear'.$i); $BudgetAmount = $this->input->post('BudgetAmount'.$i); $Remarks = $this->input->post('Remarks'.$i); - $this->costcenter_model->DeleteBudget( $BudgetType,$BudgetYear,$CostCode); + // $this->costcenter_model->DeleteBudget($BudgetType,$BudgetYear,$CostCode); $Budget = array('CostCenterCode'=>$CostCode, 'BudgetType'=>$BudgetType,'BudgetYear'=>$BudgetYear,'BudgetAmount'=>$BudgetAmount,'Remarks'=>$Remarks,'CreatedBy'=>$updatedBy,'createdDate'=>$updateddt,'UpdatedBy'=>$updatedBy,'UpdatedDate'=>$updateddt); - //print_r($Budget); - $this->costcenter_model->addBudget($Budget); - //print_r( $BudgetType ); + $ExistYearBudget = $this->costcenter_model->CheckExistBudget($BudgetType,$BudgetYear,$CostCode); + if($ExistYearBudget){ + $this->costcenter_model->updateBudget($Budget,$BudgetType,$BudgetYear,$CostCode); + } + else{ + $this->costcenter_model->addBudget($Budget); + } + + } echo('Successfully Updated Cost details'); diff --git a/application/models/costcenter_model.php b/application/models/costcenter_model.php index e54f44ab..e821965b 100755 --- a/application/models/costcenter_model.php +++ b/application/models/costcenter_model.php @@ -356,5 +356,33 @@ function addNewcost($Cost) return $this->db->get('T_CostCenter_Master as bud')->result_array(); } + //get exist budget year details + function CheckExistBudget($BudgetType,$BudgetYear,$CostCode){ + $this->db->select('CostCenterCode'); + $this->db->from('T_CostCenter_Budget'); + $this->db->where('CostCenterCode',$CostCode); + $this->db->where('BudgetType',$BudgetType); + $this->db->where('BudgetYear',$BudgetYear); + + $query = $this->db->get(); + + if ($query->num_rows > 0) { + return TRUE; + } + else{ + return FALSE; + } + } + + //update budget + function updateBudget($Budget,$BudgetType,$BudgetYear,$CostCode) + { + $this->db->where('CostCenterCode',$CostCode); + $this->db->where('BudgetType',$BudgetType); + $this->db->where('BudgetYear',$BudgetYear); + + $this->db->update('T_CostCenter_Budget', $Budget); + return TRUE; + } } ?> \ No newline at end of file diff --git a/application/views/editOldcost.php b/application/views/editOldcost.php index d47c58f6..abbff4d9 100755 --- a/application/views/editOldcost.php +++ b/application/views/editOldcost.php @@ -93,9 +93,12 @@ $(function() { //}); $('#drpBudget').change(function() { - + + + var id = $('#drpBudget').val(); var code = $('#CostCode').val(); + if(id != '-1') { $('#content').loader('show'); @@ -106,8 +109,9 @@ $(function() { type:"POST", url:"CostCenter/GetBudgetForYear?BudYear="+id+"&CostCode="+code, success:function(json) { + //alert('success'); - //alert(json); + //alert(JSON.stringify(json)); //alert(json.BudYear); $("#tempAppend").empty(); $('#tempAppend').append(json.Html); @@ -115,7 +119,9 @@ $(function() { $("#Addbudget").append(json.BudYear); //$("#Addbudget").append(json.BudYear); $('#content').loader('hide'); - //$("#Employee").append(result); + //$("#Employee").append(result); + index = $('#txtRowCount').val(); + } }); @@ -181,7 +187,7 @@ $(function() {
'CostCode','value' => set_value( 'CostCode',$CostCenterCode ),'id'=>'c', 'class' => 'form-control' ,'readonly' => 'true' ); + $data = array('name' => 'CostCode','value' => set_value( 'CostCode',$CostCenterCode ),'id'=>'CostCode', 'class' => 'form-control' ,'readonly' => 'true' ); echo form_input($data); ?>
@@ -380,7 +386,8 @@ $(function() {
- + +
@@ -439,6 +446,7 @@ $(function() { $index = 0; if(!empty($CostBudget)) { + foreach($CostBudget as $record) { $index =$index + 1; @@ -460,7 +468,7 @@ $(function() { Remarks ?> -     +     @@ -516,10 +524,13 @@ $(function() { Budget Year :
- 'EditYear', 'value' => set_value('EditYear'),'id'=>'EditYear', 'class' => 'form-control','onkeypress'=>'return isNumberKey(event);','onkeypress'=>'return false;'); + + + +
@@ -639,6 +650,7 @@ var numbers = /^[0-9]+$/; var userid = ''; $("#Edit").on("shown.bs.modal", function(e) { + userid = $(e.relatedTarget).data('userid'); $('#Editbudget').val($('#BudgetTable tr:eq('+ userid +') td:eq(0)').text()); @@ -655,6 +667,7 @@ $("#Edit").on("shown.bs.modal", function(e) { }); $('.tempClick').click(function(){ + if ($("#Addbudget option:selected").val() =='-1' ) {