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

12651 Commits

This Branch
This Branch
All Branches
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
Cris 08b1047b09 Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of https://github.com/FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-11 14:59:06 +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 f85dd2fd2e Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-10 18:21:01 +02:00
Cris a5f6ffa237 Changed content in Student view as requested by QM 
. changed tooltip text and help text regarding Maximale ECTS and Berufliche Praxis.
 2022-08-10 18:19:50 +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
Paolo e39bb1ea8a Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets 2022-08-09 18:43:06 +02:00
Harald Bamberger 7499a7f90a navigation component add option to pass css classes for left menu, verticalsplit add isCollapsed function, searchbar remove search button and prevent page reload on pressing enter 2022-08-09 17:12:47 +02:00
Cris c0ce8997ba Optimized Usability: Column 'Details' now on very left side of table 
User needs to open details link very often, but needed to scroll until end of table to open link.
Now the link is set as first column to provide direct access.
 2022-08-09 16:52:23 +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
Cris 844bfe9150 Fixed wrong 'Bisher angerechnete ECTS' calculation when approving and withdrawing in one go 2022-08-09 11:10:16 +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
Paolo b912ca9a06 Navigation and Filter components code improvements 2022-08-08 10:31:30 +02:00
Manfred 602bd375c4 BugFix PHP 7.4 Milak 2022-08-04 17:32:03 +02:00
Manfred 7b0de6b3e1 BugFix PHP 4 Milak 2022-08-04 14:41:34 +02:00
Cris fc94ea4b49 Fixed: Maximale Dokument Uploadgröße 2022-08-03 16:43:34 +02:00
Cris fac257a2b1 Corrected: Falsche ECTS Summenberechnung, wenn Genehmigung zurückgenommen wurde, korrigiert. 
Zurückgenommene Anrechnungen haben noch einen Eintrag "angerechnet" in der Zeugnisnotentabelle, weshalb
sie in der ECTS Summenberechnung mitgerechnet wurden. Das ist nun behoben.
 2022-08-03 16:40:58 +02:00
Cris bb8a2a97a5 Fixed: Unclickable URLs after approving Anrechnung are clickable now 2022-08-02 15:25:06 +02:00
Manfred e9c2bcd690 Merge remote-tracking branch 'origin/master' 2022-08-01 14:09:10 +02:00
Manfred 62700194dd Bugfix aktuelles Studiensemester 2022-08-01 14:09:00 +02:00
Cris bf3ed6e48e Corrected ECTS Summen Display in Detail View when Withdrawing 
If STGL withdraws a former rejection, there is no need to substract the ECTS in "Bisher angerechnete ECTS".
This is needed only if STGL withdraws a former approvement.
 2022-07-27 16:22:17 +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 760e5758ce Optimized performance of all 'Alle auswählen'-buttons defined via tableWidgetHook 
...by passing an array of rows to be selected, instead of selecting each row one by one.
Further triggered functions, e.g. rowSelectionChanged, are now called once only, not for each row.
 2022-07-19 17:50:37 +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
Harald Bamberger a463fc0dbf Merge branch 'feature-18236/Standardisierung_Extension_OP-KVP' 2022-07-14 15:58:58 +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
Manfred 9fa2f56c89 Grant SELECT to bis.tbl_gsprogramm for web-user 2022-07-14 10:37:25 +02:00
Manfred d569384e66 Merge remote-tracking branch 'origin/master' 2022-07-14 10:34:51 +02:00
Manfred c851cf9da2 Testkorrektur HR Services 2022-07-14 10:34:24 +02:00
Paolo de07d1f340 Switched FilterCmpt to tabulator 2022-07-13 18:57:55 +02:00
Paolo e433affcc3 - Fixed disappearing side menu when additional menu entries are provided by another component 
- Fixed wrong parameter for removeFilterField call
 2022-07-13 15:44:00 +02:00
Paolo 4dab69cb15 Reverted changes in application/models/person/Benutzer_model.php, pk => array 2022-07-13 09:45:58 +02:00