diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php index bebc844ab..de456145b 100644 --- a/application/controllers/Cis/Pub.php +++ b/application/controllers/Cis/Pub.php @@ -14,7 +14,7 @@ class Pub extends Auth_Controller { parent::__construct( array( - 'bild' => ['basis/cis:r'] + 'bild' => ['basis/cis:r', 'assistenz:r'] ) ); } diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css index ff1b181dd..2bb467048 100644 --- a/public/css/Cis4/Cis.css +++ b/public/css/Cis4/Cis.css @@ -407,6 +407,7 @@ html { background-color: var(--fhc-background); border-color: var(--fhc-border); padding: var(--fhc-cis-main-py) var(--fhc-cis-main-px); + min-width: 0; /* fix flex-grow with tabulator exceeding width */ } #cis-main .fa-arrow-up-right-from-square { @@ -854,4 +855,4 @@ html { #cis-main .modal-footer { background-color: var(--fhc-secondary); -} \ No newline at end of file +} diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 03f84f75e..e3a750e0c 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -155,7 +155,7 @@ export default { extraItems.push({ link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'content/statistik/notenspiegel.php?type=xls' + + 'content/statistik/notenspiegel.php?typ=xls' + '&studiengang_kz=' + studiengang_kz + '&semester=' + semester + '&studiensemester=' + this.studiensemesterKurzbz @@ -173,7 +173,7 @@ export default { }); extraItems.push({ link: FHC_JS_DATA_STORAGE_OBJECT.app_root - + 'content/statistik/notenspiegel.php?type=html' + + 'content/statistik/notenspiegel.php?typ=html' + '&studiengang_kz=' + studiengang_kz + '&semester=' + semester + '&studiensemester=' + this.studiensemesterKurzbz diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js index 11b80efd0..953462a74 100644 --- a/public/js/components/Stv/Studentenverwaltung/List.js +++ b/public/js/components/Stv/Studentenverwaltung/List.js @@ -140,7 +140,12 @@ export default { * we need to get the params from elsewhere. * @see https://github.com/olifolkerd/tabulator/issues/4318 */ - return this.$api.call({...config, url, params: this.tabulatorOptions.ajaxParams}); + const apiconfig = { + ...this.tabulatorOptions.ajaxConfig, + url: this.tabulatorOptions.ajaxURL, + params: this.tabulatorOptions.ajaxParams + }; + return this.$api.call(apiconfig); }, ajaxResponse: (url, params, response) => { return response?.data; @@ -182,7 +187,7 @@ export default { count: 0, filteredcount: 0, selectedcount: 0, - currentEndpointRawUrl: '' + currentEndpoint: null } }, computed: { @@ -357,16 +362,20 @@ export default { updateUrl(endpoint, first) { this.lastSelected = first ? undefined : this.selected; - if( endpoint === undefined ) + console.log('function param endpoint: ' + JSON.stringify(endpoint)); + console.log('current endpoint: ' + JSON.stringify(this.currentEndpoint)); + + if( endpoint === undefined && this.currentEndpoint === null) { - endpoint = {url: this.currentEndpointRawUrl}; - } - else if( endpoint.url === undefined ) + endpoint = { url: '' }; + } + else if( endpoint === undefined ) { - endpoint.url = this.currentEndpointRawUrl; - } else + endpoint = JSON.parse(JSON.stringify(this.currentEndpoint)); + } + else { - this.currentEndpointRawUrl = endpoint.url; + this.currentEndpoint = JSON.parse(JSON.stringify(endpoint)); } endpoint.url = endpoint.url.replace( @@ -375,13 +384,16 @@ export default { ); const params = (endpoint?.params !== undefined) ? endpoint.params : {}; - const method = (endpoint?.method !== undefined) ? endpoint.method : 'get'; - if (this.filter.length) + let method = (endpoint?.method !== undefined) ? endpoint.method : 'get'; + if (this.filter.length && !endpoint.url.match(/\/search\//)) + { params.filter = this.filter; + method = 'post'; + } this.tabulatorOptions.ajaxURL = endpoint.url; this.tabulatorOptions.ajaxParams = { ...params }; - this.tabulatorOptions.ajaxConfig = method; + this.tabulatorOptions.ajaxConfig = {method}; if (!this.$refs.table.tableBuilt) { if (this.$refs.table.tabulator) { this.$refs.table.tabulator.on("tableBuilt", () => { diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 4e538f172..5fd4404ef 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -38928,7 +38928,7 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Anzahl angezeigter vergangender Studiensemester', + 'text' => 'Anzahl angezeigter vergangener Studiensemester', 'description' => '', 'insertvon' => 'system' ),