blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 00:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,351 Commits 211 Branches 6 Tags
7b99d7ead3f3445ec4673e19a491490eef02bda4
Commit Graph

7351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bison 7b99d7ead3 - MessageLib fix: if sending an email fails inside of method sendMessageVorlage, 
it will no longer rolls back the database
- Added parameter all in method getMessagesByPerson of model Message_model
 2016-08-25 09:52:00 +02:00
bison b83cf14841 Has been wrote the method getStudiengangStudienplan of controller Studiengang2 
from the scratch to achieving better performances
 2016-08-24 17:12:37 +02:00
bison d6664e74c5 - Added element email_send_immediately in configuration array in mail.php 
- Renamed sendOne to sendEmail
- Added new method sendOne
- Added $message_id parameter to method getMessages of model Recipient_model
 2016-08-24 13:38:47 +02:00
bison 011dbb980f Changes in method getMessagesByPerson of model Message_model 2016-08-23 14:28:43 +02:00
oesi 7963a4cc0e Config Eintrag für REST API hinzugefügt 2016-08-22 15:45:59 +02:00
bison 5c7d2e9688 Changed method getGemeindeByPlz, added DISTINCT and ORDER BY clauses on column ortschaftsname 2016-08-22 13:37:21 +02:00
bison dd02a5ff0e Added method getCompleteStudiengang to get all data about all Studiengang with better performance. 
The methods _getStudienplaene, _getBewerbungstermine and _getReihungstests are complementary.
 2016-08-22 11:28:22 +02:00
bison 44694c2a08 Merge origin/ci into ci 2016-08-19 15:29:26 +02:00
bison d4edb54c4c Added changes in migration scripts, new column zugangscode_timestamp 
for table tbl_person
 2016-08-19 15:29:15 +02:00
oesi edb60ef17b - Fixed Fallback if Vorlage doesnt exist 
- Added Additional Parameters to Message
 2016-08-19 11:31:30 +02:00
Paminger b46692913c Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-19 10:23:19 +02:00
Paminger 58bd4d003d Vorlage MailStatConfirmInteressent 2016-08-19 10:22:22 +02:00
bison 60681d5402 Added parameter "new" in method postDms of Dms controller 2016-08-19 10:06:36 +02:00
Paolo 40a2b53858 Merge master into HEAD 
Conflicts:
	include/dokument_export.class.php
	include/studiengang.class.php
	vilesci/stammdaten/reihungstestverwaltung.php
 2016-08-18 16:23:11 +02:00
oesi da3409cf1d PartTime in der Vorlage ergänzt 2016-08-18 14:26:52 +02:00
oesi 7e498482d8 Meine LV zeigt jetzt LVs des Sommer- und Wintersemesters an wenn kein aktuelles Studiensemester vorhanden ist 2016-08-18 11:51:19 +02:00
Andreas Moik cac1aae235 implemented cascading deletion of persons/employees/students 2016-08-18 11:20:02 +02:00
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