updates before release

Database/migrations/2023_11_12_092039_create_trip_reports_table.php

@@ -20,9 +20,8 @@ public function up()
             $table->string('id');
             $table->foreignId('parent_id')->nullable();
             $table->string('parent_type')->nullable();
-            $table->integer('trip_type');
+            $table->longText('description')->nullable();
             $table->string('name');
-            $table->foreignId('owner_id');
             $table->integer('state');
             $table->foreignId('aircraft_id')->nullable();
             $table->timestamps();
@@ -34,6 +33,11 @@ public function up()
             $table->string('pirep_id')->nullable();
             $table->integer('order');
         });
+        Schema::create('trip_report_user', function (Blueprint $table) {
+            $table->string('trip_report_id');
+            $table->foreignId('user_id');
+            $table->boolean('owner');
+        });
     }
 
     /**

Database/migrations/2024_02_11_065647_create_ch_trip_templates_table.php

@@ -0,0 +1,60 @@
+<?php
+
+use App\Contracts\Migration;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+
+/**
+ * Class CreateChTripTemplatesTable
+ */
+class CreateChTripTemplatesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Allow Multiple Users to be assigned to a trip.
+        Schema::create('trip_report_user', function (Blueprint $table) {
+            $table->string('trip_report_id');
+            $table->foreignId('user_id');
+            $table->boolean('owner');
+        });
+        // Convert Users from old trip ownership to new one.
+        //$tr = \Modules\CHTrips\Models\TripReport::all();
+        //$user_id = $tr->owner_id;
+        //$tr->users()->attach($user_id, ['owner' => true]);
+
+        // Add Trip Templates
+        Schema::create('ch_trip_templates', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->boolean('visible')->default(true);
+            $table->boolean('enabled')->default(true);
+            $table->longText('description')->nullable();
+            $table->integer('type')->nullable();
+            $table->json('data'); // List of all the flights to be generated for this trip.
+            $table->date('starting_at')->nullable();
+            $table->date('ending_at')->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+        });
+        Schema::table('ch_trip_reports', function (Blueprint $table) {
+            $table->boolean('can_duplicate'); // Allows trip to be duplicated by another user so they can fly a similar trip.
+            //$table->foreignId('owner_id')->nullable()->change(); // Allow trip to be claimed by users.
+            $table->dropColumn('owner_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('ch_trip_templates');
+    }
+}

Http/Controllers/Admin/MissionAdminController.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Modules\CHTrips\Http\Controllers\Admin;
+
+use App\Contracts\Controller;
+use Illuminate\Http\Request;
+
+/**
+ * Admin controller
+ */
+class MissionAdminController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function index(Request $request)
+    {
+        return view('chtrips::admin.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function create(Request $request)
+    {
+        return view('chtrips::admin.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     */
+    public function store(Request $request)
+    {
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function edit(Request $request)
+    {
+        return view('chtrips::admin.edit');
+    }
+
+    /**
+     * Show the specified resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function show(Request $request)
+    {
+        return view('chtrips::admin.show');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param Request $request
+     */
+    public function update(Request $request)
+    {
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Request $request
+     */
+    public function destroy(Request $request)
+    {
+    }
+}

Http/Controllers/Admin/TripTemplatesAdminController.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Modules\CHTrips\Http\Controllers\Admin;
+
+use App\Contracts\Controller;
+use Illuminate\Http\Request;
+use Modules\CHTrips\Models\TripTemplate;
+
+/**
+ * Admin controller
+ */
+class TripTemplatesAdminController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function index(Request $request)
+    {
+        return view('chtrips::admin.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function create(Request $request)
+    {
+        return view('chtrips::admin.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param Request $request
+     */
+    public function store(Request $request)
+    {
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function edit(Request $request, TripTemplate $id)
+    {
+        return view('chtrips::admin.edit');
+    }
+
+    /**
+     * Show the specified resource.
+     *
+     * @param Request $request
+     *
+     * @return mixed
+     */
+    public function show(Request $request, TripTemplate $id)
+    {
+        return view('chtrips::admin.show');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param Request $request
+     */
+    public function update(Request $request, TripTemplate $id)
+    {
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Request $request
+     */
+    public function destroy(Request $request, TripTemplate $id)
+    {
+        $id->delete();
+    }
+}

Http/Controllers/Admin/AdminController.php → Http/Controllers/Admin/TripsAdminController.php

@@ -8,7 +8,7 @@
 /**
  * Admin controller
  */
-class AdminController extends Controller
+class TripsAdminController extends Controller
 {
     /**
      * Display a listing of the resource.

Http/Controllers/Frontend/IndexController.php

@@ -38,16 +38,22 @@ public function __construct(
      */
     public function index(Request $request)
     {
-        $trips = TripReport::where('owner_id', Auth::user()->id)->with('fpts')->get();
+        $trips = TripReport::whereHas('users', function ($q) {
+            $q->where('user_id', Auth::user()->id);
+        })->get();
         foreach($trips as $trip) {
-            $completed = $trip->fpts->where('completed', true)->count();
-            if (count($trip->fpts) == 0) {
-                $trip->progress = 0;
-                continue;
+            $completed = 0;
+            $fpts = $trip->fpts()->orderBy('order')->get();
+            foreach ($fpts as $fpt) {
+                if ($fpt->pirep_id === null) {
+                    //dd(Flight::find($fpt->flight_id));
+                } else {
+                    $completed++;
+                }
             }
-            $prog = round($completed / count($trip->fpts) * 100);
+            $prog = round($completed / count($fpts) * 100);
 
-            $trip->progress = "{$completed}/{$trip->fpts->count()} ({$prog})";
+            $trip->progress = "{$completed}/{$trip->fpts->count()} ({$prog}%)";
         }
         return view('chtrips::index', ['trips' => $trips]);
     }
@@ -88,7 +94,7 @@ public function store(Request $request)
         unset($data['airports']);
         // First, create the trip.
         $tr = new TripReport();
-        $tr->owner_id = $user->id;
+
 
         if ($data['name'] == "") {
             $tr->name = "Free Flight: {$airports[0]}->{$airports[count($airports) - 1]}";
@@ -102,6 +108,7 @@ public function store(Request $request)
 
         $tr->save();
 
+        $tr->users()->attach($user->id);
         // Now, create each flight based on the params
         for ($i = 0; $i < count($airports) - 1; $i++) {
             $data['dpt_airport_id'] = $airports[$i];