From cb7bee429ec5cc557a83df6271ecd7178359bad4 Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Wed, 22 Nov 2023 08:14:25 +0300
Subject: [PATCH 1/9] sms receiver merged

---
 app/Http/Controllers/ReceiverController.php | 76 +++++++++++++++++++++
 app/Models/UshauriInbox.php                 | 18 +++++
 app/Models/UshauriOutbox.php                | 18 +++++
 routes/api.php                              |  6 +-
 4 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Controllers/ReceiverController.php
 create mode 100644 app/Models/UshauriInbox.php
 create mode 100644 app/Models/UshauriOutbox.php

diff --git a/app/Http/Controllers/ReceiverController.php b/app/Http/Controllers/ReceiverController.php
new file mode 100644
index 0000000..a67baf9
--- /dev/null
+++ b/app/Http/Controllers/ReceiverController.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+use\App\Models\UshauriInbox;
+use\App\Models\UshauriOutbox;
+use Log;
+
+
+class ReceiverController extends Controller
+{
+    public function index(Request $request)
+    {
+        if ($request->to == '40149') {
+
+            // dd($request->all());
+
+            $inbox = new UshauriInbox;
+
+            $inbox->destination = $request->to;
+            $inbox->source = $request->from;
+            $inbox->msg = $request->text;
+            $inbox->receivedtime = $request->date;
+            $inbox->reference = $request->id;
+            $inbox->LinkId = $request->linkId;
+
+            $inbox->save();
+
+            $lastID1 = $inbox->id;
+            $task = 1;
+            $this->task($task, $lastID1);
+        }
+    }
+
+    function task($task, $LastInsertId)
+    {
+        Log::info("ID: " . $LastInsertId . ", TASK: " . $task);
+        switch ($task) {
+            case 1:
+
+                $ch = curl_init();
+
+                curl_setopt($ch, CURLOPT_URL, "http://ushaurinode.localhost/receiver/$LastInsertId");
+                curl_setopt($ch, CURLOPT_HEADER, 0);
+                curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+                curl_exec($ch);
+
+                curl_close($ch);
+                echo 'Done task 1';
+                break;
+            default:
+                break;
+        }
+    }
+
+    public function ushauri_callback(Request $request)
+    {
+
+        //check incoming id and update single sms with telco status
+
+        $updateDetails = [
+            'callback_status' => $request->get('status'),
+            'failure_reason' => $request->get('failureReason')
+        ];
+
+        // return $request;
+
+        $sms = UshauriOutbox::where('message_id', $request->id)->first();
+        if ($sms) {
+            $sms = UshauriOutbox::where('message_id', $request->id)
+                ->update($updateDetails);
+        }
+    }
+}
diff --git a/app/Models/UshauriInbox.php b/app/Models/UshauriInbox.php
new file mode 100644
index 0000000..cf4cdfa
--- /dev/null
+++ b/app/Models/UshauriInbox.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class UshauriInbox extends Model
+{
+    use HasFactory;
+    // protected $connection = 'ushauri';
+    public $table = 'tbl_incoming';
+    public $timestamps = false;
+
+    protected $fillable = [
+        'destination', 'source', 'msg', 'receivedtime', 'reference', 'LinkId'
+    ];
+}
diff --git a/app/Models/UshauriOutbox.php b/app/Models/UshauriOutbox.php
new file mode 100644
index 0000000..079cd80
--- /dev/null
+++ b/app/Models/UshauriOutbox.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class UshauriOutbox extends Model
+{
+    use HasFactory;
+    
+    public $table = 'tbl_clnt_outgoing';
+    public $timestamps = false;
+
+    protected $fillable = [
+        'destination', 'source', 'msg', 'updated_at', 'deleted_at', 'created_at', 'status', 'responded', 'message_type_id', 'content_id', 'recepient_type', 'created_by', 'updated_by', 'is_deleted', 'clnt_usr_id', 'ushauri_id', 'db_source', 'message_id', 'cost', 'callback_status', 'failure_reason'
+    ];
+}
diff --git a/routes/api.php b/routes/api.php
index 997ed01..1497aaf 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -17,5 +17,9 @@
 
 
 Route::middleware('auth:api')->get('/user', function (Request $request) {
-    return $request->user();
+  return $request->user();
 });
+
+
+Route::post('/sms/receiver', 'App\Http\Controllers\ReceiverController@index');
+Route::post('/sms/callback/ushauri', 'App\Http\Controllers\ReceiverController@ushauri_callback');

From dde699ab1fc7d9f526358218e3904881d4a1114a Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Thu, 30 Nov 2023 09:37:07 +0300
Subject: [PATCH 2/9] added program indicators and review of nishauri dashboard

---
 app/Http/Controllers/NewReportController.php |  31 ++
 app/Http/Controllers/NishauriController.php  | 223 ++++++-----
 app/Models/NishauriAccess.php                |  17 +
 app/Models/NishauriFacility.php              |  18 +
 app/Models/NishauriUptake.php                |  18 +
 app/Models/UshauriProgram.php                |  15 +
 resources/views/dashboard/program.blade.php  | 387 ++++++++++++++++++
 resources/views/nishauri/dashboard.blade.php | 393 +++++++++++++------
 routes/web.php                               |   6 +
 9 files changed, 884 insertions(+), 224 deletions(-)
 create mode 100644 app/Models/NishauriAccess.php
 create mode 100644 app/Models/NishauriFacility.php
 create mode 100644 app/Models/NishauriUptake.php
 create mode 100644 app/Models/UshauriProgram.php
 create mode 100644 resources/views/dashboard/program.blade.php

diff --git a/app/Http/Controllers/NewReportController.php b/app/Http/Controllers/NewReportController.php
index 01ffd7a..4d7274a 100644
--- a/app/Http/Controllers/NewReportController.php
+++ b/app/Http/Controllers/NewReportController.php
@@ -17,6 +17,7 @@
 use App\Models\Language;
 use App\Models\Condition;
 use App\Models\Marital;
+use App\Models\UshauriProgram;
 use DB;
 use Auth;
 use Carbon\Carbon;
@@ -755,4 +756,34 @@ public function client_message(Request $request)
 
         return view('new_reports.client_messages', compact('client_messages', 'selected_from', 'selected_to'));
     }
+    public function program_index()
+    {
+        return view('dashboard.program');
+    }
+
+    public function program()
+    {
+        $data = [];
+
+        $program = UshauriProgram::select('*')->orderBy('MonthYear', 'ASC');
+        $months = UshauriProgram::select('MonthYear')->orderBy('MonthYear', 'ASC')->groupBy('MonthYear');
+
+        $data["program"] = $program->get();
+        $data["months"] = $months->get();
+
+        return $data;
+    }
+    public function program_filter(Request $request)
+    {
+        $data = [];
+        $selected_month = $request->month;
+
+        $program = UshauriProgram::select('*')->orderBy('MonthYear', 'ASC');
+
+        if (!empty($selected_month)) {
+            $program = $program->where('MonthYear', $selected_month);
+        }
+        $data["program"] = $program->get();
+        return $data;
+    }
 }
diff --git a/app/Http/Controllers/NishauriController.php b/app/Http/Controllers/NishauriController.php
index 5b9c7d4..4a59898 100644
--- a/app/Http/Controllers/NishauriController.php
+++ b/app/Http/Controllers/NishauriController.php
@@ -11,6 +11,9 @@
 use App\Models\Partner;
 use App\Models\County;
 use App\Models\SubCounty;
+use App\Models\NishauriUptake;
+use App\Models\NishauriAccess;
+use App\Models\NishauriFacility;
 use RealRashid\SweetAlert\Facades\Alert;
 use Illuminate\Support\Facades\Auth;
 use DB;
@@ -140,14 +143,12 @@ public function dashboard()
                 ->get();
 
             $counties = County::where("status", "=", "Active")
-                ->remember($this->remember_period)
                 ->get(['id', 'name']);
 
             $sub_counties = SubCounty::select('tbl_sub_county.id', 'tbl_sub_county.name')
                 ->join('tbl_partner_facility', 'tbl_sub_county.id', '=', 'tbl_partner_facility.sub_county_id')
                 ->where('tbl_partner_facility.county_id', Auth::user()->county_id)
                 ->groupBy('tbl_sub_county.name')
-                ->remember($this->remember_period)
                 ->get();
 
 
@@ -207,12 +208,15 @@ public function nishauri_uptake()
                 ->groupBy('tbl_tx_cur.mfl_code')
                 ->get();
             $txcurr = $txcurr->sum('tx_cur');
