visualization fix pro/scen

This commit is contained in:
Florinda
2024-10-23 16:57:55 +02:00
parent 6b1eb70239
commit b115712698
6 changed files with 19 additions and 3 deletions

View File

@@ -1,16 +1,19 @@
<script setup>
import { useLayout } from '@/layout/composables/layout';
import { computed, onMounted, ref, watch } from 'vue';
import { useRoute } from 'vue-router';
import { UserPrefStore } from '../stores/UserPrefStore.js';
import AppFooter from './AppFooter.vue';
import AppSidebar from './AppSidebar.vue';
import AppTopbar from './AppTopbar.vue';
const { layoutConfig, layoutState, isSidebarActive, resetMenu } = useLayout();
const outsideClickListener = ref(null);
const page = ref("progetti");
const userPrefStore = UserPrefStore();
const route = useRoute();
onMounted(() => {
userPrefStore.fetchUserData();
@@ -65,7 +68,7 @@ const isOutsideClicked = (event) => {
<app-topbar :page="page"></app-topbar>
<div class="layout-sidebar">
<app-sidebar></app-sidebar>
<app-sidebar v-if="route.path !== '/projects'"></app-sidebar>
</div>
<div class="layout-main-container">
<div class="layout-main">

View File

@@ -5,7 +5,7 @@
<span v-if="user">
{{ user.name + " " + user.surname }}
</span>
<button @click="redirectProject()" class="p-button p-button-danger p-button-outlined">Projects</button>
<button @click="redirectProject()" class="p-button p-button-outlined">Projects</button>
<button @click="auth.logout()" class="p-button p-button-danger p-button-outlined">Logout</button>
</div>
</div>

View File

@@ -1,11 +1,14 @@
<script setup>
import { onMounted } from 'vue';
import { useRoute } from 'vue-router';
import { UserPrefStore } from '../stores/UserPrefStore.js';
import AppMenu from './AppMenu.vue';
const userPrefStore = UserPrefStore();
const route = useRoute();
onMounted(() => {
userPrefStore.fetchUserData();
console.log("route path", route);
});
</script>

View File

@@ -8,10 +8,14 @@ import { LoadingStore } from '../stores/LoadingStore.js';
import { ScenarioStore } from '../stores/ScenarioStore.js';
import { UserPrefStore } from '../stores/UserPrefStore.js';
import { useRoute } from 'vue-router';
import AppConfigurator from './AppConfigurator.vue';
import AppProfileMenu from './AppProfileMenu.vue';
const auth = useAuth();
const route = useRoute();
const router = useRouter();
const props = defineProps(['page']);
@@ -49,7 +53,7 @@ const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
</router-link>
</div>
<button class="layout-menu-button layout-topbar-action" @click="onMenuToggle">
<button v-if="route.path !== '/projects'" class="layout-menu-button layout-topbar-action" @click="onMenuToggle">
<i class="pi pi-bars"></i>
</button>
@@ -87,6 +91,7 @@ const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
placeholder="Select an Option"
class="dropdown-list"
@change="scenario_store.fetchApplicationScenarios()"
:disabled="route.path === '/projects'"
/>
<button
class="layout-topbar-menu-button layout-topbar-action"

View File

@@ -28,9 +28,12 @@ export const UserPrefStore = defineStore('userpref_store', () => {
async function updateSelectedProject(project) {
try {
loadingStore.user_loading = true;
selectedApp.value = null;
// Aspetta che l'aggiornamento del progetto finisca
await ProjectService.updateSelectedProject(project);
} catch (error) {
console.error("Errore durante l'aggiornamento del progetto:", error);

View File

@@ -98,8 +98,10 @@ const scenarioTypeOp = ref([
onMounted(() => {
userPrefStore.fetchUserData().then(() => {
scenario_store.fetchScenarios();
scenario_store.fetchScenariosCross();
});
});