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

Merge branch 'feature/108-Moznost-evidovat-platene-zamestnanie-ako-prax' into develop

Browse Source
This commit is contained in:
Fábián Varga
2025-11-29 16:48:18 +01:00
parent 487058a616 19d7c6945c
commit 371257cf4c
26 changed files with 243 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/app/components/InternshipAgreementDownloader.vue
View File

@@ -2,7 +2,8 @@
import { FetchError } from 'ofetch';
const props = defineProps<{
internship_id: number
internship_id: number,
block?: boolean,
}>();
const client = useSanctumClient();
@@ -13,8 +14,8 @@ async function requestDownload() {
loading.value = true;
try {
const agreement = await client<Blob>(`/api/internships/${props.internship_id}/default-agreement`);
triggerDownload(agreement, `default-agreement-${props.internship_id}`);
const proof = await client<Blob>(`/api/internships/${props.internship_id}/default-proof`);
triggerDownload(proof, `default-proof-${props.internship_id}`);
} catch (e) {
if (e instanceof FetchError) {
alert(`Nepodarilo sa vygenerovať zmluvu: ${e.statusMessage}`);
@@ -27,8 +28,8 @@ async function requestDownload() {
<template>
<div>
<v-btn prepend-icon="mdi-download" color="blue" class="mr-2 mt-2" block :disabled="loading"
@click="requestDownload">
<v-btn prepend-icon="mdi-download" color="blue" class="mr-2 mt-2 mb-2" :disabled="loading"
:block="block ?? undefined" @click="requestDownload">
<span v-show="!loading">Stiahnuť originálnu zmluvu</span>
<span v-show="loading">Prosím čakajte...</span>
</v-btn>

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

@@ -18,7 +18,7 @@ const rules = {
const loading = ref(false);
const error = ref<string | null>(null);
const agreement = ref<File | null>(null);
const proof = ref<File | null>(null);
const report = ref<File | null>(null);
const report_confirmed = ref(props.internship.report_confirmed);
@@ -35,9 +35,9 @@ function triggerDownload(file: Blob, file_name: string) {
window.URL.revokeObjectURL(url);
}
async function downloadAgreement() {
const agreement: Blob = await client(`/api/internships/${props.internship.id}/agreement`);
triggerDownload(agreement, `agreement-${props.internship.id}`);
async function downloadProof() {
const proof: Blob = await client(`/api/internships/${props.internship.id}/proof`);
triggerDownload(proof, `proof-${props.internship.id}`);
}
async function downloadReport() {
@@ -51,8 +51,8 @@ async function onSubmit() {
const formData = new FormData();
formData.append('report_confirmed', report_confirmed.value ? '1' : '0');
if (agreement.value) {
formData.append('agreement', agreement.value);
if (proof.value) {
formData.append('proof', proof.value);
}
if (report.value) {
formData.append('report', report.value);
@@ -64,7 +64,7 @@ async function onSubmit() {
body: formData
});
agreement.value = null;
proof.value = null;
report.value = null;
emit('successfulSubmit');
} catch (e) {
@@ -87,19 +87,22 @@ async function onSubmit() {
<v-form @submit.prevent="onSubmit" :disabled="loading">
<div>
<h4 class="mb-2">Podpísaná zmluva / dohoda</h4>
<h4 class="mb-2">Dokument o vykonaní praxe</h4>
<WarningAlert v-if="props.internship.agreement" title="Existujúci dokument"
text="V systéme je už nahratá zmluva/dohoda. Ak chcete nahradiť existujúcu verziu, vyberte súbor, alebo v opačnom prípade nechajte toto pole nevyplnené.">
<p>Zmluva/dohoda o brigádnickej praxi alebo 3 faktúry v pre živnostníkov.</p>
<InternshipAgreementDownloader :internship_id="internship.id" />
<WarningAlert v-if="props.internship.proof" title="Existujúci dokument"
text="V systéme je už nahratý dokument. Ak chcete nahradiť existujúcu verziu, vyberte súbor, alebo v opačnom prípade nechajte toto pole nevyplnené.">
<br />
<v-btn prepend-icon="mdi-download" color="blue" class="mr-2 mt-2" @click="downloadAgreement">
<v-btn prepend-icon="mdi-download" color="blue" class="mr-2 mt-2" @click="downloadProof">
Stiahnuť
</v-btn>
</WarningAlert>
<v-file-input v-model="agreement" :rules="[rules.isPdf, rules.maxSize]" accept=".pdf,application/pdf"
prepend-icon="mdi-handshake" label="Nahrať PDF zmluvu" variant="outlined" show-size clearable
<v-file-input v-model="proof" :rules="[rules.isPdf, rules.maxSize]" accept=".pdf,application/pdf"
prepend-icon="mdi-handshake" label="Nahrať PDF dokument" variant="outlined" show-size clearable
hint="Povolené: PDF, max 10 MB" persistent-hint />
</div>
@@ -108,6 +111,12 @@ async function onSubmit() {
<div>
<h4 class="mb-2">Výkaz</h4>
<p>Dokument o hodnotení praxe.</p>
<v-btn prepend-icon="mdi-download" color="blue" class="mr-2 mt-2 mb-2" target="_blank"
href="https://www.fpvai.ukf.sk/images/Organizacia_studia/odborna_prax/aplikovana_informatika/Priloha_Vykaz_o_vykonanej_odbornej_praxi-AI.docx">
<span>Stiahnuť šablónu na výkaz</span>
</v-btn>
<WarningAlert v-if="props.internship.report" title="Existujúci dokument"
text="V systéme je už nahratý výkaz. Ak chcete nahradiť existujúcu verziu, vyberte súbor, alebo v opačnom prípade nechajte toto pole nevyplnené.">
@@ -123,14 +132,14 @@ async function onSubmit() {
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"
:disabled="!props.internship.proof || !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 && (!props.internship.agreement || !props.internship.report)">
:disabled="!proof && !report && (!props.internship.proof || !props.internship.report)">
Uloziť
</v-btn>
</v-form>

25
frontend/app/components/InternshipDocumentViewer.vue
View File

@@ -8,8 +8,8 @@ const props = defineProps<{
const client = useSanctumClient();
async function downloadAgreement() {
const agreement: Blob = await client(`/api/internships/${props.internship.id}/agreement`);
triggerDownload(agreement, `agreement-${props.internship.id}`);
const proof: Blob = await client(`/api/internships/${props.internship.id}/proof`);
triggerDownload(proof, `proof-${props.internship.id}`);
}
async function downloadReport() {
@@ -21,18 +21,19 @@ async function downloadReport() {
<template>
<div>
<v-row class="d-flex">
<!-- Podpísaná zmluva -->
<!-- Podpísaný dokument k praxe -->
<v-col cols="12" md="6">
<v-card variant="outlined" class="h-100">
<v-card-title class="d-flex align-center ga-2">
<v-icon icon="mdi mdi-file-document-outline" />
Podpísaná zmluva / dohoda
Dokument o vykonaní praxe
</v-card-title>
<v-card-text>
<InternshipAgreementDownloader :internship_id="internship.id" />
<WarningAlert v-if="!props.internship.agreement" title="Neodovzdané"
text="Zmluva zatiaľ nebola nahratá." />
<v-card-text>
<InternshipAgreementDownloader :internship_id="internship.id" block />
<WarningAlert v-if="!props.internship.proof" title="Neodovzdané"
text="Dokument zatiaľ nebol nahratý." />
<div v-else>
<SuccessAlert title="Odovzdané" text="Zmluva bola nahratá." />
@@ -53,8 +54,14 @@ async function downloadReport() {
<v-icon icon="mdi-file-clock-outline" />
Výkaz
</v-card-title>
<v-card-text>
<InfoAlert v-if="!props.internship.report" title="Neodovzdané"
<v-btn prepend-icon="mdi-download" color="blue" class="mr-2 mt-2" block target="_blank"
href="https://www.fpvai.ukf.sk/images/Organizacia_studia/odborna_prax/aplikovana_informatika/Priloha_Vykaz_o_vykonanej_odbornej_praxi-AI.docx">
<span>Stiahnuť šablónu na výkaz</span>
</v-btn>
<WarningAlert v-if="!props.internship.report" title="Neodovzdané"
text="Výkaz zatiaľ nebol nahratý." />
<div v-else>

5
frontend/app/components/InternshipStatusEditor.vue
View File

@@ -68,10 +68,11 @@ async function submit() {
<ErrorAlert v-if="save_error" :error="`Nepodarilo uložiť: ${save_error}`" />
<!-- Chybová hláška -->
<ErrorAlert v-if="load_error" :error="`Nepodarilo sa načítať stavy: ${save_error}`" />
<ErrorAlert v-if="load_error" :error="`Nepodarilo sa načítať stavy: ${load_error}`" />
<!-- Chybová hláška -->
<ErrorAlert v-else-if="data?.length === 0" :error="`Nepodarilo sa načítať stavy: ${save_error}`" />
<WarningAlert v-else-if="data?.length === 0" title="Blokované"
text="Stav praxe už nie je možné meniť, pretože bola (ne)obhájená alebo zamietnutá. V prípade, že ste prax zamietli omylom, alebo ak máte technické problémy, prosíme kontaktovať garanta praxe." />
<v-form v-else v-model="isValid" @submit.prevent="submit" :disabled="loading">
<v-select v-model="new_state" label="Stav" :items="data" item-value="value"></v-select>

3
frontend/app/pages/dashboard/company/internships/edit/[id].vue
View File

@@ -99,7 +99,8 @@ async function handleUpdateOfBasicInfo(internship: NewInternship) {
<div>
<h2>Nahratie dokumentov</h2>
<ErrorAlert v-if="data?.status.status !== InternshipStatus.CONFIRMED" title="Blokované"
<ErrorAlert v-if="data?.status.status !== InternshipStatus.CONFIRMED_BY_COMPANY"
title="Blokované"
error='Vaša prax nie je v stave "Schválená" a teda nemôžete nahrať dokumenty.' />
<InternshipDocumentEditor v-else :internship="data!" @successful-submit="refresh" />

3
frontend/app/pages/dashboard/student/internship/edit/[id].vue
View File

@@ -92,7 +92,8 @@ async function handleUpdateOfBasicInfo(internship: NewInternship) {
<div>
<h2>Nahratie dokumentov</h2>
<ErrorAlert v-if="data?.status.status !== InternshipStatus.CONFIRMED" title="Blokované"
<ErrorAlert v-if="data?.status.status !== InternshipStatus.CONFIRMED_BY_COMPANY"
title="Blokované"
error='Vaša prax nie je v stave "Schválená" a teda nemôžete nahrať dokumenty.' />
<InternshipDocumentEditor v-else :internship="data!" @successful-submit="refresh" />

25
frontend/app/types/internship_status.ts
View File

@@ -14,20 +14,29 @@ export interface NewInternshipStatusData {
export enum InternshipStatus {
SUBMITTED = 'SUBMITTED',
CONFIRMED = 'CONFIRMED',
DENIED = 'DENIED',
CONFIRMED_BY_COMPANY = 'CONFIRMED_BY_COMPANY',
CONFIRMED_BY_ADMIN = 'CONFIRMED_BY_ADMIN',
DENIED_BY_COMPANY = 'DENIED_BY_COMPANY',
DENIED_BY_ADMIN = 'DENIED_BY_ADMIN',
DEFENDED = 'DEFENDED',
NOT_DEFENDED = 'NOT_DEFENDED'
};
NOT_DEFENDED = 'NOT_DEFENDED',
}
export function prettyInternshipStatus(status: InternshipStatus) {
switch (status) {
case InternshipStatus.SUBMITTED:
return "Zadané";
case InternshipStatus.CONFIRMED:
return "Potvrdené";
case InternshipStatus.DENIED:
return "Zamietnuté";
case InternshipStatus.CONFIRMED_BY_COMPANY:
return "Potvrdené firmou";
case InternshipStatus.CONFIRMED_BY_ADMIN:
return "Potvrdené garantom";
case InternshipStatus.DENIED_BY_COMPANY:
return "Zamietnuté firmou";
case InternshipStatus.DENIED_BY_ADMIN:
return "Zamietnuté garantom";
case InternshipStatus.DEFENDED:
return "Obhájené";
case InternshipStatus.NOT_DEFENDED:

2
frontend/app/types/internships.ts
View File

@@ -11,7 +11,7 @@ export interface Internship {
year_of_study: number;
semester: string;
position_description: string;
agreement: boolean;
proof: boolean;
report: boolean;
report_confirmed: boolean;
status: InternshipStatusData;

2
frontend/cypress/e2e/admin/internships/downloads.cy.ts
View File

@@ -14,7 +14,7 @@ describe('Admin Student Document Downloads', () => {
cy.url().should('include', '/dashboard/admin/internships')
})
it('should be able to generate and download the default agreement', () => {
it('should be able to generate and download the default proof', () => {
cy.get('table').within(() => {
cy.get('tbody tr')
.then(rows => {