v1.1.2

Author: lukablaskovic

src/components/Tables/TableStudents.vue

@@ -234,6 +234,12 @@ function toggleSortDirection(column) {
 		sortDirection.value = "asc";
 	}
 }
+
+watch(studentsPaginated, (newList) => {
+	if (newList.length === 0 && numPages.value > 1) {
+		currentPage.value = 0;
+	}
+});
 </script>
 
 <template>

src/helpers/maps.js

@@ -259,7 +259,25 @@ class UserTaskMappings {
 	}
 }
 
-import { mdiRayStartArrow, mdiClipboardCheck, mdiNumeric, mdiHandshake, mdiProgressClock, mdiCheck, mdiThumbsUpDownOutline, mdiNoteCheck, mdiAccountTie, mdiNotebook, mdiFileDocumentPlus, mdiRayEnd, mdiContentSaveOutline, mdiApi, mdiEmailArrowRight, mdiCertificate, mdiCancel } from "@mdi/js";
+import {
+	mdiRayStartArrow,
+	mdiClipboardCheck,
+	mdiNumeric,
+	mdiHandshake,
+	mdiProgressClock,
+	mdiCheck,
+	mdiThumbsUpDownOutline,
+	mdiNoteCheck,
+	mdiAccountTie,
+	mdiNotebook,
+	mdiFileDocumentPlus,
+	mdiRayEnd,
+	mdiContentSaveOutline,
+	mdiApi,
+	mdiEmailArrowRight,
+	mdiCertificate,
+	mdiCancel,
+} from "@mdi/js";
 
 import { endpoints } from "@/config";
 
@@ -430,7 +448,21 @@ class ActivityEventMappings {
 		},
 	];
 
-	static skipEvents = ["spremanje_alokacija", "odabir_prihvacen", "uzimanje_podataka_o_poslodavcu_student", "spremanje_zahtjeva_profesor_ponistio", "obavjestavanje_poslodavca_nakon_alokacije", "obavjestavanje_studenta_nakon_alokacije", "obavjestavanje_studenta_nakon_ponistavanja_email", "student_prihvacen", "obavjestavanje_studenta_nakon_prihvacanja_email", "azuriranje_podataka_profesor", "slanje_potvrde_student_email", "slanje_potvrde_mentor_email", "spremanje_dnevnika"];
+	static skipEvents = [
+		"spremanje_alokacija",
+		"odabir_prihvacen",
+		"uzimanje_podataka_o_poslodavcu_student",
+		"spremanje_zahtjeva_profesor_ponistio",
+		"obavjestavanje_poslodavca_nakon_alokacije",
+		"obavjestavanje_studenta_nakon_alokacije",
+		"obavjestavanje_studenta_nakon_ponistavanja_email",
+		"student_prihvacen",
+		"obavjestavanje_studenta_nakon_prihvacanja_email",
+		"azuriranje_podataka_profesor",
+		"slanje_potvrde_student_email",
+		"slanje_potvrde_mentor_email",
+		"spremanje_dnevnika",
+	];
 
 	static isGatewayEvent(activityId) {
 		return activityId.startsWith("Gateway_");

src/stores/main_store.ts

@@ -12,7 +12,7 @@ export interface Assignment {
 
 export const useMainStore = defineStore("main", {
 	state: () => ({
-		praksa_version: "1.1.1",
+		praksa_version: "v1.1.2",
 		academicYear: "2024/2025",
 		voditelj_prakse: "doc. dr. sc. Ivan Lorencin",
 

src/views/admin/StudentsInternshipView.vue

@@ -128,6 +128,18 @@ const toggleBetweenModelsFilter = () => {
 	} else {
 		adminStore.filterModelState = "A";
 	}
+
+	let newModel = adminStore.filterModelState;
+
+	const query = { ...route.query };
+
+	if (!newModel || newModel === "AB") {
+		delete query.model;
+	} else {
+		query.model = newModel;
+	}
+
+	router.replace({ query });
 };
 
 const toggleBetweenInternshipStages = () => {
@@ -139,6 +151,16 @@ const toggleBetweenInternshipStages = () => {
 	} else {
 		adminStore.filterInternshipStage = "ceka_alokaciju";
 	}
+	let newStage = adminStore.filterInternshipStage;
+	const query = { ...route.query };
+
+	if (!newStage || newStage === "all") {
+		delete query.stage;
+	} else {
+		query.stage = newStage;
+	}
+
+	router.replace({ query });
 };
 
 let email_postData = ref(null);
@@ -215,7 +237,7 @@ onMounted(loadDataForStudent);
 		<LayoutAuthenticated v-if="mainStore.userAuthenticated">
 			<SectionMain>
 				<SectionTitleLineWithButton :icon="mdiAccountMultiple" title="Studenti u procesu prakse" button-enabled main @click="bpmn_help_modal = true"> </SectionTitleLineWithButton>
-				<div class="flex flex-row">
+				<div class="flex flex-wrap">
 					<div class="mb-4">
 						<PillTag
 							class="cursor-pointer"