-            $all_enrollment  = DB::select("CALL sp_nishauri_national_uptake(?,?,?,?,?,?,?,?)", ["%", "%", "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-            $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", "%", "%", "1900-01-01", $currentDate]);
+            $all_enrollment  = NishauriUptake::select('*');
+            $all_module = NishauriAccess::select('*');
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
+            $data['all_module'] =  $all_module->get();
         }
         if (Auth::user()->access_level == 'Facility') {
             $facility = Auth::user()->facility_id;
@@ -229,12 +233,12 @@ public function nishauri_uptake()
                 ->groupBy('tbl_tx_cur.mfl_code')
                 ->get();
             $txcurr = $txcurr->sum('tx_cur');
-            $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", "%", $facility, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-            $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", "%", $facility, "1900-01-01", $currentDate]);
+            $all_enrollment  = NishauriFacility::select('*')->where('mfl_code', Auth::user()->facility_id);
+            $all_module = NishauriAccess::select('*')->where('mfl_code', Auth::user()->facility_id);
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] =  $all_enrollment->get();
+            $data['all_module'] =  $all_module->get();
         }
         if (Auth::user()->access_level == 'Partner') {
             $partner = Auth::user()->partner_id;
@@ -251,12 +255,15 @@ public function nishauri_uptake()
                 ->groupBy('tbl_tx_cur.mfl_code')
                 ->get();
             $txcurr = $txcurr->sum('tx_cur');
-            $all_enrollment  = DB::select("CALL sp_nishauri_national_uptake(?,?,?,?,?,?,?,?)", [$partner, "%", "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-            $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$partner, "%", "%", "%", "1900-01-01", $currentDate]);
+            $all_enrollment  = NishauriUptake::select('*')->where('partner_id', Auth::user()->partner_id);
+            $all_module = NishauriAccess::select('*')->where('partner_id', Auth::user()->partner_id);
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
+            $data['all_module'] =  $all_module->get();
         }
         if (Auth::user()->access_level == 'County') {
             $county = Auth::user()->county_id;
@@ -273,12 +280,15 @@ public function nishauri_uptake()
                 ->groupBy('tbl_tx_cur.mfl_code')
                 ->get();
             $txcurr = $txcurr->sum('tx_cur');
-            $all_enrollment  = DB::select("CALL sp_nishauri_national_uptake(?,?,?,?,?,?,?,?)", ["%", $county, "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-            $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $county, "%", "%", "1900-01-01", $currentDate]);
+            $all_enrollment  = NishauriUptake::select('*')->where('county_id', Auth::user()->county_id);
+            $all_module = NishauriAccess::select('*')->where('county_id', Auth::user()->county_id);
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
+            $data['all_module'] =  $all_module->get();
         }
         if (Auth::user()->access_level == 'Sub County') {
             $subcounty = Auth::user()->sub_county_id;
@@ -294,12 +304,16 @@ public function nishauri_uptake()
                 ->groupBy('tbl_tx_cur.mfl_code')
                 ->get();
             $txcurr = $txcurr->sum('tx_cur');
-            $all_enrollment  = DB::select("CALL sp_nishauri_national_uptake(?,?,?,?,?,?,?,?)", ["%", "%", $subcounty, "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-            $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", $subcounty, "%", "1900-01-01", $currentDate]);
+            $all_enrollment  = NishauriUptake::select('*')->where('sub_county_id', Auth::user()->subcounty_id);
+            $all_module = NishauriAccess::select('*')->where('sub_county_id', Auth::user()->subcounty_id);
+
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
+            $data['all_module'] =  $all_module->get();
         }
 
         return $data;
@@ -333,8 +347,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$selected_partners, "%", "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$selected_partners, "%", "%", "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('partner_id', $selected_partners);
+                $all_module = NishauriAccess::select('*')->where('partner_id', $selected_partners);
             }
             if (!empty($selected_counties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -347,8 +361,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$partner, $selected_counties, "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$partner, $selected_counties, "%", "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('partner_id', Auth::user()->partner_id)->where('county_id', $selected_counties);
+                $all_module = NishauriAccess::select('*')->where('partner_id', Auth::user()->partner_id)->where('county_id', $selected_counties);
             }
             if (!empty($selected_subcounties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -362,8 +376,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$partner, "%", $selected_subcounties, "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$partner, "%", $selected_subcounties, "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('partner_id', Auth::user()->partner_id)->where('sub_county_id', $selected_subcounties);
+                $all_module = NishauriAccess::select('*')->where('partner_id', Auth::user()->partner_id)->where('sub_county_id', $selected_subcounties);
             }
             if (!empty($selected_facilites)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -377,8 +391,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$partner, "%", "%", $selected_facilites, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$partner, "%", "%", $selected_facilites, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('partner_id', Auth::user()->partner_id)->where('mfl_code', $selected_facilites);
+                $all_module = NishauriAccess::select('*')->where('partner_id', Auth::user()->partner_id)->where('mfl_code', $selected_facilites);
             }
             if (!empty($selected_from || $selected_to)) {
 
@@ -398,14 +412,17 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$partner, "%", "%", "%", date($request->from), date($request->to), date($request->from), date($request->to)]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$partner, "%", "%", "%", date($request->from), date($request->to)]);
+                $all_enrollment  = NishauriUptake::select('*')->where('partner_id', Auth::user()->partner_id)->where('enrolled_date', '>=', date($request->from))->where('enrolled_date', '<=', date($request->to));
+                $all_module = NishauriAccess::select('*')->where('partner_id', Auth::user()->partner_id)->where('date', '>=', date($request->from))->where('date', '<=', date($request->to));
             }
 
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
+            $data['all_module'] =  $all_module->get();
 
             return $data;
         }
@@ -435,8 +452,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$selected_partners, $county, "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$selected_partners, $county, "%", "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('county_id', Auth::user()->county_id)->where('partner_id', $selected_partners);
+                $all_module = NishauriAccess::select('*')->where('county_id', Auth::user()->county_id)->where('partner_id', $selected_partners);
             }
             if (!empty($selected_counties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -449,8 +466,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", $selected_counties, "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $selected_counties, "%", "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('county_id', Auth::user()->county_id)->where('county_id', $selected_counties);
+                $all_module = NishauriAccess::select('*')->where('county_id', Auth::user()->county_id)->where('county_id', $selected_counties);
             }
             if (!empty($selected_subcounties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -464,8 +481,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", $county, $selected_subcounties, "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $county, $selected_subcounties, "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('county_id', Auth::user()->county_id)->where('sub_county_id', $selected_subcounties);
+                $all_module = NishauriAccess::select('*')->where('county_id', Auth::user()->county_id)->where('sub_county_id', $selected_subcounties);
             }
             if (!empty($selected_facilites)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -479,8 +496,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", $county, "%", $selected_facilites, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $county, "%", $selected_facilites, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('mfl_code', $selected_facilites);
+                $all_module = NishauriAccess::select('*')->where('mfl_code', $selected_facilites);
             }
             if (!empty($selected_from || $selected_to)) {
 
@@ -500,14 +517,17 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", $county, "%", "%", date($request->from), date($request->to), date($request->from), date($request->to)]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $county, "%", "%", date($request->from), date($request->to)]);
+                $all_enrollment  = NishauriUptake::select('*')->where('county_id', Auth::user()->county_id)->where('enrolled_date', '>=', date($request->from))->where('enrolled_date', '<=', date($request->to));
+                $all_module = NishauriAccess::select('*')->where('county_id', Auth::user()->county_id)->where('date', '>=', date($request->from))->where('date', '<=', date($request->to));
             }
 
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
+            $data['all_module'] =  $all_module->get();
 
             return $data;
         }
@@ -537,8 +557,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$selected_partners, "%", $subcounty, "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$selected_partners, "%", $subcounty, "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('partner_id', $selected_partners);
+                $all_module = NishauriAccess::select('*')->where('partner_id', $selected_partners);
             }
             if (!empty($selected_counties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -551,8 +571,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", $selected_counties, $subcounty, "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $selected_counties, $subcounty, "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('county_id', $selected_counties);
+                $all_module = NishauriAccess::select('*')->where('county_id', $selected_counties);
             }
             if (!empty($selected_subcounties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -566,8 +586,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", $selected_subcounties, "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", $selected_subcounties, "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('sub_county_id', $selected_subcounties);
+                $all_module = NishauriAccess::select('*')->where('sub_county_id', $selected_subcounties);
             }
             if (!empty($selected_facilites)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -581,8 +601,8 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", $subcounty, $selected_facilites, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", $subcounty, $selected_facilites, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('mfl_code', $selected_facilites);
+                $all_module = NishauriAccess::select('*')->where('mfl_code', $selected_facilites);
             }
             if (!empty($selected_from || $selected_to)) {
 
@@ -602,13 +622,16 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", $subcounty, "%", date($request->from), date($request->to), date($request->from), date($request->to)]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", $subcounty, "%", date($request->from), date($request->to)]);
+                $all_enrollment  = NishauriUptake::select('*')->where('sub_county_id', Auth::user()->subcounty_id)->where('enrolled_date', '>=', date($request->from))->where('enrolled_date', '<=', date($request->to));
+                $all_module = NishauriAccess::select('*')->where('sub_county_id', Auth::user()->subcounty_id)->where('date', '>=', date($request->from))->where('date', '<=', date($request->to));
             }
 
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
             $data['all_module'] =  $all_module;
 
             return $data;
@@ -626,7 +649,7 @@ public function filter_nishauri_uptake(Request $request)
             $currentDate = Carbon::now();
 
             $query = Txcurr::query()->join('tbl_partner_facility', 'tbl_tx_cur.mfl_code', '=', 'tbl_partner_facility.mfl_code')
-                ->where('tbl_partner_facility.county_id', Auth::user()->county_id);
+                ->where('tbl_partner_facility.mfl_code', Auth::user()->facility_id);
 
             if (!empty($selected_partners)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
@@ -639,13 +662,13 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$selected_partners, "%", "%", $facility, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$selected_partners, "%", "%", $facility, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriFacility::select('*')->where('partner_id', $selected_partners);
+                $all_module = NishauriAccess::select('*')->where('partner_id', $selected_partners);
             }
             if (!empty($selected_counties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest_con'), function ($join) {
+                  FROM tbl_tx_cur t1
+                  GROUP BY t1.mfl_code) latest_con'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest_con.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest_con.max_period');
                 })->where('tbl_partner_facility.county_id', $selected_counties)
@@ -653,13 +676,13 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", $selected_counties, "%", $facility, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $selected_counties, "%", $facility, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriFacility::select('*')->where('county_id', $selected_counties);
+                $all_module = NishauriAccess::select('*')->where('county_id', $selected_counties);
             }
             if (!empty($selected_subcounties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest_sub'), function ($join) {
+                    FROM tbl_tx_cur t1
+                    GROUP BY t1.mfl_code) latest_sub'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest_sub.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest_sub.max_period');
                 })
@@ -668,13 +691,13 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", $selected_subcounties, $facility, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", $selected_subcounties, $facility, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriFacility::select('*')->where('sub_county_id', $selected_subcounties);
+                $all_module = NishauriAccess::select('*')->where('sub_county_id', $selected_subcounties);
             }
             if (!empty($selected_facilites)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest_fac'), function ($join) {
+                    FROM tbl_tx_cur t1
+                    GROUP BY t1.mfl_code) latest_fac'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest_fac.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest_fac.max_period');
                 })
@@ -683,16 +706,16 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", "%", $selected_facilites, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", "%", $selected_facilites, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriFacility::select('*')->where('mfl_code', $selected_facilites);
+                $all_module = NishauriAccess::select('*')->where('mfl_code', $selected_facilites);
             }
             if (!empty($selected_from || $selected_to)) {
 
                 $selectedFrom = date('Ym', strtotime($request->from));
                 $selectedTo = date('Ym', strtotime($request->to));
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest_date'), function ($join) {
+                    FROM tbl_tx_cur t1
+                    GROUP BY t1.mfl_code) latest_date'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest_date.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest_date.max_period');
                 })
@@ -704,14 +727,14 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", "%", $facility, date($request->from), date($request->to), date($request->from), date($request->to)]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", "%", $facility, date($request->from), date($request->to)]);
+                $all_enrollment  = NishauriFacility::select('*')->where('mfl_code', Auth::user()->facility_id)->where('enrolled_date', '>=', date($request->from))->where('enrolled_date', '<=', date($request->to));
+                $all_module = NishauriAccess::select('*')->where('mfl_code', Auth::user()->facility_id)->where('date', '>=', date($request->from))->where('date', '<=', date($request->to));
             }
 
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] =  $all_enrollment->get();
+            $data['all_module'] =  $all_module->get();
 
             return $data;
         }
@@ -730,8 +753,8 @@ public function filter_nishauri_uptake(Request $request)
 
             if (!empty($selected_partners)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest'), function ($join) {
+                   FROM tbl_tx_cur t1
+                   GROUP BY t1.mfl_code) latest'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest.max_period');
                 })->where('tbl_partner_facility.partner_id', $selected_partners)
@@ -739,13 +762,13 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", [$selected_partners, "%", "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", [$selected_partners, "%", "%", "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('partner_id', $selected_partners);
+                $all_module = NishauriAccess::select('*')->where('partner_id', $selected_partners);
             }
             if (!empty($selected_counties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest_con'), function ($join) {
+                    FROM tbl_tx_cur t1
+                    GROUP BY t1.mfl_code) latest_con'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest_con.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest_con.max_period');
                 })->where('tbl_partner_facility.county_id', $selected_counties)
@@ -753,13 +776,13 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", $selected_counties, "%", "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", $selected_counties, "%", "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('county_id', $selected_counties);
+                $all_module = NishauriAccess::select('*')->where('county_id', $selected_counties);
             }
             if (!empty($selected_subcounties)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest_sub'), function ($join) {
+                    FROM tbl_tx_cur t1
+                    GROUP BY t1.mfl_code) latest_sub'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest_sub.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest_sub.max_period');
                 })
@@ -768,13 +791,13 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", $selected_subcounties, "%", "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", $selected_subcounties, "%", "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('sub_county_id', $selected_subcounties);
+                $all_module = NishauriAccess::select('*')->where('sub_county_id', $selected_subcounties);
             }
             if (!empty($selected_facilites)) {
                 $query->join(DB::raw('(SELECT t1.mfl_code, MAX(t1.period) AS max_period
-                FROM tbl_tx_cur t1
-                GROUP BY t1.mfl_code) latest_fac'), function ($join) {
+                    FROM tbl_tx_cur t1
+                    GROUP BY t1.mfl_code) latest_fac'), function ($join) {
                     $join->on('tbl_tx_cur.mfl_code', '=', 'latest_fac.mfl_code')
                         ->on('tbl_tx_cur.period', '=', 'latest_fac.max_period');
                 })
@@ -783,9 +806,10 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", "%", $selected_facilites, "1900-01-01", $currentDate, "1900-01-01", $currentDate]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", "%", $selected_facilites, "1900-01-01", $currentDate]);
+                $all_enrollment  = NishauriUptake::select('*')->where('mfl_code', $selected_facilites);
+                $all_module = NishauriAccess::select('*')->where('mfl_code', $selected_facilites);
             }
+
             if (!empty($selected_from || $selected_to)) {
 
                 $selectedFrom = date('Ym', strtotime($request->from));
@@ -804,14 +828,17 @@ public function filter_nishauri_uptake(Request $request)
                 $txcurr = $query->selectRaw('SUM(tbl_tx_cur.tx_cur) as tx_cur')
                     ->get()
                     ->sum('tx_cur');
-                $all_enrollment  = DB::select("CALL sp_nishauri_uptake(?,?,?,?,?,?,?,?)", ["%", "%", "%", "%", date($request->from), date($request->to), date($request->from), date($request->to)]);
-                $all_module = DB::select("CALL sp_nishauri_access_uptake(?,?,?,?,?,?)", ["%", "%", "%", "%", date($request->from), date($request->to)]);
+                $all_enrollment  = NishauriUptake::select('*')->where('enrolled_date', '>=', date($request->from))->where('enrolled_date', '<=', date($request->to));
+                $all_module = NishauriAccess::select('*')->where('date', '>=', date($request->from))->where('date', '<=', date($request->to));
             }
 
 
             $data['txcurr'] =  $txcurr;
-            $data['all_enrollment'] =  $all_enrollment;
-            $data['all_module'] =  $all_module;
+            $data['all_enrollment'] = $all_enrollment->get()->map(function ($item) {
+                $item['no_of_clients'] = (int)$item['no_of_clients'];
+                return $item;
+            });
+            $data['all_module'] =  $all_module->get();
 
             return $data;
         }
