Commit Graph

  • 18729af639 Verbesserungen in Personensuche kindlm 2016-07-12 10:49:02 +02:00
  • 1f60271803 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core kindlm 2016-07-11 19:51:45 +02:00
  • c0379b7755 Studienplan_sprache in ausbildungsvertrag.xml.php kindlm 2016-07-11 19:51:33 +02:00
  • d6ab664a33 - phpC(dis)I fixes IV paolo 2016-07-11 18:31:11 +02:00
  • 9756ce6b14 - phpC(dis)I fixes III paolo 2016-07-11 18:23:59 +02:00
  • 57c6e59eb9 fixed numbering on exam-list, lv-name in exam header Gerald Raab 2016-07-11 18:20:43 +02:00
  • 1e53cbde71 Merge origin/ci into ci paolo 2016-07-11 17:21:10 +02:00
  • bc331e10ad - phpC(dis)I fixes II paolo 2016-07-11 17:18:49 +02:00
  • 364ca5ed72 Sprache bei Vorlagentext Paminger 2016-07-11 16:52:00 +02:00
  • 4abf10d3e3 phrases for pruefungstool Gerald Raab 2016-07-11 15:52:31 +02:00
  • d58ba92b15 - phpC(dis)I fixes paolo 2016-07-11 13:35:12 +02:00
  • 53cfa9eb9c get user messages Gerry Raab 2016-07-09 03:06:54 +02:00
  • 0950eebca6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core kindlm 2016-07-08 17:53:25 +02:00
  • a5c29fa2f7 Berechtigungsabfrage granularer; GUI-Verbesserungen kindlm 2016-07-08 17:53:20 +02:00
  • a9daf5bdc6 Fehler in Bildprüfung behoben kindlm 2016-07-08 17:48:50 +02:00
  • 38ed9a6e43 Ausbildungsvertrag D und E aktualisiert kindlm 2016-07-08 17:47:35 +02:00
  • 6ba0787cb7 Neues Logo; user als Parameter für admins kindlm 2016-07-08 17:41:19 +02:00
  • 268130756e Merge origin/ci into ci paolo 2016-07-08 15:37:36 +02:00
  • 91ad613884 - Try fixing phpC(dis)I paolo 2016-07-08 15:37:02 +02:00
  • 3fffad9d77 Problem behoben bei dem der Verbands Tree nicht geladen wurde wenn Sonderzeichen in Studiengängen oder Gruppen enthalten waren oesi 2016-07-08 08:37:05 +02:00
  • 37c1721aeb Buttons und Menüpunkt zum Versenden und Antworten auf Messages hinzugefügt oesi 2016-07-07 22:52:48 +02:00
  • 8fbc64bbff - Try to fix problems with phpC(dis)I - Changed permissions in dump.sql paolo 2016-07-07 17:15:30 +02:00
  • 79230cd85d Added function getBerechtigungKurzbz to model FHC_Model. Using this function will be avoided the notice "Undefined index". All models have been adapted. paolo 2016-07-07 16:42:04 +02:00
  • aaef564d52 show user messages in fas Gerry Raab 2016-07-07 09:39:27 +02:00
  • 03d84be366 Vorlagentexte Paminger 2016-07-07 09:26:40 +02:00
  • 9f49093b38 Aufnahmetermine Editieren und Gesamtpunkte berechnung hinzugefügt oesi 2016-07-06 18:16:08 +02:00
  • 64b68c180f - MigrationLib is now using, where it is possible, dbforge from CI - 011_reihungstest.php migration script adapted to the new MigrationLib paolo 2016-07-06 16:59:57 +02:00
  • 04db2afed1 Merge origin/ci into ci paolo 2016-07-06 16:07:32 +02:00
  • ba1c637ca4 Method getPhrases of library PhrasesLib now returns the text of a phrase converted from textile to html paolo 2016-07-06 16:07:17 +02:00
  • 325e7f49c6 fixed bug when index is missing in post data Stefan Puraner 2016-07-06 13:31:34 +02:00
  • 925bb10efa Better error messages when sending a message with a template paolo 2016-07-06 12:05:10 +02:00
  • 61a559d380 Changed permission basis/phrase to system/phrase paolo 2016-07-06 10:13:43 +02:00
  • c9e980c74a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci Paminger 2016-07-05 19:13:59 +02:00
  • d7801da391 Roles Paminger 2016-07-05 19:13:37 +02:00
  • 6a609283a4 Seeds and DBTools extension Paminger 2016-07-05 19:12:54 +02:00
  • 901f4352df Merge origin/ci into ci paolo 2016-07-05 17:55:03 +02:00
  • eac6aae4f1 MigrationLib has a better output for HTTP or CLI paolo 2016-07-05 17:54:26 +02:00
  • 8713b819ba Erstversion für AufnahmeTermine Karteireiter im FAS Template für Messages Karteireiter im FAS oesi 2016-07-05 17:39:17 +02:00
  • 65765bceb1 - Removed CI Inheritance from Prestudent because it breaks the person inheritance - Added function to parse Language Arrays to db_extras oesi 2016-07-05 16:28:35 +02:00
  • c85a406ec6 Merge origin/ci into ci paolo 2016-07-05 16:25:24 +02:00
  • 8e37e85ecc Because the column ort_kurzbz of the table tbl_rt_person is now optional, the join with the table tbl_ort has been replaced with a left join paolo 2016-07-05 16:24:46 +02:00
  • 1590fad8bb fixed bug Stefan Puraner 2016-07-05 15:36:00 +02:00
  • 0c7df621a5 orgform widget + neues recht Gerry Raab 2016-07-05 14:34:50 +02:00
  • 65613d2869 tbl_rt_person ort_kurzbz is now optional oesi 2016-07-05 14:20:52 +02:00
  • 5de98911ec Link zu LV-Infos zur Lehrveranstaltungsübersicht hinzugefügt oesi 2016-07-05 13:57:26 +02:00
  • 6544a656f8 - Studienplan removed Getter to get CI-Language working - Prestudent added missing Person Class oesi 2016-07-05 10:00:49 +02:00
  • 385e17eff7 Added Foreign Key for UID Column oesi 2016-07-05 09:58:34 +02:00
  • cddfc142c7 Kosmetik Paminger 2016-07-05 07:11:46 +02:00
  • a6c61d0bc1 phrases stuff Gerry Raab 2016-07-05 00:22:53 +02:00
  • 39c0350af8 Generate Studienordnung Paminger 2016-07-04 22:43:11 +02:00
  • b95fc0f06a Roles Paminger 2016-07-04 22:42:41 +02:00
  • 9707c523e0 Studienordnung_semester auf Studienplan_semester geändert oesi 2016-07-04 18:31:25 +02:00
  • 23201670b1 Phrasentext delete Gerry Raab 2016-07-04 18:25:35 +02:00
  • de7fc12c62 Changes in migration script 011_reihungstest paolo 2016-07-04 17:57:14 +02:00
  • 10963be983 Merge origin/ci into ci paolo 2016-07-04 15:37:35 +02:00
  • ba0e2bb7ff MigrationLib to help with the migration procedure paolo 2016-07-04 15:36:53 +02:00
  • f08f85afe2 fixed table name Stefan Puraner 2016-07-04 11:48:10 +02:00
  • be79ca299c Breite der DropDowns auf 100% geändert oesi 2016-07-04 09:19:56 +02:00
  • 4902f41a3f Added addSelect to DB_Model paolo 2016-07-01 12:17:08 +02:00
  • 9cce095e9b - Added permissions for table public.tbl_rt_person - Added method postAddReihungstest to controller Prestudent - Added method getReihungstestByPersonID to controller Reihungstest - Fixed tables structure in the migration script 011_reihungstest.php - Added model RtPerson_model paolo 2016-07-01 10:50:37 +02:00
  • c96b6de669 Fehler behoben wodurch der letzte Tag des Studiensemesters nicht korrekt dem Studiensemester zugeordnet wurde oesi 2016-07-01 08:57:10 +02:00
  • 41a0cc33f1 Kosmetik Paminger 2016-07-01 00:40:15 +02:00
  • ad8c5bfb32 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci Paminger 2016-07-01 00:28:18 +02:00
  • 93422b75b5 BugFix Paminger 2016-07-01 00:27:57 +02:00
  • ce3a2f26d3 Extended migration tool to allow the prestudenten to sign more reihungstests paolo 2016-06-30 17:43:32 +02:00
  • 81ca197020 bugfix Andreas Moik 2016-06-30 16:15:05 +02:00
  • 075312963e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci Paminger 2016-06-30 07:22:34 +02:00
  • 09787cca65 BugFix PhraseLib Paminger 2016-06-30 07:22:18 +02:00
  • 341d5cf8da Changed method getGemeinde of controller Gemeinde, now it returns all data if no parameters are specified. Data are ordered by the field plz. paolo 2016-06-29 16:27:25 +02:00
  • 7cdac1d047 Added method getByStudiengangStudiensemester to controller Reihungstest paolo 2016-06-29 16:16:14 +02:00
  • a3210781ea - Added permission system/vorlagestudiengang to dump.sql - Added method getMessagesByToken to controller Message - Library MessageLib now load the helper fhc_helper - Added new method getMessagesByToken to library MessageLib - Added field relationmessage_id to methods sendMessage and sendMessageVorlage - Method sendMessageVorlage now checks if the text and the subject for the template are not empty - Method sendMessageVorlage now saves the token automatically generated - Method sendMessageVorlage now return a more comprehensive error message - Method getMessagesByPerson of Message_model now checks for the right permissions - Added fields relationmessage_id and person_id in getMessagesByPerson query - Added method getMessagesByToken to model Message_model paolo 2016-06-29 15:41:40 +02:00
  • a4a907a83f bugfix Andreas Moik 2016-06-29 15:04:41 +02:00
  • 5f07058338 more changes for eine_uid Andreas Moik 2016-06-29 12:02:49 +02:00
  • 94ae62ca14 Changed the method postMessage of controller Message, now it works even without recipients paolo 2016-06-29 10:45:32 +02:00
  • 73c36d8520 BugFix Paminger 2016-06-29 09:34:51 +02:00
  • 48655039ba Move public.phrase to system.phrase and change phrase_inhalt to phrasentext Paminger 2016-06-29 09:32:51 +02:00
  • 9a44c818ea FHC Helper Paminger 2016-06-29 08:41:02 +02:00
  • 6af45f99f6 BugFix Paminger 2016-06-29 08:08:06 +02:00
  • 4e6c1bd9fd Dont set rights in Migration files Paminger 2016-06-29 08:05:57 +02:00
  • b4fdd11686 BugFix Paminger 2016-06-29 08:00:29 +02:00
  • 9108b9ecd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci Paminger 2016-06-28 22:11:12 +02:00
  • 0d55276bd2 Checkroles Paminger 2016-06-28 22:10:56 +02:00
  • a68dfa7ba2 Added method postChangeStatus to controller Message paolo 2016-06-28 18:13:20 +02:00
  • 3622052bd9 Berechnung der bereits aufgenommenen Personen korrigiert oesi 2016-06-28 16:15:19 +02:00
  • bcc42f2b02 Fix: the query present in the method AllForBewerbung of the model Studiengang_model is changed, now it doesn't work anymore with the view vw_studienplan, that it is deprecated. paolo 2016-06-28 15:36:27 +02:00
  • d2e3a346ce Fix: Phrase controller still tries to use the method _getUID paolo 2016-06-28 15:05:02 +02:00
  • f3c2630a66 SeedBugFix Paminger 2016-06-28 12:53:53 +02:00
  • e21b2f6233 Seeds Paminger 2016-06-28 12:34:12 +02:00
  • 974b5c0fe8 berits aufgenommene Studenten mit einer anderen Studienplan_id werden nun nicht mehr als aufgenommen angezeigt Andreas Moik 2016-06-28 12:15:11 +02:00
  • 0c28a6d6c4 bei dem aufnehmen der Bewerber wird nun der gewählte Studienplan und die Orgform bei dem Prestudentstatus eingetragen Andreas Moik 2016-06-28 11:43:33 +02:00
  • 5e4090e0ce _validate method of Person controller now checks correctly the parameters, in accordance with the table structure paolo 2016-06-27 14:58:46 +02:00
  • bee12ac317 Fix: method getAuthUID of the helper fhcauth_herpel.php, sometimes it misses the uid paolo 2016-06-27 12:17:16 +02:00
  • 534a162809 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core kindlm 2016-06-27 11:33:25 +02:00
  • 4c21acc5f2 Firma DeleteOrganisationseinheit; Nur Eigene löschen kindlm 2016-06-27 11:33:17 +02:00
  • 5071605ce2 Prüfungsprotokoll Master-Lehrgänge kindlm 2016-06-27 11:31:12 +02:00
  • c773cd3ddc Korrektur Query DeleteFirmaOrganisationseinheit kindlm 2016-06-27 11:30:29 +02:00
  • 4d77c603d0 Letzte Rolle nur durch admin löschbar kindlm 2016-06-27 11:29:10 +02:00
  • fbf33e708e Fixed Typo oesi 2016-06-27 09:31:01 +02:00
  • 673e7a2a2f Berechnung korrigiert damit alle Bewerber einberechnet werden und nicht nur die noch nicht aufgenommenen oesi 2016-06-24 17:15:13 +02:00
  • ad335ad240 RTPunkte1, RTPunkte2 und Private EMail hinzugefügt. Funktion aus Klasse entfernt oesi 2016-06-24 17:04:56 +02:00