From adadd7994e12dff09362635a7542ba321a84bbd3 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Fri, 12 Mar 2021 00:28:12 +0900 Subject: [PATCH] added to the after action report controller --- .../AfterActionReportsController.php | 31 +++++++++++++++++-- .../AfterActionReports/AfterActionReport.php | 1 + ...145_create_after_action_reports_tables.php | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php b/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php index ba4c06e33..068d1cd50 100644 --- a/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php +++ b/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php @@ -23,7 +23,6 @@ class AfterActionReportsController extends Controller public function StoreReport(Request $request) { $this->validate($request, [ - 'fc' => 'required', 'location' => 'required', 'time' => 'required', 'comms' => 'required', @@ -35,17 +34,43 @@ class AfterActionReportsController extends Controller 'well' => 'required', 'comments' => 'required', ]); + + $report = new Report; + $report->fc_id = auth()->user()->getId(); + $report->fc_name = auth()->user()->getName(); + $report->formup_time = $request->time; + $report->formup_location = $request->location; + $report->comms = $request->comms; + $report->doctrine = $request->doctrine; + $report->objective = $request->objective; + $report->objective_result = $request->result; + $report->summary = $request->summary; + $report->improvements = $request->improvements; + $report->worked_well = $request->well; + $report->additon_comments = $request->comments; + $report->save(); + return redirect('/reports/display/all')->with('success', 'Added report to the database.'); } public function StoreComment(Request $request) { $this->validate($request, [ - + 'report_id' => 'required', + 'comments' => 'required', ]); + + $comment = new AfterActionReportComment; + $comment->report_id = $request->report_id; + $comment->character_id = auth()->user()->getId(); + $comment->character_name = auth()->user()->getName(); + $comment->comments = $required->comments; + $comment->save(); + + return redirect('/reports/display/all')->with('success', 'Added comemnt to the report.'); } public function DisplayAllReports() { - + return view('reports.user.displayreports'); } diff --git a/app/Models/AfterActionReports/AfterActionReport.php b/app/Models/AfterActionReports/AfterActionReport.php index 9f3036745..4c238c54d 100644 --- a/app/Models/AfterActionReports/AfterActionReport.php +++ b/app/Models/AfterActionReports/AfterActionReport.php @@ -23,6 +23,7 @@ class AfterActionReport extends Model protected $fillable = [ 'fc_id', 'fc_name', + 'formup_time', 'formup_location', 'comms', 'doctrine', diff --git a/database/migrations/2021_03_10_130145_create_after_action_reports_tables.php b/database/migrations/2021_03_10_130145_create_after_action_reports_tables.php index 57ca7b16b..1af3e1617 100644 --- a/database/migrations/2021_03_10_130145_create_after_action_reports_tables.php +++ b/database/migrations/2021_03_10_130145_create_after_action_reports_tables.php @@ -18,6 +18,7 @@ class CreateAfterActionReportsTables extends Migration $table->id(); $table->unsignedBigInteger('fc_id'); $table->string('fc_name'); + $table->dateTime('formup_time'); $table->string('formup_location'); $table->enum('comms', [ 'W4RP',