blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-23 15:09:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,334 Commits 228 Branches 6 Tags
ec00c93d04fd0389fe87a7fbceae36727f4584ce
Commit Graph

8334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Puraner 64aa1cfd4f Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-17 17:57:49 +02:00
Stefan Puraner 959b01f6a1 fixed delete method 2016-08-17 17:56:06 +02:00
oesi 233de362f4 Bei Statusbestätigung wird ein Info-Mail versandt 2016-08-17 16:51:41 +02:00
bison 1dde2c5cb2 Fixed method loadVorlagetext, now it take care about all the parameters 2016-08-17 16:24:42 +02:00
bison 18f401d365 Merge origin/ci into ci 2016-08-17 15:41:29 +02:00
bison f21db9531e - Added new controller RtPerson 
- Changed pk in model RtPerson
- Added grants for new sequence in migration script 011_reihungstest
 2016-08-17 15:41:07 +02:00
oesi 4d3205a6e7 Fixed Template 2016-08-17 12:41:15 +02:00
bison d419cc327d - Added method getGemeindeByPlz to controller Gemeinde 2016-08-17 12:10:16 +02:00
bison b2c8d1b2de - VorlageLib fix 
- MessageLib better message error
 2016-08-17 11:59:43 +02:00
bison cf999b6d82 - Added constant DOC_ROOT in system.config-default.inc.php 
- Using DOC_ROOT in dbupdate_3.2.php to be compatible with checksystem.php and DBTools.php
- Rolled back all classes in the include directory from CI to basis_db
 2016-08-17 11:14:52 +02:00
bison dd6ef9fdb1 Migration scripts and lib fixes 2016-08-16 17:09:30 +02:00
Andreas Moik 2188a120c2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-11 14:10:15 +02:00
Andreas Moik 70bd1b795d ignore empty documentlists 2016-08-11 14:09:48 +02:00
kindlm e512a80335 Aufnahmeverfahren fhstp 
Zusammenlegung RT-Anmeldungen
 2016-08-11 09:57:00 +02:00
kindlm 35f8bab8b2 Aufnahmeverfahren fhstp 
- Funktion loadReihungstestPerson
- Anpassungen Excel-Export
 2016-08-11 09:56:23 +02:00
kindlm 6851e75c3f Several changes in reihungstestverwaltung 
- Add multiple studienplaene
 2016-08-09 14:58:33 +02:00
kindlm 66226f7e8d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-09 14:01:44 +02:00
kindlm 89d920427a Changes in studienplan.class 
- New function searchStudienplaene
- Changes in function getStudienplaeneFromSem
 2016-08-09 14:01:36 +02:00
kindlm c7f5e038f2 New functions in reihungstest.class 
- saveStudienplanReihungstest
- getStudienplaeneReihungstest
- deleteStudienplanReihungstest
- Added new attribute studienplan_id to all classes
 2016-08-09 14:00:34 +02:00
kindlm 5e4833bac5 Migration 011_reihunstest anpassungen 
- Add Studienplan_id to testtool.tbl_ablauf
- Add Aktiv to testtool.tbl_frage
- Add Aktiv to testtool.tbl_vorschlag
- Add Bezeichnung_mehrsprachig to testtool.tbl_gebiet
- Typing error "stundenplan_id" corrected to "studienplan_id"
- New column rt_person_id with Primary-Key to tbl_rt_person
- UniqueKey on "person_id","rt_id","studienplan_id"
 2016-08-09 13:58:39 +02:00
Stefan Puraner 6bee671674 fixed bug in mehtod to check rules 2016-08-09 11:45:04 +02:00
Andreas Moik 4916ba09d6 removed echo 2016-08-09 11:13:14 +02:00
Andreas Moik 7f6d632935 new features for dokumentenakt 
-now uses versions of templates
	-only takes active templates
	-covering page now uses the oe_kurzbz
 2016-08-09 11:10:01 +02:00
Andreas Moik 55729f5eb6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-09 10:44:09 +02:00
Andreas Moik 22118abc5a template resolution is now handeled recursively 2016-08-09 10:42:47 +02:00
Stefan Puraner b75a82a4fa fixed bug when saving anrechnung in FAS 2016-08-09 10:04:24 +02:00
Stefan Puraner 4a5f0554c7 fixed bug when saving a comment 2016-08-09 09:44:03 +02:00
Stefan Puraner 20a750b9c3 fixed date and time errors 2016-08-09 09:32:55 +02:00
Stefan Puraner 9610418a96 fixed bug for missing data 2016-08-09 09:21:19 +02:00
Stefan Puraner 4036f5f7cd Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-08 11:17:15 +02:00
Andreas Moik deba2733d6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-08 11:15:09 +02:00
Andreas Moik 4ad5de915a added page to link documents with templates 2016-08-08 11:14:22 +02:00
Stefan Puraner e5952f93cc Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-08 08:31:35 +02:00
paolo 20e492bd63 Merge origin/ci into ci 2016-08-04 14:53:44 +02:00
paolo 527a627574 Removed var_dumps from library REST_Controller 2016-08-04 14:53:32 +02:00
Andreas Moik e178f78dba added tbl_vorlagedokument 2016-08-03 15:20:54 +02:00
paolo 92a81ae3a4 - Migration tool workaround for new installation 
- phpC(dis)I better configuration
 2016-08-03 11:58:46 +02:00
paolo 5fb0408a31 Codeception fixes 2016-08-03 11:02:34 +02:00
paolo c8f9980c5a Codeception fixes 2016-08-03 10:42:03 +02:00
paolo 2d8f7fcac3 Codeception workaround 2016-08-03 09:57:24 +02:00
Andreas Moik c01eecf196 bugfix 2016-08-02 14:49:31 +02:00
Andreas Moik 68b911fef4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-02 11:51:23 +02:00
Andreas Moik feab67a83a Merged documents are now shown on the covering page 2016-08-02 11:50:22 +02:00
kindlm 3e386a9208 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-08-02 11:40:13 +02:00
kindlm 7574597fe6 Freifächerzertifikat 
Lehrziele werden mit Aufzählungszeichen angedruckt
 2016-08-02 11:40:06 +02:00
kindlm 243b4ece99 Uebernahmebestaetigung Schluessel 
Wenn Typ Schlüssel ist, wird die Nummer des Schlüssels auf der
Übernahmebestätigung angedruckt
 2016-08-02 11:39:14 +02:00
kindlm 4d800a39d3 Zutrittskarte.php 
Wenn kein Lichtbild in den Akten vorhanden ist, Foto aus tbl_person
holen;
Wenn der Inhalt des Lichtbilds leer ist, Foto aus tbl_person holen;
Wenn auch kein Foto in tbl_person gespeichert ist, mit der naechsten UID
fortfahren
 2016-08-02 11:38:12 +02:00
kindlm 98555f3dca Studiensemester GUI 2016-08-02 11:36:37 +02:00
Andreas Moik c6f5d49e3b better error handling 2016-08-02 09:25:08 +02:00
oesi 0f48d7996a Config Eintrag für Menu damit keine Links angezeigt werden bei Modulen ohne Lehrauftrag 2016-08-01 16:46:34 +02:00