diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index da14b14..46ebbd5 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -215,16 +215,7 @@ class MasterController extends BaseController } } - public function get_service_data() - { - if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } - - $service_group_id = $this->request->getVar('service_group_id'); - $result = $this->ServiceModel->where('service_group_id',$service_group_id)->findAll(); - - return $this->response->setJSON(['count'=>count($result) , 'data'=>$result ]); - - } + public function template_edit() { @@ -267,18 +258,27 @@ class MasterController extends BaseController if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } - $client_id = $this->request->getVar('client_id'); - $data['doc_list'] = $this->ClientDocsModel->getDocs($client_id); - $data['clientdata'] = $this->ClientModel->where('client_id', $client_id)->get()->getRow(); - $data['serviceData'] = $this->ServiceModel->findAll(); + + $data['doc_list'] = $this->ClientDocsModel->getDocs(); + $data['clientdata'] = $this->ClientModel->findAll(); + $data['serviceGroupData'] = $this->ServiceGroupModel->findAll(); $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); echo view('layout/header', ['Data'=>$staffdata]); - echo view('docs_shared_with_client',$data); + echo view('share_docs',$data); echo view('layout/footer'); } + public function get_service_data() + { + + $service_group_id = $this->request->getVar('service_group_id'); + $result = $this->ServiceModel->where('service_group_id',$service_group_id)->findAll(); + + return $this->response->setJSON(['count'=>count($result) , 'data'=>$result ]); + + } public function get_templates() { @@ -288,6 +288,7 @@ class MasterController extends BaseController } + public function create_docs() { $docData = $this->request->getVar(); diff --git a/app/Models/ClientDocsModel.php b/app/Models/ClientDocsModel.php index 265f2d0..b4116d9 100644 --- a/app/Models/ClientDocsModel.php +++ b/app/Models/ClientDocsModel.php @@ -23,13 +23,13 @@ class ClientDocsModel extends Model } - public function getDocs($client_id){ + public function getDocs(){ $this->select('template.template_name , template.template_id ,client_docs.is_approved ,client_docs.id as doc_id ,client_docs.is_active, services.service_name'); $this->join('template', 'template.template_id = client_docs.template_id'); $this->join('services', 'services.service_id = template.service_id'); - $this->where('client_docs.client_id', $client_id); + return $this->findAll(); } diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 8c0265e..d79ca12 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -286,7 +286,7 @@