br0kenpixel/isop-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

potvrdenie vykazu a oprava databazy

Browse Source
This commit is contained in:
Sofia Reháková
2025-11-03 22:56:35 +01:00
parent 8915a7cec8
commit 69df349d3f
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
backend/app/Http/Controllers/InternshipController.php
View File

@@ -37,7 +37,7 @@ class InternshipController extends Controller
});
$internships->each(function ($internship) {
$internship->status = InternshipStatus::whereColumn('internship_id', '=', $internship->id)->orderByDesc('changed')->get()->first()->makeHidden(['created_at', 'updated_at', 'id']);
$internship->status = InternshipStatus::whereInternshipId($internship->id)->orderByDesc('changed')->get()->first()->makeHidden(['created_at', 'updated_at', 'id']);
$internship->status->modified_by = User::find($internship->status->modified_by)->makeHidden(['created_at', 'updated_at', 'email_verified_at']);
});
@@ -126,7 +126,7 @@ class InternshipController extends Controller
$internship->contact = User::find($internship->company->contact)->makeHidden(['created_at', 'updated_at', 'email_verified_at']);
unset($internship->company->contact);
$internship->status = InternshipStatus::whereColumn('internship_id', '=', $internship->id)->orderByDesc('changed')->get()->first()->makeHidden(['created_at', 'updated_at', 'id']);
$internship->status = InternshipStatus::whereInternshipId($internship->id)->orderByDesc('changed')->get()->first()->makeHidden(['created_at', 'updated_at', 'id']);
$internship->status->modified_by = User::find($internship->status->modified_by)->makeHidden(['created_at', 'updated_at', 'email_verified_at']);
$internship->agreement = $internship->agreement !== null;
@@ -231,21 +231,16 @@ class InternshipController extends Controller
], 400);
}
if ($user->role !== 'ADMIN' && $internship->user_id !== $user->id && $user->id !== $internship->contact) {
if ($internship->user_id !== $user->id && $user->id !== $internship->company->contact) {
abort(403, 'Unauthorized');
}
$request->validate([
'agreement' => ['nullable', 'file', 'mimes:pdf', 'max:10240'],
'report' => ['nullable', 'file', 'mimes:pdf', 'max:10240']
'report' => ['nullable', 'file', 'mimes:pdf', 'max:10240'],
'report_confirmed' => ['required', 'boolean'],
]);
if (!$request->hasFile('agreement') && !$request->hasFile('report')) {
return response()->json([
'message' => 'At least one document (agreement or report) must be provided.'
], 400);
}
if ($request->hasFile('agreement')) {
$internship->agreement = file_get_contents($request->file('agreement')->getRealPath());
}
@@ -254,6 +249,16 @@ class InternshipController extends Controller
$internship->report = file_get_contents($request->file('report')->getRealPath());
}
if($user->role === 'EMPLOYER') {
if($request->report_confirmed && (!$internship->agreement || !$internship->report)) {
return response()->json([
'message' => 'Report cannot be confirmed without an agreement and report.'
], 400);
}
$internship->report_confirmed = $request->report_confirmed;
}
$internship->save();
return response()->noContent();
}

9
frontend/app/components/InternshipDocumentEditor.vue
View File

@@ -1,6 +1,8 @@
<script setup lang="ts">
import type { Internship } from '~/types/internships';
import { FetchError } from 'ofetch';
import type { User } from '~/types/user';
import { Role } from '~/types/role';
const props = defineProps<{
internship: Internship
@@ -18,14 +20,17 @@ const loading = ref(false);
const error = ref<string | null>(null);
const agreement = ref<File | null>(null);
const report = ref<File | null>(null);
const report_confirmed = ref(props.internship.report_confirmed);
const client = useSanctumClient();
const user = useSanctumUser<User>();
async function onSubmit() {
error.value = null;
loading.value = true;
const formData = new FormData();
formData.append('report_confirmed', report_confirmed.value ? '1' : '0');
if (agreement.value) {
formData.append('agreement', agreement.value);
}
@@ -86,11 +91,13 @@ async function onSubmit() {
<v-file-input v-model="report" :rules="[rules.isPdf, rules.maxSize]" accept=".pdf,application/pdf"
prepend-icon="mdi-chart-box-outline" label="Nahrať PDF výkaz" variant="outlined" show-size clearable
hint="Povolené: PDF, max 10 MB" persistent-hint />
<v-checkbox v-if="user?.role === Role.EMPLOYER" :disabled="!props.internship.agreement || !props.internship.report" v-model="report_confirmed" label="Výkaz je správny"></v-checkbox>
</div>
<br />
<v-btn type="submit" color="success" size="large" block :disabled="!agreement && !report">
<v-btn type="submit" color="success" size="large" block :disabled="!agreement && !report && (!props.internship.agreement || !props.internship.report)">
Uloziť
</v-btn>
</v-form>