Commit Graph

13768 Commits

Author SHA1 Message Date
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
Andreas Moik a705862d18 bugfix 2016-08-01 16:36:38 +02:00
Andreas Moik 24e78bbae3 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-01 16:33:07 +02:00
Andreas Moik 85d397b451 added support for documents
if pdf creation failed, show the failed documents and added a button to force creation of the pdf and skip broken files
2016-08-01 16:31:00 +02:00
paolo 65aa2b5d29 - Added codeception test for PCRM
- Fixes and improvements for PCRMLib
2016-08-01 16:18:38 +02:00
oesi 7b89d4dbbe Bugfix für das Löschen von Kursen mit Moodle 3.1 2016-08-01 14:25:06 +02:00
paolo d0a2378a67 Merge origin/ci into ci 2016-08-01 14:07:53 +02:00
paolo c8c580131c - Moved all the logic from controller PCRM to PCRMLib
- Extended functionality to others HTTP methods
- Added checking permissions if the requested resource is a library
(permissions are automatically handled by models) using PermissionLib
- Extended PermissionLib
2016-08-01 14:07:40 +02:00
kindlm 9e7eabb88f Mlist_generate Backslash-Fehler korrigiert 2016-08-01 13:49:43 +02:00
kindlm 320f253e30 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-01 13:48:20 +02:00
kindlm 12e0f88b45 Reihungstestverwaltung Errormessage 2016-08-01 13:48:15 +02:00
Andreas Moik 8074fa5383 Bewerberakt vorlage geändert 2016-08-01 11:37:25 +02:00
paolo 1c01faba5f This controller allows to call any methods of any class present in libraries and in models.
First raw version, code to be refined. Functionality to be extended to others HTTP methods.

PS: PCRM stands for "Please Christian Rename Me", because I've no name to give to it :D
2016-07-29 16:33:21 +02:00
paolo c431f8e015 Merge origin/ci into ci 2016-07-29 15:37:15 +02:00
paolo 4b82843c76 - Added parameter blockTags to controller Phrase
If this parameter is set to "no", it will be removed the tags <p> and </p>
from the beginning and from the end of the returned phrases
2016-07-29 15:36:32 +02:00
Werner Masik caf69b4d0b Pfad für Dokumente hinzugefügt 2016-07-28 16:58:24 +02:00
Andreas Moik b820f409aa bugfix 2016-07-28 16:55:09 +02:00