Commit Graph

856 Commits

Author SHA1 Message Date
Cris fabdb70d72 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-10 16:08:54 +02:00
Cris bfa9c2c8a7 Merge remote-tracking branch 'origin/feature-18224/Anrechnungen_ECTS-Grenze' into feature-18224/Anrechnungen_ECTS-Grenze 2022-08-10 16:01:42 +02:00
Cris 1d728336a2 Hided colums 'ECTS Schule bisher'/'ECTS Beruf bisher'
Hide by default colums 'ECTS Schule bisher'/'ECTS Beruf bisher',
as dynamic ECTS column is providing those informations.
2022-08-10 15:59:11 +02:00
Cris e56237038d Optimized 'Ablehnen'-/'Nicht empfehlen'-panels for better usability
- Copy-icons are now right aligned and bigger
- Less in-between-text, instead short explanation text into textarea placeholder
2022-08-09 16:40:43 +02:00
Harald Bamberger e63d34132c merged current master 2022-08-08 13:29:44 +02:00
Paolo 6d81e36e68 Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-08 12:11:08 +02:00
Cris fc94ea4b49 Fixed: Maximale Dokument Uploadgröße 2022-08-03 16:43:34 +02:00
Cris bb8a2a97a5 Fixed: Unclickable URLs after approving Anrechnung are clickable now 2022-08-02 15:25:06 +02:00
Cris 94644b4403 Adapted: Hochschulqualifikation werden bei Berechnung der max ECTS Überschreitung ausgenommen
Anrechnung aufgrund von Hochschulqualifikationen sind ungeschränkt möglich.
2022-07-26 18:22:51 +02:00
Cris 7b9fd39bbc Added: Hochschul-Qualifikation + ECTS Anzeige in Student View
Checkbox zur Angabe von Hochschulqualifikation
Anzeige, wenn ECTS Grenzen überschritten werden.
2022-07-26 18:18:08 +02:00
Cris 6a43928322 Added: Display (Qualifikations-)Begruendung in STGL Anrechnungen Detail View 2022-07-26 18:14:23 +02:00
Cris 86d7f8a35e Code refactoring of Dynamic ECTS Summen
. now build with tabulators column formatter.
. rows are reinitialized instead of using the updateData.
. format of cell background-color has moved out from row formatter to cell formatter
2022-07-20 11:25:35 +02:00
Cris 4ba1f2cef5 Changed: Dynamic ECTS Summen (LV ECTS Sum by Prestudent + former ECTS) now build with tabulators mutator and rowFormatter 2022-07-18 17:38:20 +02:00
Cris 1544653fa3 Added Begründungstext 'Max ECTS überschritten' als Ablehnungsgrund 2022-07-18 17:33:50 +02:00
Cris 3b1d0f3aaa Merged DB Model Int/Float conversion
+ query type cast adaptation
2022-07-18 17:33:20 +02:00
Paolo 267f5b2972 - Added new directory public/js/apps/LogsViewer/
- Moved public/js/apps/LogsViewer.js to public/js/apps/LogsViewer/
- Added new JS file public/js/apps/LogsViewer/TabulatorSetup.js to setup the tabulator in the LogsViewer app
- Added new property tabulatorEvents to the FilterCmpt to subscribe events for the tabulator
2022-07-14 11:28:06 +02:00
Paolo de07d1f340 Switched FilterCmpt to tabulator 2022-07-13 18:57:55 +02:00
Paolo 6ce7068ead Includes fixes tinymce/tinymce to tinymce/tinymce4 2022-07-12 12:39:48 +02:00
Paolo 790f2bb130 Includes fixes jsoneditor to josdejong/jsoneditor 2022-07-12 12:34:30 +02:00
Paolo 3f07aa172c Includes fixes json-forms to brutusin/json-forms 2022-07-12 12:29:11 +02:00
ma0048 1434deeca1 zeigt die nation gruppe an 2022-07-07 11:29:38 +02:00
Cris ade55c9d1f Added ECTS Summen to Anrechnung Detail View 2022-07-07 10:26:56 +02:00
Cris b40db6abbd Added ECTS Summen columns to Anrechnung Übersichtstable 2022-07-07 10:26:13 +02:00
Werner Masik f7c394547e * fixed missing $primevue3 var in FHC-Common.php 2022-07-06 17:52:13 +02:00
Werner Masik 19273003ee * changed composer.json
* primvue is now included with help of https://asset-packagist.org/
* https://asset-packagist.org/ makes including npm packages with composer easy
2022-07-06 17:52:13 +02:00
Cris 44a3231d55 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
2022-07-06 12:00:09 +02:00
Paolo ce9aa4c388 - Removed inlcudes of RESTClient from PHP (FHC-Common, FHC-Footer and views/system/logs/logsViewer)
- Changed RESTClient to be a JS module
- Now RESTClient is included via JS in the app LogsViewer and in component Navigation
- Added new directory public/js/components/navigation
- Moved component Navigation to public/js/components/navigation
- Moved API calls of the Navigation component to public/js/components/navigation/API.js
- Navigation component now imports public/js/components/navigation/API.js
2022-07-06 09:48:15 +02:00
Paolo 60b3be3d64 - Added new JS public/js/RESTClient.js as axios wrapper
- composer.json: added axios from github
- Added new directory application/components/extensions/
- Added new utility function findResource to application/helpers/hlp_common_helper.php
- Now the library libraries/FilterCmptLib loads the component definition php files from the extensions
- views/system/logs/logsViewer now includes axios and restclient, removed the includes for ajaxlib and jQueryUI
- Added includes for the RESTClient and axios to views/templates/FHC-Common and views/templates/FHC-Footer
- Improved component js/components/Fetch
- Components public/js/components/Filter.js and public/js/components/Navigation.js now they are making use of the Fetch component or/and the RESTClient
2022-07-04 19:25:16 +02:00
KarpAlex 1c3acc6366 issue overview: added column "Zugehörigkeit"(Belonging) to show study programs of concerning person and wether it is an employee 2022-06-29 17:59:57 +02:00
Paolo f85225cc4e Addex axios to the views/templates/ includes 2022-06-29 10:58:33 +02:00
Harald Bamberger 47f7c03075 virtualsplit and searchbar vue component, TestSearch Controller and View for Demonstration, minor change to SearchBar Controller to work with posted json 2022-06-24 19:26:37 +02:00
Paolo 147ab92bae - Added new library libraries/SearchBarLib
- Added new controller components/SearchBar
- Removed not anymore used view application/views/system/logs/logsViewerData.php
2022-06-24 17:59:01 +02:00
Paolo 24b78454d3 - Added new function generateJSModulesInclude to application/helpers/hlp_header_helper.php
- Added entry "customJSModules" to the application/views/templates/FHC-Footer.php to be passed to the generateJSModulesInclude function to generate JS modules tags
- The new VUE components are making use of the JS import and export functionalities
2022-06-24 15:07:50 +02:00
Cris 5f5031e8d1 Added ECTS Summe to Anrechnung Detail View. 2022-06-22 10:54:17 +02:00
ma0048 5731a98127 uhrzeit bei der rt freigegeben uebersicht hinzugefuegt 2022-06-14 10:29:20 +02:00
Andreas Österreicher 25ee7f76cb Merge branch 'feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten' 2022-06-08 14:10:28 +02:00
Paolo 618a62425b Adapted composer.json and includes to be compatible to composer version 2 2022-06-07 14:56:33 +02:00
Paolo 29002124cc - Added new controller components/Filter.php
- Added new library FilterCmptLib
- Fixed includes paths in FHC-Footer and FHC-Header
- Moved the LogsViewer tool to VUE+BS5
2022-06-02 10:32:26 +02:00
Andreas Österreicher 974791e19b Ausbildungssemester Limitiert damit bei Wiederholern die anzeige
funktioniert
2022-05-27 14:23:24 +02:00
Paolo 061780a0d2 - Added new VUE based JS public/js/components/Filter.js, public/js/components/Navigation.js and public/js/apps/LogsViewer.js
- Fixed bootstrap includes in FHC-Footer and FHC-Header
- Moved Job Logs Viewer to VUE
2022-05-24 09:45:31 +02:00
Paolo a603081544 - Changed composer.json and updated composer.lock
- Added new PostgreSQL types in application/core/DB_Model.php
- Updated the includes in application/views/*
- Added new view template application/views/templates/FHC-Common.php
- Moved JS includes in application/views/templates/FHC-Footer.php
- Updated JS and CSS includes in application/views/templates/FHC-Footer.php and application/views/templates/FHC-Header.php
- Updated public/js/bootstrapper.js
- Changed global variable names in application/views/templates/FHC-Common.php to include the version of the included source
2022-05-23 18:45:29 +02:00
Andreas Österreicher b7b6cd5399 Merge branch 'master' into feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten 2022-04-28 18:26:18 +02:00
Andreas Österreicher 968fcecc7c Merge branch 'feature-19208/infocenter_accesscodesent_personaldata_saved_filter' 2022-04-28 15:06:03 +02:00
ma0048 3544acc60a filter angepasst 2022-04-26 08:38:51 +02:00
ma0048 ebb87d6296 berechtigungen angepasst 2022-04-20 11:21:49 +02:00
Harald Bamberger 10aa88e262 Merge branch 'feature-15391/Positive_Zeitsperre' 2022-04-19 13:46:38 +02:00
KarpAlex 087006a7a5 bugfixes issues Zuständigkeiten GUI:
- all needed oe kurzbz are shown at any time for assignment
- only functions not already assigned are shown
- funktion can only be entered after oe
2022-04-15 21:14:42 +02:00
KarpAlex 4fe562cbe2 Fehlerzuständigkeiten and issues GUI improvements:
- menu link opens in new tab
- controller id set for easier refresh
- added person and oe Zuständigkeiten to issues list
-
2022-04-13 20:08:08 +02:00
Andreas Österreicher d820079f0c Merge branch 'feature-17785/infocenter_kurzbezeichnung_des_studiengangs_von_studienordnung_holen' 2022-04-13 11:49:32 +02:00
Andreas Österreicher 59df862b3f Merge branch 'bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument' 2022-04-13 08:55:06 +02:00