diff --git a/app/Models/NishauriAccess.php b/app/Models/NishauriAccess.php
new file mode 100644
index 0000000..98e45aa
--- /dev/null
+++ b/app/Models/NishauriAccess.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class NishauriAccess extends Model
+{
+    use HasFactory;
+
+    public $table = 'etl_nishauri_access_uptake';
+    public $timestamps = false;
+    public $incrementing = false;
+
+    protected $fillable = [];
+}
diff --git a/app/Models/NishauriFacility.php b/app/Models/NishauriFacility.php
new file mode 100644
index 0000000..f09c3ae
--- /dev/null
+++ b/app/Models/NishauriFacility.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class NishauriFacility extends Model
+{
+    use HasFactory;
+    public $table = 'etl_nishauri_facility';
+    public $timestamps = false;
+    public $incrementing = false;
+
+    protected $fillable = [
+
+    ];
+}
diff --git a/app/Models/NishauriUptake.php b/app/Models/NishauriUptake.php
new file mode 100644
index 0000000..b5b14a6
--- /dev/null
+++ b/app/Models/NishauriUptake.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class NishauriUptake extends Model
+{
+    use HasFactory;
+    public $table = 'etl_nishauri_dashboard';
+    public $timestamps = false;
+    public $incrementing = false;
+
+    protected $fillable = [
+
+    ];
+}
diff --git a/app/Models/UshauriProgram.php b/app/Models/UshauriProgram.php
new file mode 100644
index 0000000..0702316
--- /dev/null
+++ b/app/Models/UshauriProgram.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class UshauriProgram extends Model
+{
+    use HasFactory;
+    public $table = 'etl_ushauri_program_indicators';
+    public $timestamps = false;
+
+    protected $fillable = [];
+}
diff --git a/resources/views/dashboard/program.blade.php b/resources/views/dashboard/program.blade.php
new file mode 100644
index 0000000..7a7632c
--- /dev/null
+++ b/resources/views/dashboard/program.blade.php
@@ -0,0 +1,387 @@
+@extends('layouts.master')
+@section('page-css')
+<link rel="stylesheet" href="{{asset('assets/styles/vendor/datatables.min.css')}}">
+
+<style rel="stylesheet" type="text/css">
+    .no_count {
+        font-weight: 700;
+        font-size: 24px;
+    }
+
+    .Clients {
+
+        background: #FFFFFF;
+        border-radius: 10px;
+
+    }
+</style>
+
+@endsection
+
+@section('main-content')
+<!-- <div class="breadcrumb">
+                <ul>
+                    <li><a href="">Appointment Dashboard</a></li>
+                    <li></li>
+                </ul>
+            </div> -->
+
+<div class="col">
+
+    <form role="form" method="get" action="#" id="dataFilter">
+        {{ csrf_field() }}
+        <div class="row">
+
+            <div class="col-lg-3">
+                <div class="form-group">
+                    <span class="filter_facility_wait" style="display: none;"></span>
+
+                    <select class="form-control filter_facility input-rounded input-sm select2" id="month" name="month">
+                        <option value="">Month:</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-lg-3">
+                <div class="form-group">
+
+                    <span class="filter_facility_wait" style="display: none;"></span>
+                    <button class="btn btn-default filter btn-round  btn-small btn-primary  " type="submit" name="filter" id="filter"> <i class="fa fa-filter"></i>
+                        Filter</button>
+                </div>
+            </div>
+        </div>
+
+    </form>
+
+</div>
+<nav>
+    <div class="nav nav-tabs" id="nav-tab" role="tablist">
+        <a class="nav-item nav-link active" id="nav-client-tab" data-toggle="tab" href="#nav-client" role="tab" aria-controls="nav-client" aria-selected="true">Program Dashboard</a>
+        <a class="nav-item nav-link" data-toggle="tab" href="#nav-indicators" role="tab" aria-selected="false"></a>
+    </div>
+</nav>
+<div class="tab-content" id="nav-tabContent">
+    <!-- main dashbaord starts -->
+    <div class="tab-pane fade show active" id="nav-client" role="tabpanel" aria-labelledby="nav-client-tab">
+        <div class="row">
+            <div class="col-6">
+
+                <div class="card-body row">
+                    <div id="client_chart" class="col" style="height:  400px;margin-top:20px;width: 900px"></div> <br />
+                </div>
+            </div>
+            <div class="col-6">
+
+                <div class="card-body row">
+                    <div id="site-chart" class="col" style="height:  400px;margin-top:20px;width: 900px"></div> <br />
+                </div>
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-12">
+                <div class="table-responsive">
+                    <table id="table_client" class="display table table-striped table-bordered" style="width:100%">
+                        <thead>
+                            <tr>
+                                <th>Partner</th>
+                                <th>Facility</th>
+                                <th>MFL Code</th>
+                                <th>County</th>
+                                <th>Facility Status</th>
+                                <th>Month</th>
+                                <th>Booked Clients</th>
+                                <th>Date Last Used</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+
+                        </tbody>
+
+                    </table>
+
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+</div>
+
+
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<link href="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/css/select2.min.css" rel="stylesheet" />
+<script src="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/js/select2.min.js"></script>
+<script src="https://code.highcharts.com/highcharts.js"></script>
+<script src="https://code.highcharts.com/modules/series-label.js"></script>
+<script src="https://code.highcharts.com/modules/exporting.js"></script>
+<script src="https://code.highcharts.com/modules/export-data.js"></script>
+<script src="https://code.highcharts.com/modules/accessibility.js"></script>
+<script src="https://code.highcharts.com/themes/high-contrast-light.js"></script>
+
+<!-- Sweet alert -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@9"></script>
+
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.24/css/jquery.dataTables.min.css">
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/buttons/1.7.0/css/buttons.dataTables.min.css">
+<script type="text/javascript" src="https://cdn.datatables.net/1.10.24/js/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/buttons/1.7.0/js/dataTables.buttons.min.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/buttons/1.7.0/js/buttons.html5.min.js"></script>
+
+
+
+<script>
+    $.ajaxSetup({
+        headers: {
+            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+        }
+    });
+
+    var $j = jQuery.noConflict();
+
+    function fetchData() {
+        $.ajax({
+            url: '/program/data',
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                createChart(data);
+                createChart2(data)
+
+                var list = data.program;
+                $.each(list, function(index, item) {
+                    $('#table_client tbody').append('<tr><td>' + item.PartnerName + '</td><td>' + item.SiteName + '</td><td>' + item.SiteCode + '</td><td>' + item.County_Name + '</td><td>' + item.SiteStatus + '</td><td>' + item.MonthYear + '</td><td>' + item.num_clients + '</td><td>' + item.LastDateUsed + '</td></tr>');
+                });
+                $j('#table_client').DataTable({
+                    columnDefs: [{
+                            targets: [0],
+                            orderData: [0, 1]
+                        },
+                        {
+                            targets: [1],
+                            orderData: [1, 0]
+                        },
+                        {
+                            targets: [4],
+                            orderData: [4, 0]
+                        }
+                    ],
+                    "pageLength": 10,
+                    "paging": true,
+                    "responsive": true,
+                    "ordering": true,
+                    "info": true,
+                    dom: 'Bfrtip',
+                    buttons: [
+                        'copyHtml5',
+                        'excelHtml5',
+                        'csvHtml5',
+                        'pdfHtml5'
+                    ]
+                });
+                if (data.months && data.months.length > 0) {
+                    // Clear existing options
+                    $('#module').empty();
+
+                    // Add a default option
+                    $('#module').append('<option value="">Month : </option>');
+
+                    // Add each month as an option
+                    $.each(data.months, function(index, monthObj) {
+                        if (monthObj.MonthYear) {
+                            var parts = monthObj.MonthYear.split('-');
+                            var month = parts[0];
+                            var year = parts[1];
+                            $('#month').append('<option value="' + monthObj.MonthYear + '">' + month + '-' + year + '</option>');
+                        }
+                    });
+                } else {
+                    console.error('No months data available');
+                }
+            },
+            error: function(xhr, status, error) {
+                console.error('Error fetching data:', status, error);
+            }
+        });
+    }
+
+    function fetchData2() {
+        $('#dataFilter').on('submit', function(e) {
+            e.preventDefault();
+            let month = $('#month').val();
+
+            Swal.fire({
+                title: "Please wait, Loading Charts!",
+                showConfirmButton: false,
+                allowOutsideClick: false
+            });
+            $.ajaxSetup({
+                headers: {
+                    'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+                }
+            });
+
+            $.ajax({
+                type: 'GET',
+                data: {
+                    "month": month
+                },
+                url: "{{ route('program_filter') }}",
+                success: function(data) {
+                    createChart(data);
+                    createChart2(data);
+                    var list = data.program;
+                    var table = $j('#table_client').DataTable();
+
+                    // Destroy the DataTable instance
+                    table.destroy();
+
+                    $('#table_client tbody').empty();
+                    $.each(list, function(index, item) {
+                        $('#table_client tbody').append('<tr><td>' + item.PartnerName + '</td><td>' + item.SiteName + '</td><td>' + item.SiteCode + '</td><td>' + item.County_Name + '</td><td>' + item.SiteStatus + '</td><td>' + item.MonthYear + '</td><td>' + item.num_clients + '</td><td>' + item.LastDateUsed + '</td></tr>');
+                    });
+                    $j('#table_client').DataTable({
+                        columnDefs: [{
+                                targets: [0],
+                                orderData: [0, 1]
+                            },
+                            {
+                                targets: [1],
+                                orderData: [1, 0]
+                            },
+                            {
+                                targets: [4],
+                                orderData: [4, 0]
+                            }
+                        ],
+                        "pageLength": 10,
+                        "paging": true,
+                        "responsive": true,
+                        "ordering": true,
+                        "info": true,
+                        dom: 'Bfrtip',
+                        buttons: [
+                            'copyHtml5',
+                            'excelHtml5',
+                            'csvHtml5',
+                            'pdfHtml5'
+                        ]
+                    });
+
+                    Swal.close();
+
+                }
+            });
+        });
+    }
+
+    function createChart(jsonData) {
+        const processedData = jsonData.program.reduce((accumulator, item) => {
+            if (item.MonthYear && item.num_clients) {
+                const monthYear = item.MonthYear;
+                accumulator[monthYear] = (accumulator[monthYear] || 0) + item.num_clients;
+            }
+            return accumulator;
+        }, {});
+
+        const seriesData = Object.keys(processedData).map(monthYear => ({
+            name: monthYear,
+            y: processedData[monthYear]
+        }));
+
+        Highcharts.chart('client_chart', {
+            chart: {
+                type: 'column',
+                style: {
+                    fontFamily: 'Inter',
+                    fontSize: '14px'
+                }
+            },
+            title: {
+                text: 'No of Clients Booked for the last 6 Months',
+                style: {
+                    fontFamily: 'Inter',
+                    fontSize: '14px'
+                }
+            },
+            xAxis: {
+                categories: Object.keys(processedData),
+                title: {
+                    text: 'MonthYear'
+                }
+            },
+            yAxis: {
+                title: {
+                    text: 'No of Clients',
+                    style: {
+                        fontFamily: 'Inter',
+                        fontSize: '14px'
+                    }
+                }
+            },
+            series: [{
+                name: 'No of Clients',
+                color: '#01058A',
+                data: seriesData
+            }]
+        });
+    }
+
+    function createChart2(jsonData) {
+        const monthYearCount = jsonData.program.reduce((accumulator, item) => {
+            if (item.MonthYear) {
+                accumulator[item.MonthYear] = (accumulator[item.MonthYear] || 0) + 1;
+            }
+            return accumulator;
+        }, {});
+
+        const seriesData = Object.keys(monthYearCount).map(monthYear => ({
+            name: monthYear,
+            y: monthYearCount[monthYear]
+        }));
+
+        Highcharts.chart('site-chart', {
+            chart: {
+                type: 'column'
+            },
+            title: {
+                text: 'Active Sites the last 6 Months',
+                style: {
+                    fontFamily: 'Inter',
+                    fontSize: '14px'
+                }
+            },
+            xAxis: {
+                categories: Object.keys(monthYearCount),
+                title: {
+                    text: 'MonthYear'
+                }
+            },
+            yAxis: {
+                title: {
+                    text: 'No of Sites'
+                }
+            },
+            series: [{
+                name: 'No of Sites',
+                color: '#01058A',
+                data: seriesData
+            }]
+        });
+    }
+
+    // Fetch data when the page loads
+    fetchData();
+    fetchData2();
+</script>
+
+
+
+
+
+<!-- end of col -->
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/nishauri/dashboard.blade.php b/resources/views/nishauri/dashboard.blade.php
index dbd164a..ab652ea 100644
--- a/resources/views/nishauri/dashboard.blade.php
+++ b/resources/views/nishauri/dashboard.blade.php
@@ -155,7 +155,7 @@
                 <div class="form-group">
 
                     <select class="form-control select2" id="partners" name="partner">
-                    <option value="">Partner</option>
+                        <option value="">Partner</option>
                         @if (count($partners) > 0)
                         @foreach($partners as $partner)
                         <option value="{{$partner->id }}">{{ ucwords($partner->name) }}</option>
@@ -970,9 +970,13 @@ function getCountsByFacility(data) {
                         notenrolledCount += allEnrollments[i].no_of_clients;
                     }
                 }
