blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 17:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,601 Commits 216 Branches 6 Tags
97af0bdc00c314ff38ba99f965fee8790d4d4480
Commit Graph

9601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paolo 97af0bdc00 Removed migrations and seeds directory 2019-04-25 17:23:39 +02:00
Paolo 55636c5bb7 Merge branch 'master' into cleanci 2019-04-25 17:06:28 +02:00
Paolo d1498a9b12 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2019-04-25 17:05:21 +02:00
Paolo f65f3daceb - Added private property $_requiredPermissions to APIv1_Controller 
- Removed method _isAllowed from APIv1_Controller
- Added public method _remap to APIv1_Controller
- PermissionLib loading moved from constructor to _remap in APIv1_Controller
- Changed method basicAuthentication in AuthLib, now calls loginLDAP
 2019-04-25 17:02:43 +02:00
Manfred Kindl e38d822f82 Open link in _blank Window 2019-04-25 16:22:41 +02:00
Manfred Kindl 1d6cd91074 CodestyleFix 2019-04-25 16:20:46 +02:00
Manfred Kindl dbb404743f BugFix Personen Zusammenlegen Foto 2019-04-25 16:18:00 +02:00
Manfred Kindl ac27cb81e7 BugFix Bezeichnung Studiensemester englisch 2019-04-25 16:17:25 +02:00
Manfred Kindl 3291fba775 BugFix Summe falsche Spalte 2019-04-25 16:16:27 +02:00
Paolo 2cf15bcd74 REST_Controller now loads helper hlp_session 2019-04-25 14:53:35 +02:00
Paolo b0919a8740 Removed never used rdf/Basic controller 2019-04-25 13:52:06 +02:00
Paolo a0967588fb Better error messages in DB_Model 2019-04-25 13:38:46 +02:00
Paolo 286114255e Better error messages in FS_Model 2019-04-25 12:59:07 +02:00
Paolo 699aca74d1 - Changed helper and language autoload 
- Changed language config
- Removed never used constants
- Changed rest_language in rest config file
- Adapted models that where extending FHC_Model
- Adapted code to load hlp_return_object
- Adapted code to use exit status codes constants
 2019-04-25 12:09:31 +02:00
Paolo 1fe9a95236 Removed controllers/DBTools.php and core/FHC_Model.php 2019-04-24 19:49:34 +02:00
Paolo be6857822d - Renamed application/helpers/hlp_message_helper.php to application/helpers/hlp_return_object_helper.php 
- Added function _createReturnObject to hlp_return_object_helper.php
 2019-04-24 19:48:21 +02:00
Paolo 1da4cdb9aa - Removed languages files for CI file system based phrase system 
- Renamed application/language/de-AT/ to application/language/english/
- Kept language file rest_controller_lang.php to be used with the REST_Controller
 2019-04-24 19:46:19 +02:00
Andreas Österreicher a2b6d1e8dd Fixed FreeBusy Import of Google Calender 
Google Calender now exports FreeBusy Information without BEGIN:VFREEBUSY/END:VFREEBUSY Tags
 2019-04-24 18:04:10 +02:00
Andreas Österreicher 803c1cb4c3 Ändern des Erledigt-Status von Notizen setzt jetzt immer das Updatevon/Updateamum Feld 2019-04-23 15:32:37 +02:00
alex c049090987 - Added jquery checkboxes to FHC-Header template 
- select checkbox range with shift key is automatically possible in FilterWidget tables
 2019-04-19 13:16:37 +02:00
alex 09478e0d6c Schnitt is calculated only from positive grades in Studienerfolgsbestätigung 2019-04-19 11:12:17 +02:00
Andreas Österreicher dfd97824de Changed Version Number in Planner 2019-04-18 17:27:42 +02:00
alex fdf80f2d7e InfocenterData, infocenterfreigegebendata, infocenterreihungstestabsolviertdata: 
added log name "Login with user" to list of excluded logs for "last Action"
 2019-04-18 17:15:21 +02:00
alex 86902a0d35 Diplomasupplement, Studienerfolg, Zeugnis Dokumentvorlagen: 
- ECTS (Diplomasupplement, Studienerfolg, Zeugnis) and lv Gesamtstunden (studienerfolg) werden korrekt berechnet, nicht angezeigte negative Lvs werden ausgenommen.
 2019-04-18 13:37:18 +02:00
