pulisce etichette di prova e gestisce la compilazione del profilo utente
All checks were successful
Build and Publish / build (push) Successful in 2m59s

This commit is contained in:
2026-04-12 19:34:58 +02:00
parent 35e3c51623
commit b152c255b4
3 changed files with 229 additions and 150 deletions

View File

@@ -9,7 +9,7 @@ export default defineComponent({
const { showLogin } = useLoginModal();
const authenticated = inject<ComputedRef<boolean>>('authenticated');
const username = inject<ComputedRef<string>>('currentUsername');
const utenteAppService = inject<UtenteAppService>('utenteAppService', () => new UtenteAppService());
const utenteAppService = inject<UtenteAppService>('utenteAppService', () => new UtenteAppService(), true);
const profileIncomplete: Ref<boolean> = ref(false);
const checkingProfile: Ref<boolean> = ref(false);
@@ -23,7 +23,7 @@ export default defineComponent({
try {
checkingProfile.value = true;
const utenteApp = await utenteAppService.getCurrentUser();
console.log('utenteApp', utenteApp);
// Check if essential profile fields are missing
if (
!utenteApp ||

View File

@@ -1,4 +1,4 @@
import { type Ref, computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
import { type ComputedRef, type Ref, computed, defineComponent, inject, onMounted, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n';
import { useAlertService } from '@/shared/alert/alert.service';
@@ -12,6 +12,14 @@ import { useAccountStore } from '@/shared/config/store/account-store';
import ConfermaService from '../conferma/conferma.service';
import PrenotazioneService from './prenotazione.service';
import UtenteAppService from '@/entities/utente-app/utente-app.service';
import account from '@/router/account.ts';
import type { IUtenteApp } from '@/shared/model/utente-app.model.ts';
import axios from 'axios';
const baseApiUrl = 'api/utente-apps';
export default defineComponent({
name: 'Prenotazione',
setup() {
@@ -22,6 +30,9 @@ export default defineComponent({
const alertService = inject('alertService', () => useAlertService(), true);
const accountStore = useAccountStore();
const authenticated = inject<ComputedRef<boolean>>('authenticated');
const utenteAppService = inject<UtenteAppService>('utenteAppService', () => new UtenteAppService(), true);
const itemsPerPage = ref(20);
const queryCount: Ref<number> = ref(null);
const page: Ref<number> = ref(1);
@@ -49,6 +60,57 @@ export default defineComponent({
});
const isSubmittingConferma = ref(false);
// CONTROLLIAMO SE L'UTENTE HA UN PROFILO IMPOSTATO+
const profileIncomplete: Ref<boolean> = ref(false);
const checkingProfile: Ref<boolean> = ref(false);
const getCurrentUser = async () => {
return new Promise<IUtenteApp>((resolve, reject) => {
axios
.get(`${baseApiUrl}/current`)
.then(res => {
resolve(res.data);
})
.catch(err => {
reject(err);
});
});
};
const checkProfileCompletion = async () => {
if (!authenticated.value) {
profileIncomplete.value = false;
return;
}
try {
checkingProfile.value = true;
const utenteApp = await getCurrentUser();
// Check if essential profile fields are missing
if (
!utenteApp ||
!utenteApp.nome ||
!utenteApp.cognome ||
!utenteApp.dataNascita ||
!utenteApp.luogoNascita ||
!utenteApp.residente ||
!utenteApp.telefono
) {
profileIncomplete.value = true;
} else {
console.log('Profile is complete');
profileIncomplete.value = false;
}
} catch (error) {
// If UtenteApp doesn't exist, profile is incomplete
profileIncomplete.value = true;
} finally {
checkingProfile.value = false;
}
};
// CHIUDIAMO IL CONTROLLO DEL PROFILO IMPOSTATO
const clear = () => {
page.value = 1;
};
@@ -86,6 +148,7 @@ export default defineComponent({
onMounted(async () => {
await retrievePrenotaziones();
await checkProfileCompletion();
});
const removeId: Ref<number> = ref(null);
@@ -162,6 +225,10 @@ export default defineComponent({
await retrievePrenotaziones();
});
watch(page, async () => {
await checkProfileCompletion();
});
return {
prenotaziones,
handleSyncList,
@@ -182,6 +249,10 @@ export default defineComponent({
totalItems,
changeOrder,
t$,
authenticated,
profileIncomplete,
checkingProfile,
checkProfileCompletion,
// Role-based
isIncaricato,
prenotazioniPendenti,

View File

@@ -2,6 +2,13 @@
<div>
<!-- ============================= ROLE_USER VIEW ============================= -->
<template v-if="!isIncaricato">
<div class="alert alert-warning" v-if="authenticated && profileIncomplete && !checkingProfile">
<span>{{ t$('home.profile.incomplete.message') }}</span>
<div>
<router-link class="alert-link" to="/account/profile">{{ t$('home.profile.incomplete.link') }}</router-link>
</div>
</div>
<div v-if="authenticated && !profileIncomplete && !checkingProfile">
<h2 id="page-heading" data-cy="PrenotazioneHeading">
<span id="prenotazione">{{ t$('smartbookingApp.prenotazione.home.title') }}</span>
<div class="d-flex justify-content-end">
@@ -150,6 +157,7 @@
<b-pagination size="md" :total-rows="totalItems" v-model="page" :per-page="itemsPerPage"></b-pagination>
</div>
</div>
</div>
</template>
<!-- ============================= ROLE_INCARICATO VIEW ============================= -->
@@ -211,11 +219,7 @@
<font-awesome-icon icon="eye"></font-awesome-icon>
<span class="d-none d-md-inline">{{ t$('entity.action.view') }}</span>
</router-link>
<button
class="btn btn-success btn-sm"
data-cy="prendiInCaricoButton"
@click="prendiInCarico(prenotazione)"
>
<button class="btn btn-success btn-sm" data-cy="prendiInCaricoButton" @click="prendiInCarico(prenotazione)">
<font-awesome-icon icon="check"></font-awesome-icon>
<span class="d-none d-md-inline">{{ t$('smartbookingApp.prenotazione.prendiInCarico.button') }}</span>
</button>
@@ -304,7 +308,11 @@
</div>
<!-- "Prendi in carico" modal -->
<b-modal v-model="showPrendiInCaricoModal" :title="t$('smartbookingApp.prenotazione.prendiInCarico.title')" @hidden="closePrendiInCaricoModal">
<b-modal
v-model="showPrendiInCaricoModal"
:title="t$('smartbookingApp.prenotazione.prendiInCarico.title')"
@hidden="closePrendiInCaricoModal"
>
<div v-if="selectedPrenotazione">
<p class="text-muted mb-3">
{{ t$('smartbookingApp.prenotazione.prendiInCarico.subtitle', { id: selectedPrenotazione.id }) }}