Fix/monthviewlinks

app/ClubEvent.php

@@ -127,11 +127,11 @@ public function schedule()
      */
     public function hasShift($person)
     {
-        return $this->shifts ->contains(function(Shift $shift) use($person){
-            return $shift->person_id === $person->id;
+        return $this->shifts->contains(function(Shift $shift) use($person){
+            return $shift->person_id == $person->id;
         });
     }
-    
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough|Shift
      */

app/Console/Commands/UpdateLara.php

@@ -95,7 +95,7 @@ public function handle()
 
             // log what you are doing
             $this->info(''); // new line
-            $this->info('Executing "'.$step.'"...');
+            $this->info('Executing "' . $step . '"...');
 
             // perform the instruction
             passthru($step, $result);
@@ -115,8 +115,8 @@ public function handle()
         // Inform the users
         $this->info(''); // new line
         $this->info(''); // new line
-        Log::info('Finished Lara update after '.($counterEnd - $counterStart).' seconds.');
-        $this->info('Finished Lara update after '.($counterEnd - $counterStart).' seconds.');
+        Log::info('Finished Lara update after ' . ($counterEnd - $counterStart) . ' seconds.');
+        $this->info('Finished Lara update after ' . ($counterEnd - $counterStart) . ' seconds.');
 
     }
 }

app/Http/Controllers/ClubEventController.php

@@ -19,8 +19,8 @@
 use Lara\ShiftType;
 use Lara\Shift;
 use Lara\Person;
-use Lara\Section;
 use Lara\Schedule;
+use Lara\Section;
 use Lara\Template;
 use Lara\Utilities;
 use Lara\utilities\RoleUtility;

app/Http/Controllers/LoginController.php

@@ -12,6 +12,7 @@
 use Lara\Section;
 use Lara\User;
 use Lara\utilities\RoleUtility;
+use Lara\Utilities;
 use Log;
 use Session;
 
@@ -151,7 +152,8 @@ protected function attemptLoginViaLDAP()
         try {
             return $this->attemptLoginViaLDAPInternal();
         } catch (\Exception $e) {
-            Log::error("ldap broken: " . $e->getMessage(), $e->getTrace());
+            Log::error(Input::get("username") . " tried to login via LDAP, but LDAP is not available.");
+            Utilities::error(trans("auth.ldap_down"));
             return false;
         }
     }