+                var enrolledPercentage = 0;
+                var notEnrolledPercentage = 0;
                 var totalCount = enrolledCount + notenrolledCount;
-                var enrolledPercentage = (enrolledCount / totalCount) * 100;
-                var notEnrolledPercentage = (notenrolledCount / totalCount) * 100;
+                if (totalCount !== 0) {
+                    enrolledPercentage = (enrolledCount / totalCount) * 100;
+                    notEnrolledPercentage = (notenrolledCount / totalCount) * 100;
+                }
 
 
             } else {
@@ -1080,9 +1084,13 @@ function getCountsByFacility(data) {
                     }
                 }
 
+                var enrolledPercentage = 0;
+                var notEnrolledPercentage = 0;
                 var totalCount = enrolledCount + notenrolledCount;
-                var enrolledPercentage = (enrolledCount / totalCount) * 100;
-                var notEnrolledPercentage = (notenrolledCount / totalCount) * 100;
+                if (totalCount !== 0) {
+                    enrolledPercentage = (enrolledCount / totalCount) * 100;
+                    notEnrolledPercentage = (notenrolledCount / totalCount) * 100;
+                }
             }
 
             // gender
@@ -1256,30 +1264,275 @@ function getCountsByFacility(data) {
                 var enrolledCount = 0;
                 var notenrolledCount = 0;
 
+                if (authenticating == 'Admin' || authenticating == 'Donor' || authenticating == 'Partner' || authenticating == 'County' || authenticating == 'Sub County') {
+                    function getCountsByGender(allEnrollments) {
+                        const counts = {
+                            Male: {
+                                enrolled: 0,
+                                not_enrolled: 0
+                            },
+                            Female: {
+                                enrolled: 0,
+                                not_enrolled: 0
+                            },
+                            Unknown: {
+                                enrolled: 0,
+                                not_enrolled: 0
+                            }
+                        };
+
+                        data.all_enrollment.forEach(entry => {
+                            const {
+                                gender,
+                                no_of_clients,
+                                enrollment
+                            } = entry;
+                            if (enrollment === 'Enrolled') {
+                                counts[gender].enrolled += no_of_clients;
+                            } else if (enrollment === 'Not Enrolled') {
+                                counts[gender].not_enrolled += no_of_clients;
+                            }
+                        });
+
+                        return counts;
+                    }
+
+                    function getCountsByAge(data) {
+                        const counts = {};
+                        data.forEach(entry => {
+                            const age = entry.age_range;
+                            if (!counts[age]) {
+                                counts[age] = {
+                                    age_enrolled: 0,
+                                    age_not_enrolled: 0
+                                };
+                            }
+                            if (entry.enrollment === 'Enrolled') {
+                                counts[age].age_enrolled += entry.no_of_clients;
+                            } else if (entry.enrollment === 'Not Enrolled') {
+                                counts[age].age_not_enrolled += entry.no_of_clients;
+                            }
+                        });
+                        return counts;
+                    }
+
+                    function getCountsByMonthly(data) {
+                        const counts = {};
+                        data.forEach(entry => {
+                            const monthly = entry.enrolled_month;
+                            if (monthly !== null) {
+                                if (!counts[monthly]) {
+                                    counts[monthly] = {
+                                        monthly_enrolled: 0,
+                                        monthly_not_enrolled: 0
+                                    };
+                                }
+                                if (entry.enrollment === 'Enrolled') {
+                                    counts[monthly].monthly_enrolled += entry.no_of_clients;
+                                } else if (entry.enrollment === 'Not Enrolled') {
+                                    counts[monthly].monthly_not_enrolled += entry.no_of_clients;
+                                }
+                            }
+                        });
+                        return counts;
+                    }
+                    if (authenticating == 'Admin' || authenticating == 'Donor') {
+                        function getCountsByPartner(data) {
+                            const counts = {};
+                            data.forEach(entry => {
+                                const partner = entry.partner;
+                                if (!counts[partner]) {
+                                    counts[partner] = {
+                                        enrolled: 0,
+                                        not_enrolled: 0
+                                    };
+                                }
+                                if (entry.enrollment === 'Enrolled') {
+                                    counts[partner].enrolled += entry.no_of_clients;
+                                } else if (entry.enrollment === 'Not Enrolled') {
+                                    counts[partner].not_enrolled += entry.no_of_clients;
+                                }
+                            });
+                            return counts;
+                        }
+                    } else {
+                        function getCountsByFacility(data) {
+                            const counts = {};
+                            data.forEach(entry => {
+                                const facility = entry.facility;
+                                if (!counts[facility]) {
+                                    counts[facility] = {
+                                        enrolled: 0,
+                                        not_enrolled: 0
+                                    };
+                                }
+                                if (entry.enrollment === 'Enrolled') {
+                                    counts[facility].enrolled += entry.no_of_clients;
+                                } else if (entry.enrollment === 'Not Enrolled') {
+                                    counts[facility].not_enrolled += entry.no_of_clients;
+                                }
+                            });
+                            return counts;
+                        }
+                    }
+
+                    for (let i = 0; i < allEnrollments.length; i++) {
+                        if (allEnrollments[i].enrollment === "Enrolled") {
+                            enrolledCount += allEnrollments[i].no_of_clients;
+                        } else {
+                            notenrolledCount += allEnrollments[i].no_of_clients;
+                        }
+                    }
+                    var enrolledPercentage = 0;
+                    var notEnrolledPercentage = 0;
+                    var totalCount = enrolledCount + notenrolledCount;
+                    if (totalCount !== 0) {
+                        enrolledPercentage = (enrolledCount / totalCount) * 100;
+                        notEnrolledPercentage = (notenrolledCount / totalCount) * 100;
+                    }
+
+
+                } else {
+
+                    function getCountsByGender(data) {
+                        const counts = {};
+                        data.forEach(entry => {
+                            const gender = entry.gender;
+                            if (!counts[gender]) {
+                                counts[gender] = {
+                                    enrolled: 0,
+                                    not_enrolled: 0
+                                };
+                            }
+                            if (entry.enrollment === 'Enrolled') {
+                                counts[gender].enrolled++;
+                            } else if (entry.enrollment === 'Not Enrolled') {
+                                counts[gender].not_enrolled++;
+                            }
+                        });
+                        return counts;
+                    }
+
+                    function getCountsByAge(data) {
+                        const counts = {};
+                        data.forEach(entry => {
+                            const age = entry.age_range;
+                            if (!counts[age]) {
+                                counts[age] = {
+                                    age_enrolled: 0,
+                                    age_not_enrolled: 0
+                                };
+                            }
+                            if (entry.enrollment === 'Enrolled') {
+                                counts[age].age_enrolled++;
+                            } else if (entry.enrollment === 'Not Enrolled') {
+                                counts[age].age_not_enrolled++;
+                            }
+                        });
+                        return counts;
+                    }
+
+                    function getCountsByMonthly(data) {
+                        const counts = {};
+                        data.forEach(entry => {
+                            const monthly = entry.enrolled_month;
+                            if (monthly !== null) {
+                                if (!counts[monthly]) {
+                                    counts[monthly] = {
+                                        monthly_enrolled: 0,
+                                    };
+                                }
+                                if (entry.enrollment === 'Enrolled') {
+                                    counts[monthly].monthly_enrolled++;
+                                }
+                            }
+                        });
+                        return counts;
+                    }
+
+                    function getCountsByFacility(data) {
+                        const counts = {};
+                        data.forEach(entry => {
+                            const facility = entry.facility;
+                            if (!counts[facility]) {
+                                counts[facility] = {
+                                    enrolled: 0,
+                                    not_enrolled: 0
+                                };
+                            }
+                            if (entry.enrollment === 'Enrolled') {
+                                counts[facility].enrolled++;
+                            } else if (entry.enrollment === 'Not Enrolled') {
+                                counts[facility].not_enrolled++;
+                            }
+                        });
+                        return counts;
+                    }
+
+
+                    // function getCountsByPartner(data) {
+                    //     const counts = {};
+                    //     data.forEach(entry => {
+                    //         const partner = entry.partner;
+                    //         if (!counts[partner]) {
+                    //             counts[partner] = {
+                    //                 enrolled: 0,
+                    //                 not_enrolled: 0
+                    //             };
+                    //         }
+                    //         if (entry.enrollment === 'Enrolled') {
+                    //             counts[partner].enrolled++;
+                    //         } else if (entry.enrollment === 'Not Enrolled') {
+                    //             counts[partner].not_enrolled++;
+                    //         }
+                    //     });
+                    //     return counts;
+                    // }
+
+                    for (var i = 0; i < allEnrollments.length; i++) {
+                        if (allEnrollments[i].enrollment === "Enrolled") {
+                            enrolledCount++;
+                        } else {
+                            notenrolledCount++;
+                        }
+                    }
+
+                    var enrolledPercentage = 0;
+                    var notEnrolledPercentage = 0;
+                    var totalCount = enrolledCount + notenrolledCount;
+                    if (totalCount !== 0) {
+                        enrolledPercentage = (enrolledCount / totalCount) * 100;
+                        notEnrolledPercentage = (notenrolledCount / totalCount) * 100;
+                    }
+
+                }
+
                 // gender
-                const counts = getCountsByGender(data.all_enrollment);
+                const counts = getCountsByGender(allEnrollments);
                 const gender = Object.keys(counts);
-                const enrolled = gender.map(gf => counts[gf].enrolled);
-                const not_enrolled = gender.map(gf => counts[gf].not_enrolled);
+                const enrolled = gender.map(g => counts[g].enrolled);
+                const not_enrolled = gender.map(g => counts[g].not_enrolled);
                 enrollmentGender(gender, enrolled, not_enrolled);
                 // age
-                const agecounts = getCountsByAge(data.all_enrollment);
+                const agecounts = getCountsByAge(allEnrollments);
                 const age = Object.keys(agecounts);
                 const age_enrolled = age.map(a => agecounts[a].age_enrolled);
                 const age_not_enrolled = age.map(a => agecounts[a].age_not_enrolled);
                 enrollmentAge(age, age_enrolled, age_not_enrolled);
 
                 // monthly enrollment
-                const monthlycounts = getCountsByMonthly(data.all_enrollment);
+                const monthlycounts = getCountsByMonthly(allEnrollments);
                 const monthly = Object.keys(monthlycounts);
                 monthly.sort((a, b) => new Date(a) - new Date(b));
                 const monthly_enrolled = monthly.map(a => monthlycounts[a].monthly_enrolled);
                 enrollmentMonthly(monthly, monthly_enrolled);
 
+                // laoding sequentially
+
                 if (authenticating == 'Partner' || authenticating == 'County' || authenticating == 'Sub County') {
 
                     // facilities enrollment
-                    const facilitycounts = getCountsByFacility(data.all_enrollment);
+                    const facilitycounts = getCountsByFacility(allEnrollments);
                     const facility = Object.keys(facilitycounts);
                     const facility_enrolled = facility.map(f => facilitycounts[f].enrolled);
                     const facility_not_enrolled = facility.map(f => facilitycounts[f].not_enrolled);
@@ -1288,7 +1541,7 @@ function getCountsByFacility(data) {
 
                 if (authenticating == 'Admin' || authenticating == 'Donor') {
                     // partner enrollment
-                    const partnercounts = getCountsByPartner(data.all_enrollment);
+                    const partnercounts = getCountsByPartner(allEnrollments);
                     const partner = Object.keys(partnercounts);
                     const partner_enrolled = partner.map(p => partnercounts[p].enrolled);
                     const partner_not_enrolled = partner.map(p => partnercounts[p].not_enrolled);
@@ -1324,7 +1577,7 @@ function getCountsByFacility(data) {
                     []
                 ];
                 // Loop through the all_enrollment data to count login days
-                data.all_enrollment.forEach(function(entry) {
+                allEnrollments.forEach(function(entry) {
                     var loginDate = entry.last_login; // Assuming last_login is the date of login
 
                     if (loginDate) {
@@ -1341,114 +1594,6 @@ function getCountsByFacility(data) {
                 // Initialize and render Highcharts column chart
 
 
-
-                function getCountsByGender(data) {
-                    const counts = {};
-                    data.forEach(entry => {
-                        const gender = entry.gender;
-                        if (!counts[gender]) {
-                            counts[gender] = {
-                                enrolled: 0,
-                                not_enrolled: 0
-                            };
-                        }
-                        if (entry.enrollment === 'Enrolled') {
-                            counts[gender].enrolled++;
-                        } else if (entry.enrollment === 'Not Enrolled') {
-                            counts[gender].not_enrolled++;
-                        }
-                    });
-                    return counts;
-                }
-
-                function getCountsByAge(data) {
-                    const counts = {};
-                    data.forEach(entry => {
-                        const age = entry.age_range;
-                        if (!counts[age]) {
-                            counts[age] = {
-                                age_enrolled: 0,
-                                age_not_enrolled: 0
-                            };
-                        }
-                        if (entry.enrollment === 'Enrolled') {
-                            counts[age].age_enrolled++;
-                        } else if (entry.enrollment === 'Not Enrolled') {
-                            counts[age].age_not_enrolled++;
-                        }
-                    });
-                    return counts;
-                }
-
-                function getCountsByMonthly(data) {
-                    const counts = {};
-                    data.forEach(entry => {
-                        const monthly = entry.enrolled_month;
-                        if (monthly !== null) {
-                            if (!counts[monthly]) {
-                                counts[monthly] = {
-                                    monthly_enrolled: 0,
-                                };
-                            }
-                            if (entry.enrollment === 'Enrolled') {
-                                counts[monthly].monthly_enrolled++;
-                            }
-                        }
-                    });
-                    return counts;
-                }
-
-                function getCountsByFacility(data) {
-                    const counts = {};
-                    data.forEach(entry => {
-                        const facility = entry.facility;
-                        if (!counts[facility]) {
-                            counts[facility] = {
-                                enrolled: 0,
-                                not_enrolled: 0
-                            };
-                        }
-                        if (entry.enrollment === 'Enrolled') {
-                            counts[facility].enrolled++;
-                        } else if (entry.enrollment === 'Not Enrolled') {
-                            counts[facility].not_enrolled++;
-                        }
-                    });
-                    return counts;
-                }
-
-
-                function getCountsByPartner(data) {
-                    const counts = {};
-                    data.forEach(entry => {
-                        const partner = entry.partner;
-                        if (!counts[partner]) {
-                            counts[partner] = {
-                                enrolled: 0,
-                                not_enrolled: 0
-                            };
-                        }
-                        if (entry.enrollment === 'Enrolled') {
-                            counts[partner].enrolled++;
-                        } else if (entry.enrollment === 'Not Enrolled') {
-                            counts[partner].not_enrolled++;
-                        }
-                    });
-                    return counts;
-                }
-
-                for (var i = 0; i < allEnrollments.length; i++) {
-                    if (allEnrollments[i].enrollment === "Enrolled") {
-                        enrolledCount++;
-                    } else {
-                        notenrolledCount++;
-                    }
-                }
-
-                var totalCount = enrolledCount + notenrolledCount;
-                var enrolledPercentage = (enrolledCount / totalCount) * 100;
-                var notEnrolledPercentage = (notenrolledCount / totalCount) * 100;
-
                 $("#client_enrolled").html(enrolledCount.toLocaleString());
                 $("#client_profile").html(notenrolledCount.toLocaleString());
                 $("#client").html(data.txcurr.toLocaleString());
@@ -1459,17 +1604,14 @@ function getCountsByPartner(data) {
                 $("#enrolledPercentage").text(enrolledPercentage.toFixed(1) + "%");
                 $("#notEnrolledPercentage").text(notEnrolledPercentage.toFixed(1) + "%")
 
-                var radial = document.querySelector(".radial-01");
-                radial.style.setProperty("--progress", notEnrolledPercentage + "%");
-
                 if (authenticating == 'Facility') {
+                    var list_client = allEnrollments;
                     var table = $j('#table_client').DataTable();
 
                     // Destroy the DataTable instance
                     table.destroy();
 
                     $('#table_client tbody').empty();
-                    var list_client = data.all_enrollment;
                     $.each(list_client, function(index, item) {
                         $('#table_client tbody').append('<tr><td>' + item.upi_no + '</td><td>' + item.clinic_number + '</td><td>' + item.client_name + '</td><td>' + item.dob + '</td><td>' + item.phone_no + '</td><td>' + item.gender + '</td><td>' + item.enrollment + '</td><td>' + item.last_login + '</td></tr>');
                     });
@@ -1498,7 +1640,6 @@ function getCountsByPartner(data) {
                         ]
                     });
                 }
-
                 Swal.close();
 
 
diff --git a/routes/web.php b/routes/web.php
index d9af119..230161f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -301,4 +301,10 @@
 
   Route::get('/tracing/attempts', ['uses' => 'App\Http\Controllers\ReportController@tracing_attempts', 'as' => 'tracing_attempts']);
   Route::get('/report/tracing/attempts', ['uses' => 'App\Http\Controllers\ReportController@tracing_attempts_form', 'as' => 'tracing_attempts_form']);
+
+  //program reports
+  Route::get('/reports/program', ['uses' => 'App\Http\Controllers\NewReportController@program_index', 'as' => 'program']);
+  Route::get('/program/data', ['uses' => 'App\Http\Controllers\NewReportController@program', 'as' => 'program_data']);
+  Route::get('/program_filter', ['uses' => 'App\Http\Controllers\NewReportController@program_filter', 'as' => 'program_filter']);
+
 });

From 819b0b5d2f134094d9a81979bf56e7458d3d6731 Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Mon, 4 Dec 2023 08:04:27 +0300
Subject: [PATCH 3/9] updated program indicator

---
 app/Http/Controllers/NewReportController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/NewReportController.php b/app/Http/Controllers/NewReportController.php
index 4d7274a..ee767d9 100644
--- a/app/Http/Controllers/NewReportController.php
+++ b/app/Http/Controllers/NewReportController.php
@@ -765,8 +765,8 @@ public function program()
     {
         $data = [];
 
-        $program = UshauriProgram::select('*')->orderBy('MonthYear', 'ASC');
-        $months = UshauriProgram::select('MonthYear')->orderBy('MonthYear', 'ASC')->groupBy('MonthYear');
+        $program = UshauriProgram::select('*')->orderBy('Months', 'ASC');
+        $months = UshauriProgram::select('MonthYear')->orderBy('Months', 'ASC')->groupBy('MonthYear');
 
         $data["program"] = $program->get();
         $data["months"] = $months->get();
@@ -778,7 +778,7 @@ public function program_filter(Request $request)
         $data = [];
         $selected_month = $request->month;
 
-        $program = UshauriProgram::select('*')->orderBy('MonthYear', 'ASC');
+        $program = UshauriProgram::select('*')->orderBy('Months', 'ASC');
 
         if (!empty($selected_month)) {
             $program = $program->where('MonthYear', $selected_month);

From 32c660f18680fb09f7a1b21607426df152583764 Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:59:39 +0300
Subject: [PATCH 4/9] changes on program dashboard

---
 app/Http/Controllers/NewReportController.php  |  72 ++++++-
 app/Models/UshauriProgramActive.php           |  15 ++
 resources/views/dashboard/program.blade.php   | 185 ++++++++++++------
 .../large-vertical-sidebar/sidebar.blade.php  |   5 +
 4 files changed, 208 insertions(+), 69 deletions(-)
 create mode 100644 app/Models/UshauriProgramActive.php

diff --git a/app/Http/Controllers/NewReportController.php b/app/Http/Controllers/NewReportController.php
index ee767d9..c2b94ee 100644
--- a/app/Http/Controllers/NewReportController.php
+++ b/app/Http/Controllers/NewReportController.php
@@ -18,6 +18,7 @@
 use App\Models\Condition;
 use App\Models\Marital;
 use App\Models\UshauriProgram;
+use App\Models\UshauriProgramActive;
 use DB;
 use Auth;
 use Carbon\Carbon;
@@ -765,25 +766,84 @@ public function program()
     {
         $data = [];
 
-        $program = UshauriProgram::select('*')->orderBy('Months', 'ASC');
-        $months = UshauriProgram::select('MonthYear')->orderBy('Months', 'ASC')->groupBy('MonthYear');
+        $latestMonthYear = UshauriProgram::max('LastDateUsed');
+        $latestMonthYear = UshauriProgramActive::max('LastDateUsed');
+
+        $sixMonthsBefore = Carbon::parse($latestMonthYear)->subMonths(5);
+        $program = UshauriProgram::whereDate('LastDateUsed', '>=', $sixMonthsBefore)->orderBy('Months', 'ASC');
+        $active_site = UshauriProgramActive::whereDate('LastDateUsed', '>=', $sixMonthsBefore)->orderBy('Months', 'ASC');
+
 
         $data["program"] = $program->get();
-        $data["months"] = $months->get();
+        $data["active_site"] = $active_site->get();
 
         return $data;
     }
     public function program_filter(Request $request)
     {
         $data = [];
-        $selected_month = $request->month;
+        $selected_month = $request->months;
+        $selected_year = $request->year;
+
+
 
-        $program = UshauriProgram::select('*')->orderBy('Months', 'ASC');
 
         if (!empty($selected_month)) {
-            $program = $program->where('MonthYear', $selected_month);
+            $program = UshauriProgram::select('*')->orderBy('Months', 'ASC');
+            $program = $program->where('MonthYear', 'LIKE', "%$selected_month%");
+
+            $active_site = UshauriProgramActive::select('*')->orderBy('Months', 'ASC');
+            $active_site = $active_site->where('MonthYear', 'LIKE', "%$selected_month%");
+        }
+        if (!empty($selected_year)) {
+            $program = UshauriProgram::select('*')->orderBy('Months', 'ASC');
+            $program = $program->where('MonthYear', 'LIKE', "%$selected_year%");
+
+            $active_site = UshauriProgramActive::select('*')->orderBy('Months', 'ASC');
+            $active_site = $active_site->where('MonthYear', 'LIKE', "%$selected_year%");
+        }
+        if (!empty($selected_year) && !empty($selected_month)) {
+            // $program = UshauriProgram::where('MonthYear', 'LIKE', "$selected_month-$selected_year");
+            $selected_month_number = date('n', strtotime("$selected_month 1"));
+
+            $program = UshauriProgram::where(function ($query) use ($selected_month, $selected_year, $selected_month_number) {
+                $query->where('MonthYear', 'LIKE', "$selected_month-$selected_year")->orderBy('Months', 'ASC');
+
+                for ($i = 1; $i <= 5; $i++) {
+                    $previous_month_number = $selected_month_number - $i;
+                    $previous_month_name = date('F', mktime(0, 0, 0, $previous_month_number, 1));
+
+                    if ($previous_month_number <= 0) {
+                        $previous_month_number += 12;
+                        $previous_year = $selected_year - 1;
+                    } else {
+                        $previous_year = $selected_year;
+                    }
+
+                    $query->orWhere('MonthYear', 'LIKE', "$previous_month_name-$previous_year");
+                }
+            });
+
+            $active_site = UshauriProgramActive::where(function ($query) use ($selected_month, $selected_year, $selected_month_number) {
+                $query->where('MonthYear', 'LIKE', "$selected_month-$selected_year")->orderBy('Months', 'ASC');
+
+                for ($i = 1; $i <= 5; $i++) {
+                    $previous_month_number = $selected_month_number - $i;
+                    $previous_month_name = date('F', mktime(0, 0, 0, $previous_month_number, 1));
+
+                    if ($previous_month_number <= 0) {
+                        $previous_month_number += 12;
+                        $previous_year = $selected_year - 1;
+                    } else {
+                        $previous_year = $selected_year;
+                    }
+
+                    $query->orWhere('MonthYear', 'LIKE', "$previous_month_name-$previous_year");
+                }
+            });
         }
         $data["program"] = $program->get();
+        $data["active_site"] = $active_site->get();
         return $data;
     }
 }
diff --git a/app/Models/UshauriProgramActive.php b/app/Models/UshauriProgramActive.php
new file mode 100644
index 0000000..25299f6
--- /dev/null
+++ b/app/Models/UshauriProgramActive.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class UshauriProgramActive extends Model
+{
+    use HasFactory;
+    public $table = 'etl_ushauri_program_active';
+    public $timestamps = false;
+
+    protected $fillable = [];
+}
diff --git a/resources/views/dashboard/program.blade.php b/resources/views/dashboard/program.blade.php
index 7a7632c..216630e 100644
--- a/resources/views/dashboard/program.blade.php
+++ b/resources/views/dashboard/program.blade.php
@@ -36,9 +36,32 @@
                 <div class="form-group">
                     <span class="filter_facility_wait" style="display: none;"></span>
 
-                    <select class="form-control filter_facility input-rounded input-sm select2" id="month" name="month">
+                    <!-- <select class="form-control filter_facility input-rounded input-sm select2" id="month" name="month">
                         <option value="">Month:</option>
+                    </select> -->
+                    <select class="form-control filter_facility input-rounded input-sm select2" id="months" name="months">
+                        <option value="">Month:</option>
+                    </select>
+
+
+                </div>
+            </div>
+            <div class="col-lg-3">
+                <div class="form-group">
+                    <span class="filter_facility_wait" style="display: none;"></span>
+                    <select class="form-control filter_facility input-rounded input-sm select2" id="year" name="year">
+                        <option value="">Year:</option>
+                        @php
+                        $currentYear = date('Y');
+                        $startYear = 2019;
+                        @endphp
+
+                        @for ($year = $currentYear; $year >= $startYear; $year--)
+                        <option value="{{ $year }}">{{ $year }}</option>
+                        @endfor
                     </select>
+
+
                 </div>
             </div>
             <div class="col-lg-3">
@@ -134,6 +157,25 @@
 
 
 <script>
+    document.addEventListener("DOMContentLoaded", function() {
+        // Get a reference to the select element
+        var monthsSelect = document.getElementById("months");
+
+        // Create an array of month names
+        var monthNames = [
+            "January", "February", "March", "April", "May", "June",
+            "July", "August", "September", "October", "November", "December"
+        ];
+
+        // Iterate through the month names and add options to the select element
+        for (var i = 0; i < monthNames.length; i++) {
+            var option = document.createElement("option");
+            option.value = monthNames[i];
+            option.text = monthNames[i];
+            monthsSelect.add(option);
+        }
+    });
+
     $.ajaxSetup({
         headers: {
             'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -151,7 +193,15 @@ function fetchData() {
                 createChart(data);
                 createChart2(data)
 
-                var list = data.program;
+                var listdata = data.program;
+                var maxMonths = listdata.reduce(function(max, site) {
+                    return site.Months > max ? site.Months : max;
+                }, '');
+                var list = listdata.filter(function(site) {
+                    return site.Months === maxMonths;
+                });
+
+
                 $.each(list, function(index, item) {
                     $('#table_client tbody').append('<tr><td>' + item.PartnerName + '</td><td>' + item.SiteName + '</td><td>' + item.SiteCode + '</td><td>' + item.County_Name + '</td><td>' + item.SiteStatus + '</td><td>' + item.MonthYear + '</td><td>' + item.num_clients + '</td><td>' + item.LastDateUsed + '</td></tr>');
                 });
@@ -182,25 +232,25 @@ function fetchData() {
                         'pdfHtml5'
                     ]
                 });
-                if (data.months && data.months.length > 0) {
-                    // Clear existing options
-                    $('#module').empty();
-
-                    // Add a default option
-                    $('#module').append('<option value="">Month : </option>');
-
-                    // Add each month as an option
-                    $.each(data.months, function(index, monthObj) {
-                        if (monthObj.MonthYear) {
-                            var parts = monthObj.MonthYear.split('-');
-                            var month = parts[0];
-                            var year = parts[1];
-                            $('#month').append('<option value="' + monthObj.MonthYear + '">' + month + '-' + year + '</option>');
-                        }
-                    });
-                } else {
-                    console.error('No months data available');
-                }
+                // if (data.months && data.months.length > 0) {
+                //     // Clear existing options
+                //     $('#module').empty();
+
+                //     // Add a default option
+                //     $('#module').append('<option value="">Month : </option>');
+
+                //     // Add each month as an option
+                //     $.each(data.months, function(index, monthObj) {
+                //         if (monthObj.MonthYear) {
+                //             var parts = monthObj.MonthYear.split('-');
+                //             var month = parts[0];
+                //             var year = parts[1];
+                //             $('#month').append('<option value="' + monthObj.MonthYear + '">' + month + '-' + year + '</option>');
+                //         }
+                //     });
+                // } else {
+                //     console.error('No months data available');
+                // }
             },
             error: function(xhr, status, error) {
                 console.error('Error fetching data:', status, error);
@@ -211,7 +261,8 @@ function fetchData() {
     function fetchData2() {
         $('#dataFilter').on('submit', function(e) {
             e.preventDefault();
-            let month = $('#month').val();
+            let months = $('#months').val();
+            let year = $('#year').val();
 
             Swal.fire({
                 title: "Please wait, Loading Charts!",
@@ -227,13 +278,21 @@ function fetchData2() {
             $.ajax({
                 type: 'GET',
                 data: {
-                    "month": month
+                    "months": months,
+                    "year":year
                 },
                 url: "{{ route('program_filter') }}",
                 success: function(data) {
                     createChart(data);
                     createChart2(data);
-                    var list = data.program;
+                    var listdata = data.program;
+                    var maxMonths = listdata.reduce(function(max, site) {
+                        return site.Months > max ? site.Months : max;
+                    }, '');
+                    var list = listdata.filter(function(site) {
+                        return site.Months === maxMonths;
+                    });
+                    console.log(list);
                     var table = $j('#table_client').DataTable();
 
                     // Destroy the DataTable instance
@@ -331,47 +390,47 @@ function createChart(jsonData) {
     }
 
     function createChart2(jsonData) {
-        const monthYearCount = jsonData.program.reduce((accumulator, item) => {
-            if (item.MonthYear) {
-                accumulator[item.MonthYear] = (accumulator[item.MonthYear] || 0) + 1;
+    const monthYearSum = jsonData.active_site.reduce((accumulator, item) => {
+        if (item.MonthYear) {
+            accumulator[item.MonthYear] = (accumulator[item.MonthYear] || 0) + item.num_sites;
+        }
+        return accumulator;
+    }, {});
+
+    const seriesData = Object.keys(monthYearSum).map(monthYear => ({
+        name: monthYear,
+        y: monthYearSum[monthYear]
+    }));
+
+    Highcharts.chart('site-chart', {
+        chart: {
+            type: 'column'
+        },
+        title: {
+            text: 'Active Sites the last 6 Months',
+            style: {
+                fontFamily: 'Inter',
+                fontSize: '14px'
             }
-            return accumulator;
-        }, {});
-
-        const seriesData = Object.keys(monthYearCount).map(monthYear => ({
-            name: monthYear,
-            y: monthYearCount[monthYear]
-        }));
-
-        Highcharts.chart('site-chart', {
-            chart: {
-                type: 'column'
-            },
+        },
+        xAxis: {
+            categories: Object.keys(monthYearSum),
             title: {
-                text: 'Active Sites the last 6 Months',
-                style: {
-                    fontFamily: 'Inter',
-                    fontSize: '14px'
-                }
-            },
-            xAxis: {
-                categories: Object.keys(monthYearCount),
-                title: {
-                    text: 'MonthYear'
-                }
-            },
-            yAxis: {
-                title: {
-                    text: 'No of Sites'
-                }
-            },
-            series: [{
-                name: 'No of Sites',
-                color: '#01058A',
-                data: seriesData
-            }]
-        });
-    }
+                text: 'MonthYear'
+            }
+        },
+        yAxis: {
+            title: {
+                text: 'No of Sites'
+            }
+        },
+        series: [{
+            name: 'No of Sites',
+            color: '#01058A',
+            data: seriesData
+        }]
+    });
+}
 
     // Fetch data when the page loads
     fetchData();
diff --git a/resources/views/layouts/large-vertical-sidebar/sidebar.blade.php b/resources/views/layouts/large-vertical-sidebar/sidebar.blade.php
index 28f91b4..998bcac 100644
--- a/resources/views/layouts/large-vertical-sidebar/sidebar.blade.php
+++ b/resources/views/layouts/large-vertical-sidebar/sidebar.blade.php
@@ -167,6 +167,11 @@
                     <span class=" text-muted">SMS Analytics</span>
                 </a>
             </li>
+            <li class="nav-item">
+                <a class="{{ Route::currentRouteName()=='program' ? 'open' : '' }}" href="{{route('program')}}">
+                    <span class=" text-muted">Program Dashboard</span>
+                </a>
+            </li>
             @endif
             @endif
         </ul>

From 8419ca9a2bef26dadc5b034915ef7eeecc40911e Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:11:38 +0300
Subject: [PATCH 5/9] Program dashboard:sorted the client booking trends chart
 on filter in ASC

---
 resources/views/dashboard/program.blade.php | 115 ++++++++++++--------
 1 file changed, 69 insertions(+), 46 deletions(-)

diff --git a/resources/views/dashboard/program.blade.php b/resources/views/dashboard/program.blade.php
index 216630e..f51e3fa 100644
--- a/resources/views/dashboard/program.blade.php
+++ b/resources/views/dashboard/program.blade.php
@@ -279,20 +279,36 @@ function fetchData2() {
                 type: 'GET',
                 data: {
                     "months": months,
-                    "year":year
+                    "year": year
                 },
                 url: "{{ route('program_filter') }}",
                 success: function(data) {
                     createChart(data);
                     createChart2(data);
                     var listdata = data.program;
-                    var maxMonths = listdata.reduce(function(max, site) {
-                        return site.Months > max ? site.Months : max;
-                    }, '');
+
+                    // finding the filtered maximum Months value
+                    function parseMonthYear(dateString) {
+                        var parts = dateString.split('-');
+                        if (parts.length === 2) {
+                            var month = parseInt(parts[0], 10);
+                            var year = parseInt(parts[1], 10);
+                            if (!isNaN(month) && !isNaN(year)) {
+                                return new Date(year, month - 1);
+                            }
+                        }
+                        return null;
+                    }
+                    var maxDate = listdata.reduce(function(max, site) {
+                        var currentDate = parseMonthYear(site.Months);
+                        return currentDate > max ? currentDate : max;
+                    }, new Date(0));
+
                     var list = listdata.filter(function(site) {
-                        return site.Months === maxMonths;
+                        var currentDate = parseMonthYear(site.Months);
+                        return currentDate && currentDate.getTime() === maxDate.getTime();
                     });
-                    console.log(list);
+
                     var table = $j('#table_client').DataTable();
 
                     // Destroy the DataTable instance
@@ -338,7 +354,13 @@ function fetchData2() {
     }
 
     function createChart(jsonData) {
-        const processedData = jsonData.program.reduce((accumulator, item) => {
+        const sortedProgramData = jsonData.program.sort((a, b) => {
+            const dateA = new Date(a.LastDateUsed);
+            const dateB = new Date(b.LastDateUsed);
+            return dateA - dateB;
+        });
+
+        const processedData = sortedProgramData.reduce((accumulator, item) => {
             if (item.MonthYear && item.num_clients) {
                 const monthYear = item.MonthYear;
                 accumulator[monthYear] = (accumulator[monthYear] || 0) + item.num_clients;
@@ -351,6 +373,7 @@ function createChart(jsonData) {
             y: processedData[monthYear]
         }));
 
+
         Highcharts.chart('client_chart', {
             chart: {
                 type: 'column',
@@ -390,47 +413,47 @@ function createChart(jsonData) {
     }
 
     function createChart2(jsonData) {
-    const monthYearSum = jsonData.active_site.reduce((accumulator, item) => {
-        if (item.MonthYear) {
-            accumulator[item.MonthYear] = (accumulator[item.MonthYear] || 0) + item.num_sites;
-        }
-        return accumulator;
-    }, {});
-
-    const seriesData = Object.keys(monthYearSum).map(monthYear => ({
-        name: monthYear,
-        y: monthYearSum[monthYear]
-    }));
-
-    Highcharts.chart('site-chart', {
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'Active Sites the last 6 Months',
-            style: {
-                fontFamily: 'Inter',
-                fontSize: '14px'
+        const monthYearSum = jsonData.active_site.reduce((accumulator, item) => {
+            if (item.MonthYear) {
+                accumulator[item.MonthYear] = (accumulator[item.MonthYear] || 0) + item.num_sites;
             }
-        },
-        xAxis: {
-            categories: Object.keys(monthYearSum),
-            title: {
-                text: 'MonthYear'
-            }
-        },
-        yAxis: {
+            return accumulator;
+        }, {});
+
+        const seriesData = Object.keys(monthYearSum).map(monthYear => ({
+            name: monthYear,
+            y: monthYearSum[monthYear]
+        }));
+
+        Highcharts.chart('site-chart', {
+            chart: {
+                type: 'column'
+            },
             title: {
-                text: 'No of Sites'
-            }
-        },
-        series: [{
-            name: 'No of Sites',
-            color: '#01058A',
-            data: seriesData
-        }]
-    });
-}
+                text: 'Active Sites the last 6 Months',
+                style: {
+                    fontFamily: 'Inter',
+                    fontSize: '14px'
+                }
+            },
+            xAxis: {
+                categories: Object.keys(monthYearSum),
+                title: {
+                    text: 'MonthYear'
+                }
+            },
+            yAxis: {
+                title: {
+                    text: 'No of Sites'
+                }
+            },
+            series: [{
+                name: 'No of Sites',
+                color: '#01058A',
+                data: seriesData
+            }]
+        });
+    }
 
     // Fetch data when the page loads
     fetchData();

From ac17e0a49da0819b26c02612be8d5c9e752ab6e1 Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:19:30 +0300
Subject: [PATCH 6/9] fixed bug on adding partner

---
 resources/views/partners/addpartner.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partners/addpartner.blade.php b/resources/views/partners/addpartner.blade.php
index 648f9fa..e633372 100644
--- a/resources/views/partners/addpartner.blade.php
+++ b/resources/views/partners/addpartner.blade.php
@@ -29,7 +29,7 @@
                         </div>
                         <div class="col-md-6 form-group mb-3">
                             <label for="add_partner_type">Partner Type</label>
-                            <select class="form-control dynamic" data-dependant="rolename" data-width="100%" id="partner_type" name="add_partner_type">
+                            <select class="form-control dynamic" data-dependant="rolename" data-width="100%" id="partner_type" name="partner_type">
                                 <option value="">Please select </option>
                                 @if (count($partner_type) > 0)
                                 @foreach($partner_type as $type)

From 58959fdef3be8f5b5929c75592bdcdd8823cd467 Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Mon, 18 Dec 2023 12:58:14 +0300
Subject: [PATCH 7/9] fixed consent line list at partner level

---
 .../Controllers/NewDashboardController.php    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/NewDashboardController.php b/app/Http/Controllers/NewDashboardController.php
index 232cc4e..08f5836 100644
--- a/app/Http/Controllers/NewDashboardController.php
+++ b/app/Http/Controllers/NewDashboardController.php
@@ -63,7 +63,28 @@ public function partner_summary()
                 ->whereNull('tbl_client.hei_no')
                 ->groupBy('tbl_tx_cur.mfl_code')
                 ->remember($this->remember_period)
-                ->selectRaw('COUNT(tbl_client.clinic_number) as client_ever_enrolled, tbl_county.name as county, tbl_partner.name as partner, tbl_master_facility.name as facility, tbl_master_facility.code as mfl_code, (SELECT COUNT(*) FROM tbl_client WHERE tbl_client.mfl_code = tbl_partner_facility.mfl_code AND tbl_client.hei_no IS NULL AND tbl_client.smsenable = "Yes" AND tbl_partner_facility.partner_id = ' . Auth::user()->partner_id . ') as client_consented');
+                ->selectRaw('COUNT(tbl_client.clinic_number) as client_ever_enrolled, tbl_county.name as county, tbl_partner.name as partner, tbl_master_facility.name as facility, tbl_master_facility.code as mfl_code,
+    (SELECT
+    COUNT(CASE
+        WHEN c.smsenable = "Yes" THEN 1
+        WHEN a.client_id IS NOT NULL THEN
+					1
+    END) AS client_consented
+    FROM
+        tbl_client c
+        LEFT JOIN (
+        SELECT
+            client_id,
+            DATE( created_at ) AS created_at
+        FROM
+            tbl_appointment a1
+        WHERE
+            a1.id = ( SELECT MAX( a2.id ) FROM tbl_appointment a2 WHERE a2.client_id = a1.client_id )
+        AND a1.consented = "YES"
+    ) a ON c.id = a.client_id
+    WHERE c.mfl_code = tbl_partner_facility.mfl_code AND c.hei_no IS NULL AND tbl_partner_facility.partner_id = ' . Auth::user()->partner_id . ') as client_consented');
+
+            // ->selectRaw('COUNT(tbl_client.clinic_number) as client_ever_enrolled, tbl_county.name as county, tbl_partner.name as partner, tbl_master_facility.name as facility, tbl_master_facility.code as mfl_code, (SELECT COUNT(*) FROM tbl_client WHERE tbl_client.mfl_code = tbl_partner_facility.mfl_code AND tbl_client.hei_no IS NULL AND tbl_client.smsenable = "Yes" AND tbl_partner_facility.partner_id = ' . Auth::user()->partner_id . ') as client_consented');
         }
 
 

From f34a318c29a13f69264fcc590682d0cd6c18de5b Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Mon, 18 Dec 2023 13:29:52 +0300
Subject: [PATCH 8/9] formated messages failure reasons from AT to human
 understable

---
 app/Http/Controllers/NewReportController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/NewReportController.php b/app/Http/Controllers/NewReportController.php
index c2b94ee..66db40d 100644
--- a/app/Http/Controllers/NewReportController.php
+++ b/app/Http/Controllers/NewReportController.php
@@ -660,7 +660,7 @@ public function client_message(Request $request)
                     'tbl_client.phone_no',
                     'tbl_clnt_outgoing.msg',
                     DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Failed" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "Failed" ELSE "Success" END AS callback_status'),
-                    DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "DeliveryFailure" ELSE tbl_clnt_outgoing.failure_reason END AS failure_reason'),
+                    DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "Phone No. Inactive" WHEN tbl_clnt_outgoing.failure_reason = "UserInBlackList" THEN "Service Blacklisted" WHEN tbl_clnt_outgoing.failure_reason = "AbsentSubscriber" THEN "Phone off >48 Hours" WHEN tbl_clnt_outgoing.failure_reason = "UserInactive" THEN "Failure at Telco" WHEN tbl_clnt_outgoing.failure_reason = "DeliveryFailure" THEN "Phone No. Inactive" END AS failure_reason'),
                     'tbl_clnt_outgoing.updated_at',
                     'tbl_appointment.appntmnt_date as appointment_date',
                     'tbl_appointment_types.name as app_type',
@@ -697,7 +697,7 @@ public function client_message(Request $request)
                     'tbl_client.phone_no',
                     'tbl_clnt_outgoing.msg',
                     DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Failed" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "Failed" ELSE "Success" END AS callback_status'),
-                    DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "DeliveryFailure" ELSE tbl_clnt_outgoing.failure_reason END AS failure_reason'),
+                    DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "Phone No. Inactive" WHEN tbl_clnt_outgoing.failure_reason = "UserInBlackList" THEN "Service Blacklisted" WHEN tbl_clnt_outgoing.failure_reason = "AbsentSubscriber" THEN "Phone off >48 Hours" WHEN tbl_clnt_outgoing.failure_reason = "UserInactive" THEN "Failure at Telco" WHEN tbl_clnt_outgoing.failure_reason = "DeliveryFailure" THEN "Phone No. Inactive" END AS failure_reason'),
                     'tbl_clnt_outgoing.updated_at',
                     'tbl_appointment.appntmnt_date as appointment_date',
                     'tbl_appointment_types.name as app_type',
@@ -735,7 +735,7 @@ public function client_message(Request $request)
                     'tbl_client.phone_no',
                     'tbl_clnt_outgoing.msg',
                     DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Failed" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "Failed" ELSE "Success" END AS callback_status'),
-                    DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "DeliveryFailure" ELSE tbl_clnt_outgoing.failure_reason END AS failure_reason'),
+                    DB::raw('CASE WHEN tbl_clnt_outgoing.message_id IS NULL OR tbl_clnt_outgoing.message_id = "None" OR tbl_clnt_outgoing.callback_status = "Expired" THEN "Phone No. Inactive" WHEN tbl_clnt_outgoing.failure_reason = "UserInBlackList" THEN "Service Blacklisted" WHEN tbl_clnt_outgoing.failure_reason = "AbsentSubscriber" THEN "Phone off >48 Hours" WHEN tbl_clnt_outgoing.failure_reason = "UserInactive" THEN "Failure at Telco" WHEN tbl_clnt_outgoing.failure_reason = "DeliveryFailure" THEN "Phone No. Inactive" END AS failure_reason'),
                     'tbl_clnt_outgoing.no_of_days',
                     'tbl_clnt_outgoing.updated_at',
                     'tbl_appointment.appntmnt_date as appointment_date',

From 598f215536724ff32326204b51638248e474cffd Mon Sep 17 00:00:00 2001
From: Ronald-pro <36841157+Ronald-pro@users.noreply.github.com>
Date: Fri, 26 Jan 2024 13:26:36 +0300
Subject: [PATCH 9/9] revised the initial page and added facility directory

---
 app/Http/Controllers/Auth/LoginController.php |   2 +-
 app/Http/Controllers/DirectoryController.php  |  28 +++
 resources/views/auth/login.blade.php          |  12 +-
 .../clients/adolescents_clients.blade.php     | 189 ++++++++--------
 resources/views/directory/search.blade.php    | 211 ++++++++++++++++++
 resources/views/landing/page.blade.php        |  62 +++++
 routes/web.php                                |   8 +-
 7 files changed, 412 insertions(+), 100 deletions(-)
 create mode 100644 app/Http/Controllers/DirectoryController.php
 create mode 100644 resources/views/directory/search.blade.php
 create mode 100644 resources/views/landing/page.blade.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 83e1e32..1386965 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -40,7 +40,7 @@ protected function redirectTo() {
         Session::flash('statuscode', 'success');
         return '/admin/dashboard';
     }else {
-        return '/';
+        return '/login';
     }
 }
 /**
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
new file mode 100644
index 0000000..c0be76d
--- /dev/null
+++ b/app/Http/Controllers/DirectoryController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+
+class DirectoryController extends Controller
+{
+    public function directory(Request $request, $facility)
+    {
+        $mfl = implode('', range(0, 9));
+
+        $apiUrl = env('ART_URL') . "directory/{$mfl}/{$facility}";
+
+        $response = Http::get($apiUrl);
+
+        if ($response->successful()) {
+
+            $apiData = $response->json();
+            return response()->json($apiData);
+        } else {
+
+            $errorData = $response->json();
+            return response()->json(['error' => 'API request failed'], $response->status());
+        }
+    }
+}
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index daf8d59..4ee8ab7 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -12,6 +12,12 @@
 </head>
 
 <body>
+    <div class="left-end" style="margin-top: 20px; margin-left: 20px;">
+        <a href="{{ url('/') }}" style="text-decoration: none; color: #333; display: flex; align-items: center;">
+            <i class="fas fa-chevron-left" style="margin-right: 5px;"></i> Go back
+        </a>
+    </div>
+
     <div class="auth-layout-wrap">
         <div class="auth-content">
             <div class="card o-hidden">
@@ -22,7 +28,9 @@
                                 <img src="{{ asset('/assets/images/Ushauri_big.png') }}" style="margin-left: 230px;" height="40">
 
                             </div>
-                            <div class="text-center">  <h4>Login</h4> </div>
+                            <div class="text-center">
+                                <h4>Login</h4>
+                            </div>
 
                             <form method="POST" id="login_form" action="{{ route('login') }}">
                                 @csrf
@@ -131,4 +139,4 @@
 
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/resources/views/clients/adolescents_clients.blade.php b/resources/views/clients/adolescents_clients.blade.php
index 0a79448..360a05f 100644
--- a/resources/views/clients/adolescents_clients.blade.php
+++ b/resources/views/clients/adolescents_clients.blade.php
@@ -6,114 +6,111 @@
 
 @section('main-content')
 <div class="breadcrumb">
-                <ul>
-                    <li><a href="">Adolescent Clients</a></li>
-                    <li></li>
-                </ul>
-            </div>
+    <ul>
+        <li><a href="">Adolescent Clients</a></li>
+        <li></li>
+    </ul>
+</div>
 
 <div class="col-md-12 mb-4">
-                    <div class="card text-left">
+    <div class="card text-left">
 
-                        <div class="card-body">
-                        <! <h4 class="card-title mb-3">ADOLESCENT Grouping List</h4>
-                            <div class="col-md-12" style="margin-top:10px; ">
+        <div class="card-body">
+            <! <h4 class="card-title mb-3">ADOLESCENT Grouping List</h4>
+                <div class="col-md-12" style="margin-top:10px; ">
 
-                            </div>
-                                <div class="table-responsive">
-                                    <table id="multicolumn_ordering_table" class="display table table-striped table-bordered" style="width:100%">
-                                        <thead>
-                                            <tr>
-                                                <th>No.</th>
-                                                <th>Clinic Number</th>
-                                                <th>First Name</th>
-                                                <th>Middle Name</th>
-                                                <th>Last Name</th>
-                                                <th>Phone No</th>
-                                                <th>Grouping</th>
-                                                <th>Treatment</th>
-                                                <th>Date Enrolled</th>
-
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            @if (count($all_adolescents_clients) > 0)
-                                                @foreach($all_adolescents_clients as $result)
-                                                    <tr>
-                                                        <td> {{ $loop->iteration }}</td>
-                                                        <td>  {{$result->clinic_number}}</td>
-                                                        <td>  {{$result->f_name}}</td>
-                                                        <td>  {{$result->m_name}}</td>
-                                                        <td>  {{$result->l_name}}</td>
-                                                        <td>  {{$result->phone_no}}</td>
-                                                        <td>  {{$result->name}}</td>
-                                                        <td>  {{$result->client_status}}</td>
-                                                        <td>  {{$result->enrollment_date}}</td>
-                                                    </tr>
-                                                @endforeach
-                                            @endif
-                                        </tbody>
+                </div>
+                <div class="table-responsive">
+                    <table id="multicolumn_ordering_table" class="display table table-striped table-bordered" style="width:100%">
+                        <thead>
+                            <tr>
+                                <th>No.</th>
+                                <th>Clinic Number</th>
+                                <th>First Name</th>
+                                <th>Middle Name</th>
+                                <th>Last Name</th>
+                                <th>Phone No</th>
+                                <th>Grouping</th>
+                                <th>Treatment</th>
+                                <th>Date Enrolled</th>
 
-                                    </table>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @if (count($all_adolescents_clients) > 0)
+                            @foreach($all_adolescents_clients as $result)
+                            <tr>
+                                <td> {{ $loop->iteration }}</td>
+                                <td> {{$result->clinic_number}}</td>
+                                <td> {{$result->f_name}}</td>
+                                <td> {{$result->m_name}}</td>
+                                <td> {{$result->l_name}}</td>
+                                <td> {{$result->phone_no}}</td>
+                                <td> {{$result->name}}</td>
+                                <td> {{$result->client_status}}</td>
+                                <td> {{$result->enrollment_date}}</td>
+                            </tr>
+                            @endforeach
+                            @endif
+                        </tbody>
 
-                                </div>
+                    </table>
 
-                        </div>
-                    </div>
                 </div>
-                <!-- end of col -->
+
+        </div>
+    </div>
+</div>
+<!-- end of col -->
 
 @endsection
 
 @section('page-js')
 
- <script src="{{asset('assets/js/vendor/datatables.min.js')}}"></script>
- <script type="text/javascript">
-   // multi column ordering
-   $('#multicolumn_ordering_table').DataTable({
-        columnDefs: [{
-            targets: [0],
-            orderData: [0, 1]
-        }, {
-            targets: [1],
-            orderData: [1, 0]
-        }, {
-            targets: [4],
-            orderData: [4, 0]
-        }],
-        "paging": true,
-        "responsive":true,
-        "ordering": true,
-        "info": true,
-        dom: 'Bfrtip',
-        buttons: [
-            {
-            extend: 'copy',
-            title: 'Active LTFU Appointments',
-            filename: 'Active LTFU Appointments'
-            },
-            {
-            extend: 'csv',
-            title: 'ADOLESCENT CLIENTS',
-            filename: 'ADOLESCENT'
-            },
-            {
-            extend: 'excel',
-            title: 'ADOLESCENT CLIENTS',
-            filename: 'ADOLESCENT'
-            },
-            {
-            extend: 'pdf',
-            title: 'ADOLESCENT CLIENTS',
-            filename: 'ADOLESCENT'
-            },
-            {
-            extend: 'print',
-            title: 'ADOLESCENT CLIENTS',
-            filename: 'ADOLESCENT'
-            }
-        ]
-    });</script>
+<script src="{{asset('assets/js/vendor/datatables.min.js')}}"></script>
+<script type="text/javascript">
+    // multi column ordering
+    // multi column ordering
+    $(document).ready(function() {
+        $('#multicolumn_ordering_table').DataTable({
+            columnDefs: [{
+                    targets: [0],
+                    orderData: [0, 1]
+                },
+                {
+                    targets: [1],
+                    orderData: [1, 0]
+                },
+                {
+                    targets: [2],
+                    orderData: [2, 0]
+                }
+            ],
+            "paging": true,
+            "responsive": true,
+            "ordering": true,
+            "info": true,
+            "lengthMenu": [5, 10, 25], // Set the desired values for the number of entries per page
+            dom: 'Bfrtip',
+            buttons: [{
+                    extend: 'copy'
+                },
+                {
+                    extend: 'csv'
+                },
+                {
+                    extend: 'excel'
+                },
+                {
+                    extend: 'pdf'
+                },
+                {
+                    extend: 'print'
+                }
+            ]
+        });
+    });
+</script>
 
 
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/directory/search.blade.php b/resources/views/directory/search.blade.php
new file mode 100644
index 0000000..5ae30d9
--- /dev/null
+++ b/resources/views/directory/search.blade.php
@@ -0,0 +1,211 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="icon" type="image/jpeg" sizes="16x16" href="{{ asset('assets/images/ushauri.jpeg') }}">
+    <title>Ushauri - Getting better one text at a time</title>
+    <link href="https://fonts.googleapis.com/css?family=Inter:300,400,400i,600,700,800,900" rel="stylesheet">
+    <link rel="stylesheet" href="{{asset('assets/styles/css/themes/lite-purple.min.css')}}">
+    <link rel="stylesheet" href="{{asset('assets/styles/vendor/datatables.min.css')}}">
+    <style>
+        .header-block h1,
+        .card-title,
+        .footer-block p {
+            font-family: 'Inter', sans-serif;
+        }
+
+        .header-block {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        .header-block h1 {
+            margin-right: auto;
+            /* Push the h1 to the left */
+        }
+
+        .logo {
+            max-height: 50px;
+            /* Set the max height of your logo */
+        }
+    </style>
+</head>
+
+<body>
+    <div class="container mt-5">
+        <!-- Header Section -->
+        <div class="header-block mb-4">
+            <div class="left-end">
+                <a href="{{url('/')}}"><i class="fas fa-chevron-left"></i> Back</a>
+            </div>
+
+            <div class="center">
+                <h2>Facility Directory</h2>
+            </div>
+            <div class="right-end">
+                <img src="{{ asset('assets/images/NASCOP_Logo.png') }}" alt="Logo" class="logo">
+            </div>
+        </div>
+
+        <!-- Body Section -->
+        <hr class="mb-4">
+        <!-- Search Section -->
+        <div class="row justify-content-center">
+            <div class="col-md-6 mb-3">
+                <label for="searchInput" class="form-label">Search Facility:</label>
+                <input type="text" class="form-control" id="searchInput" placeholder="Enter Facility Name">
+                <button class="btn btn-primary mt-2" id="searchButton">Search</button>
+            </div>
+        </div>
+
+        <div class="row justify-content-center" id="resultTableSection" style="display: none;">
+            <table id="multicolumn_ordering_table" class="display table table-striped table-bordered" style="width:100%">
+                <thead>
+                    <tr>
+                        <th scope="col">No</th>
+                        <th scope="col">Facility Name</th>
+                        <th scope="col">MFL Code</th>
+                        <th scope="col">Contact</th>
+                        <th scope="col">Facility Type</th>
+                        <th scope="col">More</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- Placeholder row for DataTable -->
+                </tbody>
+            </table>
+        </div>
+
+        <hr class="mt-4">
+
+        <!-- Footer Section -->
+        <div class="footer-block text-center mt-4">
+            <p>&copy; KeHMIS &nbsp;2016 - <?php echo date('Y'); ?> </p>
+            <p><b>HelpDesk Contact: Toll Free 0800722440</b></p>
+        </div>
+    </div>
+
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="{{asset('assets/js/common-bundle-script.js')}}"></script>
+    <script src="{{asset('assets/js/script.js')}}"></script>
+    <script src="{{asset('assets/js/vendor/datatables.min.js')}}"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
+    <script type="text/javascript">
+        $(document).ready(function() {
+            var mfl = Array.from({
+                length: 10
+            }, (_, index) => index).join('');
+            var dataTable = $('#multicolumn_ordering_table').DataTable({
+                columnDefs: [{
+                    targets: [0],
+                    orderData: [0, 1]
+                }, {
+                    targets: [1],
+                    orderData: [1, 0]
+                }, {
+                    targets: [2],
+                    orderData: [2, 0]
+                }],
+                "paging": true,
+                "responsive": true,
+                "ordering": true,
+                "info": true,
+                dom: 'Bfrtip',
+                buttons: [{
+                    extend: 'copy'
+                }, {
+                    extend: 'csv'
+                }, {
+                    extend: 'excel'
+                }, {
+                    extend: 'pdf'
+                }, {
+                    extend: 'print'
+                }],
+                columns: [{
+                        data: 'No'
+                    },
+                    {
+                        data: 'Facility Name'
+                    },
+                    {
+                        data: 'MFL Code'
+                    },
+                    {
+                        data: 'Contact'
+                    },
+                    {
+                        data: 'Facility Type'
+                    },
+                    {
+                        data: 'More',
+                        orderable: false,
+                        searchable: false
+                    }
+                ],
+            });
+
+            $('#searchButton').on('click', function() {
+                var facility = $('#searchInput').val();
+
+                Swal.fire({
+                    title: "loading results......",
+                    showConfirmButton: false,
+                    allowOutsideClick: false
+                });
+
+                var apiUrl = "{{ env('ART_URL') }}directory/" + mfl + '/' + facility;
+                $.ajax({
+                    url: apiUrl,
+                    method: 'GET',
+                    success: function(response) {
+                        Swal.close();
+                        var facilities = response.message;
+
+                        // Clear existing table data
+                        dataTable.clear();
+
+                        facilities.forEach(function(facility, index) {
+                            // Add a clickable link for "More" column
+                            var moreLink = '<a href="https://kmhfl.health.go.ke/#/facility_filter/results?code=' + facility.code + '" target="_blank">More</a>';
+
+                            // Add the row to the DataTable
+                            dataTable.row.add({
+                                'No': index + 1,
+                                'Facility Name': facility.name,
+                                'MFL Code': facility.code,
+                                'Contact': facility.telephone,
+                                'Facility Type': facility.facility_type,
+                                'More': moreLink
+                            });
+                        });
+
+                        // Draw the updated DataTable
+                        dataTable.draw();
+
+                        // Clear the search input
+                        $('#searchInput').val('');
+
+                        // Show the result table section
+                        $('#resultTableSection').show();
+                    },
+                    error: function(error) {
+                        console.log(error);
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Error',
+                            text: 'Error fetching the data.'
+                        });
+                    }
+                });
+            });
+        });
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/views/landing/page.blade.php b/resources/views/landing/page.blade.php
new file mode 100644
index 0000000..1871ab7
--- /dev/null
+++ b/resources/views/landing/page.blade.php
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="icon" type="image/jpeg" sizes="16x16" href="{{ asset('assets/images/ushauri.jpeg') }}">
+    <title>Ushauri - Getting better one text at a time</title>
+    <link href="https://fonts.googleapis.com/css?family=Inter:300,400,400i,600,700,800,900" rel="stylesheet">
+    <link rel="stylesheet" href="{{asset('assets/styles/css/themes/lite-purple.min.css')}}">
+</head>
+
+<body>
+    <style>
+        .header-block h1,
+        .card-title,
+        .footer-block p {
+            font-family: 'Inter', sans-serif;
+        }
+    </style>
+
+    <div class="container mt-5">
+        <div class="header-block text-center mb-4">
+            <h1>mHealth Applications</h1>
+        </div>
+
+        <hr class="mb-4">
+
+        <div class="row justify-content-center">
+            <div class="col-md-4 mb-4">
+                <a href="{{ url('/login') }}" class="card">
+                    <img src="{{ asset('/assets/images/Ushauri_big.png') }}" class="card-img-top" alt="Ushauri Logo">
+                    <div class="card-body text-center">
+                        <h5 class="card-title">Ushauri</h5>
+                    </div>
+                </a>
+            </div>
+            <div class="col-md-4 mb-4">
+                <a href="{{ url('directory') }}" class="card">
+                    <img src="{{ asset('assets/images/login/moh.png') }}" class="pl-3" alt="ART Directory Logo" height="90">
+                    <div class="card-body text-center">
+                        <h5 class="card-title">Facility Directory</h5>
+                    </div>
+                </a>
+            </div>
+            <!-- Add more cards for other applications -->
+        </div>
+
+        <hr class="mt-4">
+
+        <div class="footer-block text-center mt-4">
+            <p>&copy; KeHMIS &nbsp;2016 - <?php echo date('Y'); ?> </p>
+            <p><b>HelpDesk Contact: Toll Free 0800722440</p>
+        </div>
+    </div>
+
+    <script src="{{asset('assets/js/common-bundle-script.js')}}"></script>
+    <script src="{{asset('assets/js/script.js')}}"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 230161f..370cea8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -26,9 +26,15 @@
 |
 */
 
-Route::get('/', function () {
+Route::get('/login', function () {
   return view('auth/login');
 });
+Route::get('/', function () {
+  return view('landing/page');
+});
+Route::get('/directory', function () {
+  return view('directory/search');
+});
 
 
 //SMS Scheduler routes