Merge branch 'staging' into deployment

Author: horcsinbalint

.devcontainer/devcontainer.json

@@ -6,14 +6,16 @@
 	],
 	"service": "mars_dev",
 	"workspaceFolder": "/workspace/mars",
-	"settings": {},
-	"extensions": [
-		// "mikestead.dotenv",
-		// "amiralizadeh9480.laravel-extra-intellisense",
-		// "ryannaddy.laravel-artisan",
-		// "onecentlin.laravel5-snippets",
-		// "onecentlin.laravel-blade"
-	],
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"php-cs-fixer.executablePath": "${workspaceFolder}/vendor/bin/php-cs-fixer"
+			},
+			"extensions": [
+				"junstyle.php-cs-fixer"
+			]
+		}
+	},
 	"remoteUser": "ubuntu",
 	"postCreateCommand": "make build"
 	// "forwardPorts": [],

Makefile

@@ -10,4 +10,11 @@ seed:
 	php artisan db:seed
 
 serve:
-	php artisan serve --host=0.0.0.0
+	php artisan serve --host=0.0.0.0
+
+clear_cache:
+	php artisan cache:clear
+	php artisan view:clear
+	php artisan config:clear
+	php artisan event:clear
+	php artisan route:clear

app/Console/Commands/FinalizeSemesterEvaluation.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Http\Controllers\Secretariat\SemesterEvaluationController;
+use Illuminate\Support\Facades\App;
+use App\Models\Semester;
+
+class FinalizeSemesterEvaluation extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:finalize-semester-evaluation {year} {part}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Finalizes the semester evaluation, deactivates collegists who has not set their new status.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $year = $this->argument('year');
+        $part = $this->argument('part');
+
+
+        $semester = Semester::where('year', $year)->where('part', $part)->first();
+
+        App::setLocale('hu');
+        app(SemesterEvaluationController::class)->finalize($semester);
+    }
+}

app/Http/Controllers/Dormitory/Printing/PrintJobController.php

@@ -179,6 +179,7 @@ private function paginatorFrom(Builder $printJobs, array $columns)
         $paginator = TabulatorPaginator::from($printJobs)->sortable($columns)->filterable($columns)->paginate();
 
         // Process the data before showing it in a table.
