From 6dc0c4e6e0a05db1fa940e2386b57ada521b5af4 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 25 Oct 2017 17:42:25 +0530 Subject: [PATCH] HR login changes --- application/controllers/employeedetails.php | 46 ++++--------------- application/logs/log-2017-10-25.php | 15 ++++++ application/views/EditPurchaseOrder.php | 0 application/views/alterpurchaseorder.php | 0 application/views/editRevenueAmendPO.php | 0 .../views/editRevenuepurchaseorder.php | 0 application/views/includes/header.php | 24 +++++++--- application/views/purchaseorder.php | 0 8 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 application/logs/log-2017-10-25.php mode change 100644 => 100755 application/views/EditPurchaseOrder.php mode change 100644 => 100755 application/views/alterpurchaseorder.php mode change 100644 => 100755 application/views/editRevenueAmendPO.php mode change 100644 => 100755 application/views/editRevenuepurchaseorder.php mode change 100644 => 100755 application/views/purchaseorder.php diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 52e15ff9..e27ce458 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -35,12 +35,7 @@ class employeedetails extends BaseController */ function employeeListing() { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + $this->load->model('employeedetails_model'); @@ -50,8 +45,7 @@ class employeedetails extends BaseController $this->global['pageTitle'] = 'Siddharth : Employee Listing'; $this->loadViews("employeeListing", $this->global, $data, NULL); - } - } + } /* Validation for Gender status Dropdown */ @@ -202,12 +196,7 @@ class employeedetails extends BaseController function AddNewEmployee() { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + $this->load->library('form_validation'); $this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]'); @@ -347,7 +336,7 @@ echo "";redirect('e echo "";redirect('employeeListing','refresh'); } - } + } } @@ -378,12 +367,7 @@ echo "";redirect('employeeListing',' * This function is used to load the add new Employee form with dropdown values */ function addemployee() { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + $this->load->model('employeedetails_model'); $GenderConfigID = 'C013'; $MartialConfigID = 'C012'; @@ -400,7 +384,7 @@ echo "";redirect('employeeListing',' $data['Department'] = $this->employeedetails_model->getDepartment(); $this->global['pageTitle'] = 'Siddharth : Add New Employee'; $this->loadViews("addemployee", $this->global, $data, NULL); - } + } /** * This function is used to check whether the Employee is existing in the database or not */ @@ -518,12 +502,7 @@ echo "";redirect('employeeListing',' function ViewEmployee($EmpNO='') { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + if($EmpNO == '') { $EmpID = $_GET['EmpID']; @@ -552,7 +531,7 @@ echo "";redirect('employeeListing',' $this->loadViews("editEmployee", $this->global, $data, NULL); - } + } /* To Check the email exists in the database or not for the employee*/ function checkMailEmp() @@ -576,12 +555,7 @@ echo "";redirect('employeeListing',' /* To Update the employee details*/ function UpdateEmployee() { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + $EmpId = $this->input->post('employeeid'); $this->load->library('form_validation'); //$mail = $this->this->.post('emailid'); @@ -758,7 +732,7 @@ echo ""; redirect('employeeListin } // redirect('employeeListing'); - } + } } diff --git a/application/logs/log-2017-10-25.php b/application/logs/log-2017-10-25.php new file mode 100644 index 00000000..b2b6cc75 --- /dev/null +++ b/application/logs/log-2017-10-25.php @@ -0,0 +1,15 @@ + + +ERROR - 2017-10-25 12:02:20 --> Severity: Notice --> Undefined variable: Depcode /opt/lampp/htdocs/25oct/siddharth_application/application/views/includes/header.php 161 +ERROR - 2017-10-25 12:27:44 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 13:52:52 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 13:53:14 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 13:56:00 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 13:56:30 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 14:00:36 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 14:01:05 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 14:02:20 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 14:02:34 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 14:02:57 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 14:04:49 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 +ERROR - 2017-10-25 14:07:59 --> Severity: Notice --> Undefined variable: uano /opt/lampp/htdocs/25oct/siddharth_application/application/views/editEmployee.php 992 diff --git a/application/views/EditPurchaseOrder.php b/application/views/EditPurchaseOrder.php old mode 100644 new mode 100755 diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php old mode 100644 new mode 100755 diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php old mode 100644 new mode 100755 diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php old mode 100644 new mode 100755 diff --git a/application/views/includes/header.php b/application/views/includes/header.php index b0b760da..221a7332 100755 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -158,7 +158,7 @@ $(function() { @@ -167,11 +167,11 @@ $(function() {