From fe6f229d9f4a4866cb2c05ee0bc55ac811aed1b6 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Tue, 3 Dec 2024 14:44:18 +0100 Subject: [PATCH 1/4] template fix; remove unused menu function; --- .../controllers/api/frontend/v1/LvMenu.php | 18 ------------------ public/js/components/DashboardWidget/News.js | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php index 777d49b0c..328ef194d 100644 --- a/application/controllers/api/frontend/v1/LvMenu.php +++ b/application/controllers/api/frontend/v1/LvMenu.php @@ -284,24 +284,6 @@ class LvMenu extends FHCAPI_Controller } - - private function fhc_menu_digitale_anwesenheiten(&$menu, $angemeldet, $studiengang_kz, $semester, $lvid, $angezeigtes_stsem){ - - // DIGITALE ANWESENHEITEN - if (defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet) { - - $menu[] = array - ( - 'id' => 'core_menu_digitale_anwesenheitslisten', - 'position' => '50', - 'name' => $this->p->t('lehre', 'digiAnw'), - 'c4_icon' => base_url('skin/images/button_kreuzerltool.png'), - 'c4_link' => base_url("index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem&nav=false"), - 'c4_linkList' => [] - ); - } - } - private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){ // LVINFO diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js index f774f0934..8f36f86f6 100644 --- a/public/js/components/DashboardWidget/News.js +++ b/public/js/components/DashboardWidget/News.js @@ -164,7 +164,7 @@ export default { data-bs-interval="false" ref="carocontrols">
- +
From 65c154054d4f28efbeaf9c40710938489b0f2774 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 4 Dec 2024 13:52:17 +0100 Subject: [PATCH 2/4] actually provide root to bindKeys() in FhcApiFactoryWrapper constructor --- public/js/plugin/FhcApi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js index fd41eda7d..c25204d49 100644 --- a/public/js/plugin/FhcApi.js +++ b/public/js/plugin/FhcApi.js @@ -302,7 +302,7 @@ export default { } }) - this.bindKeys(factorypart) + this.bindKeys(factorypart, root) } bindKeys(factorypart, root) { From f0e97c915b4d095f5a3f5056b34e2c70f1e8507b Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Thu, 5 Dec 2024 13:53:08 +0100 Subject: [PATCH 3/4] rename bindKeys() to addEndpoints(); removed Vue.reactive on $fhcApi; check if Api has been instantiated in install, only addEndpoints if that is the case; --- public/js/plugin/FhcApi.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js index c25204d49..0845a1a5e 100644 --- a/public/js/plugin/FhcApi.js +++ b/public/js/plugin/FhcApi.js @@ -4,6 +4,12 @@ import FhcApiFactory from '../api/fhcapifactory.js'; export default { install: (app, options) => { + if (app.config.globalProperties.$fhcApi) { + if (options?.factory) { + app.config.globalProperties.$fhcApi.factory.addEndpoints(options.factory); + } + return; + } app.use(FhcAlert); function _get_config(form, uri, data, config) { @@ -136,7 +142,7 @@ export default { return Promise.reject(error); }); - app.config.globalProperties.$fhcApi = Vue.reactive({ + app.config.globalProperties.$fhcApi = { getUri(url) { return fhcApiAxios.getUri({url}); }, @@ -289,38 +295,43 @@ export default { $fhcAlert.alertDefault('error', error.message, message); } } - }); + }; class FhcApiFactoryWrapper { constructor(factorypart, root) { - if (root === undefined) + if (root === undefined) { this.$fhcApi = app.config.globalProperties.$fhcApi; - else + this.$fhcApi.factory = this; + } else { Object.defineProperty(this, '$fhcApi', { get() { return (root || this).$fhcApi; } }) + } - this.bindKeys(factorypart, root) + this.addEndpoints(factorypart) } - bindKeys(factorypart, root) { + addEndpoints(factorypart) { Object.keys(factorypart).forEach(key => { Object.defineProperty(this, key, { get() { if (typeof factorypart[key] == 'function') return factorypart[key].bind(this); - return new FhcApiFactoryWrapper(factorypart[key], root || this); + return new FhcApiFactoryWrapper(factorypart[key], this.$fhcApi.factory); } }); }); } } - const mergedFhcApiFactory = options?.factory ? {...FhcApiFactory, ...options.factory} : FhcApiFactory; + const factory = new FhcApiFactoryWrapper(FhcApiFactory); + if (options?.factory) + factory.addEndpoints(options.factory); + + app.config.globalProperties.$fhcApi.factory = factory; - app.config.globalProperties.$fhcApi.factory = new FhcApiFactoryWrapper(mergedFhcApiFactory); app.provide('$fhcApi', app.config.globalProperties.$fhcApi); } }; \ No newline at end of file From 7f6884b67deca611348ddd37b2c3bde05bc2d691 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Thu, 5 Dec 2024 15:03:46 +0100 Subject: [PATCH 4/4] primevue imports cis/dashboard; Anw widget implementation; WIP showing single anw entries on click on a quota progress bar in widget; --- application/views/CisVue/Dashboard.php | 8 ++- public/js/apps/Cis.js | 6 ++ public/js/apps/Dashboard/Fhc.js | 7 +- public/js/components/Cis/Cms/Content.js | 95 +++++++++++++------------ public/js/components/Cis/Cms/News.js | 66 ++++++++--------- 5 files changed, 100 insertions(+), 82 deletions(-) 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