+        // @phpstan-ignore-next-line
         $paginator->getCollection()->append([
             'translated_cost',
             'translated_state',

app/Http/Controllers/Secretariat/SemesterEvaluationController.php

@@ -89,17 +89,17 @@ public function handlePeriodicEventStart(): void
     public function handlePeriodicEventReminder(int $daysBeforeEnd): void
     {
         if($daysBeforeEnd < 3) {
-            $userCount = $this->usersHaventFilledOutTheForm()->count();
+            $userCount = SemesterEvaluationController::usersHaventFilledOutTheForm($this->semester())->count();
             Mail::to(config('contacts.mail_membra'))->queue(new EvaluationFormReminder($userCount, $this->getDeadline()));
         }
     }
 
     /**
      * Send email about results and deactivate collegists who did not fill out the form.
      */
-    public function handlePeriodicEventEnd()
+    public static function finalize($semester)
     {
-        $users = $this->usersHaventFilledOutTheForm();
+        $users = SemesterEvaluationController::usersHaventFilledOutTheForm($semester);
         $users_names = $users->pluck('name')->toArray();
 
         if (User::secretary()) {
@@ -137,7 +137,6 @@ public function show()
         $this->authorize('fillOrManage', SemesterEvaluation::class);
 
         return view('secretariat.evaluation-form.app', [
-            'phd' => user()->educationalInformation->isSenior(),
             'user' => user(),
             'faculties' => Faculty::all(),
             'workshops' => Workshop::all(),
@@ -146,7 +145,7 @@ public function show()
             'community_services' => user()->communityServiceRequests()->where('semester_id', Semester::current()->id)->get(),
             'position_roles' => user()->roles()->whereIn('name', Role::STUDENT_POSTION_ROLES)->get(),
             'periodicEvent' => $this->periodicEvent(),
-            'users_havent_filled_out' => user()->can('manage', SemesterEvaluation::class) ? $this->usersHaventFilledOutTheForm() : null,
+            'users_havent_filled_out' => user()->can('manage', SemesterEvaluation::class) ? SemesterEvaluationController::usersHaventFilledOutTheForm($this->semester()) : null,
         ]);
     }
 
@@ -243,11 +242,17 @@ public function store(Request $request)
     /**
      * @return User[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection
      */
-    public function usersHaventFilledOutTheForm()
+    public static function usersHaventFilledOutTheForm($semester)
     {
-        return User::withRole(Role::COLLEGIST)->verified()->whereDoesntHave('semesterStatuses', function ($query) {
-            $query->where('semester_id', $this->semester()?->succ()?->id);
-        })->get();
+        return User::withRole(Role::COLLEGIST)
+            ->whereDoesntHave('roles', function ($query) {
+                $query->where('name', Role::SENIOR);
+            })
+            ->verified()
+            ->whereDoesntHave('semesterStatuses', function ($query) use ($semester) {
+                $query->where('semester_id', $semester?->succ()?->id);
+            })
+            ->get();
     }
 
     /**

app/Http/Controllers/Secretariat/UserController.php

@@ -169,6 +169,7 @@ public function updateEducationalInformation(Request $request, User $user): Redi
             'study_lines' => 'array',
             'study_lines.*.name' => 'required|string|max:255',
             'study_lines.*.level' => ['required', Rule::in(array_keys(StudyLine::TYPES))],
+            'study_lines.*.training_code' => 'string|max:255',
             'study_lines.*.minor' => 'nullable|string|max:255',
             'study_lines.*.start' => 'required',
             'email' => [
@@ -209,7 +210,6 @@ public function updateEducationalInformation(Request $request, User $user): Redi
 
             if ($request->has('workshop')) {
                 $user->workshops()->sync($request->input('workshop'));
-                WorkshopBalance::generateBalances(Semester::current());
             }
 
             if ($request->has('faculty')) {
@@ -223,6 +223,7 @@ public function updateEducationalInformation(Request $request, User $user): Redi
                         'name' => $studyLine["name"],
                         'type' => $studyLine["level"],
                         'minor' => $studyLine["minor"] ?? null,
+                        'training_code' => $studyLine["training_code"],
                         'start' => $studyLine["start"],
                         'end' => $studyLine["end"] ?? null,
                     ]);

app/Http/Controllers/StudentsCouncil/EconomicController.php

@@ -105,8 +105,6 @@ public static function payKKTNetregLogic(User $payer, User $receiver, int $kkt_a
             'moved_to_checkout' => null,
         ]);
 
-        WorkshopBalance::generateBalances(Semester::current());
-
         $new_expiry_date = $payer->internetAccess->extendInternetAccess();
 
         return [$kkt, $netreg, $new_expiry_date];

app/Models/EducationalInformation.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 use App\Models\Semester;
+use App\Models\Role;
 
 /**
  * Either B2 or C1.
@@ -113,11 +114,11 @@ public function languageExamsBeforeAcceptance()
     }
 
     /**
-     * Whether the user is a senior (i.e. currently has a PhD study line).
+     * Whether the user is a senior
      */
     public function isSenior(): bool
     {
-        return $this->studyLines()->currentlyEnrolled()->where('type', 'phd')->exists();
+        return $this->user->isSenior();
     }
 
     /**

app/Models/FreePages.php

@@ -77,7 +77,7 @@ public function printAccount()
 
     /**
      * Wether the free pages are still available.
-     * @return bool
+     * @return Attribute
      */
     protected function available(): Attribute
     {

app/Models/PrintAccount.php

@@ -69,7 +69,7 @@ public function freePages()
 
     /**
      * The free pages which are currently available. Sorts the free pages by their deadline.
-     * @return Collection
+     * @return Collection|FreePages[]
      */
     public function availableFreePages()
     {
@@ -131,7 +131,7 @@ public function updateHistory(bool $useFreePages, int $cost)
             $availableFreePages = $this->availableFreePages()->where('amount', '>', 0);
 
             // Subtract the pages from the free pages pool, as many free pages as necessary
-            /** @var FreePages */
+            /** @var FreePages $freePages */
             foreach ($availableFreePages as $freePages) {
                 $subtractablePages = $freePages->calculateSubtractablePages($freePagesToSubtract);
                 $freePages->subtractPages($subtractablePages);