fixes #549: fill missing arrival dates and prevent setting arrival by admin-user instead of admin-arrive

4 files changed, 33 insertions, 5 deletions

diff --git a/db/migrations/2018_12_27_000000_fix_missing_arrival_dates.php b/db/migrations/2018_12_27_000000_fix_missing_arrival_dates.php
new file mode 100644
index 00000000..b932158c
--- /dev/null
+++ b/db/migrations/2018_12_27_000000_fix_missing_arrival_dates.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Engelsystem\Migrations;
+
+use Engelsystem\Database\Migration\Migration;
+use Engelsystem\Models\User\State;
+
+class FixMissingArrivalDates extends Migration
+{
+    /**
+     * Run the migration
+     */
+    public function up()
+    {
+        $states = State::whereArrived(true)->whereArrivalDate(null)->get();
+        foreach($states as $state) {
+            $state->arrival_date = $state->user->personalData->planned_arrival_date;
+            $state->save();
+        }
+    }
+
+    /**
+     * Down is not possible and not needed since this is a bugfix.
+     */
+    public function down()
+    {}
+}
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index c8fbee47..8a7ee517 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -5,7 +5,6 @@ use Engelsystem\Database\DB;
 use Engelsystem\Models\User\PasswordReset;
 use Engelsystem\Models\User\User;
 use Engelsystem\ValidationResult;
-use Illuminate\Database\Query\JoinClause;
 
 /**
  * User model
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 72caa48f..d42c3b39 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -75,7 +75,12 @@ function admin_user()
 
         // Gekommen?
         $html .= '  <tr><td>Gekommen</td><td>' . "\n";
-        $html .= html_options('eGekommen', $options, $user_source->state->arrived) . '</td></tr>' . "\n";
+        if($user_source->state->arrived) {
+            $html .= _('Yes');
+        } else {
+            $html .= _('No');
+        }
+        $html .= '</td></tr>' . "\n";
 
         // Aktiv?
         $html .= '  <tr><td>Aktiv</td><td>' . "\n";
@@ -263,7 +268,6 @@ function admin_user()
                 $user_source->contact->mobile = $request->postData('eHandy');
                 $user_source->contact->dect = $request->postData('eDECT');
                 $user_source->contact->save();
-                $user_source->state->arrived = $request->postData('eGekommen');
                 $user_source->state->active = $request->postData('eAktiv');
                 $user_source->state->force_active = $force_active;
                 $user_source->state->got_shirt = $request->postData('eTshirt');
@@ -271,7 +275,6 @@ function admin_user()
 
                 engelsystem_log(
                     'Updated user: ' . $request->postData('eNick') . ', ' . $request->postData('eSize')
-                    . ', arrived: ' . $request->postData('eVorname')
                     . ', active: ' . $request->postData('eAktiv')
                     . ', tshirt: ' . $request->postData('eTshirt')
                 );
diff --git a/src/Models/User/PersonalData.php b/src/Models/User/PersonalData.php
index d5b74128..921e821e 100644
--- a/src/Models/User/PersonalData.php
+++ b/src/Models/User/PersonalData.php
@@ -32,7 +32,6 @@ class PersonalData extends HasUserModel
         'first_name',
         'last_name',
         'shirt_size',
-        'arrival_date',
         'planned_arrival_date',
         'planned_departure_date',
     ];