diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php index 2f241af87..f97af8b07 100644 --- a/application/views/CisVue/Dashboard.php +++ b/application/views/CisVue/Dashboard.php @@ -3,7 +3,13 @@ $includesArray = array( 'title' => 'Dashboard', 'tabulator5'=>true, 'primevue3' => true, - 'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'], + 'customJSModules' => [ + 'public/js/apps/Dashboard/Fhc.js' + ], + 'customJSs' => [ + 'vendor/npm-asset/primevue/accordion/accordion.js', + 'vendor/npm-asset/primevue/accordiontab/accordiontab.js' + ], 'customCSSs' => [ 'public/css/components/dashboard.css' ], diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js index c9d322e07..78b82cc1f 100644 --- a/public/js/apps/Cis.js +++ b/public/js/apps/Cis.js @@ -107,5 +107,11 @@ const app = Vue.createApp({ } }); app.use(FhcApi); +app.use(primevue.config.default, { + zIndex: { + overlay: 9000, + tooltip: 8000 + } +}) app.use(Phrasen); app.mount('#cis-header'); diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js index d096d4cde..24459759f 100644 --- a/public/js/apps/Dashboard/Fhc.js +++ b/public/js/apps/Dashboard/Fhc.js @@ -14,7 +14,12 @@ const app = Vue.createApp({ }); setScrollbarWidth(); - app.use(FhcApi); +app.use(primevue.config.default, { + zIndex: { + overlay: 9000, + tooltip: 8000 + } +}) app.use(Phrasen); app.mount('#content'); \ No newline at end of file diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js index 2ba999007..efcd34e12 100644 --- a/public/js/components/Cis/Cms/Content.js +++ b/public/js/components/Cis/Cms/Content.js @@ -3,55 +3,56 @@ import general from './Content_types/General.js' export default { - props:{ - content_id:{ - type:Number, - required:true, - }, - version:{ - type:[String, Number], - default: null, - }, - sprache:{ - type:[String, Number], - default: null, - }, - sichtbar:{ - type:[String, Number], - default: null, - } + props: { + content_id: { + type: Number, + required: true, + }, + version: { + type: [String, Number], + default: null, + }, + sprache: { + type: [String, Number], + default: null, + }, + sichtbar: { + type: [String, Number], + default: null, + } - }, - components:{ - raum_contentmittitel, - general, - }, - data() { - return { - content: null, - }; - }, - computed:{ - computeContentType: function(){ - switch(this.content_type){ - case "raum_contentmittitel": - return "raum_contentmittitel"; - default: - return "general"; - }; - }, - }, - created() { - this.$fhcApi.factory.cms.content(this.content_id,this.version, this.sprache, this.sichtbar).then(res =>{ - this.content = res.data.content; - this.content_type=res.data.type; - }); - }, - mounted(){ - - }, - template: /*html*/ ` + }, + components: { + raum_contentmittitel, + general, + }, + data() { + return { + content: null, + }; + }, + computed: { + computeContentType: function () { + switch (this.content_type) { + case "raum_contentmittitel": + return "raum_contentmittitel"; + default: + return "general"; + } + ; + }, + }, + created() { + this.$fhcApi.factory.cms.content(this.content_id, this.version, this.sprache, this.sichtbar).then(res => { + this.content = res.data.content; + this.content_type = res.data.type; + }); + }, + mounted() { + + }, + template: /*html*/ `

No content is available to display

diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js index 8e8c080f7..e104737a8 100644 --- a/public/js/components/Cis/Cms/News.js +++ b/public/js/components/Cis/Cms/News.js @@ -1,40 +1,40 @@ import Pagination from "../../Pagination/Pagination.js"; export default { - components: { - Pagination, - }, - data() { - return { - content: null, - maxPageCount: 0, - page_size: 10, - }; - }, - methods: { - loadNewPageContent: function (data) { - this.$fhcApi.factory.cms.getNews(data.page, data.rows) - .then(res => res.data) - .then(result => { - this.content = result; - }); - - }, - }, - created() { - this.$fhcApi.factory.cms.getNews(1, this.page_size) - .then(res => res.data) - .then(result => { - this.content = result; - }); + components: { + Pagination, + }, + data() { + return { + content: null, + maxPageCount: 0, + page_size: 10, + }; + }, + methods: { + loadNewPageContent: function (data) { + this.$fhcApi.factory.cms.getNews(data.page, data.rows) + .then(res => res.data) + .then(result => { + this.content = result; + }); - this.$fhcApi.factory.cms.getNewsRowCount() - .then(res => res.data) - .then(result => { - this.maxPageCount = result; - }); - }, - template: /*html*/ ` + }, + }, + created() { + this.$fhcApi.factory.cms.getNews(1, this.page_size) + .then(res => res.data) + .then(result => { + this.content = result; + }); + + this.$fhcApi.factory.cms.getNewsRowCount() + .then(res => res.data) + .then(result => { + this.maxPageCount = result; + }); + }, + template: /*html*/ `

News