From 257648616fee0115c1bc7b293c7d4be74c93d212 Mon Sep 17 00:00:00 2001 From: venbatechnologies Date: Wed, 13 Dec 2017 13:13:42 +0530 Subject: [PATCH] fixed permission issue --- application/config/routes.php | 2 +- application/controllers/monthlypay.php | 44 +- application/models/monthlypay_model.php | 21 +- application/views/permission.php | 1361 +++++++++++++++++++++-- 4 files changed, 1312 insertions(+), 116 deletions(-) diff --git a/application/config/routes.php b/application/config/routes.php index b01343ed..e7babaef 100755 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -82,7 +82,7 @@ $route['loanreports'] = 'payslip/loadLoanReport'; // permission slip// $route['permission'] = 'monthlypay/permissionslip'; -$route['permissionlist'] = 'monthlypay/addper'; +$route['permissionlist'] = 'monthlypay/permissionlist'; diff --git a/application/controllers/monthlypay.php b/application/controllers/monthlypay.php index 41fac184..15357da6 100755 --- a/application/controllers/monthlypay.php +++ b/application/controllers/monthlypay.php @@ -398,7 +398,7 @@ class monthlypay extends BaseController $data['emplists']=$this->monthlypay_model->emplist(); - $this->loadviews('permission',$this->global,$data,NULL); + $this->loadviews('permission',$this->global,$data,NULL); } /*this function used to view page value get database move it now*/ @@ -409,6 +409,8 @@ class monthlypay extends BaseController $EmpID = $this->input->post('emp'); $Date =$this->input->post('date'); + $CUR = date('Y-m-d',strtotime($Date)); + // print_r($CUR);die; $From = $this->input->post('timepicker1'); $To = $this->input->post('timepicker2'); $Shift = $this->input->post('shift'); @@ -416,17 +418,30 @@ class monthlypay extends BaseController $Reason= $this->input->post('Reason'); $Createdby = $this->session->userdata('userId'); //$Remarks = $this->input->post('Remarks'); - - $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); - $Createdtime = $dt->format('Y-m-d H:i:s'); - - $Permissiondata = array('EmpID'=>$EmpID,'Date'=>$Date,'From'=>$From,'To'=>$To,'Shift'=>$Shift,'Permission'=>$Permission,'Reason'=>$Reason,'Createby'=>$Createdby,'Createdtime'=>$Createdtime); - //print_r($Permissiondata);die; + + $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); + $Createdtime = $dt->format('Y-m-d H:i:s'); + if(!empty($EmpID)){ + $Permissiondata = array('EmpID'=>$EmpID,'Date'=>$CUR,'From'=>$From,'To'=>$To,'Shift'=>$Shift,'Permission'=>$Permission,'Reason'=>$Reason,'Createby'=>$Createdby,'Createdtime'=>$Createdtime); } + //print_r($Permissiondata);exit; $result = $this->monthlypay_model->addper($Permissiondata); + // print_r($result);die; + if(!empty($result)){ + echo ""; + + }else{ + echo ""; + //redirect('permission'); + } + + @@ -434,23 +449,23 @@ class monthlypay extends BaseController } //this function used to database value get listing page view that values// function permissionlist(){ - + $this->global['pageTitle'] = 'Siddharth : Monthly Pay Details'; $data['permissionlist']=$this->monthlypay_model->perlist(); //print_r($data);die; - $this->loadviews('permissionlist',$this->global,$data,NULL); + $this->loadviews('permissionlist',$this->global,$data,NULL); } //this function used to pdf value display // function permissionpdf($SNO){ $data['per'] = $this->monthlypay_model->pdf($SNO); - //print_r($data);die; + //print_r($data);die; $this->load->view($this->config->item('admin_folder') .'/permissionpdf',$data); - //pdf_create($php, 'Trip-Detail'); - + //pdf_create($php, 'Trip-Detail'); + $mpdf=new mPDF('utf-8','A4-P',10, 10,10, 10, 10, 38, 4, 6); @@ -466,10 +481,11 @@ class monthlypay extends BaseController $mpdf->Output("Permission".$data.'.pdf','I',$php); - + } + } ?> \ No newline at end of file diff --git a/application/models/monthlypay_model.php b/application/models/monthlypay_model.php index 69ad0f1f..0c0942cc 100755 --- a/application/models/monthlypay_model.php +++ b/application/models/monthlypay_model.php @@ -256,7 +256,7 @@ function addNewmonthlisting($m_list) } - /*permission form model */ + /*permission form model */ function emplist() { @@ -272,11 +272,19 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA function addper($Permissiondata) { - //print_r($Permissiondata);die; - $this->db->insert('T_Permission',$Permissiondata); - $reuslt = $this->db->insert_id(); - return $reuslt; - } + + //if(!empty($Permissiondata){ + $this->db->trans_start(); + $this->db->insert('T_Permission', $Permissiondata); + + //$Asset_Code = $this->db->insert_id(); + $Permission = $this->db->affected_rows(); + + $this->db->trans_complete(); + + return $Permission; + + } function perlist() { @@ -301,6 +309,7 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA + } ?> diff --git a/application/views/permission.php b/application/views/permission.php index a260037d..7ca53066 100644 --- a/application/views/permission.php +++ b/application/views/permission.php @@ -1,23 +1,1195 @@ - + - - + +
-
+

SIDDHARTH INDUSTRES

-

EMPLOYEE PERMISSION / ON DUTY SLIP

+

EMPLOYEE PERMISSION / ON DUTY SLIP

-
-
+ +
-
- -
+
+ +
'Select Employee'); //print_r( $options); @@ -36,46 +1208,46 @@ ?>
- -
- -
- -
- + +
+ +
+ 'dep','value' => set_value('dep',''),'id'=>'dep', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); ?>
-
-
- -
- +
+ +
+ 'shift','value' => set_value('shift',''),'id'=>'shift', 'class' => 'form-control','required'=>'true'); echo form_input($data); - ?> + ?>
-
+
-
- -
- + +
+ 'date','value' => set_value('date',$date),'id'=>'date', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); ?>
-
+
-
- +
+
@@ -83,38 +1255,38 @@ -
-
- +
+
+
- -
-
+ +
+
- 'Pretime','value' => set_value('Pretime',''),'id'=>'Pretime', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); ?>
- -
-
-
+ +
+
+
-
+
-
- -
+
+ +
- 'Reason','value' => set_value('Reason'),'id'=>'Reason', 'class' => 'form-control ' ,'rows' => '3', 'cols' => '40','required'=>'true'); - echo Form_textarea($data); - ?> + 'Reason','value' => set_value('Reason'),'id'=>'Reason', 'class' => 'form-control ' ,'rows' => '3', 'cols' => '40','required'=>'true'); + echo Form_textarea($data); + ?>



@@ -125,7 +1297,7 @@
-
+
@@ -134,42 +1306,42 @@
-
- - -