diff --git a/.env.example b/.env.example
index ac74863..b3ed4b9 100644
--- a/.env.example
+++ b/.env.example
@@ -44,3 +44,6 @@ PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+SMS_SERVICE_HOST="https://domain-to-sms-service/api/sender"
+SMS_SERVICE_KEY="sms-service-key"
diff --git a/.github/workflows/Test deployment.yml b/.github/workflows/Test deployment.yml
new file mode 100644
index 0000000..9801683
--- /dev/null
+++ b/.github/workflows/Test deployment.yml
@@ -0,0 +1,39 @@
+name: deploy to test instance
+on:
+ push:
+ branches: [ main ]
+jobs:
+
+ build:
+ name: Deploy
+ runs-on: ubuntu-latest
+ steps:
+ - name: executing remote connection
+ uses: appleboy/ssh-action@master
+ with:
+ host: ${{ secrets.HOST }}
+ username: ${{ secrets.USERNAME }}
+ key: ${{ secrets.CICD_SECRET }}
+ port: ${{ secrets.PORT }}
+ script: |
+ cd /apps/github-workflows/mhealth-apps/
+ sudo rm -rf ushauri_dashboard
+ sudo mkdir ushauri_dashboard
+ sudo chown -R cicd2:cicd2 ushauri_dashboard
+ git config --global --add safe.directory /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+ cd ushauri_dashboard
+ git clone -b main https://github.com/palladiumkenya/ushauri_dashboard.git .
+ git status
+ cp /apps/configs/ushauri-dashboard/.env /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+ cp /apps/configs/ushauri-dashboard/docker-compose.yml /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+ cp /apps/configs/ushauri-dashboard/nginx.dockerfile /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+ cp /apps/configs/ushauri-dashboard/php.dockerfile /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+ cp -r /apps/configs/ushauri-dashboard/nginx /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+ docker-compose down
+ docker-compose rm -f
+ docker-compose --env-file .env up -d --build site
+ # execute normal laravel commands
+ docker-compose exec -T php composer install --ignore-platform-reqs --no-dev
+ docker-compose exec -T php php artisan config:cache
+ docker-compose exec -T php php artisan view:cache
+ docker-compose exec -T php chmod -R 777 storage/
diff --git a/.github/workflows/cicd_process.yml b/.github/workflows/cicd_process.yml
new file mode 100644
index 0000000..af74207
--- /dev/null
+++ b/.github/workflows/cicd_process.yml
@@ -0,0 +1,22 @@
+name: deploy to test instance
+on:
+ push:
+ branches: [ master ]
+jobs:
+
+ build:
+ name: Deploy
+ runs-on: ubuntu-latest
+ steps:
+ - name: executing remote connection
+ uses: appleboy/ssh-action@master
+ with:
+ host: ${{ secrets.PRODUCTION_HOST }}
+ username: ${{ secrets.PRODUCTION_USERNAME }}
+ key: ${{ secrets.PRODUCTION_SECRET }}
+ port: ${{ secrets.PRODUCTION_PORT }}
+ script: |
+
+ cd /var/www/ushauri_dashboard
+ git pull origin
+
diff --git a/README.md b/README.md
index f3decb1..26c8fbd 100644
--- a/README.md
+++ b/README.md
@@ -1,61 +1,61 @@
-
+# Getting started
+ [](https://github.com/palladiumkenya/ushauri_dashboard/actions/workflows/cicd_process.yml)
+## Installation
+
-
+Clone the repository
-## About Laravel
+ git clone https://github.com/palladiumkenya/ushauri_dashboard
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
+Switch to the repo folder
+ cd ushauri_dashboard
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
+Install all the dependencies using composer
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
+ composer install
-## Learning Laravel
+Copy the example env file and make the required configuration changes in the .env file
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
+ cp .env.example .env
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+Start the local development server
-## Laravel Sponsors
+ php artisan serve
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
+You can now access the server at http://localhost:8000
-### Premium Partners
+**TL;DR command list**
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- **[OP.GG](https://op.gg)**
+ git clone https://github.com/palladiumkenya/ushauri_dashboard
+ cd ushauri_dashboard
+ composer install
+ cp .env.example .env
+ php artisan serve
+
+ ----------
-## Contributing
+# Code overview
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
+## Folders
-## Code of Conduct
+- `app/Models` - Contains all the Eloquent models
+- `app/Http/Controllers` - Contain all the data controllers
+- `app/Http/Controllers/Auth` - Contains all the auth controllers
+- `app/Http/Middleware` - Contains the JWT auth middleware
+- `app/Http/Jobs` - Contains all the jobs handlers
+- `config` - Contains all the application configuration files
+- `database/factories` - Contains the model factory for all the models
+- `database/seeds` - Contains the database seeder
+- `resources` - Contains all the application views and styling files
+- `routes` - Contains all the web routes defined in web.php file
+- `tests` - Contains all the application tests
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
+## Environment variables
-## Security Vulnerabilities
+- `.env` - Environment variables can be set in this file
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
+***Note*** : You can quickly set the database information and other variables in this file and have the application fully working.
-## License
+----------
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/app/Console/Commands/ClientReferral.php b/app/Console/Commands/ClientReferral.php
new file mode 100644
index 0000000..95f2a76
--- /dev/null
+++ b/app/Console/Commands/ClientReferral.php
@@ -0,0 +1,167 @@
+httpresponse = Http::withoutVerifying()
+ ->withHeaders(['api-token' => "$key"])
+ ->post("$host", [
+ 'destination' => $destination,
+ 'msg' => $msg,
+ 'sender_id' => $destination,
+ 'gateway' => $source,
+
+ ]);
+
+ return json_decode($this->httpresponse->getBody(), true);
+ }
+
+ public function handle()
+ {
+ $client = Client::join('tbl_master_facility', 'tbl_client.mfl_code', '=', 'tbl_master_facility.code')
+ ->leftJoin('tbl_ward', 'tbl_master_facility.Ward_id', '=', 'tbl_ward.id')
+ ->join('tbl_appointment', 'tbl_client.id', '=', 'tbl_appointment.client_id')
+ ->select(
+ 'tbl_client.clinic_number',
+ 'tbl_client.id as client_id',
+ 'tbl_client.phone_no',
+ 'tbl_client.client_type',
+ 'tbl_client.f_name',
+ 'tbl_client.language_id',
+ 'tbl_master_facility.name as facility',
+ 'tbl_ward.name as location',
+ DB::raw('(CASE WHEN tbl_appointment.appntmnt_date > CURDATE() THEN tbl_appointment.appntmnt_date
+ WHEN tbl_client.language_id = "1" THEN "huna siku ya cliniki"
+ ELSE "no appointment" END) as appointment_date')
+ )
+ ->where('tbl_client.client_type', '=', 'Transfer')
+ ->whereNotNull('tbl_client.phone_no')
+ ->whereDate('tbl_client.updated_at', [now()->subMinutes(30), now()])
+ ->groupBy('tbl_client.id')
+ ->get();
+
+
+
+ foreach ($client as $value) {
+ $phone_no = $value->phone_no;
+ $client_id = $value->client_id;
+ $client_type = $value->client_type;
+ $client_name = $value->f_name;
+ $facility = $value->facility;
+ $location = $value->location;
+ $language = $value->language_id;
+ $appointment_date = $value->appointment_date;
+
+ $check_existence = ClientOutgoing::select('*')->where('message_type_id', '=', '2')
+ ->where('clnt_usr_id', '=', $client_id)
+ ->whereDate('created_at', '=', Carbon::Now())
+ ->limit(1)->count();
+
+ if ($check_existence > 0) {
+ echo 'Message already sent to the client';
+ } else {
+ if (!empty($phone_no)) {
+
+ if ($language !== 2 || $language !== 1) {
+ $get_message = Content::select('*')->where('identifier', '=', '20')->where('language_id', '=', '2')->get();
+ } else {
+ $get_message = Content::select('*')->where('identifier', '=', '20')->where('language_id', '=', $language)->get();
+ }
+
+ foreach ($get_message as $value) {
+ $message = $value->content;
+ $content_id = $value->id;
+ $source = '40149';
+
+ $new_message = str_replace("XXX", $client_name, $message);
+ $facility_name = str_replace('FFF', $facility, $new_message);
+ $location_name = str_replace('LLL', $location, $facility_name);
+ $final_message = str_replace('YYY', $appointment_date, $location_name);
+
+ $save_outgoing = new ClientOutgoing;
+
+ $save_outgoing->destination = $phone_no;
+ $save_outgoing->msg = $final_message;
+ $save_outgoing->source = '40149';
+ $save_outgoing->responded = 'No';
+ $save_outgoing->status = 'Not Sent';
+ $save_outgoing->message_type_id = '2';
+ $save_outgoing->clnt_usr_id = $client_id;
+ $save_outgoing->recepient_type = 'Client';
+ $save_outgoing->content_id = $content_id;
+ // $save_outgoing->created_at = date("Y-m-d H:i:s");
+ $save_outgoing->created_by = '1';
+
+ if ($save_outgoing->save()) {
+ // $sender = new SenderController;
+ $sender = $this->send_message($source, $phone_no, $final_message);
+
+ echo json_encode($sender);
+ } else {
+ echo 'Could not send the message';
+ }
+ }
+ } else {
+ echo 'Can not send to an empty phone number';
+ }
+ }
+ }
+
+ dd("Clients : {$client}");
+
+
+ // return 0;
+ }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 69914e9..f0b18c4 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
* @var array
*/
protected $commands = [
- //
+ 'App\Console\Commands\ClientReferral',
];
/**
@@ -25,6 +25,7 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule)
{
// $schedule->command('inspire')->hourly();
+ $schedule->command('client:referral')->everyMinutes(30);
}
/**
@@ -34,7 +35,7 @@ protected function schedule(Schedule $schedule)
*/
protected function commands()
{
- $this->load(__DIR__.'/Commands');
+ $this->load(__DIR__ . '/Commands');
require base_path('routes/console.php');
}
diff --git a/app/Http/Controllers/AppointmentController.php b/app/Http/Controllers/AppointmentController.php
index d3448ca..1683988 100644
--- a/app/Http/Controllers/AppointmentController.php
+++ b/app/Http/Controllers/AppointmentController.php
@@ -23,7 +23,7 @@ public function index()
if (Auth::user()->access_level == 'Facility') {
$all_future_apps = Appointments::join('tbl_client', 'tbl_client.id', '=', 'tbl_appointment.client_id')
->join('tbl_appointment_types', 'tbl_appointment_types.id', '=', 'tbl_appointment.app_type_1')
- ->select('tbl_appointment.id', 'tbl_appointment.client_id', 'tbl_client.clinic_number', 'tbl_appointment.appntmnt_date', 'tbl_appointment_types.name as app_type')
+ ->select('tbl_appointment.id', 'tbl_appointment.client_id', 'tbl_client.clinic_number', 'tbl_client.upi_no', 'tbl_appointment.appntmnt_date', 'tbl_appointment_types.name as app_type')
->where('tbl_appointment.appntmnt_date', '>', Now())
->where('tbl_client.mfl_code', Auth::user()->facility_id)
->get();
@@ -44,6 +44,7 @@ public function editappointment(Request $request)
'expln_app' => "EDITED",
]);
+
if ($appointment) {
Session::flash('statuscode', 'success');
return redirect('report/future/appointments')->with('status', 'Appointment was updated successfully!');
@@ -60,14 +61,14 @@ public function get_future_appointments()
if (Auth::user()->access_level == 'Admin') {
$all_future_appointments = Appointments::join('tbl_client', 'tbl_client.id', '=', 'tbl_appointment.client_id')
->join('tbl_appointment_types', 'tbl_appointment_types.id', '=', 'tbl_appointment.app_type_1')
- ->selectRaw('tbl_client.clinic_number, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
+ ->selectRaw('tbl_client.clinic_number, tbl_client.upi_no, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
->where('tbl_appointment.appntmnt_date', '>', Now());
}
if (Auth::user()->access_level == 'Facility') {
$all_future_appointments = Appointments::join('tbl_client', 'tbl_client.id', '=', 'tbl_appointment.client_id')
->join('tbl_appointment_types', 'tbl_appointment_types.id', '=', 'tbl_appointment.app_type_1')
- ->selectRaw('tbl_client.clinic_number, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
+ ->selectRaw('tbl_client.clinic_number, tbl_client.upi_no, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
->where('tbl_client.mfl_code', Auth::user()->facility_id)
->where('tbl_appointment.appntmnt_date', '>', Now());
}
@@ -75,7 +76,7 @@ public function get_future_appointments()
if (Auth::user()->access_level == 'Partner') {
$all_future_appointments = Appointments::join('tbl_client', 'tbl_client.id', '=', 'tbl_appointment.client_id')
->join('tbl_appointment_types', 'tbl_appointment_types.id', '=', 'tbl_appointment.app_type_1')
- ->selectRaw('tbl_client.clinic_number, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
+ ->selectRaw('tbl_client.clinic_number, tbl_client.upi_no, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
->where('tbl_client.partner_id', Auth::user()->partner_id)
->where('tbl_appointment.appntmnt_date', '>', Now());
}
@@ -83,7 +84,7 @@ public function get_future_appointments()
if (Auth::user()->access_level == 'Donor') {
$all_future_appointments = Appointments::join('tbl_client', 'tbl_client.id', '=', 'tbl_appointment.client_id')
->join('tbl_appointment_types', 'tbl_appointment_types.id', '=', 'tbl_appointment.app_type_1')
- ->selectRaw('tbl_client.clinic_number, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
+ ->selectRaw('tbl_client.clinic_number, tbl_client.upi_no, tbl_client.file_no, tbl_client.f_name, tbl_client.m_name, tbl_client.l_name, tbl_client.phone_no, tbl_appointment.appntmnt_date, tbl_appointment_types.name as app_type')
->where('donor_id', Auth::user()->donor_id)
->where('tbl_appointment.appntmnt_date', '>', Now());
}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 8c5b5ef..83e1e32 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -32,13 +32,13 @@ protected function redirectTo() {
}
else if (Auth::user()->access_level == 'Facility') {
Session::flash('statuscode', 'Login Success!, You will be redirected to your Home page in a few.');
- return '/Reports/facility_home';
+ return '/admin/dashboard';
} else if (Auth::user()->access_level == 'Partner') {
Session::flash('statuscode', 'success');
- return '/Reports/dashboard';
+ return '/admin/dashboard';
} else if (Auth::user()->access_level == 'Admin') {
Session::flash('statuscode', 'success');
- return '/Reports/dashboard';
+ return '/admin/dashboard';
}else {
return '/';
}
diff --git a/app/Http/Controllers/BroadcastController.php b/app/Http/Controllers/BroadcastController.php
index 60cb735..f662971 100644
--- a/app/Http/Controllers/BroadcastController.php
+++ b/app/Http/Controllers/BroadcastController.php
@@ -1,9 +1,11 @@
where('partner_id', Auth::user()->partner_id)
->get();
- $groups = Group::all();
+ $groups = Group::all()->where('status', '=', 'Active');
- $genders = Gender::all();
+ $genders = Gender::all()->where('status', '=', 'Active');
+ $time = Time::all();
$data = array(
'facilities' => $facilities,
'groups' => $groups,
- 'genders' => $genders
+ 'genders' => $genders,
+ 'time' => $time
);
$p_data = array(
'facilities' => $p_facilities,
'groups' => $groups,
- 'genders' => $genders
+ 'genders' => $genders,
+ 'time' => $time
);
$u_data = array(
'facilities' => $u_facilities,
'groups' => $groups,
- 'genders' => $genders
+ 'genders' => $genders,
+ 'time' => $time
);
if (Auth::user()->access_level == 'Facility') {
- return view('broadcast.facility_broadcast')->with($u_data);
+ return view('broadcast.facility_broadcast')->with($u_data);
+ } else if (Auth::user()->access_level == 'Partner') {
- } else if(Auth::user()->access_level == 'Partner') {
+ return view('broadcast.partner_broadcast')->with($p_data);
+ } else if (Auth::user()->access_level == 'Admin' || Auth::user()->access_level == 'Donor') {
- return view('broadcast.partner_broadcast')->with($p_data);
+ return view('broadcast.broadcast')->with($data);
+ }
+ }
- } else if(Auth::user()->access_level == 'Admin') {
+ public function broadcast_page()
+ {
+ return view('broadcast.broadcast_page');
+ }
+
+ public function broadcast_user()
+ {
+ $facilities = Facility::join('tbl_users', 'tbl_users.facility_id', '=', 'tbl_master_facility.code')->select('tbl_master_facility.code', 'tbl_master_facility.name')->groupBy('tbl_master_facility.name')->get();
+
+ $p_facilities = Facility::join('tbl_partner_facility', 'tbl_partner_facility.mfl_code', '=', 'tbl_master_facility.code')
+ ->select(
+ 'tbl_partner_facility.mfl_code',
+ 'tbl_partner_facility.partner_id',
+ 'tbl_master_facility.name'
+ )
+ ->where('partner_id', Auth::user()->partner_id)
+ ->get();
+ $data = array(
+ 'facilities' => $facilities
+ );
+ $p_data = array(
+ 'p_facilities' => $p_facilities
+ );
- return view('broadcast.broadcast')->with($data);
+ if (Auth::user()->access_level == 'Partner') {
+ return view('broadcast.broadcast_userpartner')->with($p_data);
+ } else if (Auth::user()->access_level == 'Admin' || Auth::user()->access_level == 'Donor') {
+
+ return view('broadcast.broadcast_user')->with($data);
}
+ }
+
+ public function sendSMS_user(Request $request)
+ {
+ if (Auth::user()->access_level == 'Partner') {
+
+ // $request->validate([
+ // 'mfl_code' => 'required',
+ // 'message' => 'required'
+ // ]);
+
+ $users = User::where('status', '=', 'Active')->where('access_level', '=', 'Facility')->where('partner_id', Auth::user()->partner_id)->get();
+
+ // if ($users->count() == 0)
+ // continue;
+
+
+ foreach ($users as $user) {
+
+ $dest = $user->phone_no;
+
+ $msg = $request->message;
+
+ SendSMS::dispatch($dest, $msg);
+ }
+
+ Session::flash('statuscode', 'success');
+ return back()->with('status', 'Message Successfully Sent To The Users.');
+
+ // return back();
+
+ } else if (Auth::user()->access_level == 'Admin' || Auth::user()->access_level == 'Donor') {
+
+ // $request->validate([
+ // 'mfl_code' => 'required',
+ // 'message' => 'required'
+ // ]);
+
+ $users = User::where('status', '=', 'Active')->where('access_level', '=', 'Facility')->get();
+
+ // if ($users->count() == 0)
+ // continue;
+
+ foreach ($users as $user) {
+
+ $dest = $user->phone_no;
+ $msg = $request->message;
+
+ SendSMS::dispatch($dest, $msg);
+ }
+
+ Session::flash('statuscode', 'success');
+ return back()->with('status', 'Message Successfully Sent To The Users.');
+ }
}
public function sendSMS(Request $request)
@@ -84,43 +177,43 @@ public function sendSMS(Request $request)
'message' => 'required'
]);
- $facility = Facility::where('code', Auth::user()->facility_id)->get();
-
- foreach($request['groups'] as $group_id) {
-
+ $facility = Facility::where('code', Auth::user()->facility_id)->pluck('code')->first();
+
+ foreach ($request['groups'] as $group_id) {
+
$group = Group::find($group_id);
-
+
if (is_null($group))
continue;
- foreach($request['genders'] as $gender_id) {
+ foreach ($request['genders'] as $gender_id) {
$gender = Gender::find($gender_id);
-
- $clients = Client::where('mfl_code', $facility)->where('group_id', '=', $group->id)->where('gender', $gender->id)->get();
-
+
+ $clients = Client::where('mfl_code', $facility)->where('group_id', '=', $group->id)->where('gender', $gender->id)->get();
+
if ($clients->count() == 0)
continue;
-
+
foreach ($clients as $client) {
-
+
$dest = $client->phone_no;
-
+
$msg = $request->message;
SendSMS::dispatch($dest, $msg);
-
+
// $sender = new SenderController;
-
+
// $sender->send($dest, $msg);
-
- }
-
+
+ }
}
-
}
+ Session::flash('statuscode', 'success');
+ return back()->with('status', 'Message Successfully Sent.');
- return back();
+ // return back();
} else if (Auth::user()->access_level == 'Partner') {
@@ -131,85 +224,79 @@ public function sendSMS(Request $request)
'message' => 'required'
]);
-
- foreach($request['groups'] as $group_id) {
-
- $group = Group::find($groups_id);
-
+
+ foreach ($request['groups'] as $group_id) {
+
+ $group = Group::find($group_id);
+
if (is_null($group))
continue;
- foreach($request['genders'] as $gender_id) {
+ foreach ($request['genders'] as $gender_id) {
$gender = Gender::find($gender_id);
-
- $clients = Client::where('mfl_code', $request->mfl_code)->where('group_id', '=', $group->id)->where('gender', $gender->id)->get();
-
+
+ $clients = Client::where('mfl_code', $request->mfl_code)->where('group_id', '=', $group->id)->where('gender', $gender->id)->get();
+
if ($clients->count() == 0)
continue;
-
+
foreach ($clients as $client) {
-
+
$dest = $client->phone_no;
-
+
$msg = $request->message;
-
+
SendSMS::dispatch($dest, $msg);
-
- }
-
- }
-
- }
+ }
+ }
+ }
+ Session::flash('statuscode', 'success');
+ return back()->with('status', 'Message Successfully Sent.');
+
+ // return back();
- return back();
-
- } else if(Auth::user()->access_level == 'Admin') {
+ } else if (Auth::user()->access_level == 'Admin' || Auth::user()->access_level == 'Donor') {
$request->validate([
'groups' => 'required',
'genders' => 'required',
'message' => 'required'
]);
-
- foreach($request['groups'] as $group_id) {
+
+ foreach ($request['groups'] as $group_id) {
$group = Group::find($group_id);
-
+
if (is_null($group))
continue;
- foreach($request['genders'] as $gender_id) {
+ foreach ($request['genders'] as $gender_id) {
$gender = Gender::find($gender_id);
-
- $clients = Client::where('group_id', '=', $group->id)->where('gender', $gender->id)->get();
-
+
+ $clients = Client::where('group_id', '=', $group->id)->where('gender', $gender->id)->get();
+
if ($clients->count() == 0)
continue;
-
+
foreach ($clients as $client) {
-
+
$dest = $client->phone_no;
-
+
$msg = $request->message;
-
- if(Str::length($dest) >= 10) {
- SendSMS::dispatch($dest, $msg);
+ if (Str::length($dest) >= 10) {
+ SendSMS::dispatch($dest, $msg);
}
-
- }
-
- }
-
+ }
+ }
}
+ Session::flash('statuscode', 'success');
+ return back()->with('status', 'Message Successfully Sent.');
+ //return back();
- return back();
-
- }
-
+ }
}
-
}
diff --git a/app/Http/Controllers/BulkUploadController.php b/app/Http/Controllers/BulkUploadController.php
index 5a882a8..74ccdd8 100644
--- a/app/Http/Controllers/BulkUploadController.php
+++ b/app/Http/Controllers/BulkUploadController.php
@@ -4,6 +4,7 @@
ini_set('max_execution_time', 0);
ini_set('memory_limit', '1024M');
+
use Illuminate\Http\Request;
use Maatwebsite\Excel\Concerns\ToModel;
use Maatwebsite\Excel\Concerns\WithHeadingRow;
@@ -14,12 +15,12 @@
class BulkUploadController extends Controller
{
- public function uploadClientForm(){
+ public function uploadClientForm()
+ {
return view('clients.upload-clients-form');
}
-
-
- public function importClients(Request $request){
+ public function importClients(Request $request)
+ {
$file = request()->file('file');
@@ -28,31 +29,29 @@ public function importClients(Request $request){
for ($i = 0; $i < count($receivedArr); $i++) {
$gender_value = trim(strtolower($receivedArr[$i]['Gender']));
- if($gender_value == 'm'){
+ if ($gender_value == 'm') {
$gender = 2;
- }
- elseif ($gender_value=='f') {
- $gender =1;
- }else {
- $gender= 5;
+ } elseif ($gender_value == 'f') {
+ $gender = 1;
+ } else {
+ $gender = 5;
}
- $marital_value = trim(strtolower($receivedArr[$i]['MaritalStatus']));
+ $marital_value = trim(strtolower($receivedArr[$i]['Marital_Status']));
- if($marital_value == 'divorced'){
+ if ($marital_value == 'Divorced') {
$marital = 3;
- }elseif ($marital_value == 'living with partner') {
+ } elseif ($marital_value == 'Living with partner') {
$marital = 5;
- }elseif ($marital_value == 'married') {
+ } elseif ($marital_value == 'Married') {
$marital = 2;
- }elseif ($marital_value == 'never married') {
+ } elseif ($marital_value == 'Never married') {
$marital = 1;
- }
- elseif ($marital_value == 'polygamous') {
+ } elseif ($marital_value == 'Polygamous') {
$marital = 8;
- }elseif ($marital_value == 'widowed') {
+ } elseif ($marital_value == 'Widowed') {
$marital = 4;
- }else{
+ } else {
$marital = 6;
}
@@ -70,30 +69,34 @@ public function importClients(Request $request){
$age_value = (float)$receivedArr[$i]['ageInYears'];
- if($age_value >=20){
+ if ($age_value >= 20) {
$group_id = 1;
- }elseif ($age_value >=13) {
+ } elseif ($age_value >= 13) {
$group_id = 2;
- }else{
+ } else {
$group_id = 4;
}
- $first_name = trim($receivedArr[$i]['GivenName']);
+ $first_name = trim($receivedArr[$i]['FirstName']);
$middle_name = trim($receivedArr[$i]['MiddleName']);
- $last_name = trim($receivedArr[$i]['FamilyName']);
+ $last_name = trim($receivedArr[$i]['LastName']);
$clinic_number = trim($receivedArr[$i]['CCC_Number']);
- $phone_number = trim($receivedArr[$i]['MobileNumber']);
+ $phone_number = trim($receivedArr[$i]['Phone_Number']);
$facility_id = trim($receivedArr[$i]['MFL']);
$mfl_code = trim($receivedArr[$i]['MFL']);
- $partner_id = trim($receivedArr[$i]['PartnerID']);
+ if (Auth::user()->access_level == 'Partner' || Auth::user()->access_level == 'Facility') {
+ $partner_id = Auth::user()->partner_id;
+ }else{
+ $partner_id = trim($receivedArr[$i]['PartnerID']);
+ }
$status = "Active";
- $client_status = "Art";
+ $client_status = "ART";
$clinic_id = 1;
$text_frequency = 168;
$text_time = 7;
- $wellness = "Yes";
- $motivational = "Yes";
- $smsenable = "Yes";
+ $wellness = "No";
+ $motivational = "No";
+ $smsenable = "No";
$language = 2;
@@ -121,6 +124,7 @@ public function importClients(Request $request){
$client->txt_time = $text_time;
$client->wellness_enable = $wellness;
$client->motivational_enable = $motivational;
+ $client->smsenable = $smsenable;
$client->created_by = Auth::user()->id;
$client->updated_by = Auth::user()->id;
@@ -132,27 +136,25 @@ public function importClients(Request $request){
// return $res;
// }
- if($existing){
+ if ($existing) {
echo ('Client' . $clinic_number . ' already exists in the system
-
-
-
+
+ Export To PDF
+
+
+
-
-
-
@@ -30,23 +30,35 @@
@section('page-js')
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-