diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 9232a819..d0efb6f2 100755 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -253,14 +253,15 @@ class assetdetails extends BaseController if($result > 0) { // $this->session->set_flashdata('success', 'New Asset created successfully'); - - redirect('assetListing','refresh'); echo ""; + redirect('assetListing','refresh'); + } else { + echo ""; redirect('assetListing','refresh'); - echo ""; + } } @@ -385,14 +386,14 @@ class assetdetails extends BaseController $result = $this->assetdetails_model->editasset($asset, $Asset_Code); if($result == true) - { + {echo ""; redirect('assetListing','refresh'); - echo ""; + } else - { + {echo ""; redirect('assetListing','refresh'); - echo ""; + } } diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index e3798594..b9351a71 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -211,9 +211,8 @@ class employeedetails extends BaseController $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|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('emailid', '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]'); @@ -221,9 +220,9 @@ class employeedetails extends BaseController $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('aadharno', 'aadharno', 'trim|min_length[14]|max_length[14]'); $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('passportno', 'passportno', 'trim|min_length[9]|max_length[9]'); $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]'); @@ -318,7 +317,7 @@ class employeedetails extends BaseController 'Additional_Qualification'=>$addqualification,'AadharNo'=>$aadharno,'PANNo'=>$panno, 'BankAccountNo'=>$accountno,'IFSCCode'=>$ifsccode,'BankBranchName'=>$bankbranchname, 'BankAddress'=>$bankaddress,'PassportNo'=>$passportno,'Passport_Valid_till'=>$Valid, - 'IsActive'=>$IsActive,'ProfilePic'=>$Profile,'Reference_Name'=>$referredby, + 'IsActive'=>$IsActive,'ProfilePic'=>$Picture,'Reference_Name'=>$referredby, 'Reference_ContactNumber'=>$referrercontno,'Remarks'=>$addinfo,'CreatedBy'=>$createdby, 'personalEmailId'=>$comEmailId,'DriverLicense'=>$driverlicense, 'LicenseValidtill'=>$License_ExpiryDate,'VoterID'=>$VoterID); @@ -329,15 +328,15 @@ class employeedetails extends BaseController { // $this->session->set_flashdata('Success', 'New Employee created successfully!'); - redirect('employeeListing','refresh'); -echo ""; + +echo "";redirect('employeeListing','refresh'); } else { $this->session->set_flashdata('Error', 'New Employee details not saved'); - redirect('employeeListing','refresh'); -echo ""; + +echo "";redirect('employeeListing','refresh'); } } @@ -580,11 +579,8 @@ echo ""; //$mail = $this->this->.post('emailid'); $this->form_validation->set_rules('ContactNumber', 'ContactNumber', 'trim|required|min_length[10]|max_length[10]'); - //if($mail == ''){ - $this->form_validation->set_rules('emailid', 'emailid', 'trim'); - //}else{ - //$this->form_validation->set_rules('emailid', 'emailid', 'trim|callback_checkMailEmp'); - //} + $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'); @@ -593,9 +589,9 @@ echo ""; $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('aadharno', 'aadharno ','trim|max_length[14]'); $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('passportno', 'passportno', 'trim|min_length[9]|max_length[9]'); $this->form_validation->set_rules('accountno', 'accountno', 'trim|min_length[10]|max_length[20]'); if($this->form_validation->run() == FALSE) @@ -709,15 +705,15 @@ echo ""; { // $this->session->set_flashdata('Success', $EmpId.'Employee Updated successfully!'); - redirect('employeeListing','refresh'); -echo ""; + +echo "";redirect('employeeListing','refresh'); } else { $this->session->set_flashdata('Error', $EmpId.'Employee details not saved'); - redirect('employeeListing','refresh'); -echo ""; + +echo ""; redirect('employeeListing','refresh'); } // redirect('employeeListing'); diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index fde0ee7d..0e3ce77a 100755 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -191,14 +191,15 @@ class rawmaterialdetails extends BaseController if($result > 0) { - redirect('rawmaterialListing','refresh'); - echo ""; + + echo "";redirect('rawmaterialListing','refresh'); } else { - redirect('rawmaterialListing','refresh'); + echo ""; + redirect('rawmaterialListing','refresh'); } @@ -322,14 +323,12 @@ class rawmaterialdetails extends BaseController if($result == true) { - redirect('rawmaterialListing','refresh'); - - echo ""; + echo ""; redirect('rawmaterialListing','refresh'); } else { - redirect('rawmaterialListing','refresh'); - echo ""; + + echo "";redirect('rawmaterialListing','refresh'); } diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index 3c70aa6b..76c61e02 100755 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -249,14 +249,16 @@ class supplier extends BaseController if($result > 0) { - redirect('supplierListing','refresh'); + echo ""; + redirect('supplierListing','refresh'); } else { - redirect('supplierListing','refresh'); + echo ""; + redirect('supplierListing','refresh'); } } @@ -380,14 +382,16 @@ class supplier extends BaseController if($result == True) { - redirect('supplierListing','refresh'); + echo ""; + redirect('supplierListing','refresh'); } else { - redirect('supplierListing','refresh'); + echo ""; + redirect('supplierListing','refresh'); } } diff --git a/application/logs/log-2017-08-23.php b/application/logs/log-2017-08-23.php old mode 100644 new mode 100755 diff --git a/application/views/addNew.php b/application/views/addNew.php index ae661cb7..74803ae3 100755 --- a/application/views/addNew.php +++ b/application/views/addNew.php @@ -31,7 +31,7 @@