From 52a8822358790846f959e0d742bd6e586c06199b Mon Sep 17 00:00:00 2001 From: shivani Date: Mon, 24 Apr 2017 06:17:30 +0000 Subject: [PATCH] Modified download report feature and minor CSS changes 3 --- app/Http/Controllers/ReportDemoController.php | 49 ++++++++++++++++--- app/Http/routes.php | 2 + resources/views/about.blade.php | 12 ++++- resources/views/importExport.blade.php | 17 +++++-- resources/views/welcome.blade.php | 2 +- 5 files changed, 67 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/ReportDemoController.php b/app/Http/Controllers/ReportDemoController.php index 8061cdd..c8bd36c 100644 --- a/app/Http/Controllers/ReportDemoController.php +++ b/app/Http/Controllers/ReportDemoController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Emergency; +use App\Patient; use Illuminate\Http\Request; use App\Http\Requests; @@ -15,21 +16,53 @@ use App\Report; +use App\Hospital; + class ReportDemoController extends Controller { public function importExport() { return view('importExport'); } - public function downloadExcel($type) + public function downloadExcel(Request $request, $type) { - $data = Report::get()->toArray(); - return Excel::create('ReportOnEmergencyAndBedCount', function($excel) use ($data) { - $excel->sheet('mySheet', function($sheet) use ($data) - { - $sheet->fromArray($data); - }); - })->download($type); + $report_type = $request['report_type']; + if($report_type == 'Hospital') { + $data = Hospital::get()->toArray(); + return Excel::create('Report on Hospitals', function($excel) use ($data) { + $excel->sheet('mySheet', function($sheet) use ($data) + { + $sheet->fromArray($data); + }); + })->download($type); + } + elseif ($report_type == 'Emergency') { + $data = Emergency::get()->toArray(); + return Excel::create('Report on Emergency', function($excel) use ($data) { + $excel->sheet('mySheet', function($sheet) use ($data) + { + $sheet->fromArray($data); + }); + })->download($type); + } + elseif ($report_type == 'Bed Status') { + $data = Report::get()->toArray(); + return Excel::create('Report on Bed Status', function($excel) use ($data) { + $excel->sheet('mySheet', function($sheet) use ($data) + { + $sheet->fromArray($data); + }); + })->download($type); + } + elseif ($report_type == 'Patients') { + $data = Patient::get()->toArray(); + return Excel::create('Report on Patients', function($excel) use ($data) { + $excel->sheet('mySheet', function($sheet) use ($data) + { + $sheet->fromArray($data); + }); + })->download($type); + } } public function importExcel() { diff --git a/app/Http/routes.php b/app/Http/routes.php index 45a352b..ce092c5 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -43,6 +43,8 @@ Route::get('downloadExcel/{type}', 'ReportDemoController@downloadExcel'); +Route::post('downloadExcel/{type}', 'ReportDemoController@downloadExcel'); + Route::post('importExcel', 'ReportDemoController@importExcel'); Route::get('/generateBarChart', 'ReportDemoController@generateBar'); diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php index eec4650..3799e33 100644 --- a/resources/views/about.blade.php +++ b/resources/views/about.blade.php @@ -6,9 +6,17 @@
-

About Us

+
+
+ Back +
+

About Us

+
-

The County Health Online Bed Tracking System is a project which was proposed by the Division Chief of Health Data and Planning for the County Health department. Where the County Health Department is responsible for coordination of the hospital resources in that county. The main purpose of this centralized system is to provide a platform to coordinate between the hospitals and all the types of users (First responder, Admin, Nurse, Coordinator).

+ The County Health Department is responsible for coordination of the hospital resources in the county. This centralized system is to provide a platform to coordinate between the hospitals and all the types of users (First responder, Admin, Nurse, Coordinator). +
+
+ Contact US : 402-999-9999
diff --git a/resources/views/importExport.blade.php b/resources/views/importExport.blade.php index b04d7bc..9c9b5d9 100644 --- a/resources/views/importExport.blade.php +++ b/resources/views/importExport.blade.php @@ -35,13 +35,22 @@
+

Download File :

+
+  {!! Form::open(['url' => 'downloadExcel/xls','method'=>'POST']) !!} +
{{ Form::select('report_type', array('Hospital' => 'Hospital', 'Emergency' => 'Emergency', 'Patients' => 'Patients', 'Bed Status' => 'Bed Status'), null, ['placeholder' => 'Select Report Type', 'class' => 'col-md-4 form-control cds-select']) }}
+
+
+ -

Download File :

- - - + +         + + {!! Form::close() !!} +              +
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index f045a53..9f7bd73 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1,4 +1,4 @@ -@extends(Auth::user() ? 'layouts.userlayout' : 'layouts.guestpage') +@extends('layouts.app')