Andreas Oesterreicher d104ac6a7f BIS-Meldung Problem behoben wodurch GS Studierende nicht korrekt 
gemeldet wurden wenn diese bereits im 1. GS Semester Absolvent sind
 2019-04-17 16:28:29 +02:00
Paolo 34791c96c4 Merge branch 'master' into ciauth 2019-04-17 15:46:27 +02:00
Andreas Österreicher f05ebf3946 Unlocking in Infocenter now always reloads the Dataset and jumps to the correct Filter 2019-04-17 09:15:41 +02:00
Manfred Kindl ed7f3f90fb Codestyle-Changes 2019-04-16 16:45:21 +02:00
Manfred Kindl 0439c19cb1 Infocenter Notices "Anmerkung zur Bewerbung" 
When there is an extra content after "Anmerkung zur Bewerbung" e.g. "Anmerkung zur Bewerbung (BWI)" the notice is also displayed on top
 2019-04-16 16:44:55 +02:00
Manfred Kindl 307f279e08 New optional param prestudent_id in function getBewerbungstoolNotizen 2019-04-16 16:43:25 +02:00
Manfred Kindl 54507543d7 Minor typo fixes 2019-04-16 16:41:20 +02:00
Manfred Kindl 2d5d6dd5ad Fixed typo in script 2019-04-16 16:40:55 +02:00
Manfred Kindl e9521d056d Implemented Nationengruppe 
- New class
- Attributes in nation.class
- Attributes in bewerbungtermin.class
 2019-04-16 16:40:31 +02:00
Manfred Kindl 1d9f489402 New Table bis.tbl_nationengruppe 
- Added Column nationengruppe_kurzbz to tbl_bewerbungstermine and tbl_nation
 2019-04-16 16:38:15 +02:00
Manfred Kindl d01e334a12 Changes to Ausbildungsvertrag 2019 2019-04-16 16:36:54 +02:00
Manfred Kindl b6c9c5718c Merge remote-tracking branch 'origin/master' 2019-04-16 16:32:54 +02:00
Manfred Kindl 476ce1b93b Added OrgForm as param to Excel-Export 2019-04-16 16:30:58 +02:00
alex d23357c331 InfoCenter Details AjaxLib calls update: 
- using outputJson... methods instead of output type and json_encode
- added errorcallbacks for blocking errors
- called IC controller methods return success or error objects
- fitstudiengang is checked when sending freigabe stg message
 2019-04-16 13:58:21 +02:00
alex 255516c8fd zgvpruefungen view InfoCenter: 
- quickinfo for disabled freigegeben buttons comes from phrases
 2019-04-16 13:32:25 +02:00
alex 95af36fc59 public/DialogLib update: 
- added alertWarning method
- outsourced code to _displayDialog method
 2019-04-16 13:29:51 +02:00
alex ff90e48e28 accounting/Kostenstelle_model: 
- corrected typo in method getKostenstellenForGeschaeftsjahrWithOe
- added method getKostenstellenBerechtigt for all Kostenstellen for which user berechtigt
 2019-04-15 18:43:52 +02:00
Andreas Österreicher aad0292d5a Added function to get all Organisationsunits that are attachted to a course 2019-04-15 17:30:55 +02:00
alex b8a504b424 Budget FilterWidget Übersicht Updates: 
- public/FilterWidget.js : ignore empty objects when rendering tablesorter table
- Insert Budget filter
- Insert app "budget"
 2019-04-15 16:59:24 +02:00
Andreas Österreicher bc68ca1e9f Added english Version of Lehrveranstaltungszeugnis 2019-04-15 15:32:02 +02:00
Andreas Österreicher b63809abfd Fixed Errorhandling when switching between Users to display correct Errormessages 2019-04-12 15:27:17 +02:00
Paolo 02bab0b301 Merge branch 'master' into ciauth 2019-04-12 14:30:28 +02:00
alex 4605413891 FHC-Controller: changed scope of outputJson from private to protected 2019-04-12 14:29:45 +02:00
Paolo 5b439eea1f Merge branch 'master' into ciauth 2019-04-11 16:24:09 +02:00
alex 4e0a47c17e Merge remote-tracking branch 'origin/master' 2019-04-11 10:11:24 +02:00
alex d32c764955 - Lehrveranstaltung_model: getLvsWithIncomings method takes studienplan_lehrveranstaltung export field (= studienplanrelevant) into account 2019-04-11 10:11:08 +02:00