Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull changes #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pull changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b930a3
Added Edit forms and some changes in add forms
ajith555 Mar 28, 2014
90e5a36
edit forms are added
ajith555 Mar 28, 2014
b9a9b27
latest
ajith555 Apr 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion application/controllers/home.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function index()
$this->load->view('templates/footer');
}


function login()
{
if(!$this->session->userdata('logged_in')){
Expand All @@ -37,7 +38,10 @@ function login()
'trim|required|xss_clean|callback_check_database');
if ($this->form_validation->run() === FALSE)
{
$this->load->view('pages/login');

$this->load->view('pages/error');
$this->load->view('pages/login');

}
else{
redirect('home', 'refresh');
Expand Down
116 changes: 91 additions & 25 deletions application/controllers/masters.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ function add($type=""){
array(
'field' => 'facility_name',
'label' => 'Facility Name',
'rules' => 'required|trim|xss_clean'
'rules' => 'trim|xss_clean'
)
);
$data['facility']=$this->masters_model->get_data("facility");
$data['facility_types']=$this->masters_model->get_data("facility_types");
$data['divisions']=$this->masters_model->get_data("divisions");
}
Expand All @@ -31,17 +32,21 @@ function add($type=""){
'rules' => 'required|trim|xss_clean'
)
);
$data['agency']=$this->masters_model->get_data("agency");

}
else if($type=="division"){
else if($type=="divisions"){
$title="Add Division";
$config=array(
array(
'field' => 'division_name',
'field' => 'division',
'label' => 'Division Name',
'rules' => 'required|trim|xss_clean'
)
);
$data['division']=$this->masters_model->get_data("division");
$data['district']=$this->masters_model->get_data("districts");

}
else if($type=="grant"){
$title="Add Grant";
Expand All @@ -57,17 +62,65 @@ function add($type=""){
'rules' => 'required|trim|xss_clean'
)
);
$data['grants']=$this->masters_model->get_data("grants");
$data['grant_sources']=$this->masters_model->get_data("grant_sources");
$data['grant_phases']=$this->masters_model->get_data("grant_phases");
}
else if($type=="user"){
else if($type=="users"){
$title="Add User";
$config=array(
array(
'field' => 'user_name',
'field' => 'user_type',
'label' => 'User Type',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'username',
'label' => 'User Name',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'password',
'label' => ' password',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'first_name',
'label' => 'first_name ',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'last_name',
'label' => 'Last Name',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'dob',
'label' => 'dob ',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'phone_no',
'label' => 'phone_no',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'email_id',
'label' => 'email_id',
'rules' => 'required|trim|xss_clean'
),
array(
'field' => 'address',
'label' => 'address',
'rules' => 'required|trim|xss_clean'
), array(
'field' => 'pincode',
'label' => 'pincode',
'rules' => 'required|trim|xss_clean'
)
);
$data['users']=$this->masters_model->get_data("users");
$data['users']=$this->masters_model->get_data("user");
}

else{
Expand All @@ -85,6 +138,7 @@ function add($type=""){
}
else{
if($this->masters_model->insert_data($type)){

$data['msg']="Inserted Successfully";
$this->load->view($page,$data);
}
Expand All @@ -109,49 +163,61 @@ function edit($type=""){
)
);
$data['facility_types']=$this->masters_model->get_data("facility_types");
$data['divisions']=$this->masters_model->get_data("divisions");
$data['division']=$this->masters_model->get_data("division");
}
else if($type=="grant"){
$title="Edit Grant";
$config=array(
array(
'field' => 'grant_id',
'label' => 'Grant',
'rules' => 'required|trim|xss_clean'
)
);
$data['grant']=$this->masters_model->get_data("grant");
$data['grants']=$this->masters_model->get_data("grants");
$data['grant_sources']=$this->masters_model->get_data("grant_sources");
$data['grant_phases']=$this->masters_model->get_data("grant_phases");

}
else if($type=="agency"){
$title="Edit Agency";
$config=array(
array(
'field' => 'agency_id',
'field' => 'search_agency_name',
'label' => 'Agency',
'rules' => 'required|trim|xss_clean'
'rules' => 'trim|xss_clean'
)
);
$data['agency']=$this->masters_model->get_data("agency");

}
else if($type=="division"){
else if($type=="divisions"){
$title="Edit Division";
$config=array(
array(
'field' => 'division_id',
'label' => 'Division',
'rules' => 'required|trim|xss_clean'
'rules' => 'trim|xss_clean'
)
);
$data['district']=$this->masters_model->get_data("districts");
}
else if($type=="grant"){
$title="Edit Grant";
$config=array(
array(
'field' => 'grant_phase_id',
'label' => 'Grant',
'rules' => 'required|trim|xss_clean'
)
);
$data['grant_sources']=$this->masters_model->get_data("grant_sources");
$data['districts']=$this->masters_model->get_data("districts");
$data['divisions']=$this->masters_model->get_data("divisions");

}
else if($type=="user"){

else if($type=="users"){
$title="Edit User";
$config=array(
array(
'field' => 'user_id',
'label' => 'User',
'rules' => 'required|trim|xss_clean'
'rules' => 'trim|xss_clean'
)
);
);
$data['users']=$this->masters_model->get_data("users");


}

else{
Expand Down