From 75841ccef3a929803cde461bc736133eb9c11e05 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Jun 2024 09:00:43 +0530 Subject: [PATCH] CHANGE_CLEINT_BRANCH_MODAL : AADHAVAN --- app/Config/Routes.php | 2 + app/Controllers/ClientController.php | 26 +++++ app/Models/ClientBranchModel.php | 19 ++++ app/Views/business.php | 14 +-- app/Views/client_branch_list.php | 164 +++++++++++++++++++++++++++ app/Views/layout/header.php | 2 +- 6 files changed, 219 insertions(+), 8 deletions(-) create mode 100644 app/Models/ClientBranchModel.php create mode 100644 app/Views/client_branch_list.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index a32a705..e224d26 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -33,8 +33,10 @@ use CodeIgniter\Router\RouteCollection; $routes->get('client_home','ClientController::client_home'); $routes->post('status_client','ClientController::status_client'); $routes->post('doc_rejection','ClientController::doc_rejection'); + $routes->match(['get','post'],'/client_branch_list','ClientController::client_branch_list'); + $routes->match(['get','post'],'/service_group_list','MasterController::service_group_list'); $routes->match(['get','post'],'/service_group_create','MasterController::service_group_create'); $routes->match(['get','post'],'/service_group_edit','MasterController::service_group_edit'); diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index ea7eb20..a3bebd0 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -2,6 +2,8 @@ namespace App\Controllers; use App\Models\ClientModel; +use App\Models\ClientBranchModel; +use App\Models\StaffModel; use App\Models\ClientDocsModel; use CodeIgniter\API\ResponseTrait; @@ -11,6 +13,8 @@ class ClientController extends BaseController { public $session; protected $ClientModel; + protected $ClientBranchModel; + protected $StaffModel; protected $ClientDocsModel; use ResponseTrait; @@ -19,6 +23,8 @@ class ClientController extends BaseController { $this->session = session(); $this->ClientModel = new ClientModel(); + $this->ClientBranchModel = new ClientBranchModel(); + $this->StaffModel = new StaffModel(); $this->ClientDocsModel = new ClientDocsModel(); } @@ -244,4 +250,24 @@ class ClientController extends BaseController } + + public function client_branch_list() + { + // if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); } + + + // $data['clientBranchList'] = $this->ClientBranchModel->select('client.* , COUNT(client_docs.id) as docs_count') + $data['clientBranchList'] = $this->ClientBranchModel->select('*') + // ->join('client_docs', 'client.client_id = client_docs.client_id', 'left') + // ->where('client.branch_id',$this->session->get('logged_in_staff_branch_id')) + // ->groupBy('client.client_id') + ->findAll(); + + $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); + echo view('layout/header', ['Data'=>$staffdata]); + // echo view('layout/header'); + echo view('client_branch_list',$data); + echo view('layout/footer'); + } + } diff --git a/app/Models/ClientBranchModel.php b/app/Models/ClientBranchModel.php new file mode 100644 index 0000000..30474c5 --- /dev/null +++ b/app/Models/ClientBranchModel.php @@ -0,0 +1,19 @@ +
-
+
@@ -283,18 +283,18 @@ function PreviewImage() { var allowedExtensions = ["jpg", "jpeg", "png"]; var fileExtension = file.name.split('.').pop().toLowerCase(); - if (!allowedExtensions.includes(fileExtension) || file.size > 200 * 1024) { - toastr.warning('Maximum file size allowed is 200KB.', 'File size exceeds limit.'); - fileInput.value = ""; // Clear the file input - document.getElementById("uploadPreview").src = "http://ssl.gstatic.com/accounts/ui/avatar_2x.png"; // Remove the preview image - } else { + // if (!allowedExtensions.includes(fileExtension) || file.size > 200 * 1024) { + // toastr.warning('Maximum file size allowed is 200KB.', 'File size exceeds limit.'); + // // fileInput.value = ""; // Clear the file input + // // document.getElementById("uploadPreview").src = "http://ssl.gstatic.com/accounts/ui/avatar_2x.png"; // Remove the preview image + // } else { var reader = new FileReader(); reader.readAsDataURL(file); reader.onload = function (event) { document.getElementById("uploadPreview").src = event.target.result; }; - } + // } } } diff --git a/app/Views/client_branch_list.php b/app/Views/client_branch_list.php new file mode 100644 index 0000000..72f036f --- /dev/null +++ b/app/Views/client_branch_list.php @@ -0,0 +1,164 @@ + + + + +
+ +
+ + +
+
+
+

Client Branch List

+
+
    +
  1. + Add Branch + +
+
+
+
+
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Branch NameGSTAddressCityStatePostal CodeContactActiveAction
+ +
+
+
+
+ + + +
+ +
+ + + + + + diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 8c0265e..1f4c0d8 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -297,7 +297,7 @@
" class="dropdown-item">Client List - " class="dropdown-item">Create Client + " class="dropdown-item">Client Branch