Skip to content

Commit 09d140f

Browse files
lukablaskoviclukablaskovic
committed
v1.0.3
1 parent 31f9a7b commit 09d140f

File tree

5 files changed

+29
-8
lines changed

5 files changed

+29
-8
lines changed

‎src/components/Premium/SectionBannerProfile.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import { mainStore } from "@/main.js";
77

88
<template>
99
<SectionBanner v-if="mainStore.userAdmin" class="bg-gradient-to-tr from-green-300 via-fipu_blue to-blue-500">
10-
<h1 class="mb-6 text-3xl text-white">Pogledajte aktivne procese</h1>
10+
<h1 class="mb-6 text-3xl text-white">Aktivni procesi prakse</h1>
1111
<router-link to="/studenti">
1212
<BaseButton :icon="mdiAccountMultiple" label="Studenti" target="_blank" rounded-full />
1313
</router-link>
1414
</SectionBanner>
15+
1516
<SectionBanner v-else class="bg-gradient-to-tr from-green-300 via-fipu_blue to-blue-500">
1617
<h1 class="mb-6 text-3xl text-white">Provjerite stanje vaše prakse</h1>
1718
<router-link to="/moja-praksa">

‎src/stores/main_store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface Assignment {
1212

1313
export const useMainStore = defineStore("main", {
1414
state: () => ({
15-
praksa_version: "1.0.2",
15+
praksa_version: "1.0.3",
1616
academicYear: "2024/2025",
1717
voditelj_prakse: "doc. dr. sc. Ivan Lorencin",
1818

‎src/views/admin/DashboardView.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ const toggleDateType = () => {
169169
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-fipu_blue" class="rounded-lg" :icon="mdiAccountSchoolOutline" :number="finished_internships" label="Uspješno odrađenih praksi (A + B)" />
170170
<SkeletonLoader v-else></SkeletonLoader>
171171

172-
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-fipu_blue" class="rounded-lg" :icon="mdiAccountMultiple" :number="ongoing_internships" label="Ukupno aktivnih procesa (A + B)" />
172+
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-fipu_blue" class="cursor-pointer rounded-lg" :icon="mdiAccountMultiple" :number="ongoing_internships" label="Ukupno aktivnih procesa (A + B)" @click="router.push('/studenti?model=AB')" />
173173
<SkeletonLoader v-else></SkeletonLoader>
174174

175175
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-fipu_blue" class="rounded-lg" :icon="mdiAccountCancel" :number="0" label="Odustalo od prakse" />
@@ -187,7 +187,7 @@ const toggleDateType = () => {
187187
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-rose-600" class="rounded-lg" :icon="mdiAccountSchoolOutline" :number="a_finished_internships" label="Uspješno odrađenih praksi (A)" />
188188
<SkeletonLoader v-else></SkeletonLoader>
189189

190-
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-rose-600" class="rounded-lg" :icon="mdiAccountMultiple" :number="a_ongoing_internships" label="Ukupno aktivnih procesa (A)" />
190+
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-rose-600" class="cursor-pointer rounded-lg" :icon="mdiAccountMultiple" :number="a_ongoing_internships" label="Ukupno aktivnih procesa (A)" @click="router.push('/studenti?model=A')" />
191191
<SkeletonLoader v-else></SkeletonLoader>
192192

193193
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-rose-600" class="rounded-lg" :icon="mdiProgressClock" :number="waiting_for_allocation" label="Čeka na alokaciju" />
@@ -205,7 +205,7 @@ const toggleDateType = () => {
205205
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-emerald-500" class="rounded-lg" :icon="mdiAccountSchoolOutline" :number="b_finished_internships" label="Uspješno odrađenih praksi (B)" />
206206
<SkeletonLoader v-else></SkeletonLoader>
207207

208-
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-emerald-500" class="rounded-lg" :icon="mdiAccountMultiple" :number="b_ongoing_internships" label="Ukupno aktivnih procesa (B)" />
208+
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-emerald-500" class="cursor-pointer rounded-lg" :icon="mdiAccountMultiple" :number="b_ongoing_internships" label="Ukupno aktivnih procesa (B)" @click="router.push('/studenti?model=B')" />
209209
<SkeletonLoader v-else></SkeletonLoader>
210210

211211
<CardBoxWidget v-if="adminStore.studentsFetched" color="text-emerald-500" class="rounded-lg" :icon="mdiProgressClock" :number="b_waiting_for_assignment_approval" label="Čeka na odobrenje zadatka" />

‎src/views/admin/StudentsInternshipView.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,16 @@ watch(modal_send_task, (newValue) => {
167167
}
168168
});
169169
170+
const setModelFilterFromQuery = () => {
171+
const modelParam = route.query.model;
172+
if (["A", "B", "AB"].includes(modelParam)) {
173+
adminStore.filterModelState = modelParam;
174+
}
175+
};
176+
170177
onMounted(async () => {
171178
await adminStore.getStudents();
179+
setModelFilterFromQuery();
172180
});
173181
174182
async function handleNewInstance() {
@@ -220,8 +228,8 @@ onMounted(loadDataForStudent);
220228
</CardBoxModal>
221229

222230
<CardBoxModal v-if="modal_send_task" v-model="modal_send_task" :title="'Ponovno slanje emaila'" has-cancel button-label="Pošalji" @confirm="sendAnAdditionalEmail()">
223-
<p class="">E-mail je već poslan putem BPMN enginea, ali ga možete ponovo poslati klikom na gumb 'Pošalji'.</p>
224-
<p class="mb-2">Ispod je prikazan e-mail koji je pohranjen u BPMN engineu, no možete unijeti novi e-mail u polje ispod i poslati ga, u tom slučaju, e-mail u engineu neće biti izmijenjen.</p>
231+
<p class="">E-mail je već poslan putem BPMN <i>enginea</i>, ali ga možete ponovo poslati klikom na gumb 'Pošalji'.</p>
232+
<p class="mb-2">Ispod je prikazan e-mail koji je pohranjen u BPMN <i>engineu</i>, no možete unijeti novie-mail ispod i poslati ga ponovo. U tom slučaju, e-mail u <i>engineu</i> neće biti ažuriran.</p>
225233

226234
<FormField label="Novi E-mail">
227235
<FormControl v-model="newEmail" :icon-left="mdiAccount" name="email" autocomplete="email" />

‎src/views/common/ProfileView.vue

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ import CardBox from "@/components/Cardbox/CardBox.vue";
2525
import BaseIcon from "@/components/Base/BaseIcon.vue";
2626
import { StudentMappings } from "@/helpers/maps.js";
2727
28+
import SectionBanner from "@/components/Section/SectionBanner.vue";
29+
30+
import { mdiLaptop, mdiDatabase } from "@mdi/js";
31+
2832
import moment from "@/moment-setup";
2933
3034
const profileForm = reactive({
@@ -63,7 +67,6 @@ const profileForm = reactive({
6367
<PillTagPlain v-if="mainStore.userAdmin" :reverse-dark="true" label="Admin" :icon="mdiAccountCircle" />
6468
<PillTagPlain v-else :reverse-dark="true" label="Student" :icon="mdiAccountCircle" />
6569
<PillTagPlain :reverse-dark="true" label="FIPU" :icon="mdiDomain" />
66-
<PillTagPlain :reverse-dark="true" :label="moment.parseZone(mainStore.currentUser.created_at).format('D. MMMM YYYY.')" :icon="mdiCalendarAccount" />
6770
</BaseButtons>
6871
</div>
6972
</div>
@@ -95,6 +98,15 @@ const profileForm = reactive({
9598
</FormField>
9699
</div>
97100
</CardBox>
101+
102+
<div>
103+
<SectionBanner v-if="mainStore.userAdmin" class="bg-gradient-to-tr from-blue-200 via-blue-400 to-gray-800">
104+
<h1 class="mb-6 text-3xl text-white">Baserow baza podataka</h1>
105+
<a href="https://baserow.unipu.hr/dashboard" target="_blank">
106+
<BaseButton :icon="mdiDatabase" label="Baserow" rounded-full />
107+
</a>
108+
</SectionBanner>
109+
</div>
98110
</div>
99111
</SectionMain>
100112
</LayoutAuthenticated>

0 commit comments

Comments
 (0)