You've already forked isop-mirror
feat: enhance deletion functionality for companies and students with improved data handling and confirmation dialogs
This commit is contained in:
@@ -169,6 +169,7 @@ class CompanyController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
$company = Company::find($id);
|
$company = Company::find($id);
|
||||||
|
$company_contact = User::find($company->contact);
|
||||||
|
|
||||||
if (!$company) {
|
if (!$company) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
@@ -176,46 +177,26 @@ class CompanyController extends Controller
|
|||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
DB::beginTransaction();
|
||||||
DB::beginTransaction();
|
|
||||||
|
|
||||||
// 1. Získaj všetky internship IDs firmy
|
$internships = Internship::whereCompanyId($company->id);
|
||||||
$internshipIds = Internship::where('company_id', $company->id)
|
|
||||||
->pluck('id')
|
|
||||||
->toArray();
|
|
||||||
|
|
||||||
// 2. Vymaž všetky internship statuses
|
// mazanie statusov
|
||||||
if (!empty($internshipIds)) {
|
$internships->each(function ($internship) {
|
||||||
InternshipStatus::whereIn('internship_id', $internshipIds)->delete();
|
InternshipStatus::whereInternshipId($internship->id)->delete();
|
||||||
}
|
});
|
||||||
|
|
||||||
// 3. Vymaž všetky internships firmy
|
// mazanie praxov
|
||||||
Internship::where('company_id', $company->id)->delete();
|
$internships->delete();
|
||||||
|
|
||||||
// 4. Získaj contact usera
|
// mazanie firmy
|
||||||
$contactUser = User::find($company->contact);
|
Company::whereContact($company_contact->id);
|
||||||
|
|
||||||
// 5. Vymaž company
|
// mazanie účtu firmy
|
||||||
$company->delete();
|
$company_contact->delete();
|
||||||
|
|
||||||
// 6. Vymaž contact usera (EMPLOYER)
|
DB::commit();
|
||||||
if ($contactUser && $contactUser->role === 'EMPLOYER') {
|
|
||||||
$contactUser->delete();
|
|
||||||
}
|
|
||||||
|
|
||||||
DB::commit();
|
return response()->noContent();
|
||||||
|
|
||||||
return response()->json([
|
|
||||||
'message' => 'Company successfully deleted.'
|
|
||||||
], 200);
|
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
DB::rollBack();
|
|
||||||
|
|
||||||
return response()->json([
|
|
||||||
'message' => 'Error deleting company.',
|
|
||||||
'error' => $e->getMessage()
|
|
||||||
], 500);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\Models\Internship;
|
||||||
use App\Models\StudentData;
|
use App\Models\StudentData;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Models\InternshipStatus;
|
use App\Models\InternshipStatus;
|
||||||
@@ -197,41 +198,27 @@ class StudentDataController extends Controller
|
|||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
DB::beginTransaction();
|
||||||
DB::beginTransaction();
|
|
||||||
|
|
||||||
// 1. Získaj internship IDs
|
// mazanie praxov
|
||||||
$internshipIds = $student->internships()->pluck('id')->toArray();
|
$internships = Internship::whereUserId($student->id);
|
||||||
|
|
||||||
// 2. Vymaž internship statuses
|
// mazanie statusov
|
||||||
if (!empty($internshipIds)) {
|
$internships->each(function ($internship) {
|
||||||
InternshipStatus::whereIn('internship_id', $internshipIds)->delete();
|
InternshipStatus::whereInternshipId($internship->id)->delete();
|
||||||
}
|
});
|
||||||
|
|
||||||
// 3. Vymaž internships
|
// mazanie praxov
|
||||||
$student->internships()->delete();
|
$internships->delete();
|
||||||
|
|
||||||
// 4. Vymaž student_data
|
// mazanie firmy
|
||||||
if ($student->studentData) {
|
StudentData::whereUserId($student->id);
|
||||||
$student->studentData()->delete();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 5. Vymaž usera
|
// mazanie účtu firmy
|
||||||
$student->delete();
|
$student->delete();
|
||||||
|
|
||||||
DB::commit();
|
DB::commit();
|
||||||
|
|
||||||
return response()->json([
|
return response()->noContent();
|
||||||
'message' => 'Student successfully deleted.'
|
|
||||||
], 200);
|
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
DB::rollBack();
|
|
||||||
|
|
||||||
return response()->json([
|
|
||||||
'message' => 'Error deleting student.',
|
|
||||||
'error' => $e->getMessage()
|
|
||||||
], 500);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { CompanyData } from '~/types/company_data';
|
import type { CompanyData } from '~/types/company_data';
|
||||||
|
import { FetchError } from 'ofetch';
|
||||||
|
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
middleware: ['sanctum:auth', 'admin-only'],
|
middleware: ['sanctum:auth', 'admin-only'],
|
||||||
@@ -24,14 +25,13 @@ const headers = [
|
|||||||
|
|
||||||
const client = useSanctumClient();
|
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
|
// State pre delete dialog
|
||||||
const deleteDialog = ref(false);
|
const deleteDialog = ref(false);
|
||||||
const companyToDelete = ref<CompanyData | null>(null);
|
const companyToDelete = ref<CompanyData | null>(null);
|
||||||
const deleteLoading = ref(false);
|
const deleteLoading = ref(false);
|
||||||
const deleteError = ref<string | null>(null);
|
const deleteError = ref<string | null>(null);
|
||||||
const deleteSuccess = ref(false);
|
|
||||||
|
|
||||||
// Funkcia na otvorenie delete dialogu
|
// Funkcia na otvorenie delete dialogu
|
||||||
const openDeleteDialog = (company: CompanyData) => {
|
const openDeleteDialog = (company: CompanyData) => {
|
||||||
@@ -45,7 +45,6 @@ const closeDeleteDialog = () => {
|
|||||||
deleteDialog.value = false;
|
deleteDialog.value = false;
|
||||||
companyToDelete.value = null;
|
companyToDelete.value = null;
|
||||||
deleteError.value = null;
|
deleteError.value = null;
|
||||||
deleteSuccess.value = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Funkcia na vymazanie firmy
|
// Funkcia na vymazanie firmy
|
||||||
@@ -60,22 +59,13 @@ const deleteCompany = async () => {
|
|||||||
method: 'DELETE'
|
method: 'DELETE'
|
||||||
});
|
});
|
||||||
|
|
||||||
// Odstránime firmu zo zoznamu
|
refresh();
|
||||||
if (data.value) {
|
closeDeleteDialog();
|
||||||
const index = data.value.findIndex(c => c.id === companyToDelete.value!.id);
|
|
||||||
if (index > -1) {
|
} catch (err) {
|
||||||
data.value.splice(index, 1);
|
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 {
|
} finally {
|
||||||
deleteLoading.value = false;
|
deleteLoading.value = false;
|
||||||
}
|
}
|
||||||
@@ -136,10 +126,10 @@ const deleteCompany = async () => {
|
|||||||
Potvrdiť vymazanie
|
Potvrdiť vymazanie
|
||||||
</v-card-title>
|
</v-card-title>
|
||||||
<v-card-text>
|
<v-card-text>
|
||||||
<p v-if="!deleteSuccess">
|
<p>
|
||||||
Naozaj chcete vymazať firmu <strong>{{ companyToDelete?.name }}</strong>?
|
Naozaj chcete vymazať firmu <strong>{{ companyToDelete?.name }}</strong>?
|
||||||
</p>
|
</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
|
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>.
|
<strong>nie je možné ju vrátiť späť</strong>.
|
||||||
</p>
|
</p>
|
||||||
@@ -148,19 +138,13 @@ const deleteCompany = async () => {
|
|||||||
<v-alert v-if="deleteError" type="error" density="compact" class="mt-3">
|
<v-alert v-if="deleteError" type="error" density="compact" class="mt-3">
|
||||||
{{ deleteError }}
|
{{ deleteError }}
|
||||||
</v-alert>
|
</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-text>
|
||||||
<v-card-actions>
|
<v-card-actions>
|
||||||
<v-spacer></v-spacer>
|
<v-spacer></v-spacer>
|
||||||
<v-btn color="grey" variant="text" @click="closeDeleteDialog" :disabled="deleteLoading">
|
<v-btn color="grey" variant="text" @click="closeDeleteDialog" :disabled="deleteLoading">
|
||||||
Zrušiť
|
Zrušiť
|
||||||
</v-btn>
|
</v-btn>
|
||||||
<v-btn color="red" variant="text" @click="deleteCompany" :loading="deleteLoading"
|
<v-btn color="red" variant="text" @click="deleteCompany" :loading="deleteLoading">
|
||||||
:disabled="deleteSuccess">
|
|
||||||
Vymazať
|
Vymazať
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</v-card-actions>
|
</v-card-actions>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { User } from '~/types/user';
|
import type { User } from '~/types/user';
|
||||||
|
import { FetchError } from 'ofetch';
|
||||||
|
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
middleware: ['sanctum:auth', 'admin-only'],
|
middleware: ['sanctum:auth', 'admin-only'],
|
||||||
@@ -25,14 +26,13 @@ const headers = [
|
|||||||
const client = useSanctumClient();
|
const client = useSanctumClient();
|
||||||
|
|
||||||
// Načítame všetkých študentov
|
// 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
|
// State pre delete dialog
|
||||||
const deleteDialog = ref(false);
|
const deleteDialog = ref(false);
|
||||||
const studentToDelete = ref<User | null>(null);
|
const studentToDelete = ref<User | null>(null);
|
||||||
const deleteLoading = ref(false);
|
const deleteLoading = ref(false);
|
||||||
const deleteError = ref<string | null>(null);
|
const deleteError = ref<string | null>(null);
|
||||||
const deleteSuccess = ref(false);
|
|
||||||
|
|
||||||
// Funkcia na otvorenie delete dialogu
|
// Funkcia na otvorenie delete dialogu
|
||||||
const openDeleteDialog = (student: User) => {
|
const openDeleteDialog = (student: User) => {
|
||||||
@@ -46,7 +46,6 @@ const closeDeleteDialog = () => {
|
|||||||
deleteDialog.value = false;
|
deleteDialog.value = false;
|
||||||
studentToDelete.value = null;
|
studentToDelete.value = null;
|
||||||
deleteError.value = null;
|
deleteError.value = null;
|
||||||
deleteSuccess.value = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Funkcia na vymazanie študenta
|
// Funkcia na vymazanie študenta
|
||||||
@@ -61,23 +60,13 @@ const deleteStudent = async () => {
|
|||||||
method: 'DELETE'
|
method: 'DELETE'
|
||||||
});
|
});
|
||||||
|
|
||||||
// Odstránime študenta zo zoznamu
|
refresh();
|
||||||
if (students.value) {
|
closeDeleteDialog();
|
||||||
const index = students.value.findIndex(s => s.id === studentToDelete.value!.id);
|
|
||||||
if (index > -1) {
|
} catch (err) {
|
||||||
students.value.splice(index, 1);
|
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 {
|
} finally {
|
||||||
deleteLoading.value = false;
|
deleteLoading.value = false;
|
||||||
}
|
}
|
||||||
@@ -140,10 +129,10 @@ const deleteStudent = async () => {
|
|||||||
Potvrdiť vymazanie
|
Potvrdiť vymazanie
|
||||||
</v-card-title>
|
</v-card-title>
|
||||||
<v-card-text>
|
<v-card-text>
|
||||||
<p v-if="!deleteSuccess">
|
<p>
|
||||||
Naozaj chcete vymazať študenta <strong>{{ studentToDelete?.name }}</strong>?
|
Naozaj chcete vymazať študenta <strong>{{ studentToDelete?.name }}</strong>?
|
||||||
</p>
|
</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
|
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>.
|
vrátiť späť</strong>.
|
||||||
</p>
|
</p>
|
||||||
@@ -152,19 +141,13 @@ const deleteStudent = async () => {
|
|||||||
<v-alert v-if="deleteError" type="error" density="compact" class="mt-3">
|
<v-alert v-if="deleteError" type="error" density="compact" class="mt-3">
|
||||||
{{ deleteError }}
|
{{ deleteError }}
|
||||||
</v-alert>
|
</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-text>
|
||||||
<v-card-actions>
|
<v-card-actions>
|
||||||
<v-spacer></v-spacer>
|
<v-spacer></v-spacer>
|
||||||
<v-btn color="grey" variant="text" @click="closeDeleteDialog" :disabled="deleteLoading">
|
<v-btn color="grey" variant="text" @click="closeDeleteDialog" :disabled="deleteLoading">
|
||||||
Zrušiť
|
Zrušiť
|
||||||
</v-btn>
|
</v-btn>
|
||||||
<v-btn color="red" variant="text" @click="deleteStudent" :loading="deleteLoading"
|
<v-btn color="red" variant="text" @click="deleteStudent" :loading="deleteLoading">
|
||||||
:disabled="deleteSuccess">
|
|
||||||
Vymazať
|
Vymazať
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</v-card-actions>
|
</v-card-actions>
|
||||||
|
|||||||
Reference in New Issue
Block a user