From 62082bd8d2d9b3557bbc8375c3df7df45f46010d Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 3 Aug 2017 12:01:36 +0530 Subject: [PATCH] employee --- application/controllers/employeedetails.php | 831 ++++++++++---------- application/controllers/supplier.php | 4 +- application/views/addemployee.php | 15 +- application/views/capitalpopdf.php | 83 +- application/views/capitalpurchaseorder.php | 99 +-- application/views/editCapitalAmendPO.php | 126 +-- application/views/editCapitalPo.php | 90 ++- application/views/editEmployee.php | 48 +- application/views/editOldRawmaterial.php | 2 +- application/views/importpopdf.php | 91 ++- application/views/revenuepopdf.php | 253 ++++-- 11 files changed, 908 insertions(+), 734 deletions(-) mode change 100755 => 100644 application/views/capitalpopdf.php mode change 100755 => 100644 application/views/capitalpurchaseorder.php mode change 100755 => 100644 application/views/editCapitalAmendPO.php mode change 100755 => 100644 application/views/editCapitalPo.php mode change 100755 => 100644 application/views/importpopdf.php mode change 100755 => 100644 application/views/revenuepopdf.php diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index ee177f99..7f877fdd 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -14,23 +14,23 @@ class employeedetails extends BaseController /** * This is default constructor of the class */ - public function __construct() + public function __construct() { parent::__construct(); $this->load->model('employeedetails_model'); $this->isLoggedIn(); } - /** + /** * This function used to load the first screen of the user */ - public function index() + public function index() { $this->global['pageTitle'] = 'Siddharth : Employee Details'; $this->loadViews("employeeListing", $this->global, NULL , NULL); } - - /** + + /** * This function is used to load the Employee details */ function employeeListing() @@ -41,7 +41,7 @@ class employeedetails extends BaseController } else { - + $this->load->model('employeedetails_model'); @@ -52,12 +52,12 @@ class employeedetails extends BaseController $this->loadViews("employeeListing", $this->global, $data, NULL); } } - /* - Validation for Gender status Dropdown - */ - function Gender_validate($selectValue) + /* + Validation for Gender status Dropdown + */ + function Gender_validate($selectValue) { - //echo 'select_validate method called'; + //echo 'select_validate method called'; // 'none' is the first option and the text says something like "-Choose one-" if($selectValue == '-1') { @@ -70,11 +70,11 @@ class employeedetails extends BaseController } } /* - Validation for Martial status Dropdown - */ - function Martial_validate($selectValue) + Validation for Martial status Dropdown + */ + function Martial_validate($selectValue) { - //echo 'select_validate method called'; + //echo 'select_validate method called'; // 'none' is the first option and the text says something like "-Choose one-" if($selectValue == '-1') { @@ -87,11 +87,11 @@ class employeedetails extends BaseController } } /* - Validation for BloodGroup Dropdown - */ - function Blood_validate($selectValue) + Validation for BloodGroup Dropdown + */ + function Blood_validate($selectValue) { - //echo 'select_validate method called'; + //echo 'select_validate method called'; // 'none' is the first option and the text says something like "-Choose one-" if($selectValue == '-1') { @@ -103,12 +103,12 @@ class employeedetails extends BaseController return true; } } - /* - Validation for Qualification Dropdown - */ - function select_validate($selectValue) + /* + Validation for Qualification Dropdown + */ + function select_validate($selectValue) { - //echo 'select_validate method called'; + //echo 'select_validate method called'; // 'none' is the first option and the text says something like "-Choose one-" if($selectValue == '-1') { @@ -121,11 +121,11 @@ class employeedetails extends BaseController } } /* - Validation for Department Dropdown - */ - function Dep_validate($selectValue) + Validation for Department Dropdown + */ + function Dep_validate($selectValue) { - //echo 'select_validate method called'; + //echo 'select_validate method called'; // 'none' is the first option and the text says something like "-Choose one-" if($selectValue == '-1') { @@ -138,11 +138,11 @@ class employeedetails extends BaseController } } /* - Validation for Desigination Dropdown - */ - function Des_validate($selectValue) + Validation for Desigination Dropdown + */ + function Des_validate($selectValue) { - //echo 'select_validate method called'; + //echo 'select_validate method called'; // 'none' is the first option and the text says something like "-Choose one-" if($selectValue == '-1') { @@ -156,7 +156,7 @@ class employeedetails extends BaseController } - /* To Check the Pan Number is exists in the database or not */ + /* To Check the Pan Number is exists in the database or not */ function Pan_validate() { // alert('validation pan'); @@ -181,9 +181,9 @@ class employeedetails extends BaseController { alert('validation aadhar validation'); $AadharNo = $this->input->post('aadharno'); - $this->load->model('employeedetails_model'); - $query = $this->employeedetails_model->checkAadharExists($AadharNo); - + $this->load->model('employeedetails_model'); + $query = $this->employeedetails_model->checkAadharExists($AadharNo); + if (count($query)> 0) { $this->form_validation->set_message('checkAadharValidate', 'The Entered Aadhar Number is already exists in the Database.'); @@ -196,148 +196,148 @@ class employeedetails extends BaseController } - /** + /** * This function is used to save the new Employee form in the database - */ - - function AddNewEmployee() + */ + + function AddNewEmployee() { - if($this->isAdmin() == TRUE) + if($this->isAdmin() == TRUE) { $this->loadThis(); } - else - { - $this->load->library('form_validation'); + else + { + $this->load->library('form_validation'); - $this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]'); - $this->form_validation->set_rules('emailid', 'emailid', 'trim|required|valid_email'); - $this->form_validation->set_rules('comemailid', 'emailid', 'trim|required|valid_email'); - $this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate'); - $this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate'); - $this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate'); - $this->form_validation->set_rules('emergencycontactnumber', 'emergencycontactnumber', 'trim|required|min_length[10]|max_length[10]'); - $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate'); - $this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate'); - $this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate'); - $this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]'); + $this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]'); + $this->form_validation->set_rules('emailid', 'emailid', 'trim|valid_email'); + $this->form_validation->set_rules('comemailid', 'emailid', 'trim|valid_email'); + $this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate'); + $this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate'); + $this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate'); + $this->form_validation->set_rules('emergencycontactnumber', 'emergencycontactnumber', 'trim|required|min_length[10]|max_length[10]'); + $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate'); + $this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate'); + $this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate'); + $this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]'); $this->form_validation->set_rules('aadharno', 'aadharno', 'trim|min_length[12]|max_length[12]'); - $this->form_validation->set_rules('panno', 'panno', 'trim|min_length[10]|max_length[10]'); - $this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]'); - $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]'); - - - if($this->form_validation->run() == FALSE) + $this->form_validation->set_rules('panno', 'panno', 'trim|min_length[10]|max_length[10]'); + $this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]'); + $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]'); + + + if($this->form_validation->run() == FALSE) { $this->addemployee(); - //echo 'Validate method called'; + //echo 'Validate method called'; } else { - //echo 'Validate not method called'; - $Picture = $this->add(); - - $FirstName = $this->input->post('FirstName'); + //echo 'Validate not method called'; + $Picture = $this->add(); + + $FirstName = $this->input->post('FirstName'); $LastName = $this->input->post('LastName'); - $FatherName = $this->input->post('FatherName'); + $FatherName = $this->input->post('FatherName'); $DateofBirth = $this->input->post('DateofBirth'); $ContactNumber = $this->input->post('ContactNumber'); $EmailId = $this->input->post('emailid'); $comEmailId = $this->input->post('comemailid'); - $Gender = $this->input->post('gender'); - $MartialStatus = $this->input->post('MartialStatus'); + $Gender = $this->input->post('gender'); + $MartialStatus = $this->input->post('MartialStatus'); - $BloodGroup = $this->input->post('bloodgroup'); - $CurrentAddress = $this->input->post('currentaddress'); - $permanentaddress = $this->input->post('permanentaddress'); - $emergencycontactname = $this->input->post('emergencycontactname'); - $emergencycontactnumber = $this->input->post('emergencycontactnumber'); - $desigination = $this->input->post('desigination'); - $departmentCode = $this->input->post('departmentname'); - $dateofjoining = $this->input->post('dateofjoining'); - $pre_experience = $this->input->post('Previousexperience'); - - if($pre_experience == '') - { - $Previousexperience = null; - } - else - { - $Previousexperience = $pre_experience; - } + $BloodGroup = $this->input->post('bloodgroup'); + $CurrentAddress = $this->input->post('currentaddress'); + $permanentaddress = $this->input->post('permanentaddress'); + $emergencycontactname = $this->input->post('emergencycontactname'); + $emergencycontactnumber = $this->input->post('emergencycontactnumber'); + $desigination = $this->input->post('desigination'); + $departmentCode = $this->input->post('departmentname'); + $dateofjoining = $this->input->post('dateofjoining'); + $pre_experience = $this->input->post('Previousexperience'); + + if($pre_experience == '') + { + $Previousexperience = null; + } + else + { + $Previousexperience = $pre_experience; + } - $eduqualifaction = $this->input->post('eduqualifaction'); + $eduqualifaction = $this->input->post('eduqualifaction'); $addqualification = $this->input->post('addqualification'); - $referredby = $this->input->post('referredby'); - $referrercontno = $this->input->post('referrercontno'); - $accountno = $this->input->post('accountno'); - $ifsccode = $this->input->post('ifsccode'); - $bankbranchname = $this->input->post('bankbranchname'); - $bankaddress = $this->input->post('bankaddress'); - $aadharno = $this->input->post('aadharno'); - $panno =strtoupper($this->input->post('panno')); - $passportno = $this->input->post('passportno'); - $ValidTill = $this->input->post('ValidTill'); - $addinfo = $this->input->post('addinfo'); + $referredby = $this->input->post('referredby'); + $referrercontno = $this->input->post('referrercontno'); + $accountno = $this->input->post('accountno'); + $ifsccode = $this->input->post('ifsccode'); + $bankbranchname = $this->input->post('bankbranchname'); + $bankaddress = $this->input->post('bankaddress'); + $aadharno = $this->input->post('aadharno'); + $panno =strtoupper($this->input->post('panno')); + $passportno = $this->input->post('passportno'); + $ValidTill = $this->input->post('ValidTill'); + $addinfo = $this->input->post('addinfo'); $IsActive = '1'; - $driverlicense = $this->input->post ( 'driverlicense' ); - $licenseExpiryDate = $this->input->post ( 'licenseExpiryDate' ); - $VoterID = $this->input->post ( 'voterID' ); - $createdby = $this->session->userdata ( 'userId' ); - - if($licenseExpiryDate != '') - { - $License_ExpiryDate = $this->getDateformat($licenseExpiryDate); - } - else - { - $License_ExpiryDate = null; - } - - $DOB = $this->getDateformat($DateofBirth); - $DOJ = $this->getDateformat($dateofjoining); - if($ValidTill != '') - { - $Valid = $this->getDateformat($ValidTill); - } - else - { - $Valid = null; - } - - //echo $DOB; + $driverlicense = $this->input->post ( 'driverlicense' ); + $licenseExpiryDate = $this->input->post ( 'licenseExpiryDate' ); + $VoterID = $this->input->post ( 'voterID' ); + $createdby = $this->session->userdata ( 'userId' ); + + if($licenseExpiryDate != '') + { + $License_ExpiryDate = $this->getDateformat($licenseExpiryDate); + } + else + { + $License_ExpiryDate = null; + } + + $DOB = $this->getDateformat($DateofBirth); + $DOJ = $this->getDateformat($dateofjoining); + if($ValidTill != '') + { + $Valid = $this->getDateformat($ValidTill); + } + else + { + $Valid = null; + } + + //echo $DOB; $Employee = array('FirstName'=>$FirstName, 'LastName'=>$LastName,'FatherName'=>$FatherName,'Gender'=>$Gender,'DateofBirth'=>$DOB,'ContactNumber'=>$ContactNumber,'EmailId'=>$EmailId,'BloodGroup'=>$BloodGroup,'MartialStatus'=>$MartialStatus,'DateofJoining'=>$DOJ,'PreviousYearsOfExp'=>$Previousexperience,'Designation'=>$desigination,'Departmentcode'=>$departmentCode,'PresentAddress'=>$CurrentAddress,'PermanentAddress'=>$permanentaddress,'EmergencyContactName'=>$emergencycontactname,'EmergencyContactNumber'=>$emergencycontactnumber,'Edu_Qualification'=>$eduqualifaction,'Additional_Qualification'=>$addqualification,'AadharNo'=>$aadharno,'PANNo'=>$panno,'BankAccountNo'=>$accountno,'IFSCCode'=>$ifsccode,'BankBranchName'=>$bankbranchname,'BankAddress'=>$bankaddress,'PassportNo'=>$passportno,'Passport_Valid_till'=>$Valid,'IsActive'=>$IsActive,'ProfilePic'=>$Picture,'Reference_Name'=>$referredby,'Reference_ContactNumber'=>$referrercontno,'Remarks'=>$addinfo,'CreatedBy'=>$createdby,'personalEmailId'=>$comEmailId,'DriverLicense'=>$driverlicense,'LicenseValidtill'=>$License_ExpiryDate,'VoterID'=>$VoterID); //print_r($Employee);die(); - $this->load->model('employeedetails_model'); + $this->load->model('employeedetails_model'); $result = $this->employeedetails_model->addNewemployee($Employee); if($result > 0) { - + // $this->session->set_flashdata('Success', 'New Employee created successfully!'); - redirect('employeeListing','refresh'); + redirect('employeeListing','refresh'); echo ""; } else { - + $this->session->set_flashdata('Error', 'New Employee details not saved'); - redirect('employeeListing','refresh'); + redirect('employeeListing','refresh'); echo ""; } - } - } - } - - function getDateformat($Val) - { - $date = new DateTime($Val); - $retDate = $date->format('Y-m-d H:i:s'); - return $retDate; - } - - /** + } + } + } + + function getDateformat($Val) + { + $date = new DateTime($Val); + $retDate = $date->format('Y-m-d H:i:s'); + return $retDate; + } + + /** * This function is used to load the add new Employee form with dropdown values */ function addemployee() { @@ -349,37 +349,39 @@ echo ""; { $this->load->model('employeedetails_model'); $GenderConfigID = 'C013'; - $MartialConfigID = 'C012'; - $QualificationConfigID = 'C014'; - $DesignationConfigID = 'C010'; - $BloodGroupConfigID = 'C011'; - - $data['Gender'] = $this->employeedetails_model->getConfigValue($GenderConfigID); - $data['Martial'] = $this->employeedetails_model->getConfigValue($MartialConfigID); - $data['Qualification'] = $this->employeedetails_model->getConfigValue($QualificationConfigID); - $data['Designation'] = $this->employeedetails_model->getConfigValue($DesignationConfigID); - $data['BloodGroup'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); + $MartialConfigID = 'C012'; + $QualificationConfigID = 'C014'; + $DesignationConfigID = 'C010'; + $BloodGroupConfigID = 'C011'; + + $data['Gender'] = $this->employeedetails_model->getConfigValue($GenderConfigID); + $data['Martial'] = $this->employeedetails_model->getConfigValue($MartialConfigID); + $data['Qualification'] = $this->employeedetails_model->getConfigValue($QualificationConfigID); + $data['Designation'] = $this->employeedetails_model->getConfigValue($DesignationConfigID); + $data['BloodGroup'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); $data['Department'] = $this->employeedetails_model->getDepartment(); - $this->global['pageTitle'] = 'Siddharth : Add New Employee'; + $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 */ function CheckEmail() - { - $id = $this->input->post('id'); - $this->load->model('employeedetails_model'); - $query = $this->employeedetails_model->checkMailExists($id ); - $query = $query[0]['EmailId']; - print_r($query); - - } - function checkPAN() + { + $id = $this->input->post('id'); + //print_r($id); + $this->load->model('employeedetails_model'); + $query = $this->employeedetails_model->checkMailExists($id ); + $query = $query[0]['EmailId']; + print_r($query); + + } + function checkPAN() { - + $id = $this->input->post('id'); + //print_r($id); $this->load->model('employeedetails_model'); $query = $this->employeedetails_model->checkPANExists($id ); $query = $query[0]['PANNo']; @@ -391,16 +393,18 @@ echo ""; { $id = $this->input->post('id'); + //print_r($id); $this->load->model('employeedetails_model'); $query = $this->employeedetails_model->checkAadharExists($id ); $query = $query[0]['AadharNo']; print_r($query); } - + /* To Check the Pan Number is exists in the database or not for the selected Supplier */ function Pan_validate_emp() { + //print_r($PanNo); $Empid = $this->input->post('employeeid'); $PanNo = $this->input->post('panno'); @@ -419,38 +423,38 @@ echo ""; // To Check the Aadhar Number is exists in the database or not for the selected Employee function Aadhar_validate_emp() { - $Empid = $this->input->post('employeeid'); - $AadharNo = $this->input->post('aadharno'); - $this->load->model('employeedetails_model'); - $query = $this->employeedetails_model->checkAadharExists($AadharNo,$Empid); - if (count($query)> 0) - { - $this->form_validation->set_message('Aadhar_validate_emp', 'The Entered Aadhar Number is exists in the Database.'); - return false; - } - else - { - return true; - } + $Empid = $this->input->post('employeeid'); + $AadharNo = $this->input->post('aadharno'); + $this->load->model('employeedetails_model'); + $query = $this->employeedetails_model->checkAadharExists($AadharNo,$Empid); + if (count($query)> 0) + { + $this->form_validation->set_message('Aadhar_validate_emp', 'The Entered Aadhar Number is exists in the Database.'); + return false; + } + else + { + return true; + } } - + - + function pageNotFound() { $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } - - function add(){ - - + + function add(){ + + $picture = ''; //Check whether user upload picture if(!empty($_FILES['photo']['name'])) - { - + { + $config['upload_path'] = 'uploads/images/'; $config['allowed_types'] = 'jpg|jpeg|png|gif'; $config['file_name'] = $_FILES['photo']['name']; @@ -460,246 +464,247 @@ echo ""; $this->upload->initialize($config); if($this->upload->do_upload('photo')) - { + { $uploadData = $this->upload->data(); $picture = $uploadData['file_name']; } - else - { - $error = array('error' => $this->upload->display_errors()); - $picture = ''; + else + { + $error = array('error' => $this->upload->display_errors()); + $picture = ''; } } - else - { + else + { $picture = ''; } return $picture ; } - - function ViewEmployee($EmpNO='') - { - if($this->isAdmin() == TRUE) + + function ViewEmployee($EmpNO='') + { + if($this->isAdmin() == TRUE) { $this->loadThis(); } else { - if($EmpNO == '') - { - $EmpID = $_GET['EmpID']; - } - else - { - - $EmpID = $EmpNO; } - - $GenderConfigID = 'C013'; - $MartialConfigID = 'C012'; - $QualificationConfigID = 'C014'; - $DesignationConfigID = 'C010'; - $BloodGroupConfigID = 'C011'; - $this->load->model('employeedetails_model'); - //print_r('hai'); - $data['GenderList'] = $this->employeedetails_model->getConfigValue($GenderConfigID); - $data['MartialList'] = $this->employeedetails_model->getConfigValue($MartialConfigID); - $data['QualificationList'] = $this->employeedetails_model->getConfigValue($QualificationConfigID); - $data['DesignationList'] = $this->employeedetails_model->getConfigValue($DesignationConfigID); - $data['BloodGroupList'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); + if($EmpNO == '') + { + $EmpID = $_GET['EmpID']; + } + else + { + + $EmpID = $EmpNO; } + + $GenderConfigID = 'C013'; + $MartialConfigID = 'C012'; + $QualificationConfigID = 'C014'; + $DesignationConfigID = 'C010'; + $BloodGroupConfigID = 'C011'; + $this->load->model('employeedetails_model'); + //print_r('hai'); + $data['GenderList'] = $this->employeedetails_model->getConfigValue($GenderConfigID); + $data['MartialList'] = $this->employeedetails_model->getConfigValue($MartialConfigID); + $data['QualificationList'] = $this->employeedetails_model->getConfigValue($QualificationConfigID); + $data['DesignationList'] = $this->employeedetails_model->getConfigValue($DesignationConfigID); + $data['BloodGroupList'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); $data['DepartmentList'] = $this->employeedetails_model->getDepartment(); - $data['EmpDetails'] = $this->employeedetails_model->viewemployee($EmpID); - $this->global['pageTitle'] = 'Siddharth : View Employee'; - - $this->loadViews("editEmployee", $this->global, $data, NULL); - - } - } - /* To Check the email exists in the database or not for the employee*/ - function checkMailEmp() - { - $Empid = $this->input->post('employeeid'); - $EmailId = $this->input->post('emailid'); - - - $query = $this->employeedetails_model->checkMailExists($EmailId, $Empid); - if (count($query)> 0) - { - $this->form_validation->set_message('checkMailEmp', 'The Entered Email id is exists in the Database.'); - return false; - } - else - { - return true; - } - } - /* To Update the employee details*/ - function UpdateEmployee() + $data['EmpDetails'] = $this->employeedetails_model->viewemployee($EmpID); + $this->global['pageTitle'] = 'Siddharth : View Employee'; + + $this->loadViews("editEmployee", $this->global, $data, NULL); + + } + } + /* To Check the email exists in the database or not for the employee*/ + function checkMailEmp() + { + + $Empid = $this->input->post('employeeid'); + $EmailId = $this->input->post('emailid'); + + $query = $this->employeedetails_model->checkMailExists($EmailId, $Empid); + if (count($query)> 0) + { + $this->form_validation->set_message('checkMailEmp', 'The Entered Email id is exists in the Database.'); + return false; + } + else + { + return true; + } + } + + /* To Update the employee details*/ + function UpdateEmployee() { - if($this->isAdmin() == TRUE) + if($this->isAdmin() == TRUE) { $this->loadThis(); } - else - { - $EmpId = $this->input->post('employeeid'); - $this->load->library('form_validation'); + else + { + $EmpId = $this->input->post('employeeid'); + $this->load->library('form_validation'); - $this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]'); - $this->form_validation->set_rules('emailid', 'emailid', 'trim|required|valid_email|callback_checkMailEmp'); - $this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate'); - $this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate'); - $this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate'); - $this->form_validation->set_rules('emergencycontactnumber', 'emergencycontactnumber', 'trim|required|min_length[10]|max_length[10]'); - $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate'); - $this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate'); - $this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate'); - $this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]'); - $this->form_validation->set_rules('aadharno', 'aadharno', 'trim|max_length[12]|callback_Aadhar_validate_emp'); - $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_Pan_validate_emp'); + $this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]'); + $this->form_validation->set_rules('emailid', 'emailid', 'trim'); + $this->form_validation->set_rules('gender', 'gender', 'callback_Gender_validate'); + $this->form_validation->set_rules('MartialStatus', 'MartialStatus', 'callback_Martial_validate'); + $this->form_validation->set_rules('bloodgroup', 'bloodgroup', 'callback_Blood_validate'); + $this->form_validation->set_rules('emergencycontactnumber', 'emergencycontactnumber', 'trim|required|min_length[10]|max_length[10]'); + $this->form_validation->set_rules('desigination', 'Desigination', 'callback_Des_validate'); + $this->form_validation->set_rules('departmentname', 'departmentname', 'callback_Dep_validate'); + $this->form_validation->set_rules('eduqualifaction', 'eduqualifaction', 'callback_select_validate'); + $this->form_validation->set_rules('referrercontno', 'referrercontno', 'trim|min_length[10]|max_length[10]'); + $this->form_validation->set_rules('aadharno', 'aadharno ','trim|max_length[12]'); + $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]'); $this->form_validation->set_rules('passportno', 'passportno', 'trim|min_length[8]|max_length[8]'); - $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]'); - - if($this->form_validation->run() == FALSE) + $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]'); + + if($this->form_validation->run() == FALSE) { $this->ViewEmployee($EmpId); - + } else { - - $this->load->model('employeedetails_model'); - $EmpId = $this->input->post('employeeid'); - $PictureName = $this->input->post('Image'); - - if ($PictureName != '') - { - //echo 'Exists'; - $Picture = $PictureName; - } - else - { - //echo 'Not Exists'; - $Picture = $this->add(); - } - //echo $Picture; - - $FirstName = $this->input->post('FirstName'); + + $this->load->model('employeedetails_model'); + $EmpId = $this->input->post('employeeid'); + $PictureName = $this->input->post('Image'); + + if ($PictureName != '') + { + //echo 'Exists'; + $Picture = $PictureName; + } + else + { + //echo 'Not Exists'; + $Picture = $this->add(); + } + //echo $Picture; + + $FirstName = $this->input->post('FirstName'); $LastName = $this->input->post('LastName'); - $FatherName = $this->input->post('FatherName'); + $FatherName = $this->input->post('FatherName'); $DateofBirth = $this->input->post('DateofBirth'); $ContactNumber = $this->input->post('ContactNumber'); $EmailId = $this->input->post('emailid'); $comEmailId = $this->input->post('comemailid'); - $Gender = $this->input->post('gender'); - $MartialStatus = $this->input->post('MartialStatus'); - $BloodGroup = $this->input->post('bloodgroup'); - $CurrentAddress = $this->input->post('currentaddress'); - $permanentaddress = $this->input->post('permanentaddress'); - $emergencycontactname = $this->input->post('emergencycontactname'); - $emergencycontactnumber = $this->input->post('emergencycontactnumber'); - $desigination = $this->input->post('desigination'); - $departmentCode = $this->input->post('departmentname'); - $dateofjoining = $this->input->post('dateofjoining'); - //$Previousexperience = $this->input->post('Previousexperience'); - $pre_experience = $this->input->post('Previousexperience'); - - if($pre_experience == '') - { - $Previousexperience = null; - } - else - { - $Previousexperience = $pre_experience; - } - $eduqualifaction = $this->input->post('eduqualifaction'); + $Gender = $this->input->post('gender'); + $MartialStatus = $this->input->post('MartialStatus'); + $BloodGroup = $this->input->post('bloodgroup'); + $CurrentAddress = $this->input->post('currentaddress'); + $permanentaddress = $this->input->post('permanentaddress'); + $emergencycontactname = $this->input->post('emergencycontactname'); + $emergencycontactnumber = $this->input->post('emergencycontactnumber'); + $desigination = $this->input->post('desigination'); + $departmentCode = $this->input->post('departmentname'); + $dateofjoining = $this->input->post('dateofjoining'); + //$Previousexperience = $this->input->post('Previousexperience'); + $pre_experience = $this->input->post('Previousexperience'); + + if($pre_experience == '') + { + $Previousexperience = null; + } + else + { + $Previousexperience = $pre_experience; + } + $eduqualifaction = $this->input->post('eduqualifaction'); $addqualification = $this->input->post('addqualification'); - $referredby = $this->input->post('referredby'); - $referrercontno = $this->input->post('referrercontno'); - $accountno = $this->input->post('accountno'); - $ifsccode = $this->input->post('ifsccode'); - $bankbranchname = $this->input->post('bankbranchname'); - $bankaddress = $this->input->post('bankaddress'); - $aadharno = $this->input->post('aadharno'); - $panno = strtoupper($this->input->post('panno')); - $passportno = $this->input->post('passportno'); - $ValidTill = $this->input->post('ValidTill'); - $addinfo = $this->input->post('addinfo'); + $referredby = $this->input->post('referredby'); + $referrercontno = $this->input->post('referrercontno'); + $accountno = $this->input->post('accountno'); + $ifsccode = $this->input->post('ifsccode'); + $bankbranchname = $this->input->post('bankbranchname'); + $bankaddress = $this->input->post('bankaddress'); + $aadharno = $this->input->post('aadharno'); + $panno = strtoupper($this->input->post('panno')); + $passportno = $this->input->post('passportno'); + $ValidTill = $this->input->post('ValidTill'); + $addinfo = $this->input->post('addinfo'); $driverlicense = $this->input->post ( 'Driverlicense' ); - $licenseExpiryDate = $this->input->post ( 'LicenseExpiryDate' ); - $VoterID = $this->input->post ( 'VoterID' ); + $licenseExpiryDate = $this->input->post ( 'LicenseExpiryDate' ); + $VoterID = $this->input->post ( 'VoterID' ); $chked = $this->input->post('isactive'); - // echo 'chkvalue'. $chked ; - if( $chked != '') - { - $IsActive = '1'; - } - else - { - $IsActive = '0'; - } - // echo 'chkvalue'. $IsActive ; - $UpdatedBY = $this->session->userdata ( 'userId' ); - - //$licenseExpiryDate = $this->getDateformat($licenseExpiryDate); - $DOB = $this->getDateformat($DateofBirth); - $DOJ = $this->getDateformat($dateofjoining); - if($ValidTill != '') - { - $Valid = $this->getDateformat($ValidTill); - } - else - { - $Valid = null; - } + // echo 'chkvalue'. $chked ; + if( $chked != '') + { + $IsActive = '1'; + } + else + { + $IsActive = '0'; + } + // echo 'chkvalue'. $IsActive ; + $UpdatedBY = $this->session->userdata ( 'userId' ); + + //$licenseExpiryDate = $this->getDateformat($licenseExpiryDate); + $DOB = $this->getDateformat($DateofBirth); + $DOJ = $this->getDateformat($dateofjoining); + if($ValidTill != '') + { + $Valid = $this->getDateformat($ValidTill); + } + else + { + $Valid = null; + } - if($licenseExpiryDate != '') - { - $License_ExpiryDate = $this->getDateformat($licenseExpiryDate); - } - else - { - $License_ExpiryDate = null; - } - - //echo $DOB; + if($licenseExpiryDate != '') + { + $License_ExpiryDate = $this->getDateformat($licenseExpiryDate); + } + else + { + $License_ExpiryDate = null; + } + + //echo $DOB; $Employee = array('FirstName'=>$FirstName, 'LastName'=>$LastName,'FatherName'=>$FatherName,'Gender'=>$Gender,'DateofBirth'=>$DOB,'ContactNumber'=>$ContactNumber,'EmailId'=>$EmailId,'BloodGroup'=>$BloodGroup,'MartialStatus'=>$MartialStatus,'DateofJoining'=>$DOJ,'PreviousYearsOfExp'=>$Previousexperience,'Designation'=>$desigination,'Departmentcode'=>$departmentCode,'PresentAddress'=>$CurrentAddress,'PermanentAddress'=>$permanentaddress,'EmergencyContactName'=>$emergencycontactname,'EmergencyContactNumber'=>$emergencycontactnumber,'Edu_Qualification'=>$eduqualifaction,'Additional_Qualification'=>$addqualification,'AadharNo'=>$aadharno,'PANNo'=>$panno,'BankAccountNo'=>$accountno,'IFSCCode'=>$ifsccode,'BankBranchName'=>$bankbranchname,'BankAddress'=>$bankaddress,'PassportNo'=>$passportno,'Passport_Valid_till'=>$Valid,'IsActive'=>$IsActive,'ProfilePic'=>$Picture,'Reference_Name'=>$referredby,'Reference_ContactNumber'=>$referrercontno,'Remarks'=>$addinfo,'UpdatedBY'=>$UpdatedBY,'personalEmailId'=>$comEmailId,'DriverLicense'=>$driverlicense,'LicenseValidtill'=>$License_ExpiryDate,'VoterID'=>$VoterID); - //print_r($Employee);die(); + //print_r($Employee);die(); $result = $this->employeedetails_model->UpdateEmployee($Employee,$EmpId); if($result > 0) { - + // $this->session->set_flashdata('Success', $EmpId.'Employee Updated successfully!'); - redirect('employeeListing','refresh'); + redirect('employeeListing','refresh'); echo ""; } else { - + $this->session->set_flashdata('Error', $EmpId.'Employee details not saved'); - redirect('employeeListing','refresh'); + redirect('employeeListing','refresh'); echo ""; } // redirect('employeeListing'); - } - } - } + } + } + } - /** this function can be use for excel report **/ - - function export_employee(){ - - - $this->load->library('excel'); + /** this function can be use for excel report **/ + + function export_employee(){ + + + $this->load->library('excel'); $this->excel->setActiveSheetIndex(0)->mergeCells('L3:S3'); - $this->excel->getActiveSheet()->setTitle('Employee details'); + $this->excel->getActiveSheet()->setTitle('Employee details'); - $this->excel->getActiveSheet()->setCellValue('L3', 'SIDDHARTH INDUSTRIES Employee Details'); + $this->excel->getActiveSheet()->setCellValue('L3', 'SIDDHARTH INDUSTRIES Employee Details'); $this->excel->getActiveSheet()->setCellValue('A5', 'EmpID'); $this->excel->getActiveSheet()->setCellValue('B5', 'FirstName-LastName'); $this->excel->getActiveSheet()->setCellValue('c5', 'FatherName'); @@ -758,86 +763,86 @@ echo ""; $this->excel->getActiveSheet()->getStyle('A5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('B5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('B5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('C5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('D5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('D5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('D5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('E5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('E5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('E5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('F5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('F5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('F5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('G5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('G5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('G5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('H5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('H5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('H5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('I5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('I5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('J5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('J5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('J5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('K5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('K5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('K5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('L5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('L5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('L5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('M5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('M5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('M5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('N5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('N5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('N5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('O5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('O5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('O5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setSize(12); - $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('R5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('R5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('R5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('S5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('S5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('S5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('T5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('T5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('T5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('U5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('U5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('U5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('V5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('V5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('V5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('W5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('W5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('X5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('Y5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('Y5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('Y5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('Z5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('Z5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('Z5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AA5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AA5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AA5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AB5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AB5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AB5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AC5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AC5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AC5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AD5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AD5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AD5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AE5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AE5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AE5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AF5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AF5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AF5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AG5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AG5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AG5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AH5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AH5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AH5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AI5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AI5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AI5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AJ5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AJ5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AJ5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AK5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AK5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AK5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AL5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AL5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AL5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AM5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AM5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AM5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AN5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AN5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AN5')->getFont()->setBold(true); - $this->excel->getActiveSheet()->getStyle('AO5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('AO5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('AO5')->getFont()->setBold(true); - - + + $exportData = $this->employeedetails_model->export_excel(); @@ -845,10 +850,10 @@ echo ""; if ($exportData) { $i = 6; $s = 1; - + foreach ($exportData as $data) { - - + + $this->excel->getActiveSheet()->setCellValue('A'. $i,$data['EmpID']); $this->excel->getActiveSheet()->setCellValue('B'. $i,$data['FirstName'].'-'.$data['LastName']); $this->excel->getActiveSheet()->setCellValue('C'. $i,$data['FatherName']); @@ -910,7 +915,7 @@ echo ""; } - + } ?> \ No newline at end of file diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index 94399b9b..ec94df7b 100755 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -179,7 +179,7 @@ class supplier extends BaseController $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required'); $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); - $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidate'); + $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]');//|callback_checkPanValidate'); $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate'); if($this->form_validation->run() == FALSE) @@ -273,7 +273,7 @@ class supplier extends BaseController $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required'); $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); - $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidateSupplier'); + $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]|callback_checkPanValidateSupplier'); $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier'); diff --git a/application/views/addemployee.php b/application/views/addemployee.php index d7fb3203..1e139720 100755 --- a/application/views/addemployee.php +++ b/application/views/addemployee.php @@ -425,13 +425,14 @@ function onlyAlphabets(evt) {
Age
-
Contact Number* - +
Contact Number* +
+
-
Personal Email ID* - +
Personal Email ID +
Gender* @@ -452,8 +453,8 @@ function onlyAlphabets(evt) {
-
Official Email ID* - +
Official Email ID +
@@ -532,7 +533,7 @@ function onlyAlphabets(evt) {
Emergency Contact Number* - +
diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php old mode 100755 new mode 100644 index a12a371c..d5f0cc86 --- a/application/views/capitalpopdf.php +++ b/application/views/capitalpopdf.php @@ -99,7 +99,7 @@ ?>
-
PURCHASE ORDER - PO NO:
+
PURCHASE ORDER - PO NO:/C
@@ -124,14 +124,14 @@ - - + + - + - - + + @@ -144,8 +144,9 @@
PO DATE :DISPATCH / SCHEDULE BY :PO DATE :  DISPATCH / SCHEDULE BY :   PLACE OF ORIGIN:EXCHANGE RATE:
PO DATE :DELIVERY DATE/ SCHEDULE BY :PO DATE :  DELIVERY DATE/ SCHEDULE BY :  
- + + @@ -160,6 +161,7 @@ ?> + @@ -173,14 +175,15 @@
Requistion NumberRequistion Date Requested By Requested Department Cost Center  
01/08/2017

 

- +
- + + - @@ -230,6 +233,7 @@ + @@ -252,7 +256,13 @@
# Item Code Item NameHSN Code QtyUOM

+
UOM Rate Per Unit in MaterialCode ; ?> MaterialName ; ?>000666 Quantity ; ?> UOM ; ?> Rate),2, '.', '') ; ?>
-

 

+

 

+ +

Payment Terms: 

+ +

Special Instruction:

+

+ @@ -264,24 +274,7 @@ - - - -
-

Payment Terms

-

-
-

Certified that the particulars given above are true and correct

-

-

 

-

Authorized Signatory

-
-

 

- -

Special Instruction:

-

-

 

- - +

 

Released By : FirstName;?>
Released On : format('d-m-Y');?>
@@ -317,5 +299,22 @@ ?> - + + + + + +

Certified that the particulars given above are true and correct

+

+

 

+

Authorized Signatory

+ + + + +

 

+ + +

 

+ \ No newline at end of file diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php old mode 100755 new mode 100644 index 32a35de8..545ca529 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -70,6 +70,9 @@ if(!empty($INRSYMBOL)) #DomesticNOT { margin-top:200px; z-index: 1080 !important; +} +.num { + text-align:right; } @@ -85,6 +88,8 @@ if(!empty($INRSYMBOL)) toolbar: false }); $(document).ready(function(){ +$("#PaymentMethod").select2(); + clearTotalItemValues(); $('#CapitalToatlOrder').val(0); //Initialize Select2 Elements @@ -356,7 +361,7 @@ function vaildateBeforeOpenModal()
- + 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); @@ -400,7 +405,7 @@ function vaildateBeforeOpenModal()
'Exchangerateon','value' => set_value('Exchangerateon',$CurrentDate),'id'=>'Exchangerateon', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + $data = array('name' => 'Exchangerateon','value' => set_value('Exchangerateon',$CurrentDate),'id'=>'Exchangerateon', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;'); echo form_input($data); ?>
@@ -409,7 +414,7 @@ function vaildateBeforeOpenModal()
'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);'); + $data = array('name' => 'ExchangeRt','value' => set_value('ExchangeRt'),'id'=>'ExchangeRt', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);'); echo form_input($data); ?>
@@ -442,7 +447,7 @@ function vaildateBeforeOpenModal() Payment Details
- Payable Terms + @@ -460,7 +465,7 @@ function vaildateBeforeOpenModal() endforeach; } - echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"'); + echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control select2"'); ?> @@ -521,9 +526,9 @@ function vaildateBeforeOpenModal()