blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-22 22:49:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,651 Commits 227 Branches 6 Tags
2e00f30e71ceba91623ff0a7caab553bc0133bc2
Commit Graph

2188 Commits

Author SHA1 Message Date
Harald Bamberger 2e00f30e71 Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 16:07:39 +02:00
Harald Bamberger 083c360338 remove duplicate body tags 2022-08-11 16:05:15 +02:00
Cris 73c516cbed Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 14:59:39 +02:00
Paolo 1103bb7aa1 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 14:47:31 +02:00
Paolo d95cbb39e3 Reverted bootstrap and jquery include order 2022-08-11 14:46:28 +02:00
ma0048 d7fb91371e added missing includes for infocenter 2022-08-11 14:34:32 +02:00
Cris 6f1ca8e374 Removed unnecessary HTML body tags and added FHC_Footer 
Body tags are set in FHC_Header and FHC_Footer.
 2022-08-11 14:00:20 +02:00
Cris c6aa3c7d9b Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-10 16:28:08 +02:00
Cris 4f435fbc20 Removed date limitation for testing 2022-08-10 16:26:36 +02:00
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 debfbf7827 Created AnrechnungJob sendMailRemindRecommendation 
...to remind lecturers to provide their recommendation if not done until
one week after request.
 2022-08-10 15:58:13 +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 952d5e51b2 Refactoring der Dynamischen Max-ECTS-Berechnungsspalte, Berechnungen stimmen nun auch nach einem Genehmigungs-Update 2022-07-27 16:03:24 +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 6b4b3bad6a Fixed application/libraries/FilterCmptLib->applyFilterFields, from arrays to objects 2022-07-14 11:47:28 +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 4dab69cb15 Reverted changes in application/models/person/Benutzer_model.php, pk => array 2022-07-13 09:45:58 +02:00
Paolo 137af3ef71 Fixed typo 2022-07-12 14:10:47 +02:00
Paolo ae70dbcb64 Fixed includes of filter type in FilterCmptLib when it is declared in an extension 2022-07-12 14:09:17 +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
Werner Masik 8c8623ce4f change primary key to string instead of array 
because it is not a composite key and the load method gets confused otherwise
 2022-07-11 17:31:37 +02:00
Paolo b53add9e67 libraries/SearchBarLib->_organisationunit removes from the leaders array those elements with uid and name == null 2022-07-11 16:10:24 +02:00
Paolo 198c6baf3d - Added new protected method getPostJSON to FHC_Controller to get POSTed JSON 
- application/controllers/components/Filter.php now makes use of getPostJSON from the FHC_Controller
- RESTClient now POST a JSON request
- public/js/components/filter/Filter.js improvements
 2022-07-11 14:54:14 +02:00
Paolo cfe7c6b9a4 Fixed typo in application/libraries/FilterCmptLib.php, renamed __getDatasetQueryCondition to _getDatasetQueryCondition 2022-07-11 10:27:49 +02:00
Andreas Österreicher b2eb035613 Merge branch 'feature-20265/infocenter_check_duplicate_user' 2022-07-08 11:24:10 +02:00
Paolo 8ab83a0baa Added directory "components" to the extension installation 2022-07-07 17:26:49 +02:00
Paolo 2f1d5f157f - Added new constant PHOTO_IMG_URL to application/libraries/SearchBarLib.php 
- phone and photo_url are now return from SearchBarLib->_mitarbeiter
- SearchBarLib->_organisationunit fixed correct number of employees per organisation unit
- SearchBarLib->_organisationunit now returns the mailgroup
- SearchBarLib->_organisationunit returns an array of leaders, each element of this array is an object having the properties uid and name
 2022-07-07 16:56:43 +02:00
ma0048 1434deeca1 zeigt die nation gruppe an 2022-07-07 11:29:38 +02:00
Cris b2715bb408 Fixed: Added missing Summe ECTS Schulisch to AntragData. 2022-07-07 10:27:50 +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
Cris 4d05f54b54 Added ECTS Summen top AnrechnungData in the AnrechnungLib 2022-07-07 10:25:19 +02:00
Cris 9d7589ddc4 Added DB methods to get ECTS Summen by schulische/berufliche Qualifikation 2022-07-07 10:18:40 +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