SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Production fix

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-04-13 16:36:52 +05:30
parent 481b9428e1
commit e3ac9e26ef
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
application/controllers/rawmaterialdetails.php
View File

@ -45,7 +45,7 @@ class rawmaterialdetails extends BaseController
$count = $this->rawmaterialdetails_model->rawmaterialListingCount($searchText); $count = $this->rawmaterialdetails_model->rawmaterialListingCount($searchText);
$returns = $this->paginationCompress ( "rawmaterialListing/", $count, 5 ); $returns = $this->paginationCompress ( "rawmaterialListing/", $count, 10 );
$data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing($searchText, $returns["page"], $returns["segment"]); $data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing($searchText, $returns["page"], $returns["segment"]);
@ -65,7 +65,7 @@ class rawmaterialdetails extends BaseController
$this->global['pageTitle'] = 'siddharth : AddNew RawMaterial'; $this->global['pageTitle'] = 'siddharth : AddNew RawMaterial';
$this->loadViews("addRawmaterial", $this->global, $data, NULL); $this->loadViews("addRawMaterial", $this->global, $data, NULL);
} }
/* /*
@ -133,21 +133,22 @@ class rawmaterialdetails extends BaseController
$IsActive = '0'; $IsActive = '0';
} }
$Material = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive); $RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive);
$result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial); $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
if($result > 0) if($result > 0)
{ {
//$this->session->set_flashdata('success', 'New RawMaterial created successfully');
redirect('rawmaterialListing','refresh');
echo "<script>alert('RawMaterial Created successfully!');</script>"; echo "<script>alert('RawMaterial Created successfully!');</script>";
redirect('rawmaterialListing','refresh');
} }
else else
{ {
// $this->session->set_flashdata('error', 'RawMaterial Not Create'); redirect('rawmaterialListing','refresh');
echo "<script>alert('RawMaterial Not Created!');</script>"; echo "<script>alert('RawMaterial Not Created!');</script>";
redirect('rawmaterialListing','refresh');
} }
} }
@ -187,14 +188,14 @@ class rawmaterialdetails extends BaseController
} }
else else
{ {
$MaterialCode = $this->input->post('MaterialCode'); $RawmaterialID = $this->input->post('MaterialCode');
$this->form_validation->set_rules('MaterialName','Material Name','trim|required|'); $this->form_validation->set_rules('MaterialName','Material Name','trim|required|');
$this->form_validation->set_rules('MaterialType','MaterialType','trim'); $this->form_validation->set_rules('MaterialType','MaterialType','trim');
$this->form_validation->set_rules('UOM','UOM','trim'); $this->form_validation->set_rules('UOM','UOM','trim');
if($this->form_validation->run() == FALSE) if($this->form_validation->run() == FALSE)
{ {
$this->editRawmaterial($RawmaterialID); $this->viewRawmaterial($RawmaterialID);
} }
else else
@ -223,14 +224,14 @@ class rawmaterialdetails extends BaseController
if($result == true) if($result == true)
{ {
redirect('rawmaterialListing','refresh'); redirect('rawmaterialListing','refresh');
// $this->session->set_flashdata('success', 'RawMaterial updated successfully');
echo "<script>alert('RawMaterial Updated successfully!');</script>"; echo "<script>alert('RawMaterial Updated successfully!');</script>";
} }
else else
{ {
redirect('rawmaterialListing','refresh'); redirect('rawmaterialListing','refresh');
echo "<script>alert('RawMaterial Record Not updated!');</script>"; echo "<script>alert('RawMaterial Record Not updated!');</script>";
// $this->session->set_flashdata('error', 'RawMaterial updation failed');
} }

4
application/controllers/supplier.php
View File

@ -131,7 +131,7 @@ class supplier extends BaseController
$this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|numeric|max_length[10]'); $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|numeric|max_length[10]');
$this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|numeric|max_length[10]'); $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|numeric|max_length[10]');
$this->form_validation->set_rules('EmailAddress','Email Address|valid_email|xss_clean|max_length[128]|required'); $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('TIN','TIN','trim|required|max_length[11]');
@ -191,7 +191,7 @@ class supplier extends BaseController
//echo 'supID' . $supplierID ; //echo 'supID' . $supplierID ;
$this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|numeric|max_length[10]'); $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|numeric|max_length[10]');
$this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|numeric|max_length[10]'); $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|numeric|max_length[10]');
$this->form_validation->set_rules('EmailAddress','Email Address|valid_email|xss_clean|max_length[128]|required'); $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('TIN','TIN','trim|required|max_length[11]');