blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 00:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,800 Commits 217 Branches 6 Tags
36731de919a85128cede6ca4b4294daafff78c76
Commit Graph
11800 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Kindl d4a05c91e3 Vorrückung der Studienpläne auch fürs SS 2021-09-08 09:23:33 +02:00
Manfred ebb7af1e59 Bei Abgewiesenen 0 als Prio anzeigen 2021-09-07 15:11:12 +02:00
Manfred fedc8dbd59 Merge remote-tracking branch 'origin/master' 2021-09-07 15:07:07 +02:00
Manfred 261e4066c8 Beginn- und Enddatum bei der Funktion Rektor beruecksichtigen 2021-09-07 15:05:35 +02:00
Manfred 9f5a8e4eb9 Updateaktiv-Datum ergänzt 2021-09-07 15:01:12 +02:00
Paolo 9c84558f5f - Added requiredPermissions to the application/config/udfmasterschema.json and set them as mandatory 
- Removed the private method _isAllowed from application/controllers/widgets/UDF.php
- Removed required permissions from views application/views/system/fas_udf.php and application/views/system/infocenter/zgvpruefungen.php
- Widget views application/views/widgets/checkbox, dropdown, textarea and textfield now they print the attribute disabled
- Added constant DISABLED to application/widgets/html/HTMLWidget.php
- Removed private property _requiredPermissions from application/widgets/udf/UDFWidget.php
- application/widgets/udf/UDFWidget.php does not check permissions anymore and does not store them anymore
- Added constants PERMISSION_TYPE_READ and PERMISSION_TYPE_WRITE to application/libraries/UDFLib.php
- Removed constant PERMISSION_TYPE from application/libraries/UDFLib.php
- Removed public method isAllowed from application/libraries/UDFLib.php
- Added private methods _readAllowed, _writeAllowed, _setRequiredPermissions and _setReadOnly to application/libraries/UDFLib.php
- UDFLib->displayUDFWidget now checks if permissions are declared in the UDF JSON and if the user is allowed to read and write such UDF
- UDFLib->saveUDFs now checks if the user has the permissions to write such UDF
- Now the UDFs are even displayed in read only mode
 2021-09-07 12:13:59 +02:00
KarpAlex 493bf0edda Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-06 22:35:40 +02:00
KarpAlex 40d686cb21 Merge branch 'feature-13092/Monitoring_Schnittstellen_Dashboard' into feature-10450/DVUH_requestMatrikelnummer 
# Conflicts:
#	system/dbupdate_3.3.php
 2021-09-06 22:33:47 +02:00
Andreas Österreicher 89209a0c27 Problem behoben wodurch Messages im FAS nicht korrekt geladen werden 
konnten
 2021-09-06 09:25:38 +02:00
Manfred 47cb486be3 Merge remote-tracking branch 'origin/master' 2021-09-03 18:03:05 +02:00
Manfred 1759bd75da Bei Upload neuer Version Beschreibung und Suche aktualisieren 2021-09-03 18:02:58 +02:00
Andreas Österreicher 04261e11e4 Wording für Anrechnungen angepasst 2021-09-03 17:38:52 +02:00
Andreas Österreicher c03e476e3b Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-09-03 17:36:19 +02:00
Manfred 3b89561736 Zutrittskarten löschen und status 
In kartenruecknahme.php werden nun Statusdetails zum Student oder Mitarbeiter angezeigt und man hat die Möglichkeit, Karten ganz aus dem System zu löschen.
 2021-09-03 15:14:54 +02:00
Andreas Österreicher f92307cec0 Merge branch 'feature/Anrechnungen_NEU' 2021-09-03 13:24:35 +02:00
Andreas Österreicher 4b94dfbda7 Merge branch 'master' into feature/Anrechnungen_NEU 2021-09-03 11:08:29 +02:00
Manfred 0099aaadb0 Merge remote-tracking branch 'origin/master' 2021-09-02 14:08:27 +02:00
Manfred 3999098fd6 Anzeige der abgelaufene Coodle-Umfragen verlängert auf 90 Tage 2021-09-02 14:08:21 +02:00
ma0068 30c2705b99 fix syntax error system/dbupdate_3.3.php 2021-09-02 11:43:43 +02:00
ma0068 778b5906f9 Merge Branche Cristina 2021-09-02 11:35:17 +02:00
ma0068 d3158b8ce0 merge dbupdate_3.3.php 2021-09-02 11:31:58 +02:00
ma0068 f0c5c3acb4 14774 Zeiterfassung: Homeoffice im CSV Import 2021-09-02 11:24:38 +02:00
ma0068 62cfa27473 14774 Zeiterfassung: Homeoffice im CSV Import 2021-09-02 09:55:14 +02:00
cris-technikum 58ce5a9132 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-09-01 13:58:48 +02:00
Paolo 6da8dd6865 Merge branch 'FHBGLD-set_gemeinde_skript' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-set_gemeinde_skript 2021-08-31 21:58:34 +02:00
Andreas Österreicher 6034da43d8 Fixed loading of current Geschaeftsjahr if it is the last day of the 
year
 2021-08-31 07:56:59 +02:00
