diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 82bd447..79da63b 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -37,14 +37,21 @@ $routes->match(['get'],'/member_edit/(:any)','Member_controller::member_edit/$1' $routes->match(['post'],'/member_edit','Member_controller::member_edit'); $routes->match(['get','post'],'/member_add','Member_controller::member_add'); -// $routes->match(['post'],'/dashboard','Member_controller::dashboard'); -// $routes->match(['get'],'/logout','Member_controller::logout'); -$routes->match(['get'],'/admin_home','Dashboard::index'); - $routes->match(['get','post'],'/admin','Admin_controller::index'); $routes->match(['get'],'/admin_logout','Admin_controller::admin_logout'); -//$routes->get('/', 'Member_controller::index'); +$routes->match(['get'],'/users_list','Admin_controller::users_list'); +$routes->match(['get'],'/user_edit/(:any)','Admin_controller::user_edit/$1'); +$routes->match(['post'],'/user_edit','Admin_controller::user_edit'); +$routes->match(['get','post'],'/user_add','Admin_controller::user_add'); + +$routes->match(['get'],'/admin_home','Dashboard::admin_home'); +$routes->match(['get'],'/member_home','Dashboard::member_home'); + + +$routes->match(['get'],'fetch_country','Common_controller::fetch_country'); +$routes->match(['get','post'],'fetch_state','Common_controller::fetch_state'); +$routes->match(['get','post'],'fetch_city','Common_controller::fetch_city'); /* * -------------------------------------------------------------------- diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index fab018a..20101ea 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -2,6 +2,8 @@ namespace App\Controllers; use App\Models\User_model; +use App\Models\Dashboard_model; +use App\Models\Common_model; class Admin_controller extends BaseController { public $session; @@ -10,6 +12,8 @@ class Admin_controller extends BaseController $this->session = session(); $this->UserModel = new User_model(); + $this->dModel = new Dashboard_model(); + $this->cModel = new Common_model(); helper(['form']); } public function index() @@ -58,56 +62,69 @@ class Admin_controller extends BaseController return redirect()->to(base_url()."admin"); } - public function members_list() + public function users_list() { - $id = session()->get('logged_user'); - $userdata['userdata']=$this->dModel->getLoggedInUserData($id); - $data['Membersdata'] = $this->MemberModel->findAll(); + + $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); + $data['userList'] = $this->UserModel->select('users.* , country.name as country_name , state.name as state_name ,city.name as city_name') + ->join('country', 'users.country = country.id', 'left') + ->join('state', 'users.state = state.id', 'left') + ->join('city', 'users.city = city.id', 'left') + ->where('users.id != ',session()->get('logged_user') ) + ->findAll(); echo view('layout/header',$userdata); - echo view('members_list',$data); + echo view('users_list',$data); echo view('layout/footer'); } - public function users_edit($user_id = null) + public function user_edit($user_id = null) { if($this->request->getmethod() == 'post') { //update member details - $Data = $this->request->getVar(); + $UserData = $this->request->getVar(); $user_id = $this->request->getVar('id'); - $this->UserModel->where('id', $user_id )->set($MemberData)->update(); - return redirect()->to(base_url()."members_list"); + $this->UserModel->where('id', $user_id )->set($UserData)->update(); + return redirect()->to(base_url()."users_list"); } $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); - $data['userList'] = $this->UserModel->where('md5(id)', $user_id )->find(); + $data['country']=$this->cModel->fetch_country(); + $data['userList'] = $this->UserModel->select('users.* , country.name as country_name , state.name as state_name ,city.name as city_name') + ->join('country', 'users.country = country.id', 'left') + ->join('state', 'users.state = state.id', 'left') + ->join('city', 'users.city = city.id', 'left') + ->where('md5(users.id)', $user_id ) + ->find(); + + //print_r($data);die(); echo view('layout/header',$userdata); - echo view('member_form',$data); + echo view('user_form',$data); echo view('layout/footer'); } - public function member_add() + public function user_add() { if($this->request->getmethod() == 'post') { //insert member details - $MemberData = $this->request->getVar(); - $this->MemberModel->save($MemberData); - return redirect()->to(base_url()."members_list"); + $userData = $this->request->getVar(); + $this->UserModel->save($userData); + return redirect()->to(base_url()."users_list"); } $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); - //print_r($userdata); die(); + $data['country']=$this->cModel->fetch_country(); echo view('layout/header',$userdata); - echo view('member_form'); + echo view('user_form',$data); echo view('layout/footer'); } diff --git a/app/Controllers/Common_controller.php b/app/Controllers/Common_controller.php new file mode 100644 index 0000000..70b5bfc --- /dev/null +++ b/app/Controllers/Common_controller.php @@ -0,0 +1,49 @@ +session = session(); + $this->UserModel = new User_model(); + $this->dModel = new Dashboard_model(); + $this->cModel = new Common_model(); + helper(['form']); + } + public function index() + { + + + } + + function fetch_country() + { + echo $this->cModel->fetch_country(); + } + + function fetch_state() + { + if($this->request->getVar('country_id')) + { + echo $this->cModel->fetch_state($this->request->getVar('country_id')); + } + } + + function fetch_city() + { + if($this->request->getVar('state_id')) + { + echo $this->cModel->fetch_city($this->request->getVar('state_id')); + } + } + + + + // ----------------------------------------------- +} diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php index 43c7d8e..9cbb7a0 100644 --- a/app/Controllers/Dashboard.php +++ b/app/Controllers/Dashboard.php @@ -14,6 +14,11 @@ class Dashboard extends BaseController public function index() { + + } + public function admin_home() + { + $data = []; if(!session()->has('logged_user')) { @@ -27,6 +32,22 @@ class Dashboard extends BaseController echo view('layout/footer'); //return view('dashboard'); } + public function member_home() + { + + $data = []; + if(!session()->has('logged_user')) + { + return redirect()->to(base_url()); + } + + $id = session()->get('logged_user'); + $data['userdata']=$this->dModel->getLoggedInMemberData($id); + //echo view('layout/header',$data); + echo view('dashboard',$data); + //echo view('layout/footer'); + //return view('dashboard'); + } diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index 90d45ab..ef7fd8d 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -3,6 +3,7 @@ namespace App\Controllers; use App\Models\Member_model; use App\Models\Dashboard_model; +use App\Models\Common_model; class Member_controller extends BaseController { public $session; @@ -12,6 +13,7 @@ class Member_controller extends BaseController $this->session = session(); $this->MemberModel = new Member_model(); $this->dModel = new Dashboard_model(); + $this->cModel = new Common_model(); helper('form'); } public function index() @@ -33,7 +35,7 @@ class Member_controller extends BaseController { $this->session->set('logged_user',$memberdata['id']); - return redirect()->to(base_url().'home'); + return redirect()->to(base_url().'member_home'); } else{ $this->session->setTempdata('error','sorry wrong password entered for the Email',3); @@ -72,7 +74,12 @@ class Member_controller extends BaseController { $id = session()->get('logged_user'); $userdata['userdata']=$this->dModel->getLoggedInUserData($id); - $data['Membersdata'] = $this->MemberModel->findAll(); + $data['Membersdata'] = $this->MemberModel->select('member.* , country.name as country_name , state.name as state_name ,city.name as city_name') + ->join('country', 'member.country = country.id', 'left') + ->join('state', 'member.state = state.id', 'left') + ->join('city', 'member.city = city.id', 'left') + ->where('member.id != ',session()->get('logged_user') ) + ->findAll(); echo view('layout/header',$userdata); echo view('members_list',$data); echo view('layout/footer'); @@ -95,7 +102,13 @@ class Member_controller extends BaseController $logged_user_id = session()->get('logged_user'); $userdata['userdata']=$this->dModel->getLoggedInUserData($logged_user_id); - $data['Memberdata'] = $this->MemberModel->where('md5(id)', $member_id )->find(); + $data['country']=$this->cModel->fetch_country(); + $data['Memberdata'] = $this->MemberModel->select('member.* , country.name as country_name , state.name as state_name ,city.name as city_name') + ->join('country', 'member.country = country.id', 'left') + ->join('state', 'member.state = state.id', 'left') + ->join('city', 'member.city = city.id', 'left') + ->where('md5(member.id)', $member_id ) + ->find(); echo view('layout/header',$userdata); echo view('member_form',$data); echo view('layout/footer'); @@ -115,9 +128,9 @@ class Member_controller extends BaseController } $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); - //print_r($userdata); die(); + $data['country']=$this->cModel->fetch_country(); echo view('layout/header',$userdata); - echo view('member_form'); + echo view('member_form',$data); echo view('layout/footer'); } diff --git a/app/Models/Common_model.php b/app/Models/Common_model.php new file mode 100644 index 0000000..9274b76 --- /dev/null +++ b/app/Models/Common_model.php @@ -0,0 +1,59 @@ +db->table('country'); + $query = $builder->get(); + //print_r($query->getResult());die(); + $output = ''; + foreach($query->getResult() as $row) + { + $output .= ''; + } + return $output; + } + + + function fetch_state($country_id) + { + + $builder = $this->db->table('state'); + $builder->where('country_id',$country_id); + $query = $builder->get(); + //print_r($query);die(); + $output = ''; + foreach($query->getResult() as $row) + { + $output .= ''; + } + return $output; + } + + + function fetch_city($state_id) + { + + $builder = $this->db->table('city'); + $builder->where('state_id',$state_id); + $query = $builder->get(); + //print_r($query);die(); + $output = ''; + foreach($query->getResult() as $row) + { + $output .= ''; + } + return $output; + } + + + + + +} \ No newline at end of file diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php index 5783477..a11e59f 100644 --- a/app/Models/Dashboard_model.php +++ b/app/Models/Dashboard_model.php @@ -19,6 +19,19 @@ class Dashboard_model extends Model } } + public function getLoggedInMemberData($id) + { + $builder = $this->db->table('member'); + $builder->where('id',$id); + $result = $builder->get(); + if(count($result->getResultArray()) ==1) + { + return $result->getRow(); + }else{ + return false; + } + + } } \ No newline at end of file diff --git a/app/Models/User_model.php b/app/Models/User_model.php index 9ad9b7b..9cfa485 100644 --- a/app/Models/User_model.php +++ b/app/Models/User_model.php @@ -7,7 +7,7 @@ class User_model extends Model protected $table = 'users'; protected $primaryKey = 'id'; - protected $allowedFields = ['role','name', 'mobile','email','user_name', 'password','created_at','updated_at']; + protected $allowedFields = ['role','name', 'mobile','email', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' ,'created_at','updated_at']; protected $beforeInsert = ['beforeInsert']; protected $beforeUpdate = ['beforeUpdate']; diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index b8bccd4..4dad314 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -1,4 +1,5 @@ -