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

feat: enhance deletion functionality for companies and students with improved data handling and confirmation dialogs

Browse Source
This commit is contained in:
dkecskes
2025-11-04 10:00:03 +01:00
parent 1973ab6b7f
commit adc2e725bf
4 changed files with 53 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
backend/app/Http/Controllers/CompanyController.php
View File

@@ -169,6 +169,7 @@ class CompanyController extends Controller
}
$company = Company::find($id);
$company_contact = User::find($company->contact);
if (!$company) {
return response()->json([
@@ -176,46 +177,26 @@ class CompanyController extends Controller
], 400);
}
try {
DB::beginTransaction();
DB::beginTransaction();
// 1. Získaj všetky internship IDs firmy
$internshipIds = Internship::where('company_id', $company->id)
->pluck('id')
->toArray();
$internships = Internship::whereCompanyId($company->id);
// 2. Vymaž všetky internship statuses
if (!empty($internshipIds)) {
InternshipStatus::whereIn('internship_id', $internshipIds)->delete();
}
// mazanie statusov
$internships->each(function ($internship) {
InternshipStatus::whereInternshipId($internship->id)->delete();
});
// 3. Vymaž všetky internships firmy
Internship::where('company_id', $company->id)->delete();
// mazanie praxov
$internships->delete();
// 4. Získaj contact usera
$contactUser = User::find($company->contact);
// mazanie firmy
Company::whereContact($company_contact->id);
// 5. Vymaž company
$company->delete();
// mazanie účtu firmy
$company_contact->delete();
// 6. Vymaž contact usera (EMPLOYER)
if ($contactUser && $contactUser->role === 'EMPLOYER') {
$contactUser->delete();
}
DB::commit();
DB::commit();
return response()->json([
'message' => 'Company successfully deleted.'
], 200);
} catch (\Exception $e) {
DB::rollBack();
return response()->json([
'message' => 'Error deleting company.',
'error' => $e->getMessage()
], 500);
}
return response()->noContent();
}
}

45
backend/app/Http/Controllers/StudentDataController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Models\Internship;
use App\Models\StudentData;
use App\Models\User;
use App\Models\InternshipStatus;
@@ -197,41 +198,27 @@ class StudentDataController extends Controller
], 400);
}
try {
DB::beginTransaction();
DB::beginTransaction();
// 1. Získaj internship IDs
$internshipIds = $student->internships()->pluck('id')->toArray();
// mazanie praxov
$internships = Internship::whereUserId($student->id);
// 2. Vymaž internship statuses
if (!empty($internshipIds)) {
InternshipStatus::whereIn('internship_id', $internshipIds)->delete();
}
// mazanie statusov
$internships->each(function ($internship) {
InternshipStatus::whereInternshipId($internship->id)->delete();
});
// 3. Vymaž internships
$student->internships()->delete();
// mazanie praxov
$internships->delete();
// 4. Vymaž student_data
if ($student->studentData) {
$student->studentData()->delete();
}
// mazanie firmy
StudentData::whereUserId($student->id);
// 5. Vymaž usera
$student->delete();
// mazanie účtu firmy
$student->delete();
DB::commit();
DB::commit();
return response()->json([
'message' => 'Student successfully deleted.'
], 200);
} catch (\Exception $e) {
DB::rollBack();
return response()->json([
'message' => 'Error deleting student.',
'error' => $e->getMessage()
], 500);
}
return response()->noContent();
}
}

38
frontend/app/pages/dashboard/admin/companies/index.vue
View File