Andreas Österreicher 6008d97f36 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-08-30 20:35:31 +02:00
Andreas Österreicher 64555c0ca1 Mahnspanne kann auch leer sein 2021-08-30 20:35:15 +02:00
KarpAlex 25cc8c6d49 matr_aktiv field in dbupdate_3.3.php: only set to true if not NULL 2021-08-30 18:11:08 +02:00
cris-technikum 64eb9eacf4 Added: Automatic Scrolling when Approving/Rejecting multiple Anrechnungen 
Also added Scrolling for Recommending/Not Recommending multiple Anrechnungen

Signed-off-by: cris-technikum <[email protected]>
 2021-08-30 15:36:50 +02:00
ma0068 a36909763f Delete comments 2021-08-30 14:28:30 +02:00
Andreas Österreicher b05fbe5978 Fixed PHP Version incompatibility issue 2021-08-27 19:05:00 +02:00
Andreas Österreicher 0a97a028ee Reihungstestübersicht zeigt nun die Reihungstests der letzten 12 Monate 
an statt der letzten 5
 2021-08-26 20:22:13 +02:00
Andreas Österreicher 484151bab2 Merge branch 'master' into feature/Anrechnungen_NEU 2021-08-26 11:32:47 +02:00
ma0068 437feb2fdd dynamische Anzeige checkbox homeoffice auch bei Ändern 2021-08-24 18:01:15 +02:00
ma0068 00d7d5c834 neues Ajaxfile zeitaufzeichnung_bisverwendung.php 2021-08-24 11:22:02 +02:00
KarpAlex b9ac73955a Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
 2021-08-24 01:19:26 +02:00
Andreas Österreicher 98d485b2ba Merge branch 'feature-13943/SAPByD_purchase_orders_job_queue_worker' 2021-08-23 17:04:09 +02:00
Andreas Österreicher a6b37c452f Merge branch 'feature-6189/SAP_basic_structure_for_data_synchronization' 2021-08-23 16:43:20 +02:00
Andreas Österreicher a22227bc26 Merge branch 'feature-13090/Bis_Bewerbermeldung_einzeln_erstellen' 2021-08-23 16:26:37 +02:00
Andreas Österreicher ccff26d834 Merge branch 'feature-12333/Change_legacy_jobs_database_log' 2021-08-23 16:19:49 +02:00
Andreas Österreicher f552c6a702 Merge branch 'feature-12894/LDAP_changes_on_CI' 2021-08-23 15:43:55 +02:00
Paolo 68b5e49f91 Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization 2021-08-22 21:04:53 +02:00
Paolo ff715a72c8 Merge branch 'master' into feature-13943/SAPByD_purchase_orders_job_queue_worker 2021-08-22 21:04:32 +02:00
Paolo a2fc3fe09b Merge branch 'master' into feature-12894/LDAP_changes_on_CI 2021-08-22 20:59:01 +02:00
Paolo fb00baae00 Merge branch 'master' into feature-12333/Change_legacy_jobs_database_log 2021-08-22 20:58:09 +02:00
Andreas Österreicher b00337973a Merge branch 'feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung' 2021-08-20 10:35:32 +02:00
Andreas Österreicher 73ce635188 Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung 2021-08-20 10:34:55 +02:00
Harald Bamberger d091374622 create merged branch with all features on topic Wiederholer - feature 13864 2021-08-19 15:26:20 +02:00
Harald Bamberger a28f187473 create merged branch with all features on topic Wiederholer - feature 12998 2021-08-19 14:58:21 +02:00