@@ -452,8 +454,7 @@ protected function attemptLoginWithCredentials($request, $userIdentifier = 'emai
      */
     protected function loginFailed()
     {
-        Session::put('message', Config::get('messages_de.login-fail'));
-        Session::put('msgType', 'danger');
+        Utilities::error(Config::get('messages_de.login-fail'));
 
         return redirect()->back();
     }

app/Http/Controllers/ShiftController.php

@@ -517,7 +517,12 @@ private function onAdd($shift, $userName, $ldapId, $userClub)
      */
     private function updateStatus($shift) {
         if ( !is_null($shift->person_id) ) {
-            return Status::style($shift->person->prsn_status);
+
+            $person = $shift->person;
+            $club = $person->club;
+            $section = $club->section();
+
+            return Status::style($person->prsn_status, $section);
         }
         return ["status"=>"fa fa-question", "style"=>"color:lightgrey;", "title"=>"Dienst frei"];
     }

app/Http/Controllers/TemplateController.php

@@ -134,7 +134,7 @@ private function createShifts($inputShifts, $amount)
             $weight = $inputShifts["weight"][$i];
 
             $position = $i;
-            $shift = ShiftController::createShiftsFromEditSchedule($id, $title, $type, $start, $end, $weight, $position);
+            $shift = ShiftController::createShiftsFromEditSchedule($id, $title, $type, $start, $end, $weight, $position,true);
             if ($shift != null) {
                 array_push($results, $shift->id);
             }

app/Status.php

@@ -9,13 +9,16 @@ class Status {
     const CANDIDATE = 'candidate';
     const MEMBER = 'member';
     const VETERAN = 'veteran';
+    const RESIGNED = 'resigned';
     const EXMEMBER = 'ex-member';
     const EXCANDIDATE = 'ex-candidate';
+    const GUEST = 'guest';
 
     const ALL = [
         self::CANDIDATE,
         self::MEMBER,
         self::VETERAN,
+        self::RESIGNED,
         self::EXMEMBER,
         self::EXCANDIDATE,
     ];
@@ -40,19 +43,22 @@ public static function shortHand($status)
         return self::SHORTHANDS[$status];
     }
 
-    public static function style($status)
+    public static function style($status, $section = NULL)
     {
+        if (!$section) {
+            $section = Section::query()->first();
+        }
         switch ($status) {
             case STATUS::CANDIDATE:
-                return ["status" => "fa fa-adjust", "style" => "color:yellowgreen;", "title" => "Kandidat"];
+                return ["status" => "fa fa-adjust", "style" => "color:yellowgreen;", "title" => self::localize($status, $section)];
             case STATUS::VETERAN:
-                return ["status" => "fa fa-star", "style" => "color:gold;", "title" => "Veteran"];
+                return ["status" => "fa fa-star", "style" => "color:gold;", "title" => self::localize($status, $section)];
             case STATUS::MEMBER:
-                return ["status" => "fa fa-circle", "style" => "color:forestgreen;", "title" => "Aktiv"];
+                return ["status" => "fa fa-circle", "style" => "color:forestgreen;", "title" => self::localize($status, $section)];
             case STATUS::EXMEMBER:
-                return ["status" => "fa fa-star-o", "style" => "color:gold;", "title" => "ex-Mitglied"];
+                return ["status" => "fa fa-star-o", "style" => "color:gold;", "title" => self::localize($status, $section)];
             case STATUS::EXCANDIDATE:
-                return ["status"=>"fa fa-circle", "style"=>"color:lightgrey;", "title"=>"ex-Kandidat"];
+                return ["status"=>"fa fa-circle", "style"=>"color:lightgrey;", "title" => self::localize($status, $section)];
             default:
                 return ["status" => "fa fa-circle", "style" => "color:lightgrey;", "title" => "Extern"];
         }

app/User.php

@@ -128,6 +128,9 @@ public static function createFromPerson(Person $person)
             'person_id' => $person->id,
             'status' => $newStatus
         ]);
+
+        $person->prsn_status = $newStatus;
+        $person->save();
         RoleUtility::assignPrivileges(
             $user, $person->club->section(),
             RoleUtility::PRIVILEGE_MEMBER

app/Utilities.php

@@ -72,14 +72,18 @@ static function getEventTypeTranslation($typeNumber){
 
     static function error($message)
     {
-        Session::put('message', $message);
-        Session::put('msgType', 'danger');
+        if (!Session::has('message')) {
+            Session::put('message', $message);
+            Session::put('msgType', 'danger');
+        }
     }
 
     static function success($message)
     {
-        Session::put('message', $message);
-        Session::put('msgType', 'success');
+        if (!Session::has('message')) {
+            Session::put('message', $message);
+            Session::put('msgType', 'success');
+        }
     }
 
 }

resources/lang/de/auth.php

@@ -33,5 +33,6 @@
     'status' => 'Status',
     'password' => 'Passwort',
     'confirmPassword' => 'Passwort bestätigen',
-    'register_submit' => 'Neuen Nutzer registrieren'
+    'register_submit' => 'Neuen Nutzer registrieren',
+    'ldap_down' => 'LDAP scheint nicht erreichbar zu sein, bitte melde dich mit deiner E-Mail Adresse an.',
 ];

resources/lang/en/auth.php

@@ -33,5 +33,6 @@
     'status' => 'Status',
     'password' => 'Password',
     'confirmPassword' => 'Confirm password',
-    'register_submit' => 'Register new user'
+    'register_submit' => 'Register new user',
+    'ldap_down' => 'LDAP is down, please use your E-Mail for logging in.',
 ];

resources/lang/pirate/auth.php

@@ -33,5 +33,6 @@
     'status' => 'Status',
     'password' => 'Passwort',
     'confirmPassword' => 'Passwort bestätigen',