@@ -1,5 +1,6 @@
<script setup lang="ts">
import type { CompanyData } from '~/types/company_data';
import { FetchError } from 'ofetch';
definePageMeta({
middleware: ['sanctum:auth', 'admin-only'],
@@ -24,14 +25,13 @@ const headers = [
const client = useSanctumClient();
const { data, error } = await useSanctumFetch<CompanyData[]>('/api/companies/simple');
const { data, error, refresh } = await useSanctumFetch<CompanyData[]>('/api/companies/simple');
// State pre delete dialog
const deleteDialog = ref(false);
const companyToDelete = ref<CompanyData | null>(null);
const deleteLoading = ref(false);
const deleteError = ref<string | null>(null);
const deleteSuccess = ref(false);
// Funkcia na otvorenie delete dialogu
const openDeleteDialog = (company: CompanyData) => {
@@ -45,7 +45,6 @@ const closeDeleteDialog = () => {
deleteDialog.value = false;
companyToDelete.value = null;
deleteError.value = null;
deleteSuccess.value = false;
};
// Funkcia na vymazanie firmy
@@ -60,22 +59,13 @@ const deleteCompany = async () => {
method: 'DELETE'
});
// Odstránime firmu zo zoznamu
if (data.value) {
const index = data.value.findIndex(c => c.id === companyToDelete.value!.id);
if (index > -1) {
data.value.splice(index, 1);
}
refresh();
closeDeleteDialog();
} catch (err) {
if (err instanceof FetchError) {
deleteError.value = err.data?.message;
}
deleteSuccess.value = true;
setTimeout(() => {
closeDeleteDialog();
}, 1500);
} catch (err: any) {
deleteError.value = err.data?.message || 'Chyba pri mazaní firmy.';
} finally {
deleteLoading.value = false;
}
@@ -136,10 +126,10 @@ const deleteCompany = async () => {
Potvrdiť vymazanie
</v-card-title>
<v-card-text>
<p v-if="!deleteSuccess">
<p>
Naozaj chcete vymazať firmu <strong>{{ companyToDelete?.name }}</strong>?
</p>
<p v-if="!deleteSuccess" class="text-error mt-2">
<p class="text-error mt-2">
Táto akcia vymaže aj kontaktnú osobu (EMPLOYER), všetky praxe a statusy spojené s touto firmou a
<strong>nie je možné ju vrátiť späť</strong>.
</p>
@@ -148,19 +138,13 @@ const deleteCompany = async () => {
<v-alert v-if="deleteError" type="error" density="compact" class="mt-3">
{{ deleteError }}
</v-alert>
<!-- Success message -->
<v-alert v-if="deleteSuccess" type="success" density="compact" class="mt-3">
Firma bola úspešne vymazaná.
</v-alert>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="grey" variant="text" @click="closeDeleteDialog" :disabled="deleteLoading">
Zrušiť
</v-btn>
<v-btn color="red" variant="text" @click="deleteCompany" :loading="deleteLoading"
:disabled="deleteSuccess">
<v-btn color="red" variant="text" @click="deleteCompany" :loading="deleteLoading">
Vymazať
</v-btn>
</v-card-actions>

39
frontend/app/pages/dashboard/admin/students/index.vue
View File

@@ -1,5 +1,6 @@
<script setup lang="ts">
import type { User } from '~/types/user';
import { FetchError } from 'ofetch';
definePageMeta({
middleware: ['sanctum:auth', 'admin-only'],
@@ -25,14 +26,13 @@ const headers = [
const client = useSanctumClient();
// Načítame všetkých študentov
const { data: students, error } = await useSanctumFetch<User[]>('/api/students');
const { data: students, error, refresh } = await useSanctumFetch<User[]>('/api/students');
// State pre delete dialog
const deleteDialog = ref(false);
const studentToDelete = ref<User | null>(null);
const deleteLoading = ref(false);
const deleteError = ref<string | null>(null);
const deleteSuccess = ref(false);
// Funkcia na otvorenie delete dialogu
const openDeleteDialog = (student: User) => {
@@ -46,7 +46,6 @@ const closeDeleteDialog = () => {
deleteDialog.value = false;
studentToDelete.value = null;
deleteError.value = null;
deleteSuccess.value = false;
};
// Funkcia na vymazanie študenta
@@ -61,23 +60,13 @@ const deleteStudent = async () => {
method: 'DELETE'
});
// Odstránime študenta zo zoznamu
if (students.value) {
const index = students.value.findIndex(s => s.id === studentToDelete.value!.id);
if (index > -1) {
students.value.splice(index, 1);
}
refresh();
closeDeleteDialog();
} catch (err) {
if (err instanceof FetchError) {
deleteError.value = err.data?.message;
}
deleteSuccess.value = true;
// Zavri dialog po 1.5 sekundách
setTimeout(() => {
closeDeleteDialog();
}, 1500);
} catch (err: any) {
deleteError.value = err.data?.message || 'Chyba pri mazaní študenta.';
} finally {
deleteLoading.value = false;
}
@@ -140,10 +129,10 @@ const deleteStudent = async () => {
Potvrdiť vymazanie
</v-card-title>
<v-card-text>
<p v-if="!deleteSuccess">
<p>
Naozaj chcete vymazať študenta <strong>{{ studentToDelete?.name }}</strong>?
</p>
<p v-if="!deleteSuccess" class="text-error mt-2">
<p class="text-error mt-2">
Táto akcia vymaže aj všetky súvisiace dáta (praxe, statusy, atď.) a <strong>nie je možné ju
vrátiť späť</strong>.
</p>
@@ -152,19 +141,13 @@ const deleteStudent = async () => {
<v-alert v-if="deleteError" type="error" density="compact" class="mt-3">
{{ deleteError }}
</v-alert>
<!-- Success message -->
<v-alert v-if="deleteSuccess" type="success" density="compact" class="mt-3">
Študent bol úspešne vymazaný.
</v-alert>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="grey" variant="text" @click="closeDeleteDialog" :disabled="deleteLoading">
Zrušiť
</v-btn>
<v-btn color="red" variant="text" @click="deleteStudent" :loading="deleteLoading"
:disabled="deleteSuccess">
<v-btn color="red" variant="text" @click="deleteStudent" :loading="deleteLoading">
Vymazať
</v-btn>
</v-card-actions>