diff --git a/application/controllers/emppaydate.php b/application/controllers/emppaydate.php index c11a782b..68ae49e2 100755 --- a/application/controllers/emppaydate.php +++ b/application/controllers/emppaydate.php @@ -83,15 +83,16 @@ class emppaydate extends BaseController { - //$this->form_validation->set_rules('Pay_Data_ID','Pay_Data_ID','trim|required'); - $this->form_validation->set_rules('EmpID','EmpID','trim|required'); + $this->load->library('form_validation'); + + $this->form_validation->set_rules('EmpID','EmpID','required'); $this->form_validation->set_rules('Basic_Pay','Basic_Pay','trim|required'); $this->form_validation->set_rules('HRA_Rate','HRA_Rate','trim|required'); $this->form_validation->set_rules('OT_Rate','OT_Rate','trim|required'); $this->form_validation->set_rules('Allowances','Allowances','trim|required'); $this->form_validation->set_rules('PF_Rate','PF_Rate','trim|required'); $this->form_validation->set_rules('ESI_Rate','ESI_Rate','trim|required'); - $this->form_validation->set_rules('Food_Allowances','Food_Allowances','trim|requried'); + $this->form_validation->set_rules('Food_Allowances','Food_Allowances','requried'); if($this->form_validation->run() == FALSE) @@ -116,7 +117,15 @@ class emppaydate extends BaseController $IsActive = '1'; + // if(EmpID == -1) + // { + // // $this->session->set_flashdata('success', 'New Asset created successfully'); + // redirect('emppaydate/addemppaydate','refresh'); + // echo ""; + // } + + //else{ //$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); //$createddt = $dt->format('Y-m-d H:i:s'); @@ -144,8 +153,8 @@ class emppaydate extends BaseController echo ""; } - } - + //} + } } /** diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index 8817c7c2..4a376800 100755 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -31,7 +31,8 @@ class payslip extends BaseController $payon = $this->input->post('payon'); $employee = $this->input->post('employee'); $result = $this->payroll_model->model_sp($payon,$employee); - return TRUE; + // $result = $this->db->last_query(); + return $result; //$this->db->call_function('model_sp'); } diff --git a/application/models/payroll_model.php b/application/models/payroll_model.php index ca594491..0ccb40b3 100755 --- a/application/models/payroll_model.php +++ b/application/models/payroll_model.php @@ -22,9 +22,10 @@ class Payroll_model extends CI_Model //echo ""; //echo "highlight_file(filename)"; //die(); - $this->db->query("call final_payroll_data('".$payon."','".$employee."')") or die(mysql_error()); - //$result->next_result() - return TRUE; + $result=$this->db->query("call P_FINAL_PAYROLL_DATA('".$payon."','".$employee."')") or die(mysql_error()); + //$result->next_result(); + + return $result; @@ -229,6 +230,7 @@ class Payroll_model extends CI_Model { $this->db->select('EmpID,FirstName,LastName'); $this->db->from('T_Employee_Details'); + $this->db->where('EmpID NOT IN (SELECT EmpID from T_Emp_Pay_Data)',NULL,FALSE); $query = $this->db->get(); return $query->result(); } diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php index 80241a6c..1da2bfb3 100755 --- a/application/views/addemppaydate.php +++ b/application/views/addemppaydate.php @@ -1,3 +1,8 @@ + + + + +
+