-    'register_submit' => 'Neuen Nutzer registrieren'
+    'register_submit' => 'Neuen Nutzer registrieren',
+    'ldap_down' => 'LDAP scheint nicht erreichbar zu sein, bitte melde dich mit deiner E-Mail Adresse an.',
 ];

resources/views/auth/register.blade.php

@@ -13,7 +13,7 @@
                 <div class="panel-body">
                     {{ Form::open(['class'=>"form-horizontal","method"=>"POST","route"=>'register']) }}
                         <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
-                            <label for="name" class="col-md-4 control-label">Name</label>
+                            <label for="name" class="col-md-4 control-label"> {{ trans('auth.nickname') }}</label>
 
                             <div class="col-md-6">
                                 <input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>

resources/views/monthView.blade.php

@@ -9,16 +9,23 @@
     <div class="col-xs-12 col-md-12">
         <div class="col-xs-12 col-md-5 btn-group no-padding">
             <a class="btn btn-default hidden-print"
-               href="{{ Request::getBasePath() }}/calendar/{{ date("Y/m",
-                                strtotime("previous month", $date['startStamp'])) }}">
+               href="{{route("calendar.month",	
+						["year"=>date("Y",strtotime("previous month", $date['startStamp'])),
+						 "month"=>date("m",strtotime("previous month", $date['startStamp']))]
+						)
+					}}">
                 &lt;&lt;
             </a>
 
             <span class="btn btn-lg disabled mobile72Width" style="text-align: center !important;">
                 {{ $date['monthName'] . " " . $date['year'] }}
             </span>
             <a class="btn btn-default hidden-print"
-               href="{{ Request::getBasePath() }}/calendar/{{ date("Y/m", strtotime("next month", $date['startStamp'])) }}">
+               href="{{route("calendar.month",	
+						["year"=>date("Y",strtotime("next month", $date['startStamp'])),
+						 "month"=>date("m",strtotime("next month", $date['startStamp']))]
+						)
+					}}">
                 &gt;&gt;
             </a>
         </div>

resources/views/partials/navigation.blade.php

@@ -86,7 +86,7 @@ class="dropdown-toggle"
                 @endis
 
                 {{-- LARA LOGS / section management or admins only --}}
-                @is(Roles::PRIVILEGE_CL, Roles::PRIVILEGE_ADMINISTRATOR)
+                @is(Roles::PRIVILEGE_ADMINISTRATOR)
                     <li><a href="{{ asset('/logs') }}">Logs</a></li>
                     <li role="separator" class="divider"></li>
                 @endis

resources/views/partials/surveyForm.blade.php

@@ -29,11 +29,13 @@
                 <div>
                     <label class="label_checkboxitem" for="checkboxitemitem"></label>
                     <label><input type="checkbox" id="required1" value="1" name="is_private"
-                                  @if(Auth::user()->isAn(Roles::PRIVILEGE_MARKETING)) checked
-                                  disabled @endif class="input_checkboxitem"
+                                  @if(!Auth::user()->isAn(Roles::PRIVILEGE_MARKETING))
+                                  disabled checked @endif class="input_checkboxitem"
                                   @if($survey->is_private) checked @endif> {{ trans('mainLang.showOnlyForLoggedInMember') }}
                     </label>
-                    <input hidden type="checkbox" id="required1_hidden" name="is_private" value="1">
+                    @if(!Auth::user()->isAn(Roles::PRIVILEGE_MARKETING))
+                        <input hidden checked type="checkbox" id="required1_hidden" name="is_private" value="1">
+                    @endif
                 </div>
                 <div>
                     <label class="label_checkboxitem" for="checkboxitemitem"></label>

resources/views/user/edituser.blade.php

@@ -27,7 +27,7 @@
 
                         @canEditUser($user)
                         <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }} input-group" >
-                            <label class="control-label" for="userName"> Name </label>
+                            <label class="control-label" for="userName"> {{ trans('auth.nickname') }} </label>
                             {{ Form::text('name',$user->name,['class'=>"form-control" ,'id'=>'userName','required'=>"",'autofocus'=>'']) }}
                             @if ($errors->has('name'))
                                 <span class="help-block">