Compare commits

..

1964 Commits

Author SHA1 Message Date
oesi a56d4bedb9 Changelog 2017-02-10 13:38:14 +01:00
oesi 03e97199f6 Removed Legacy Scripts 2017-02-10 13:33:51 +01:00
oesi 95d5c890fd SQL Error behoben wenn Personen Reservierungsrechte für Institute anstatt Studiengänge haben 2017-02-09 14:47:56 +01:00
oesi 40def3e38a Warning in Freebusy behoben wenn die URL nicht geoeffnet werden kann 2017-02-09 14:18:13 +01:00
oesi 8836bc89e7 Fixed broken odt 2017-02-09 11:34:16 +01:00
bison-paolo 338752a562 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2017-02-09 11:04:09 +01:00
bison-paolo 8d9a8b6478 Changed method loadTree of DB_Model to be compatible to older php versions than 5.5 2017-02-09 11:01:29 +01:00
oesi f0ea684c25 Bugfix Autocomplete für alte Seamonkey Version 2017-02-09 10:04:55 +01:00
oesi 206c39093f Bugfix beim Anzeigen des Studiensemesters bei Reihungstests 2017-02-09 10:01:49 +01:00
oesi b7c359618b Ausnahme für Dummy Login hinzugefügt 2017-02-08 16:44:10 +01:00
oesi fd10a6c4c8 Fehler beim Laden des Messages Tabs behoben der dazu führte das Tabs aus Addons nicht korrekt geladen wurden 2017-02-08 08:08:39 +01:00
oesi 5338f3649e Fehler beim Laden der Dokumente behoben 2017-02-07 17:11:42 +01:00
oesi 33585586ec Removed useless getter 2017-02-07 16:42:02 +01:00
oesi 64d02b62b5 Merge branch 'master' into ci 2017-02-07 14:35:09 +01:00
kindlm 5bc0d72341 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-02-07 11:46:06 +01:00
kindlm d1788b1d56 Konstanten vom Bewerbungstool entfernt
Es gibt jetzt ein eigenes CONFIG im Addon Bewerbung ->Konstanten müssen
dort definiert werden!!
2017-02-07 10:14:48 +01:00
kindlm 275e17ed3c bild.php umbau fuer Bewerbungstool
Wenn session gesetzt ist von Prestudententool, Incomingtool oder
Bewerbungstool -> keine get_uid-Abfrage da diese Personen noch keine uid
haben
2017-02-07 10:13:30 +01:00
kindlm b95f51cd07 stpl_week_anzahl_studenten.php
Abfrage der tbl_studenplandev als GET-Parameter "stpl_table"
2017-02-07 10:11:53 +01:00
kindlm 4f42c7ec12 Umbau Testtool auf .ogg Audiofiles 2017-02-07 10:10:01 +01:00
kindlm 11d29854e5 Studiengangstyp in Studienerfolgsbestätigung 2017-02-07 10:07:47 +01:00
kindlm 11e3d52fbc wochenplan.class
BugFix Fehlermeldung wenn ort=all
2017-02-07 10:07:01 +01:00
kindlm 00b629662f Neue Klasse gemeinde.class.php 2017-02-07 10:06:01 +01:00
oesi 51e73ec883 removed migration files that where moved to checksystem 2017-02-07 09:36:08 +01:00
oesi 23f4ed5688 Check hinzugefügt für Personen mit fehlerhafter Studienplanzuordnung 2017-02-07 09:30:13 +01:00
oesi 6f6d3369ba Merge branch 'master' into ci 2017-02-06 20:25:48 +01:00
oesi d2298ae52a - Moved Database Changes from Migrations to dbupdate_3.2.php
- Changed Column statusgrund_kurzbz to statusgrund_id
2017-02-06 20:24:23 +01:00
oesi fb8b37fe59 Added new Features to Changelog 2017-02-06 20:23:36 +01:00
oesi 3987d704a6 Bugfix beim Laden der Reihungstest 2017-02-06 20:23:07 +01:00
Gerald Raab 518ab50e5c Prestudentcheck auf stdsem_lv_besuch statt getktorNext 2017-02-03 12:27:27 +01:00
bison-paolo ee05870271 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2017-02-03 12:06:03 +01:00
bison-paolo ff8693ec95 Changed the order in method getAvailableReihungstestByPersonId 2017-02-03 12:05:44 +01:00
oesi ef146682e3 Merge branch 'master' into ci 2017-02-03 08:41:15 +01:00
oesi 59fb5d9910 Admins können direkt vom FAS aus archivierte Dokumente mit rechter Maustaste überschreiben 2017-02-03 08:39:51 +01:00
oesi 988a2eedea - Studienplan-Spalte bei Prestudentstatus ist jetzt per Default sichtbar
- Code Cleanup
2017-02-02 17:08:19 +01:00
oesi 4e33514787 Fehler behoben bei dem es Vorkommen konnte das der gewählte Reihungstest beim Editieren nicht im DropDown enthalten war 2017-02-02 16:34:56 +01:00
oesi 01cafa05d8 - Fehlende Berechtigung lehre/reihungstestOrt hinzugefügt
- Fehler behoben bei dem in der Reihungstestverwaltung Personen nicht angezeigt wurden wenn der Studienplan der Person nicht zum Reihungstest hinzugefügt wurde
- Divison durch 0 Fehler behoben wenn versucht wird Personen auf Räume aufzuteilen jedoch noch keine Raumzuordnung vorhanden ist oder der gewählte Raum keine Arbeitsplätze hat
2017-02-02 16:08:13 +01:00
oesi 81bcda2e40 Merge branch 'master' into ci 2017-02-02 15:20:15 +01:00
oesi 08c781a5ce Ort bei Reihungstestzuordnung im FAS entfernt
Studienplan bei Reihungstestzuordnung im FAS hinzugefügt
2017-02-02 15:19:24 +01:00
oesi bf5120a2a9 Datenbank Index für tbl_prestudent und prestudentstatus hinzugefügt 2017-02-02 13:58:13 +01:00
oesi dc494a3d45 Datentyp der Spalte nummer in campus.tbl_beispiel von smallint auf integer geändert da es sonst zu einem Überlauf kommt 2017-02-02 13:47:02 +01:00
bison-paolo 76046c6b94 - Bugfix Reihungstest controller
- Bugfix method getCountUnreadMessages in Recipient_model
2017-02-02 12:03:23 +01:00
oesi 8774f1b31d Beim Laden von Verträgen ist es jetzt möglich Verträge in kommenden Studiensemestern nicht mitzuladen 2017-02-01 17:53:03 +01:00
oesi 310283a076 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2017-02-01 11:43:48 +01:00
oesi fd80d1f104 Diverse Bugfixes Reihungstestverwaltung 2017-02-01 11:40:34 +01:00
bison-paolo 9a29b20881 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2017-01-31 12:00:39 +01:00
bison-paolo fac1b77681 Added method getAvailableReihungstestByPersonId 2017-01-31 11:59:11 +01:00
Gerry Raab 53f09e4735 person.matr_nr im rdf 2017-01-28 03:34:45 +01:00
Gerry Raab e7635e2608 logo sfu jpg 2017-01-28 03:10:13 +01:00
Gerry Raab 74fe782908 logo sfu 2017-01-28 03:05:25 +01:00
oesi 1ac55d56ba Option zum Ausblenden der Aufnahmegruppen hinzugefügt 2017-01-27 16:19:21 +01:00
oesi 9c0c7c2b6c Merge branch 'master' into ci 2017-01-27 08:34:09 +01:00
oesi 75626b620b Reihungstest Login zeigt Personen jetzt nicht mehr doppelt an wenn diese mehrere Prestudenten Einträge haben.
Personen werden jetzt korrekt mit dem Studiengang des Prestudenten anstatt mit dem Studiengang des Reihungstests angezeigt
2017-01-27 08:31:55 +01:00
oesi 7725be4b40 Option zum Ausblenden von Messages hinzugefügt 2017-01-27 08:29:05 +01:00
oesi 324c0f2bdd Optimierungen zur Erhöhung der Trefferquote beim Setzen der Studienplanzuordnung 2017-01-26 18:40:46 +01:00
oesi 1e43c1ff79 Script zur Generierung von historischen Dummy Studienordnungen 2017-01-26 13:46:12 +01:00
oesi 717c13ffb1 Fehler im Export des LVPlan behoben wodurch Reservierungen zusammengeblockt wurden obwohl zwischen den Reservierungen freie Stunden liegen 2017-01-26 13:43:34 +01:00
bison-paolo 1ccc8a8a6f Enhancement of method _validate of controller Person 2017-01-26 11:32:04 +01:00
bison-paolo 59ab63ace2 Enhancement of method _validate of controller Person 2017-01-25 15:13:57 +01:00
oesi f7ed87bcb1 Zugriff auf andere UIDs in LVA Liste unterbunden 2017-01-25 15:03:59 +01:00
bison-paolo cfc34e91e1 VorlageLib->loadVorlagetext now is searching for a parent template
without the orgform parameter
2017-01-24 15:43:36 +01:00
oesi 31b26cf850 Merge branch 'master' into ci 2017-01-23 18:07:12 +01:00
oesi 3474ce2847 Fehler behoben bei dem die Gebietssprache in manchen Fällen beim Anlegen nicht korrekt übernommen wurde 2017-01-23 18:05:49 +01:00
Gerald Raab 3d8e029782 Ital Phrase 2017-01-23 17:35:13 +01:00
oesi 66abf83142 Bugfix bei RT Migration: rt_id auf reihungstest_id korrigiert 2017-01-23 12:03:41 +01:00
oesi fb79e7a130 Added PORT to Database System Config 2017-01-23 11:52:12 +01:00
Gerald Raab 53444d5f7b Phrasen it_IT f. upload 2017-01-23 11:42:45 +01:00
oesi b8177b58e8 Merge branch 'master' into ci
Conflicts:
	composer.json
	composer.lock
	phpci.yml
	system/checksystem.php
	system/dbupdate_3.2.php
	tests/codeception/_data/dump.sql
	tests/codeception/tests/acceptance/CISLoginPage.php
2017-01-20 11:05:08 +01:00
oesi b8ad2dfd0c Sortierung bei BIS-Verwendung korrigiert damit bei Abrechnungen die korrekte Version herangezogen wird 2017-01-20 10:37:37 +01:00
oesi 51b8a15f27 Added Aufnahmegruppe DropDown in FAS 2017-01-17 14:47:16 +01:00
Gerry Raab dcf522aacc Länge der angezeigten LV-Bezeichnungen im CIS-Menue konfigurierbar 2017-01-17 00:17:15 +01:00
oesi 76995e7abc Added Aufnahmegruppe to Prestudent and Reihungstest
Added Aufnahmegruppe to Group GUI
Added Aufnahmegruppe to Reihungstest GUI
2017-01-16 19:02:30 +01:00
oesi fcb657307a Studienordnung im Vilesci zählt nur noch die ECTS der 1. Ebene zusammen. ECTS der LVs unterhalb von Modulen werden bei der Summe nicht mehr berücksichtigt da sonst falsche Summen gebildet werden 2017-01-16 14:22:16 +01:00
bison-paolo ecc10431fe Added method getLastStatuses to Prestudent model and controller 2017-01-13 17:59:58 +01:00
oesi f671ceeb8e Neue Funktion hinzugefügt um zu Prüfen ob eine Lehrveranstaltung aufgrund Lehrauftrag und Studienplan angeboten wird 2017-01-12 15:35:08 +01:00
oesi 515380baa3 vorlage_kurzbz auf 32 Zeichen verlängert 2017-01-12 15:34:28 +01:00
oesi 85165db3dc Infrastruktur Check überarbeitet 2017-01-12 14:37:17 +01:00
Gerald Raab b69b846dd0 Mailversand bei confirm all 2017-01-10 18:34:09 +01:00
Gerald Raab 7c16c05daa Anmerkung student in Vorlage 2017-01-10 17:47:15 +01:00
oesi d4498c20d1 Filter im Verbandstree für Reihungstest angemeldet/nicht angemeldet greift nun auf die neun Aufnahme-Tabellen zu. 2017-01-10 12:02:13 +01:00
Gerald Raab 9928aab2e0 Anzeige studiensemester->bezeichnung 2017-01-10 11:57:31 +01:00
Gerald Raab ec8d45d84c Prüfungsanmeldungen: Standard ist PDF über unoconf, fallback html wenn die
Vorlage 'Pruefungslist' nicht existiert
2017-01-10 11:38:37 +01:00
Gerald Raab e23db52cb9 Prüfungsmodul Bugfixes und Erweiterungen 2017-01-09 19:15:31 +01:00
oesi 87d02ce13e Wenn ein Studierender keinen Status in dem Semester hat für das ein Zeugnis erstellt werden soll, dann wird nun ein leeres Zeugnis angezeigt anstatt einer kryptischen PHP Fehlermeldung 2017-01-09 16:21:42 +01:00
Gerald Raab e27776479d Prüfungsanmeldung durch admin möglich auch wenn noch keine Studierenden angemeldet sind 2017-01-02 16:25:25 +01:00
kindlm 6309ac7438 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-12-23 17:01:27 +01:00
kindlm db9de19978 Alte Funktion "getAllForBewerbung" Deprecated
Funktion "getAllForBewerbung" überarbeitet aber vorerst auskommentiert
2016-12-23 17:01:06 +01:00
kindlm 6631c5d22c Berechtigung basis/infoscreen zu Stammdaten in Vilesci Hauptmenue 2016-12-23 16:58:29 +01:00
kindlm 9d13111c8b Link im LV-Plan Detailfenster zeigt nun auf Profil 2016-12-23 16:57:45 +01:00
kindlm b53bacacd9 Anpassung Phrasen. Pfad kommt nun aus APP_ROOT 2016-12-23 16:57:18 +01:00
kindlm b0339a6515 Anpassung Vorlagen Diplomzeugnis und PrProtokoll 2016-12-23 16:56:24 +01:00
kindlm d53574a4e0 Bewertungsskala im PDF-Export angepasst 2016-12-23 16:55:18 +01:00
bison-paolo bacf34779e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-12-23 12:04:19 +01:00
bison-paolo fb9f4e046b Added getAppliedStudiengang method 2016-12-23 12:03:49 +01:00
Gerald Raab 4b71ceaa77 XLS Spaltenbreite Gemeinde angepasst 2016-12-23 09:34:07 +01:00
Gerald Raab 8b26b5e1ae Gemeinde in XLS 2016-12-23 09:21:51 +01:00
Gerald Raab ca051b262e Mailbody 2016-12-22 11:41:05 +01:00
Gerald Raab 96f0db34e4 prüfungstermine älter als 2 monate ausblenden, locale stuff upload it 2016-12-21 18:50:33 +01:00
bison-paolo b430b34e0a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-12-21 17:50:28 +01:00
bison-paolo 603ccd1793 Added method getAkteAcceptedDms 2016-12-21 17:50:03 +01:00
oesi 8ea63d04a6 Testtool, Auswertung und Reihungstestadministration benutzen nun die neuen Reihungstestanmeldetabelle 2016-12-20 12:38:36 +01:00
oesi 892950df93 Absovlenten Status ergänzt 2016-12-20 12:10:00 +01:00
bison-paolo b99123efc6 Added method getCountUnreadMessages 2016-12-20 11:28:51 +01:00
oesi b3476f93c1 Beim Anlegen von neuen Interessenten werden nur noch Studienpläne vorgeschlagen die für die Ausgewählte kombination gültig sind 2016-12-19 14:35:28 +01:00
bison-paolo 729b4930bd Message system bugfixes 2016-12-15 15:59:11 +01:00
oesi 19190015e9 Reverted Statistic changes 2016-12-15 15:09:32 +01:00
bison-paolo ad204604b1 Fix 2016-12-15 12:00:59 +01:00
oesi 3528ca6f70 Bei der Erstellung der Personalmeldung werden jetzt mehr Details zu den gemeldetn Personen angezeigt 2016-12-15 11:25:31 +01:00
oesi 578e3d9324 Anpassung ÖH Wählerverzeichnis export angepasst damit Incoming mit aufscheinen 2016-12-15 10:33:25 +01:00
Stefan Puraner 9c98b982a7 added filter to list of studienverpflichtungen 2016-12-15 08:02:09 +01:00
bison-paolo 637f8d9770 Bugfix 2016-12-14 15:23:43 +01:00
bison-paolo ebc13b77bb Changed the logic to send messages via email 2016-12-14 15:13:20 +01:00
Stefan Puraner 5e3c908893 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-12-14 14:46:48 +01:00
Stefan Puraner 4372f5b62c fixed selection of studienverpflichtung at registration for exam 2016-12-14 14:46:11 +01:00
bison-paolo 7f4a73b51d ViewMessage controller does not require anymore the authentication 2016-12-14 12:13:23 +01:00
bison-paolo 4f288b45b5 Bugfixx 2016-12-14 11:27:00 +01:00
bison-paolo 4b16accd33 Added new parameter multiPartMime to method postMessageVorlage of
controller Message
2016-12-14 11:00:49 +01:00
oesi 5cdaf1f0a8 Anlagedatum ist nun ein eigener Filter damit auch nach ausgeschiedenem Inventar etc. pro Monat gesucht werden kann 2016-12-14 10:25:28 +01:00
oesi 1cd4471751 Fixed Typo 2016-12-14 09:21:25 +01:00
Stefan Puraner b9e0617b35 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-12-14 09:07:05 +01:00
Stefan Puraner 00685a67a4 fixed anmeldung 2016-12-14 09:06:17 +01:00
Andreas Moik 5d693398f6 - filter_details: changed save button 2016-12-13 16:25:33 +01:00
Andreas Moik 36203b4436 changed place of save button 2016-12-13 16:23:06 +01:00
Andreas Moik 183962bd3b - statistik: removed r and php 2016-12-13 16:13:30 +01:00
Andreas Moik f942d4c508 - filter_details: removed reset button 2016-12-13 14:25:40 +01:00
Andreas Moik 77cfbb1093 style changes for easyui panel 2016-12-13 14:19:12 +01:00
Stefan Puraner 6edd32c611 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-12-13 08:53:06 +01:00
Stefan Puraner 5994a25b7b fixed anmeldung for students without creditpoints 2016-12-13 08:52:43 +01:00
Andreas Moik 7365f3b350 adjusted easyui icon size 2016-12-12 11:17:17 +01:00
Andreas Moik 19bda38727 removed unused spaces 2016-12-12 11:13:44 +01:00
Andreas Moik 3b3721f3f0 reporting vector graphics:
- path to letter
2016-12-12 10:15:44 +01:00
bison-paolo 1a7f726cc5 composer.lock 2016-12-06 15:04:08 +01:00
oesi e9be4ffd8c Fixed Regex Check 2016-12-05 14:50:07 +01:00
Andreas Moik 2d6ef6abc4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-12-05 14:05:18 +01:00
Andreas Moik 526e3013e0 cleanups 2016-12-05 14:05:05 +01:00
kindlm 00258085d6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-12-05 12:16:56 +01:00
kindlm afe0334e05 Incoming-Adminseite Übersicht LVs
- An neue Berechnung des Tools angepasst
- Anzeige der Anmeldungen
- Es werden auch LVs mit Anmeldungen gezeigt, deren Incomingplätze 0
sind oder die nicht in der Studienordnung sind
2016-12-05 12:16:00 +01:00
kindlm 0fcc43d1d3 BugFix Incoming Platform
- Gültigkeitsbereich der VON-BIS Zeiten wird überprüft
- Freie Plätze werden nochmal beim speichern geprüft
- Anzeigefehler wenn Plätze < 0 behoben
2016-12-05 12:13:17 +01:00
kindlm f3a0873145 Anpassungen Dokumentvorlagen
Bezeichnung der englischen Notenstufen angepasst
2016-12-05 12:09:12 +01:00
Andreas Moik 6a1d864a4f - jsoneditor included via composer
- meta-include for jsoneditor
- new composer.lock version
2016-12-05 11:24:11 +01:00
oesi 9b35bedebb In der Lehrveranstaltungsverwaltung wird nun angezeigt in welchen Studienplänen die LV verwendet wird 2016-12-05 10:30:04 +01:00
oesi 48e632f452 Inventar - Jahr/Monat-Filter zeigt nur noch Einträge die im ausgewählten Monat neu angelegt wurden anstatt auch jene die einen Statuswechsel hatten 2016-12-02 12:57:10 +01:00
oesi 010e4eaa60 Beim Anlegen von neuen Mitarbeitern wird keine Fehlermeldung mehr angezeigt wenn das Alias File fehlt 2016-12-01 13:30:45 +01:00
oesi ff44827106 Incoming Studierende sind jetzt auch in der ÖH-Beitragsliste enthalten 2016-12-01 11:35:14 +01:00
bison-paolo 07a8b0d964 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-12-01 10:27:17 +01:00
bison-paolo 426a05bbec phpci 2016-12-01 10:27:09 +01:00
oesi 8ef26d396a Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-12-01 10:10:08 +01:00
oesi e280c87933 Faker für DMS Dateien hinzugefügt 2016-12-01 10:09:49 +01:00
bison-paolo 0b6fc563e3 - codeception 2016-12-01 10:06:37 +01:00
bison-paolo 1ee2d19dc7 - phpci
- checksystem permission checks is avoided if it is started from command
line
2016-12-01 10:02:38 +01:00
kindlm 9cd3ad0534 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-11-30 17:16:04 +01:00
kindlm a2ffa3267d Dokumentenakt
- BugFix wenn Gemeinde nicht gesetzt
- Wenn Mimetype nicht unterstützt wird, wird dies im Akt ausgegeben
- Fehlermeldungen verbessert
2016-11-30 17:15:42 +01:00
bison-paolo 9e7882ca5f phpci 2016-11-30 16:54:19 +01:00
bison-paolo 1cb25c308a phpci 2016-11-30 15:57:49 +01:00
bison-paolo c434711cf7 phpci 2016-11-30 15:52:19 +01:00
bison-paolo 2abc34d599 phpci 2016-11-30 15:31:15 +01:00
bison-paolo 39de402908 phpci 2016-11-30 15:28:33 +01:00
bison-paolo c4f59fdb27 phpci 2016-11-30 15:17:44 +01:00
bison-paolo 694bc14169 phpci 2016-11-30 14:21:26 +01:00
bison-paolo cfade891be phpci 2016-11-30 13:38:45 +01:00
bison-paolo 6b80349def phpci 2016-11-30 13:24:40 +01:00
Werner Masik 844390f926 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser
# Merge erforderlich ist, insbesondere wenn es einen aktualisierten
# Upstream-Branch mit einem Thema-Branch zusammenführt.
#
# Zeilen beginnend mit '#' werden ignoriert, und eine leere Beschreibung
# bricht den Commit ab.
2016-11-30 13:02:43 +01:00
Werner Masik 60a4a64943 WHERE-Klausel für suche nach Tags hinzugefügt 2016-11-30 13:01:42 +01:00
bison-paolo c5de38580f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-30 11:44:13 +01:00
bison-paolo 37fb5278c4 phpci 2016-11-30 11:43:54 +01:00
bison-paolo 9723ee54d2 phpci 2016-11-29 17:54:22 +01:00
bison-paolo 4cc21c715a phpci 2016-11-29 17:44:29 +01:00
bison-paolo 7398645038 phpci 2016-11-29 17:39:25 +01:00
bison-paolo 65888879d1 phpci 2016-11-29 17:31:51 +01:00
bison-paolo f7d1d96875 phpci 2016-11-29 16:39:51 +01:00
bison-paolo a9ceaf3c56 phpci 2016-11-29 16:28:26 +01:00
bison-paolo abbeb27e93 phpci 2016-11-29 16:13:21 +01:00
bison-paolo 84c523cf79 phpci 2016-11-29 15:55:44 +01:00
bison-paolo b6f414c469 phpci 2016-11-29 15:35:14 +01:00
bison-paolo 2e0b8dca00 phpci 2016-11-29 15:22:36 +01:00
bison-paolo b9d53c5c6b phpci 2016-11-29 15:14:45 +01:00
bison-paolo aa533a82d5 phpci 2016-11-29 15:01:17 +01:00
bison-paolo 2c1d29e0ba phpci 2016-11-29 14:57:50 +01:00
Stefan Puraner 29fda74f45 anmeldung für studenten mit beschränkten CP gefixt 2016-11-29 08:19:02 +01:00
Stefan Puraner 34647d9922 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-29 07:51:03 +01:00
Stefan Puraner 59c2934324 bei anrechnung nach vorhergehender negativer beuteilung wird nicht mehr
'negativ' ausgegeben
2016-11-29 07:48:47 +01:00
oesi 77bac3e328 Fehler behoben wodurch unterschiedliche Daten bei Englischen und Deutschem Studienblatt angezeigt wurden.
Fehler behoben wodurch die Meldung angezeigt wurde dass kein Studienplan eingetragen ist obwohl dieser vorhanden ist.
2016-11-28 15:49:53 +01:00
Stefan Puraner 2e4f09a607 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-28 11:17:19 +01:00
Stefan Puraner 41eb132aec fixed bug that showed complete courses as incomplete 2016-11-28 11:15:38 +01:00
Andreas Moik 401aab6baa Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-11-28 09:47:06 +01:00
Andreas Moik d62a0b304c - bugfix: changedir in dokument_export in cleanup method
- bugfix: dokumentenakt errorhandling
2016-11-28 09:44:52 +01:00
bison-paolo 0a19cbfba4 - Changed the routes used to call the controllers, now accept also
capital names
- Now method getStudiengangBewerbung of controller Studiengang returns
also data relative to the table lehre.tbl_akadgrad
- Fixes and enhancements of method loadTree of DB_Model.
2016-11-25 15:09:19 +01:00
bison-paolo b97aac7c4b Fixed XSS issues 2016-11-24 17:04:46 +01:00
kindlm db76776b39 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-11-23 17:06:08 +01:00
kindlm ca09e22c09 Dokumentenakt
- Neue Vorlage für Bewerberakt
- Abfrage, ob Mimetype von Akte und DMS ident
- Diverse neue Attribute für DataArray (Adresse, Kontakt, ...)
2016-11-23 17:05:25 +01:00
Andreas Moik c4ed2d05f1 - removed forgotten break
- restored feature 'delete person'
2016-11-23 16:26:58 +01:00
bison-paolo c33871ec2d phpC(d)I 2016-11-23 15:25:07 +01:00
oesi 6fabc46a48 Problem beim Dateidownload behoben wenn im Kreuzerltool Listen mit Sonderzeichen erstellt werden 2016-11-23 15:12:57 +01:00
bison-paolo d96a0e98d5 - Fixed codeception test
- Updated the api test suite
- Added the script generate.php to automatically generate the test cases
for the controllers
2016-11-23 15:09:10 +01:00
Andreas Moik 53dc0f5771 new reporting icons 2016-11-23 13:46:43 +01:00
oesi da1aedabcf Fixed SQL Injection Problem 2016-11-23 10:32:55 +01:00
oesi 4dcec21c9f Fehler behoben wodurch eine leere Fehlermeldung angezeigt wurde wenn die Lektorenzuordnung zu einem Studiengang entfernt wurde. 2016-11-22 15:47:21 +01:00
oesi e08b399456 Partnercode wird nicht mehr 4stellig gemeldet da dies nicht immer funktioniert 2016-11-22 14:22:36 +01:00
oesi 99cf96d9b1 Studiensemester wird bei Freifächern mitübergeben 2016-11-22 14:06:27 +01:00
oesi 68a696cdc8 Merge branch 'master' into ci
Conflicts:
	cis/testtool/admin/add_gebiet.php
	cis/testtool/admin/edit_gebiet.php
	cis/testtool/admin/index.php
	config/global.config-default.inc.php
	content/student/studentDBDML.php
	content/student/studentdetailoverlay.xul.php
	include/ablauf.class.php
	include/frage.class.php
	include/organisationseinheit.class.php
	include/studiengang.class.php
	include/vorschlag.class.php
	phpci.yml
	rdf/student.rdf.php
	system/dbupdate_3.2.php
	tests/codeception/_support/AcceptanceTester.php
	tests/codeception/_support/BasisKlasseTest.php
	tests/codeception/_support/FunctionalTester.php
	tests/codeception/_support/UnitTester.php
	tests/codeception/_support/_generated/AcceptanceTesterActions.php
	tests/codeception/acceptance/AcceptanceTester.php
	tests/codeception/acceptance/CISLoginPageCept.php
	tests/codeception/acceptance/_bootstrap.php
	tests/codeception/codeception.dist.yml
	tests/codeception/functional/FunctionalTester.php
	tests/codeception/functional/_bootstrap.php
	tests/codeception/tests/acceptance.suite.dist.yml
	tests/codeception/tests/acceptance/CISLoginPage.php
	tests/codeception/tests/acceptance/CISLoginPageCept.php
	tests/codeception/tests/api/_bootstrap.php
	tests/codeception/tests/functional/FunctionalTester.php
	tests/codeception/tests/functional/_bootstrap.php
	tests/codeception/tests/unit/BasisKlasseTest.php
	tests/codeception/tests/unit/UnitTester.php
	tests/codeception/unit/BasisKlasseTest.php
	tests/codeception/unit/UnitTester.php
2016-11-22 13:58:29 +01:00
oesi 4e1fd64cf7 Adding Frameworks 2016-11-22 10:38:29 +01:00
oesi 4513da4cbb Removed Submodule 2016-11-22 10:34:35 +01:00
oesi 4579850527 Improve Studienplan guessing on RT migration 2016-11-21 13:10:18 +01:00
kindlm c87cc822b8 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-17 18:15:02 +01:00
kindlm 8fb81c6f1b BugFix Sync-Mail LV-Plan
- Funktion getNearestTillNext liefert falsches Studiensemester. Ersetzt
durch getaktorNearest.
- Infomail für Admins nun inlusive Änderungen
2016-11-17 16:23:00 +01:00
oesi ac23999688 Fehlender Ausstellungsstaat bei Lehrgangsteilnehmern wird jetzt als Fehler angezeigt
Erweiterte Fehlerprüfung bei GS Studierenden
Einrückungen im XML angepasst
2016-11-17 15:40:47 +01:00
Gerald Raab 07556cc78d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-11-17 15:09:14 +01:00
Gerald Raab a48ee2676e bezeichnung /titel-problem: dateiname aus akte->bezeichnung 2016-11-17 15:08:05 +01:00
bison-paolo 66afe6d8f9 Added new parameter nachreichbar to controller Dokumentstudiengang and
to model Dokumentstudiengang_model
2016-11-17 14:53:23 +01:00
kindlm c0539d6657 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-17 14:28:48 +01:00
kindlm 4637d57bdc Mitloggen der Content-Aufrufe
Neuer Config-Eintrag: LOG_CONTENT Default false
2016-11-17 14:28:25 +01:00
oesi f0c1ef6e15 Problem behoben wodurch Mailverteiler nicht korrekt generiert wurden wenn der Beginn des nächsten Semesters näher ist als der Beginn des aktuellen Semesters 2016-11-17 14:23:44 +01:00
bison-paolo 278be4cc61 - Added migration script 020_dokumentstudiengang to add a new column
called nachreichbar
- Added property nachreichbar to class dokument into dokument.class.php
- VileSci->Wartung->"Dokumente Zuteilung" in now handling the field
nachreichbar
2016-11-16 16:30:39 +01:00
bison-paolo 56901b51d2 Removed XSS filter from system/Phrases controller 2016-11-16 14:46:03 +01:00
oesi e2d692217e - Anzeigefehler bei GS Zusammenfassung behoben
- CheckVerwendung zeigt nur noch Lehraufträge die größer 0 sind an
2016-11-15 17:54:27 +01:00
bison-paolo 2a0cd525dd - Updated codeception test cases
- Fixed controllers
- Removed unused controller Thread
2016-11-15 17:00:01 +01:00
kindlm 8a7521b2bc Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-14 17:53:22 +01:00
kindlm e29202eaa0 Lehrgangstyp in Ausbildungsvertrag
- Neue Funktion loadLehrgangstyp in studiengang.class
- lgartcode und lgartBezeichnung in ausbildungsvertrag.xml
- Neue Templates für Ausbildungsvertrag Lehrgänge
2016-11-14 17:52:39 +01:00
kindlm ac5f8fd683 CIS Meine LV Titel
- Volle Bezeichnung des Studiengangs, der Orgform und des Semesters im
Linktitel
2016-11-14 17:49:56 +01:00
oesi 0ac9edfece Anwesenheiten können bei Lektoren jetzt sowohl entfernt als auch gesetzt werden.Beim setzen der Anwesenheit eines Lektors werden alle zugeteilten Studierenden auf anwesend gesetzt 2016-11-14 16:08:01 +01:00
oesi 26065f4046 Anwesenheiten von Mitarbeitern können direkt im FAS gelöscht werden (rechte Maustaste bei Terminen). Dabei werden die Anwesenheiten von allen Studierenden zu diesem Termin entfernt!! 2016-11-11 16:46:46 +01:00
bison-paolo 3e618a991b Now loads only the templates with text/html as mime type 2016-11-11 16:04:48 +01:00
oesi 97ae7e2cc6 Notizen Karteireiter bei Mitarbeitern hinzugefügt 2016-11-11 15:48:16 +01:00
kindlm 783b0518e3 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-11 15:33:20 +01:00
kindlm 33aa7b7163 Testtool Aktiv und Studienplan
- Studienplan in tbl_ablauf
- Aktiv-Attribut bei Frage und Vorschlag
- Bezeichnung mehrsprachig in Gebiet
- GUI für Ablauf-Pflege inkl. Studienplan
- GUI für Gebiete hinzufügen
- GUI für Pflege der mehrsprachigen Gebietsbezeichnung
- Aktiv/Inaktiv setzen von Fragen und Vorschlägen in GUI
- !!! Aktiv-Attribute greifen noch nicht im Testtool selbst !!!
2016-11-11 15:29:56 +01:00
kindlm 2908bb7dc5 Diplomasupplement xsl Ueberprueft auf benoetigte Datenfelder 2016-11-11 15:24:13 +01:00
kindlm 14d3cb5c4c BugFix in lehreinheiten_vorrueckung 2016-11-11 15:23:29 +01:00
bison-paolo 857eef0ff6 application/migrations/002_pk_migrations.php now is using MigrationLib 2016-11-11 14:44:16 +01:00
oesi 2f4b0b573e Moodle Schnittstelle
- Fehler behoben wodurch es passieren konnte dass bei Verbindungsabbrüchen Kurse in falschen Kategorien angelegt wurden
- Nach dem zuordnen von Personen zu Kursen wird nun länger gewartet, da sonst die Gruppenzuordnung fehlschlägt
- User werden nun standardmäßig als lokale User im Moodle erstellt und dann auf LDAP User geändert da es sonst zu Passwortänderungen im LDAP kommt wenn diese gleich als LDAP User angelegt werden. (Neue Webservice-Funktion core_user_update_users muss im Moodle zugeordnet werden!)
- E-Mail Benachrichtigung über neue Teilnehmer in den Kursen enthalten nun den vollen Namen anstatt nur der UID
- Inaktive Personen werden nicht mehr in Moodle Kurse übertragen
- Bei Cronjobs wird nun auch der Output der Jobs ausgegeben/geloggt
2016-11-11 13:16:57 +01:00
bison-paolo 8025974438 Migration scripts, where it is possible, now are using MigrationLib 2016-11-11 11:16:27 +01:00
oesi b6694a600b Fehler behoben wodurch Variablennamen und der GUI angezeigt wurden anstatt den Werten 2016-11-11 08:13:17 +01:00
oesi 0cb513ead6 Felder bei gemeinsame Studien werden nun deaktiviert wenn der Studierende gewechselt wird
Reset der Felder setzt das Studiensemester auf das aktuelle
2016-11-10 16:37:51 +01:00
bison-paolo f13985620c Bug fix in method loadVorlagetext 2016-11-10 16:12:54 +01:00
oesi 1b3f765881 GS Auswahl wird beim Wechsel des Studierenden resettet. 2016-11-09 14:54:56 +01:00
oesi c1cd65f3be Lehrgangsleitungen werden jetzt nicht mehr als Studiengangsleitung gemeldet 2016-11-09 11:14:27 +01:00
Gerald Raab 48a81153bc voriges studienjahr in kontobuchungsbezeichnung 2016-11-08 15:52:56 +01:00
bison-paolo 9676017669 Dropped schema kommune 2016-11-08 15:50:26 +01:00
oesi 6765f4d1e3 Wenn Studierende mehrere Auslandssemester im Meldezeitraum haben, dann wird beim Outgoing Status die Anzahl der Auslandssemester angezeigt 2016-11-08 15:32:16 +01:00
oesi 36fc09b48b - GSProgrammCode auf 4 Stellen aufgefüllt
- Outgoing werden in der Personenliste markiert
2016-11-08 15:16:17 +01:00
kindlm 829e8d7c2b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-11-08 11:47:13 +01:00
kindlm 443997809d BugFix Excel Export
Wenn keine Studierenden zugeteilt sind, wird nun ein leeres Dokument
exportiert.
2016-11-08 11:46:48 +01:00
oesi 8b22efc51b Problem behoben wodurch beim Erstellen des Studienblattes die Meldung angezeigt wurde dass kein Studienplan eingetragen obwohl einer vorhnaden ist 2016-11-04 15:27:15 +01:00
Gerald Raab 457f50705f array 2 str bug 2016-11-04 14:36:35 +01:00
Gerald Raab 2d2c236391 bugfix obj/arr-problem 2016-11-04 13:52:55 +01:00
kindlm a6724ef19f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-04 13:38:35 +01:00
kindlm e32fb99552 Bugfix Incoming Plattform 2016-11-04 13:37:51 +01:00
oesi 24e63e7024 Fixed SQL Error on Excel Export 2016-11-03 20:03:54 +01:00
oesi 7d4612b953 Fehler beim Erstellen der Inskriptionsbestätigung behoben wenn kein Studienplan zugeordnet ist 2016-11-03 10:05:39 +01:00
oesi 789c4ccd67 Anpassung Studierendenmeldung an BIS Schnittstelle Version 6.4 2016-11-02 16:55:11 +01:00
kindlm 8fe63a9579 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-02 16:00:17 +01:00
kindlm 7602315077 Inaktive MitarbeiterInnen werden ausgegraut
Nun auch bei LektorInnenzuteilung
2016-11-02 16:00:04 +01:00
bison-paolo 64fba6c407 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-11-02 15:45:53 +01:00
bison-paolo 57fe1f9664 vilesci/personen/leistungsstipendium.php:
- Selects the current studiensemester in the studiensemester drop-down
list
- Checks if the student is also present in the previous studiensemester
to the posted one
2016-11-02 15:42:05 +01:00
oesi d20ee45880 Fehler behoben beim Anlegen von neuen Firmen 2016-11-02 15:27:51 +01:00
oesi b82d14d4cd Fehler bei Firmensuche im WaWi behoben 2016-11-02 15:00:41 +01:00
kindlm 4d9e662ba9 SQL-Injection Lücke geschlossen 2016-11-02 13:35:45 +01:00
kindlm 0008d7da08 Spalte Anmerkung in Konto 2016-11-02 13:28:48 +01:00
Gerald Raab e074479981 multiling 2016-10-30 20:38:46 +01:00
Gerald Raab 777916481f new page to change exam time and date 2016-10-30 20:32:09 +01:00
Gerald Raab cdd736e431 constant 2016-10-30 15:53:59 +01:00
Gerald Raab 811c0a23b3 module in der studienplanübericht im cis ausblendbar 2016-10-30 15:44:10 +01:00
Gerald Raab c5c728d495 import leistungsstipendien:
* abbruch, wenn bereits vorhanden fuer stsem
* insertamum, insertvon, beschreibungstext
2016-10-28 14:58:00 +02:00
kindlm 2c5232ca34 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-28 14:54:12 +02:00
kindlm 18ff20cd58 Inaktive MitarbeiterInnen werden ausgegraut
- Im Tabreiter "Mitarbeiter" (Hauptfenster) und "Lehrende" (Quellmenü)
- Default-Stundensatz wird neben Stundensatzeingabe angezeigt
2016-10-28 14:51:43 +02:00
kindlm 8159cdf238 Tabbeschriftungen gegendert 2016-10-28 14:49:00 +02:00
kindlm ec7dae3f77 Stundensatz bei Vorrückung per Config
- Neuer Config-Eintrag in global.config: VILESCI_STUNDENSATZ_VORRUECKUNG
2016-10-28 14:47:42 +02:00
oesi 6b0759e3d6 Coding Style corrections 2016-10-27 16:56:57 +02:00
bison-paolo 467ecfbff6 Import CSV file for updating leistungsstipendien 2016-10-25 18:22:34 +02:00
Gerald Raab 3b76398a94 array cleanups 2016-10-25 13:54:46 +02:00
oesi 9acd9b1d48 Reihungstest Migrationsscript 2016-10-24 16:57:53 +02:00
kindlm 6e7f199df3 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-21 16:57:12 +02:00
kindlm 4fdb7167f0 Anmerkung in tbl_konto und FAS-GUI
+ CreditPoints-Anzeige Konfigurierbar
2016-10-21 16:56:59 +02:00
kindlm be24ea74be Config-Eintrag für CreditPoints im FAS 2016-10-21 16:54:08 +02:00
bison-paolo bc8ecf5569 Wrong api.suite.dist.yml 2016-10-20 16:47:51 +02:00
bison-paolo 5087826891 - phpC(d)I
- Renamed method chkRights to _isEntitled in model DB_Model
- Updated models where it was needed
2016-10-20 16:37:52 +02:00
Stefan Puraner 8b5e1397d4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-20 11:51:06 +02:00
Stefan Puraner 76bfb4ebd5 fixed bug that displayed incomplete courses as complete 2016-10-20 11:46:43 +02:00
kindlm d5496f3931 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-20 09:43:09 +02:00
kindlm e09aca19dd Firmenverwaltung Filter nach OE 2016-10-19 18:04:00 +02:00
kindlm 1e839a3b39 Incoming-Plattform
Erweiterung der Abfrage für die Zählung
LV-Infos werden wieder richtig angezeigt
2016-10-19 18:01:25 +02:00
bison-paolo 39b4c8057d Removed _parseData workaround 2016-10-19 14:49:54 +02:00
oesi cab58f40a8 DB-Schema für Gemeinsame Studien hinzugefügt 2016-10-18 17:11:02 +02:00
oesi 562a183098 Neuen Karteireiter im FAS zur Erfassung von Gemeinsamen Studien hinzugefügt 2016-10-18 14:35:37 +02:00
Gerald Raab 6f547419f1 statusgrund im menue 2016-10-18 13:41:07 +02:00
bison-paolo 7c1d0bb58a Controller Person _validate method updated 2016-10-18 10:43:05 +02:00
bison-paolo 5e09025602 Updated interface to manage statusgrund 2016-10-17 17:54:28 +02:00
bison-paolo 9e7f9a7fe5 Added new controller Statusgrund 2016-10-17 17:11:31 +02:00
bison-paolo 94ff30f24d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-10-17 17:08:03 +02:00
bison-paolo f3b79cd731 - Added method chkRights to DB_Model
- Added method toPhp to DB_Model to convert array and boolean types from PostgresSQL to php
- Added method execQuery to DB_Model to execute a query (it calls toPhp)
- Added method pgsqlArrayToPhpArray to convert a pgsql array to php
- Updated DB_Model methods to using chkRights (and toPhp where it is needed)
- Removed methods escapeArray and _pgsqlArrayToPhpArray from controller APIv1_Controller
- Removed escapeArray from controllers Dokumentstudiengang and Dokument
- Updated models to use execQuery (and chkRights where it is needed)
2016-10-17 17:07:51 +02:00
Stefan Puraner a495153a8b changed order of db result 2016-10-17 15:26:19 +02:00
oesi 488d0614dd LehreinheitID zur LVA-Liste hinzugefügt 2016-10-17 14:35:05 +02:00
bison-paolo 19ff69110d Bug fix: debug email is also used for CC and BCC 2016-10-14 18:02:58 +02:00
bison-paolo a20bf91193 - Added functions isSuccess, isError and hasData in message helper
- Updated the code using these new functions
2016-10-14 15:04:15 +02:00
bison-paolo f8c70df0bc - Renamed PCRMLib to CallerLib :(
- Splitted the controller PCRM in two different controllers: CallerLibrary and CallerModel
2016-10-14 13:33:22 +02:00
bison-paolo ea920d11d4 - Added private method _saveMessage in library MessageLib
- Bug fixed in model Studiensemester_model
- Config property send_immediately set to false, default value
2016-10-14 11:32:17 +02:00
bison-paolo 9effd11fcd Moved the assistent function name in the message config file 2016-10-13 17:57:19 +02:00
bison-paolo 8e0ca12deb - All permission functionalities now are in the library PermissionLib
- All return messages functions are in the message helper and it is loaded by the core classes
- Added the missing constant FHC_NOPK
- Updated all the interested classes with the new permission method
- Updated all the interested classes with the new return message functions
2016-10-13 17:53:12 +02:00
bison-paolo 40f51d035f - Added method postSetAcceptedDocuments to controller Dokumentprestudent
- Added method setAcceptedDocuments to model Dokumentprestudent_model
2016-10-13 14:35:39 +02:00
oesi d2b5c6e609 Seite zum Überschreiben von bestehenden Akten hinzugefügt 2016-10-13 10:33:45 +02:00
Gerry Raab 125925ede4 Matrikelnummer auf im xml fuer dokumente 2016-10-13 01:03:17 +02:00
kindlm c33047d1aa Incoming-Plattform kleine Korrekturen
- Mehrsprachige Bezeichnung und Beschreibung in Funktion getDokumente in
dokument.class.php
2016-10-12 19:08:33 +02:00
kindlm da737c0366 Überarbeitung Incoming-Plattform
- GUI an CIS-Design angepasst
- Dokumenttypen für Upload kommen nun aus tbl_dokumentstudiengang
- Filter bei LV-Auswahl verbessert
- Diverse GUI-Verbesserungen (Datepicker,  Legenden, Abschlussseite,
...)
- Phrasenanpassungen
2016-10-12 18:34:48 +02:00
bison-paolo 4ace90adc7 Added the capability to use a debug email address for receiving all the
sent emails
2016-10-12 16:53:45 +02:00
bison-paolo ccb9daffaa Automatically set as accepted all the uploaded documents
- Added migration script 019_dokumentprestudent.php
- Added method postSetAccepted to controller Dokumentprestudent
- Added method setAccepted to model Dokumentprestudent_model
2016-10-12 15:39:37 +02:00
bison-paolo 9df9ec8f41 - MessageLib: Better error messages when sending messages
- Added a new constant for the messaging system
- Added a new phrase for the messaging system
2016-10-12 13:45:06 +02:00
bison-paolo 56cb58ca5e Removing parameter "accepted" when saving an akte 2016-10-12 11:07:22 +02:00
bison-paolo 3d4167c39f Changes to manage the specialization of a prestudent:
- Added method getSpecialization to controller Prestudent
- Added method postRmSpecialization to controller Prestudent
- Added method postSpecialization to controller Prestudent
- Added method getSpecialization to model Notiz_model
- Added method rmSpecialization to model Notiz_model
- Added method addSpecialization to model Notiz_model
2016-10-11 16:56:12 +02:00
bison-paolo ffb5cb50ca Changes in method getAktenAccepted of controller Akte and model Akten_model 2016-10-11 14:12:38 +02:00
bison-paolo 318787b195 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-10-11 13:17:21 +02:00
bison-paolo dfcb7ac2bd - Added new method getAktenAccepted in the Akte controller
- Added new method getAktenAccepted in the Akte model
2016-10-11 13:16:18 +02:00
oesi 01b577603a - Karteireiter Aufnahmetermine überarbeitet
- Reihungstest-Felder in Prestudent Karteireiter entfernt
2016-10-11 12:28:44 +02:00
Stefan Puraner 7b7039d9bc added workaround to convert pgsql arrays to php arrays to another method 2016-10-11 12:16:08 +02:00
bison-paolo 0465c1639f Added a workaround to convert pgsql arrays into php arrays
Affected controllers: Dokument and Dokumentstudiengang
2016-10-10 16:14:48 +02:00
kindlm 77fdec1446 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-07 16:13:07 +02:00
kindlm b237eb59c6 Param $order added for function getAllForBewerbung 2016-10-07 16:07:38 +02:00
bison-paolo 3588047989 All the libraries, when it is required, now are using the message helper 2016-10-07 14:13:58 +02:00
oesi 51e9e071d5 Attribute Studienplan, Genemigung und Pflicht in die Liste aufgenommen 2016-10-07 13:57:06 +02:00
Stefan Puraner 993b381282 fixed credit point calculation 2016-10-07 12:22:19 +02:00
bison-paolo 1fed18dd9b - Added Redirect controller to redirect from the link present in the email to
the page for viewing the message
2016-10-07 12:00:59 +02:00
Stefan Puraner 8fd09dfef8 fixed credit points calculation 2016-10-07 11:59:45 +02:00
bison-paolo b0459c6603 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-10-07 10:46:14 +02:00
bison-paolo a2c38c67a0 Method getStudiengangBewerbung of model Studiengang_model now is getting only active studienplaene 2016-10-07 10:46:08 +02:00
oesi fe42f54cd6 Fixed broken Datatype 2016-10-07 10:27:27 +02:00
Stefan Puraner e1c19fa4de moved credit points check from cours registration to exam registration 2016-10-06 17:04:52 +02:00
bison-paolo 044cfb8819 Added grants to sequences in the migration scripts 2016-10-06 16:54:56 +02:00
bison-paolo 00143e4c38 Now the statusgrund interface loads only enabled languages 2016-10-06 16:34:58 +02:00
bison-paolo bfaf901550 - Added new template for plain text email
- Renamed template for html email mail.php -> mailHTML.php
- Changed method getMessageByToken of Recipient_model for getting only the last message by token
- Changed method getMessages of Recipient_model for getting event the token
- Changed method send of library MailLib to add the possibility to send an alternative plain text
body for a html mail
- Changed library MessageLib to add the possibility to send emails in html/text format to inform
the users about new messages
- Added method toHTML to controller Messages
- Added new configuration entries in message.php
- Added new view messageHTML.php
2016-10-06 16:27:04 +02:00
Andreas Moik 7269672b2d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-06 09:15:42 +02:00
Andreas Moik b4efb5aaa4 new entry in tbl_webservicetyp (reports) 2016-10-06 09:15:18 +02:00
oesi f48e1e59a7 Zahlungsbestätigungen drucken ist jetzt auch möglich wenn zu viel bezahlt wurde 2016-10-05 12:57:41 +02:00
bison-paolo 5ab5b291b3 MessageLib -> sendMessageVorlage:
- If no sender_id is specified the system default person_id will be used
- If the receiver_id is not given and the oe_kurzbz is set, sends the message
to every receiver that is enabled to receive messages for that organization unit.
2016-10-05 11:00:12 +02:00
bison-paolo 1feec909cb MessageLib -> sendMessage: if no sender_id is specified the system default person_id will be used 2016-10-04 18:19:39 +02:00
bison-paolo 863d6af4eb - Method sendMessage of library MessageLib now if the receiver_id is not given and
the oe_kurzbz is set, sends the message to every receiver that is enabled to receive
messages for that organization unit.
- Added new costants for the messaging system
- Added new phrases for the messaging system
2016-10-04 15:49:55 +02:00
Stefan Puraner a029a91789 bug: registration not possible if rules are not fulfilled 2016-10-04 10:06:12 +02:00
Stefan Puraner 3bb86f6f05 fixed bug in calculation if course is completed 2016-10-03 14:53:02 +02:00
Stefan Puraner ceb2ef0dbf updated phrasen 2016-10-03 13:48:21 +02:00
Stefan Puraner bb5f2e29e6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-03 13:14:07 +02:00
Stefan Puraner b4ea35858c fixed bug which end in an unterminated loop 2016-10-03 13:11:51 +02:00
Andreas Moik 33d3697f2f add statistik_kurzbz to errormsg 2016-10-03 10:29:32 +02:00
oesi 00b52f13a6 Messages: Answer Button is disabled if Message is not from the selected User 2016-09-30 17:06:51 +02:00
oesi e321163bb0 Fixed wrong comment 2016-09-30 16:56:02 +02:00
kindlm 2e065086a2 Merge Commit 2016-09-30 16:38:32 +02:00
kindlm 05a398a5f7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-09-30 16:33:09 +02:00
kindlm 70fd4a4dea phpC(d)I 2016-09-30 16:32:57 +02:00
oesi 42757176b5 Fixed broken Update Script 2016-09-30 16:30:23 +02:00
oesi 8bd7674551 Logo Pfad korrigert 2016-09-30 16:27:08 +02:00
kindlm 059b8d19cb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	system/dbupdate_3.2.php
2016-09-30 13:42:07 +02:00
bison-paolo 7346fcf7ec Permissions for test user 2016-09-30 11:52:19 +02:00
oesi fcce3c9f10 Studiengangsseite erweitert damit für den Studiengang 334 die Leitung geändert werden kann 2016-09-30 11:21:42 +02:00
bison-paolo 240d87caaa phpC(d)I III 2016-09-30 10:48:52 +02:00
oesi 24b18db39c Lieferbedingungen zu Tabelle public.tbl_firma hinzugefügt 2016-09-30 10:08:39 +02:00
oesi f99b3cc8bf Moodle User werden nicht angelegt wenn zuvor bei der Abfrage des Users ein Netzwerkfehler auftrat 2016-09-30 09:17:54 +02:00
kindlm 11723a71e6 Ab-Datum für Outgoings auf Anwesenheitsliste
Bbei Outgoings wird zusätzlich das ab-Datum angezeigt, ab wann sie im
Ausland sind.
2016-09-29 17:54:01 +02:00
kindlm 1af4938ab2 Ampelsystem: New attribute "verpflichtend"
- New attributes "verpflichtend"(mandatory) and "buttontext" in the
ampelsystem
- Verpflichtende Ampeln are shown as div-popup on the CIS every time the
page refreshes till the notification is confirmed.
- Text of the confirm-button is changeable (fallback to default-phrase)
- Only the notifications of the current semester are shown by default
("show all" as button)
2016-09-29 17:51:36 +02:00
bison-paolo 233b60d916 Task #408: Statusgründe 2016-09-29 17:17:58 +02:00
bison-paolo 9a8863e5ef Added _parseData to method postPrestudent of controller Prestudent 2016-09-29 14:46:29 +02:00
bison-paolo ad3c0b2d21 Migration script 018_status_grund.php fixed 2016-09-29 10:48:27 +02:00
bison-paolo 124535cbc7 Fix 2016-09-29 10:39:12 +02:00
bison-paolo 23b22c0817 Added method getSentMessagesByPerson to controller Message 2016-09-28 17:29:14 +02:00
bison-paolo 7db01c8eb5 Added the ability to choose a template (Vorlage) as email text 2016-09-28 17:15:19 +02:00
oesi bb54104111 Caldav Schnittstelle korrigiert
- Fehler behoben bei dem Reservierungen nicht korrekt angezeigt wurden wenn diese in der Woche der Zeitumstellung liegen
- Fehler behoben wodurch es zu doppelten Einträgen im Kalender kam wenn sich die Endezeit eines Termines ändert
2016-09-28 13:30:46 +02:00
bison-paolo c4dd21a6d0 phpC(d)I fixes III 2016-09-28 11:21:14 +02:00
bison-paolo 772ed3c810 phpC(i)D fixes II 2016-09-28 11:17:18 +02:00
bison-paolo af1646f9af phpC(d)I fixes 2016-09-28 10:03:05 +02:00
bison-paolo b46122ab9e phpC(d)I fixes 2016-09-27 16:54:35 +02:00
bison-paolo ce2ad2c2b3 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-09-27 15:11:33 +02:00
bison-paolo eea347394a - Added new migration script 018_status_grund.php
- Added new permission "public.tbl_status_grund" in fhcomplete.php
- Manage statusgrund from vilesci
2016-09-27 15:11:25 +02:00
oesi b6a17909c9 Removed duplicate Slashes 2016-09-27 09:35:50 +02:00
oesi b9d6bb947a Message Tab Shows also Reply Messages
Added Link for Creating and Reply to Messages
2016-09-26 16:15:14 +02:00
bison-paolo 21892e1ed4 Method getMessagesByPerson of model Recipient_model now returns only the latest status of a message 2016-09-26 14:50:42 +02:00
bison-paolo a90adbda72 Task #404: GUI zum Schreiben von Nachrichten im FAS: 3rd part 2016-09-26 13:08:03 +02:00
bison-paolo 3009a03eac Task #404: GUI zum Schreiben von Nachrichten im FAS: 2nd part 2016-09-26 12:10:31 +02:00
bison-paolo 1fe6ec5ccc Task #404: GUI zum Schreiben von Nachrichten im FAS 2016-09-23 17:38:02 +02:00
kindlm 46e2c967ab Partnerhochschulen Übersicht CIS 2016-09-23 11:08:56 +02:00
bison-paolo 0ae8b4d8fa - Added method postDelDms to controller Dms
- Added method delete to library DmsLib
2016-09-22 13:16:46 +02:00
bison-paolo 7281a15e42 MessageLib changes 2016-09-21 15:00:41 +02:00
oesi ed8053f700 Warning behoben bei Anzeige der LVs wenn der Studienplan keine Sprache oder Orgform eingetragen hat 2016-09-20 16:44:54 +02:00
oesi 931c4ded3f LVs unter MeineLV sortiert 2016-09-20 16:27:27 +02:00
oesi 625a662648 Fehler behoben wodurch bei Lehreinheiten keine Gruppen mehr angezeigt wurden wenn die Gruppe eines inaktiven Studiengangs zu einer Lehreinheit zugeteilt wird 2016-09-20 16:15:00 +02:00
kindlm 13ad59f3ff Studiengangsbezeichnung in DropDown 2016-09-19 15:01:27 +02:00
kindlm ab0dcfdcff Berücksichtigung des Aktiv-Attributs bei Vorlagen 2016-09-19 15:01:26 +02:00
kindlm 48dd4469a8 Formatierung RT-Excel Export 2016-09-19 15:01:26 +02:00
Stefan Puraner 868fc0feaa fixed bug at registration for exam 2016-09-19 13:38:53 +02:00
bison 5b02f22186 Added functionalities for deleting a Prestudent and a PrestudentStatus 2016-09-14 11:18:31 +02:00
bison 924dee8da8 Method getSprache of controller Sprache2 now can returns all data 2016-09-14 09:28:00 +02:00
oesi 6c306b9ab9 Merge branch 'master' into ci
Conflicts:
	composer.json
	system/dbupdate_3.2.php
	vilesci/personen/funktion_det.php
2016-09-12 17:28:03 +02:00
oesi 6353cb5527 StudienplanID für Bewerbungstermine hinzugefügt 2016-09-12 15:29:31 +02:00
Andreas Moik 90745fdddc redirecting wawi linkts to the new addon 2016-09-12 15:07:23 +02:00
Andreas Moik 647cd1e8f9 bugfix 2016-09-09 09:36:19 +02:00
oesi aa3863d5b4 Hilfetext für Testclient hinzugefügt 2016-09-09 09:17:41 +02:00
oesi 47b9001321 Bugfix im Studienplan damit Anmeldungen korrekt angezeigt werden bei kompatiblen und angerechneten LVs 2016-09-09 09:16:25 +02:00
oesi 45c87db9b8 Added additional API Function to get current Bewerbungstermine 2016-09-08 17:48:20 +02:00
oesi 5b4939279c Rechte zum Drucken von Übernahmebestätigungen erweitert 2016-09-08 17:00:08 +02:00
kindlm ba4bd99dda Kleine SQL Korrektur in Funktion search 2016-09-08 15:29:11 +02:00
kindlm 893157c638 CIS-Search content only last version
The CIS Search of content now only displays the last (highest) version
of a content
2016-09-07 18:29:56 +02:00
kindlm 29b56af899 funktion_det.php
- Filter für OE und Semester
- GUI-Verbesserungen
2016-09-07 18:25:45 +02:00
kindlm 9e2c60fb91 timetable-week.xul.php
UNDO Befehl zum mitloggen von gelöschten Reservierungen
2016-09-07 18:24:41 +02:00
kindlm 839cdf3998 New attributes and features in Testtool Administration
- Add new Gebiet
- Edit Ablauf
- Bezeichnung mehrsprachig für Gebiete
- Aktiv Attribute für Fragen und Vorschläge (Noch nicht in Testtool
selbst implementiert)
2016-09-07 18:22:56 +02:00
bison 89744f36f5 - Added parameter available to methods getByStudiengangStudiensemester and
getReihungstestByPersonID of controller Reihungstest
- Added parameter available to method getReihungstestByPersonID of library ReihungstestLib
2016-09-07 15:41:29 +02:00
bison 3065b02512 - Added migration script to removing table lehre.tbl_bewerbungsfrist
- Added migration script to adding column studienplan_id and relative foreign key
to table public.tbl_bewerbungstermine
- Changed model Studiengang_model to use the new column in table public.tbl_bewerbungstermine
2016-09-07 12:15:02 +02:00
Andreas Moik 2c3ebf843a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-09-07 11:57:55 +02:00
Andreas Moik 92544007eb added textile in composer 2016-09-07 11:29:56 +02:00
bison 0b5644d6f1 - Added method getStudiengangBewerbung to controller Studiengang2
- Renamed method loadList to loadTree
- Improved method loadTree
- Added method getStudiengangBewerbung to model Studiengang_model
2016-09-06 15:52:34 +02:00
oesi 30b81cd376 Removed old File 2016-09-06 13:32:21 +02:00
oesi a6c9d100ee Uebersichtsliste für die Gültigkeit von Studienplänen unter Vilesci->Lehre hinzugefügt 2016-09-06 11:55:32 +02:00
bison 9f919e6e7b - Added new parameter $email_from_system to MailJob controller
- Added library MailLib to manage the sending of the email
- Changed configuration file mail.php
- Changed configuration file message.php
- Changed library MessageLib to get a better separation between the messaging
system and sending e-mail
2016-09-06 11:10:48 +02:00
Andreas Moik b43601a9cc bugfix 2016-09-05 16:27:26 +02:00
Andreas Moik 4b0fd80bf4 multiple Documents modified 2016-09-05 14:48:21 +02:00
Andreas Moik c26df3e2f1 added restart button 2016-09-05 10:46:45 +02:00
oesi 34af00d94e Erstellung der Mailverteiler für WarmUp Kurse angepasst 2016-09-02 13:51:28 +02:00
oesi 03e93fcaf9 Meine LV zeigt die LVs des aktuellen und nähesten Studiensemesters an, auch wenn ein aktives Studiensemester vorhanden ist.
Die Anzeige ist jetzt getrennt für die einzelnen Studiensemester
2016-09-02 13:37:32 +02:00
oesi 1b7e5292d4 Logo Pfad korrigiert 2016-09-01 15:05:32 +02:00
bison 451c1ec541 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-31 14:17:53 +02:00
bison 939ca288fc - Cleaned the controllers by moving the database related code and more complex logic
in the models or libraries
- DmsLib bug fix
- Person_model bug fix
2016-08-31 14:15:39 +02:00
oesi 578742c5c1 Fixed File Upload 2016-08-31 12:54:51 +02:00
Andreas Moik 0942cbf7c9 Analyzation for studienplan_id detection 2016-08-31 11:49:26 +02:00
bison 0c912c0122 Bug fix: update person data 2016-08-31 10:39:26 +02:00
bison bfe8d50772 - New migration script for changing chk_person_svnr constraint on table tbl_person
- Changed MigrationLib->execQuery for a better output
2016-08-30 15:43:21 +02:00
bison 46bc8bdb8c Bug fix 2016-08-30 14:48:08 +02:00
bison 2e3e0efb83 Updating data on tbl_person with the same svnr but with a different person_id will generate the following svnr:
<svnr> + "v" + <counter>
2016-08-30 14:22:48 +02:00
bison 3823f7f1d1 Now when inserting a new person with the same svnr, it will be created a new version of the svnr: <svnr> + "v" + <counter> 2016-08-30 13:52:40 +02:00
bison fbed4b2261 - Added new library ReihungstestLib
- Added method isEntitled to FCH_Model
- Cleaned the controllers by moving the database related code in the models or libraries
2016-08-30 12:26:22 +02:00
bison 0581183b28 Updated migration_version to 014 in migration.php 2016-08-29 13:41:55 +02:00
bison 66de5536ac Moved logic from Dms controller to DmsLib 2016-08-29 13:28:00 +02:00
bison 7e71681d26 - Added method loadList to model DB_model
- Added method getStudienplan to model Studiengang_model
- Changes in method getStudiengangStudienplan of controller Studiengang2
2016-08-26 14:21:04 +02:00
oesi ddf0a9431a Vorlage für Ausbildungsverträge korrgiert 2016-08-26 14:10:49 +02:00
oesi 012ddbe70e Fehler behoben bei dem der passende Studienplan zu einer Lehrveranstaltung nicht korrekt ermittelt wurde 2016-08-26 13:07:37 +02:00
Andreas Moik 208a5fb707 Mergt branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-08-25 15:26:22 +02:00
bison 59b5d76e44 - Fixed logic in method postDms of controller Dms, now is it possibile to
insert a new version for a dms
- Fix method getMessagesByPerson of model Message_model, now is not showing messages with status 3
2016-08-25 13:18:11 +02:00
bison 2c86315f42 Method getStudiengangStudienplan is now returning all fields of table tbl_studienplan 2016-08-25 10:29:15 +02:00
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
Andreas Moik 6c260c7cd5 bugfix for unoconv systemd service killmode 2016-08-24 15:46:48 +02:00
oesi 722d39d8ae Betriebsmittel können jetzt auch gespeichert werden nur die Berechtigung basis/betriebsmittel vorhanden ist 2016-08-24 14:27:25 +02:00
oesi c135abe41e Auf Zahlungsbestätigung, Inskriptionsbestätigung und Studienerfolgsbestätigung wird nun die Studiengangsbezeichnung aus der Studienordnung angezeigt, damit bei Umbenennung von Studiengängen die Bezeichnung korrekt angedruckt wird. 2016-08-24 13:57:16 +02:00
Andreas Moik c6c4745280 added services for systemd and upstart 2016-08-24 13:47:55 +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
oesi 644f66dae9 Hack hinzugefügt damit die Mailverteiler für WarmUp Kurse bei Semesterwechsel nicht geleert werden 2016-08-23 15:15:18 +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
oesi f2f359471e Added Studiensemester to LV Link 2016-08-19 17:35:46 +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 b1d2f60c04 Anpassung des Ausbildungsvertrages für Lehrgänge für das Studienjahr 2016/17 2016-08-18 16:11:52 +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
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
Stefan Puraner af02b3c583 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 14:26:04 +02:00
Andreas Moik bf70eedc27 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 13:30:24 +02:00
Andreas Moik 5743d05478 bugfixes 2016-07-28 13:30:09 +02:00
Werner Masik 2167b7a475 Lieferbedingungen zu Firma hinzugefügt 2016-07-28 12:10:34 +02:00
Stefan Puraner a971fa11a2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 11:45:59 +02:00
kindlm 591013e09a Icons Reihungstestverwaltung, DB update
Spalte "arbeitsplaetze" in tbl_ort
2016-07-28 11:39:48 +02:00
Stefan Puraner 05ef6a4deb Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 11:34:10 +02:00
Stefan Puraner 91f4851462 added new value to read method 2016-07-28 11:25:48 +02:00
kindlm b7fdc9cb5f Reihungstestverwaltung
BugFix bei Auswahl aller studiensemester
2016-07-28 11:19:30 +02:00
kindlm 98b8cd450d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 11:12:37 +02:00
kindlm b998a42b87 Reihungstestverwaltung
- Studiensemester
- Stufen
- Aufteilung der BewerberInnen
- Raumzuordnung
- Aufsichtspersonen
2016-07-28 11:12:32 +02:00
Werner Masik caae236c3b Lieferbedingungen hinzugefügt 2016-07-28 11:06:44 +02:00
paolo fd826ae1fe Extended codeception tests 2016-07-27 19:09:42 +02:00
oesi f4d1edf808 Bugfixes für Dokumentenakt 2016-07-27 17:28:19 +02:00
Andreas Moik 6d0f5d2bec Dokumentenakt 2016-07-27 17:18:38 +02:00
oesi 4edc917b3d Menüpunkt für Bewerberakt hinzugefügt 2016-07-27 16:52:04 +02:00
paolo 13145fd696 Color it!!! 2016-07-27 16:49:49 +02:00
paolo 9ed193d9b8 Moved methods getLastStatus from Prestudent to Prestudentstatus 2016-07-27 14:28:10 +02:00
paolo 11960628c0 Fixed method getMessagesByToken 2016-07-27 14:16:10 +02:00
paolo 3599294237 Added method getLastStatus to controller Prestudentstatus 2016-07-27 13:50:07 +02:00
paolo 763eaa6592 Added migration script 013_akte.php 2016-07-27 13:36:45 +02:00
paolo cec2bb1a27 - Added field status in the primary key array of model MsgStatus_model
- Changes in the logic of the messaging system, now every message status
is a new entry in the table tbl_msg_status
2016-07-27 13:27:55 +02:00
oesi fe643a0f68 Anpassungen für User Syncro mit Moodle 3.1 2016-07-27 10:30:54 +02:00
paolo d3bc72539a - message_helper.php fixed
- Changes in the logic of sending email
2016-07-26 18:19:13 +02:00
paolo 6eec1ba0b7 - Added method addUniqueKey, addCommentToColumn, addCommentToTable and grantSequence to MigrationLib
- Ported script 008_message.php to MigrationLib
- Added fields sent and sentinfo to tbl_msg_recipient
- Changes to 012_bewerbungsfrist.php to be phpcs compliant
2016-07-26 17:28:01 +02:00
paolo 88a395b31e Bug fixes 2016-07-25 19:27:04 +02:00
paolo d0d9b897eb Created all basic test cases for codeception 2016-07-25 17:21:39 +02:00
paolo 150a7863d6 Integrated LogLib into MessageLib 2016-07-25 11:07:06 +02:00
paolo 8f55f11346 - config.php: Set log_threshold to 1 to avoid the log to be too verbose
- Added a basic log library based on CI
2016-07-25 10:56:05 +02:00
paolo 85fa18397c Disabled phpcs 2016-07-22 16:48:21 +02:00
paolo ec4b13f100 Integrated a system to send messages via email based on CI 2016-07-22 16:09:04 +02:00
Stefan Puraner 3ee3282e5a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-21 14:22:21 +02:00
Stefan Puraner b11f8e8b8f fixed bug 2016-07-21 14:19:38 +02:00
kindlm e50f644cb6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-21 11:38:46 +02:00
kindlm 1a1d2de72c Reihungstestverwaltung Aufnahmestufen 2016-07-21 11:38:39 +02:00
paolo 178b15315f Slightly better performance 2016-07-19 17:33:27 +02:00
paolo 0eaf360140 Added parameters aktiv and onlinebewerbung to method getByStudiengangStudiensemester of controller Bewerbungstermine 2016-07-19 17:04:44 +02:00
paolo 42dabba56e Merge origin/ci into ci 2016-07-19 16:03:20 +02:00
paolo 8899a162fd Added method getByStudiengangStudiensemester to controller Bewerbungstermine 2016-07-19 16:03:08 +02:00
Stefan Puraner 19e63622d7 fixed typo 2016-07-19 15:57:16 +02:00
paolo 5b1ad70677 Merge origin/ci into ci 2016-07-19 15:32:30 +02:00
paolo e580df583a Added method getStudiengangStudienplan to controller Studiengang 2016-07-19 15:32:14 +02:00
Stefan Puraner 325608ff6f fixed typo in method name 2016-07-19 11:25:52 +02:00
paolo ad1ada800c Added method getDokumentstudiengangByStudiengang_bz to controller Dokumentstudiengang 2016-07-19 10:31:58 +02:00
kindlm 60e1e444e9 Link zum DMS-File in Bildprüfung 2016-07-18 12:05:28 +02:00
kindlm 96f3f1a243 Interpunktionskorrekturen allg. Ausb.-Vertrag
Diverse Anpassungen und Korrekturen Ausb.-Vertrag AOs
2016-07-18 12:04:21 +02:00
kindlm b9c1bddb14 LV-Anmeldung in Incoming-Plattform vorübergehend deaktiviert 2016-07-18 12:01:41 +02:00
paolo ed6152dc46 - Improved MigrationLib
- Moved 010_vorlage migration script to new lib
2016-07-15 17:17:12 +02:00
paolo 15a1eb2afd - Improved MigrationLib
- Improved migration script 011_reihungstest
- Added migration script 012_bewerbungsfrist
2016-07-15 14:57:57 +02:00
paolo 2568d8f912 - Removed the parameter "sprache" from controller Message
- Added method escape to class DB_Model
- Changed method sendMessageVorlage of MessageLib to send messages trying
to use the same language of the receiver, and improved message errors
- Added OrganisationseinheitLib to handle a recursive search using in the
organisation tree
- Removed from PhrasesLib the method loadVorlagetext because is already
present in VorlageLib
- Changed method loadVorlagetext of VorlageLib, now it searches the template
using the organisation tree
- Added method getOneLevel to model Organisationseinheit_model to get one
level of the organisation tree
2016-07-15 13:38:09 +02:00
paolo c2ed1ad122 phpCI fixes for branch master 2016-07-13 17:09:35 +02:00
paolo bbcb945bf1 phpCI fixes for master branch 2016-07-13 17:08:08 +02:00
Gerald Raab c01175fa5c reihungstestanmeldung in fas-list 2016-07-13 14:12:25 +02:00
Gerald Raab c4d04d60a6 set zeugnisnote from pruefung, add reihungstest_datum to student-list in fas 2016-07-13 13:51:33 +02:00
kindlm c309c31162 Korrekturen Ausbildungsvertrag 2016-07-13 10:54:26 +02:00
kindlm c57aa20058 Incoming-Plattform überarbeitet
- Zählung Anmeldungen korrigiert
- Learning Agreement als statischer Link ins DMS
- StudiengangsDropDown auch englisch
- "Austausch" und "Freemover" in Austauschprogramm-DropDown
2016-07-13 10:53:50 +02:00
paolo c0bf5a544f Added method postDelReihungstest() to controller Prestudent 2016-07-13 10:13:19 +02:00
Paminger ed6f9fa676 Sprache bei Templatetext 2016-07-13 07:56:19 +02:00
paolo 483d133fc1 Added parameter "sprache" to method postMessageVorlage of controller Message. It's required. 2016-07-12 11:27:58 +02:00
paolo 6f3a02abe2 Fixed method addColumn. Now it checks correctly if a column exists.
The method provided from CI (db->field_exists) is not reliable.
2016-07-12 10:52:43 +02:00
kindlm 18729af639 Verbesserungen in Personensuche 2016-07-12 10:49:02 +02:00
kindlm 1f60271803 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-07-11 19:51:45 +02:00
kindlm c0379b7755 Studienplan_sprache in ausbildungsvertrag.xml.php
Überarbeitung Ausbildungsvertrag zweisprachig
2016-07-11 19:51:33 +02:00
paolo d6ab664a33 - phpC(dis)I fixes IV 2016-07-11 18:31:11 +02:00
paolo 9756ce6b14 - phpC(dis)I fixes III 2016-07-11 18:23:59 +02:00
Gerald Raab 57c6e59eb9 fixed numbering on exam-list, lv-name in exam header 2016-07-11 18:20:43 +02:00
paolo 1e53cbde71 Merge origin/ci into ci 2016-07-11 17:21:10 +02:00
paolo bc331e10ad - phpC(dis)I fixes II 2016-07-11 17:18:49 +02:00
Paminger 364ca5ed72 Sprache bei Vorlagentext 2016-07-11 16:52:00 +02:00
Gerald Raab 4abf10d3e3 phrases for pruefungstool 2016-07-11 15:52:31 +02:00
paolo d58ba92b15 - phpC(dis)I fixes 2016-07-11 13:35:12 +02:00
Gerry Raab 53cfa9eb9c get user messages 2016-07-09 03:06:54 +02:00
kindlm 0950eebca6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-07-08 17:53:25 +02:00
kindlm a5c29fa2f7 Berechtigungsabfrage granularer; GUI-Verbesserungen 2016-07-08 17:53:20 +02:00
kindlm a9daf5bdc6 Fehler in Bildprüfung behoben
Wenn Student oder Mitarbeiter gewählt wird und weniger als 100 Einträge
vorhanden sind, kann es vorkommen, dass wegen der Random-Funktion keine
Ergebnisse kommen
2016-07-08 17:48:50 +02:00
kindlm 38ed9a6e43 Ausbildungsvertrag D und E aktualisiert
Fehlende Attribute im RDF ergänzt
2016-07-08 17:47:35 +02:00
kindlm 6ba0787cb7 Neues Logo; user als Parameter für admins 2016-07-08 17:41:19 +02:00
paolo 268130756e Merge origin/ci into ci 2016-07-08 15:37:36 +02:00
paolo 91ad613884 - Try fixing phpC(dis)I 2016-07-08 15:37:02 +02:00
oesi 3fffad9d77 Problem behoben bei dem der Verbands Tree nicht geladen wurde wenn Sonderzeichen in Studiengängen oder Gruppen enthalten waren 2016-07-08 08:37:05 +02:00
oesi 37c1721aeb Buttons und Menüpunkt zum Versenden und Antworten auf Messages hinzugefügt 2016-07-07 22:52:48 +02:00
paolo 8fbc64bbff - Try to fix problems with phpC(dis)I
- Changed permissions in dump.sql
2016-07-07 17:15:30 +02:00
paolo 79230cd85d Added function getBerechtigungKurzbz to model FHC_Model.
Using this function will be avoided the notice "Undefined index".
All models have been adapted.
2016-07-07 16:42:04 +02:00
Gerry Raab aaef564d52 show user messages in fas 2016-07-07 09:39:27 +02:00
Paminger 03d84be366 Vorlagentexte 2016-07-07 09:26:40 +02:00
oesi 9f49093b38 Aufnahmetermine Editieren und Gesamtpunkte berechnung hinzugefügt 2016-07-06 18:16:08 +02:00
paolo 64b68c180f - MigrationLib is now using, where it is possible, dbforge from CI
- 011_reihungstest.php migration script adapted to the new MigrationLib
2016-07-06 16:59:57 +02:00
paolo 04db2afed1 Merge origin/ci into ci 2016-07-06 16:07:32 +02:00
paolo ba1c637ca4 Method getPhrases of library PhrasesLib now returns the text of a phrase
converted from textile to html
2016-07-06 16:07:17 +02:00
Stefan Puraner 325e7f49c6 fixed bug when index is missing in post data 2016-07-06 13:31:34 +02:00
paolo 925bb10efa Better error messages when sending a message with a template 2016-07-06 12:05:10 +02:00
paolo 61a559d380 Changed permission basis/phrase to system/phrase 2016-07-06 10:13:43 +02:00
Paminger c9e980c74a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-05 19:13:59 +02:00
Paminger d7801da391 Roles 2016-07-05 19:13:37 +02:00
Paminger 6a609283a4 Seeds and DBTools extension 2016-07-05 19:12:54 +02:00
paolo 901f4352df Merge origin/ci into ci 2016-07-05 17:55:03 +02:00
paolo eac6aae4f1 MigrationLib has a better output for HTTP or CLI 2016-07-05 17:54:26 +02:00
oesi 8713b819ba Erstversion für AufnahmeTermine Karteireiter im FAS
Template für Messages Karteireiter im FAS
2016-07-05 17:39:17 +02:00
oesi 65765bceb1 - Removed CI Inheritance from Prestudent because it breaks the person inheritance
- Added function to parse Language Arrays to db_extras
2016-07-05 16:28:35 +02:00
paolo c85a406ec6 Merge origin/ci into ci 2016-07-05 16:25:24 +02:00
paolo 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
2016-07-05 16:24:46 +02:00
Stefan Puraner 1590fad8bb fixed bug 2016-07-05 15:36:00 +02:00
Gerry Raab 0c7df621a5 orgform widget + neues recht 2016-07-05 14:34:50 +02:00
oesi 65613d2869 tbl_rt_person ort_kurzbz is now optional 2016-07-05 14:20:52 +02:00
oesi 5de98911ec Link zu LV-Infos zur Lehrveranstaltungsübersicht hinzugefügt 2016-07-05 13:57:26 +02:00
oesi 6544a656f8 - Studienplan removed Getter to get CI-Language working
- Prestudent added missing Person Class
2016-07-05 10:00:49 +02:00
oesi 385e17eff7 Added Foreign Key for UID Column 2016-07-05 09:58:34 +02:00
Paminger cddfc142c7 Kosmetik 2016-07-05 07:11:46 +02:00
Gerry Raab a6c61d0bc1 phrases stuff 2016-07-05 00:22:53 +02:00
Paminger 39c0350af8 Generate Studienordnung 2016-07-04 22:43:11 +02:00
Paminger b95fc0f06a Roles 2016-07-04 22:42:41 +02:00
oesi 9707c523e0 Studienordnung_semester auf Studienplan_semester geändert 2016-07-04 18:31:25 +02:00
Gerry Raab 23201670b1 Phrasentext delete 2016-07-04 18:25:35 +02:00
paolo de7fc12c62 Changes in migration script 011_reihungstest 2016-07-04 17:57:14 +02:00
paolo 10963be983 Merge origin/ci into ci 2016-07-04 15:37:35 +02:00
paolo ba0e2bb7ff MigrationLib to help with the migration procedure 2016-07-04 15:36:53 +02:00
Stefan Puraner f08f85afe2 fixed table name 2016-07-04 11:48:10 +02:00
oesi be79ca299c Breite der DropDowns auf 100% geändert 2016-07-04 09:19:56 +02:00
paolo 4902f41a3f Added addSelect to DB_Model 2016-07-01 12:17:08 +02:00
paolo 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
2016-07-01 10:50:37 +02:00
oesi c96b6de669 Fehler behoben wodurch der letzte Tag des Studiensemesters nicht korrekt dem Studiensemester zugeordnet wurde 2016-07-01 08:57:10 +02:00
Paminger 41a0cc33f1 Kosmetik 2016-07-01 00:40:15 +02:00
Paminger ad8c5bfb32 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-01 00:28:18 +02:00
Paminger 93422b75b5 BugFix 2016-07-01 00:27:57 +02:00
paolo ce3a2f26d3 Extended migration tool to allow the prestudenten to sign more reihungstests 2016-06-30 17:43:32 +02:00
Andreas Moik 81ca197020 bugfix 2016-06-30 16:15:05 +02:00
Paminger 075312963e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-30 07:22:34 +02:00
Paminger 09787cca65 BugFix PhraseLib 2016-06-30 07:22:18 +02:00
paolo 341d5cf8da Changed method getGemeinde of controller Gemeinde, now it returns all data
if no parameters are specified. Data are ordered by the field plz.
2016-06-29 16:27:25 +02:00
paolo 7cdac1d047 Added method getByStudiengangStudiensemester to controller Reihungstest 2016-06-29 16:16:14 +02:00
paolo 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
2016-06-29 15:41:40 +02:00
Andreas Moik a4a907a83f bugfix 2016-06-29 15:04:41 +02:00
paolo 94ae62ca14 Changed the method postMessage of controller Message, now it works even
without recipients
2016-06-29 10:45:32 +02:00
Paminger 73c36d8520 BugFix 2016-06-29 09:34:51 +02:00
Paminger 48655039ba Move public.phrase to system.phrase and change phrase_inhalt to phrasentext 2016-06-29 09:32:51 +02:00
Paminger 9a44c818ea FHC Helper 2016-06-29 08:41:02 +02:00
Paminger 6af45f99f6 BugFix 2016-06-29 08:08:06 +02:00
Paminger 4e6c1bd9fd Dont set rights in Migration files 2016-06-29 08:05:57 +02:00
Paminger b4fdd11686 BugFix 2016-06-29 08:00:29 +02:00
Paminger 9108b9ecd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-28 22:11:12 +02:00
Paminger 0d55276bd2 Checkroles 2016-06-28 22:10:56 +02:00
paolo a68dfa7ba2 Added method postChangeStatus to controller Message 2016-06-28 18:13:20 +02:00
oesi 3622052bd9 Berechnung der bereits aufgenommenen Personen korrigiert 2016-06-28 16:15:19 +02:00
paolo 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. 2016-06-28 15:36:27 +02:00
paolo d2e3a346ce Fix: Phrase controller still tries to use the method _getUID 2016-06-28 15:05:02 +02:00
Paminger f3c2630a66 SeedBugFix 2016-06-28 12:53:53 +02:00
Paminger e21b2f6233 Seeds 2016-06-28 12:34:12 +02:00
Andreas Moik 974b5c0fe8 berits aufgenommene Studenten mit einer anderen Studienplan_id werden nun nicht mehr als aufgenommen angezeigt 2016-06-28 12:15:11 +02:00
Andreas Moik 0c28a6d6c4 bei dem aufnehmen der Bewerber wird nun der gewählte Studienplan und die Orgform bei dem Prestudentstatus eingetragen 2016-06-28 11:43:33 +02:00
paolo 5e4090e0ce _validate method of Person controller now checks correctly the parameters, in accordance with the table structure 2016-06-27 14:58:46 +02:00
paolo bee12ac317 Fix: method getAuthUID of the helper fhcauth_herpel.php, sometimes it
misses the uid
2016-06-27 12:17:16 +02:00
kindlm 534a162809 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-27 11:33:25 +02:00
kindlm 4c21acc5f2 Firma DeleteOrganisationseinheit; Nur Eigene löschen 2016-06-27 11:33:17 +02:00
kindlm 5071605ce2 Prüfungsprotokoll Master-Lehrgänge 2016-06-27 11:31:12 +02:00
kindlm c773cd3ddc Korrektur Query DeleteFirmaOrganisationseinheit 2016-06-27 11:30:29 +02:00
kindlm 4d77c603d0 Letzte Rolle nur durch admin löschbar 2016-06-27 11:29:10 +02:00
oesi fbf33e708e Fixed Typo 2016-06-27 09:31:01 +02:00
oesi 673e7a2a2f Berechnung korrigiert damit alle Bewerber einberechnet werden und nicht nur die noch nicht aufgenommenen 2016-06-24 17:15:13 +02:00
oesi ad335ad240 RTPunkte1, RTPunkte2 und Private EMail hinzugefügt.
Funktion aus Klasse entfernt
2016-06-24 17:04:56 +02:00
paolo c2c4620af9 Merge origin/ci into ci 2016-06-24 13:22:43 +02:00
paolo 9a4f5480c4 - Added permission basis/phrase to dump.sql
- The function getAuthUID() present in the helper fhcauth_helper.php
now tries to work always with CI session to get the uid
- REST_controller doesn't need anymore to handle the uid
- FHC_Controller and FHC_Model load fhcauth_helper in their constructor,
so any class that extends them now could call the function getAuthUID()
anywhere in the code
- The controllers don't need anymore to pass the uid to the models or to the
libraries
- Library FHC_DB_ACL load fhcauth_helper in its constructor and uses getAuthID()
2016-06-24 13:22:27 +02:00
Paminger 74186cc5c6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/DB_Model.php
2016-06-24 13:09:44 +02:00
Paminger 925d210bff Permission Problem workaround 2016-06-24 13:08:18 +02:00
paolo 58a6da42ae The method loadWhole has been removed from model DB_Model.
The same functionality has given by calling the load method without parameters
2016-06-24 10:39:52 +02:00
paolo 3fdf54c1d1 - Added method sendMessageVorlage to MessageLib
- Fixed method loadVorlagetext in VorlageLib
- Changed query in method getMessagesByPerson of Message_model
2016-06-23 15:42:43 +02:00
paolo 38c98531ed Fix: DBTools $seed_path property is now set in the constructor, APPPATH is not always replaced
Fix: Set the right value of seq_vorlagestudiengang_vorlagestudiengang_id before the insert
2016-06-23 12:29:58 +02:00
oesi 942dfb8633 Noteneinträge werden nicht mehr zur Übernahme markiert wenn die Zeungisnote neuer ist als die LVGesamtnote, die Note die selbe aber die Punkte unterschiedlich sind, da sonst die Punkte der komm. Pruefung überschrieben werden falls die Note die selbe bleibt 2016-06-23 11:09:42 +02:00
paolo 8df43d4b6f Merge origin/ci into ci 2016-06-23 10:34:54 +02:00
paolo 226d1652ef Merge 2016-06-23 10:34:42 +02:00
Paminger 4f14e7fa92 Messages Inbox Outbox 2016-06-23 10:28:26 +02:00
Gerry Raab ab4c8ac373 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 17:20:18 +02:00
Gerry Raab c8e4b463b5 new phrase inhalt 2016-06-22 17:19:43 +02:00
paolo d757c413e5 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 15:00:23 +02:00
paolo f35ede3974 - Added Phrase controller
- Phrase controller has the method getPhrases() to get sentences translated into several languages
- Added method getPhrases to PhrasesLib
- Modified the PhrasesLib constructor to pass the uid to the models
- Added method getPhrases to Phrase_model
2016-06-22 14:59:49 +02:00
Gerry Raab 437959221e sprache widget added 2016-06-22 13:09:16 +02:00
Gerry Raab 642f700cae phrases textile prev 2016-06-22 10:42:32 +02:00
paolo 95801a2e70 - Fix: Message_model queries does not get body from tbl_msg_message
- Added method getMessagesByUID to Message controller
2016-06-22 10:34:28 +02:00
paolo d425653d86 Modified _validate method of Message controller, now it returns a standard
error or success message
2016-06-22 09:35:36 +02:00
Paminger f2fdc62b44 BugFix 2016-06-22 08:18:53 +02:00
Paminger 49ebc3945b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 08:11:59 +02:00
Paminger 70e83b6e18 Messages 2016-06-22 08:11:04 +02:00
root 25e0ba9407 basic phrases editing 2016-06-22 01:24:59 +02:00
oesi d25dc7c707 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-06-21 17:23:08 +02:00
oesi 0701a4dd2e Neues Menu Addon für Studienplan-Basierte Ansicht 2016-06-21 17:22:40 +02:00
root e2744500a6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/FHC_Controller.php
2016-06-21 16:31:06 +02:00
root ca83b2f59d phrases system 2016-06-21 16:25:55 +02:00
paolo 971e4ed6de Fixed controller message parameters validation 2016-06-21 15:21:51 +02:00
Gerald Raab b14a1f30ba Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-21 15:10:15 +02:00
Gerald Raab 3c93439955 ital phrases 2016-06-21 15:09:49 +02:00
paolo 5a5472257a - Modified MessageLib constructor to allow to give the parameter UID from a Controller
- Controller Message now works with MessageLib
- Added getMessagesByPersonID method to controller Message
- Added permissions basis/message and fs/system to dump.sql
2016-06-21 15:07:51 +02:00
oesi fab06f9ddb Neue Funktionen für Zugriff auf Studienplaene hinzguefügt 2016-06-21 14:30:11 +02:00
Paminger 6e62fbdcd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/views/templates/footer.php
	application/views/templates/header.php
2016-06-21 11:28:46 +02:00
Paminger dbe19fafb5 Messages 2016-06-21 11:27:36 +02:00
paolo 6dc145d618 Merge origin/ci into ci 2016-06-21 11:11:14 +02:00
paolo 5a5a22e0d5 - Removed body tag from footer.php and header.php
- Added permission fs/dms to dump.sql and fhcomplete.php
- Added FilesystemLib to read and write from/in filesystem
- Added FS_Model to manage filesystem with the same permission system of DB_Model
- Added more models to handle the Dms
- Modified Dms controller to use the new models
2016-06-21 11:10:55 +02:00
Andreas Moik 7758fa3807 fixed timestamp bug in eventkalender 2016-06-20 14:46:55 +02:00
Paminger 834b119f9c BugFix 2016-06-20 13:03:59 +02:00
Paminger 68963a962a BugFix 2016-06-20 08:36:37 +02:00
Paminger 377b1ecdd0 JSON-Forms 2016-06-19 19:41:10 +02:00
Gerald Raab f2b45b7f2a ital phrases 2016-06-19 19:03:11 +02:00
Paminger 83540e068a VorlageExtension 2016-06-18 11:32:29 +02:00
Paminger 3d45527a5d TemplateParser 2016-06-18 09:11:00 +02:00
Paminger b5d14fb59f BugFix 2016-06-17 23:12:07 +02:00
Paminger 7aea047537 Templates 2016-06-17 23:09:50 +02:00
Paminger a987eba1ac Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-17 00:13:35 +02:00
Paminger 4c58b95728 Libs and Vorlagen 2016-06-17 00:12:46 +02:00
paolo 3397192298 Fix: check if data are present 2016-06-16 18:02:18 +02:00
paolo 8b5fb84d0e Merge origin/ci into ci 2016-06-16 15:11:36 +02:00
paolo e5cd3c5a9e Fixed header.php: removed body tag 2016-06-16 15:11:20 +02:00
Gerald Raab ef025b674e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-16 12:31:49 +02:00
Gerald Raab 8a64b70ea2 rights for phrase 2016-06-16 12:31:20 +02:00
paolo c5ee56f23d Moved _validate method from the model Person_model to the controller Person 2016-06-16 12:18:29 +02:00
paolo 13a07e2207 Merge origin/ci into ci 2016-06-16 12:16:10 +02:00
paolo 0c2c0468af - Added helper message with the functions success and error
- Added methods _success and _error to classes FHC_model and APIv1_Controller
2016-06-16 12:15:52 +02:00
Gerald Raab 6574af6518 DB add tables for phrases 2016-06-16 12:10:11 +02:00
Paminger 7766595c5d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-16 11:41:23 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +02:00
kindlm c4ebb5a395 Mlists_generate
Mailverteiler tw_stgl um StellvertreterInnen erweitert
2016-06-15 16:24:48 +02:00
kindlm 0b4bc2b70b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-15 15:40:08 +02:00
kindlm 41f9f5def4 PDF-Export
Werden PreStudent-IDs übergeben, wird die Vorlage des betreffenden
Studiengangs ermittelt.
Beim archivieren von Dokumenten wird nun das Style der DB berücksichtigt
2016-06-15 15:36:42 +02:00
paolo 6536ff155c - Moved the _validate method from the controller Person to the model Person_model
- Fixed method _validate
2016-06-15 14:09:01 +02:00
paolo 149b04654a Added the method getOnlyKontaktByPersonID to controller Kontakt 2016-06-15 11:30:22 +02:00
paolo 28751df237 Merge origin/ci into ci 2016-06-15 11:23:03 +02:00
paolo 8d109cf170 DMS bugfix: if no version is submitted 2016-06-15 11:22:45 +02:00
Stefan Puraner 86a98e9a8c added parse data method 2016-06-15 10:38:19 +02:00
Stefan Puraner 8c555944e2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-15 08:12:23 +02:00
Stefan Puraner 2aa8cff74d added parse data method to model 2016-06-15 08:10:15 +02:00
Gerald Raab a4fbebbf30 layout pruefungsanmeldeliste, ital phrases 2016-06-15 00:38:19 +02:00
oesi a09a892b0b Automatische Gruppe für alle Leitungen hinzugefügt 2016-06-14 17:12:41 +02:00
oesi 7ba5026436 Personen ohne RTGesamtpunkte werden nicht berücksichtigt
Wenn zu weniger Bewerber als APZ vorhanden sind wird die Anzahl der Personen aufgrund der Gesamtzahl der Bewerber berechnet anstatt anhand der APZ
2016-06-14 17:09:49 +02:00
paolo 3df35d0ed5 - Added method getOnlyKontakt to controller Kontakt
- Added method getAkten to the controller Akte
2016-06-14 15:26:51 +02:00
paolo dfa5b0386d - Added method getOnlyKontakt to controller Kontakt 2016-06-14 15:23:08 +02:00
paolo a8b7be6ad5 - Added controller CheckUserAuth to authenticate the end user
- FHC_Auth now extends directly authentication
2016-06-14 15:19:34 +02:00
Andreas Moik c57b84d10c implemented the aliquote reduction 2016-06-14 10:11:16 +02:00
paolo f5ebe0c42b Extended db_extra 2016-06-13 18:08:01 +02:00
paolo fadb2fb792 Merge origin/ci into ci 2016-06-10 18:11:17 +02:00
paolo ffa0bdc947 - Moved old libraries to CI
- Bugfixes
2016-06-10 18:09:54 +02:00
Paminger eb712f4242 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/FHC_Model.php
2016-06-10 15:41:09 +02:00
Stefan Puraner 87e93e2828 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-10 14:51:15 +02:00
Stefan Puraner c8e743d7cd added stg bezeichnung 2016-06-10 14:49:34 +02:00
Paminger 850777476e Message 2016-06-09 10:00:23 +02:00
oesi 6089be78f7 Anmerkung/Prio wird bei Aliqoute Reduktion mit angezeigt 2016-06-09 09:53:00 +02:00
oesi 8d10a9a654 Fehlerbehandlung bei Dokumentenexport hinzugefügt 2016-06-08 18:14:30 +02:00
paolo d237915e80 - Added file read/write from/to file system functionality in Dms 2016-06-08 17:52:14 +02:00
Stefan Puraner 3a2c5b0ceb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-08 13:48:15 +02:00
Stefan Puraner cf3ce680d6 config-eintraege hinzugefuegt; bugfixes pruefungsverwaltung und
studienplanansicht im cis; anpassungen zeugnis
2016-06-08 13:32:06 +02:00
paolo 3955d4b395 - Moved old libraries to CI
- Extended Controllers functionalities
- Added controls to ueberbuchung.php, zeitwuensche.php and funktion_det.php
pages to avoid warnings and notices, especially when no data are in DB
- Removed fhcdb_helper.php because it's no more needed
2016-06-07 17:55:31 +02:00
oesi ee39e5a3f7 Maximalen Datumsbereich auf 400 Tage vergroessert da es sonst zu Problemen kommt wenn das aktuelle und das nächste StSem nach Google exportiert wird 2016-06-07 14:06:25 +02:00
paolo 0dc605df3c - Modified FHC_Model, now it is saving uid in CI session
- Added codeception tests
- Added statistik to dump.sql
- Moved old libraries to CI
2016-06-06 16:36:23 +02:00
paolo dabcf8188b - Modified FHC_Model contructor to get UID from vilesci authentication
- Copied functionalities from old libraries to controllers
- Ported old libraries to CI
- Modified codeception
2016-06-03 16:19:06 +02:00
kindlm 73b69d8657 Reverted wrong commit 2016-06-01 17:45:39 +02:00
kindlm 9f109127a5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	cis/private/profile/studienplan.php
#	locale/de-AT/pruefung.php
#	locale/en-US/pruefung.php
#	locale/it-IT/pruefung.php
#	vilesci/lehre/lv_merge.php
2016-06-01 17:09:10 +02:00
kindlm 8c8753b667 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	include/studienplan.class.php
2016-06-01 16:52:57 +02:00
oesi b0b3fe845a Aliqoute Reduktion verwendet die MasterZGV bei Masterstudiengängen zur Reihung 2016-06-01 13:55:42 +02:00
Gerald Raab 5b0a843500 ital. phrases 2016-05-30 17:32:50 +02:00
oesi f1098055fe Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-05-30 16:00:58 +02:00
oesi ba9d398b55 Engliche Fehlermeldung bei Fehlerhaftem Login 2016-05-30 16:00:26 +02:00
Gerald Raab 01143cd51d it phrase 2016-05-26 22:17:29 +02:00
Gerald Raab 58738112e9 typo 2016-05-26 05:19:33 +02:00
Gerald Raab 18036f7a40 Studienjahr im rdf 2016-05-26 05:16:31 +02:00
Gerald Raab 7733f8df79 matr_nr added 2016-05-26 05:00:38 +02:00
Gerald Raab 5fd6070ea3 list changes 2016-05-26 04:47:05 +02:00
Gerald Raab d7dc25dbc5 liste erweitert 2016-05-26 04:33:31 +02:00
Gerald Raab de5eefc6fb expand list 2016-05-26 04:14:49 +02:00
Gerald Raab e390c49b2b added mat_nr 2016-05-26 03:38:01 +02:00
Gerald Raab 04955a3ff1 Weiche f. milano 2016-05-26 03:10:53 +02:00
Gerald Raab 41bf684767 Matrikelnummer from Person added for use in generated list 2016-05-26 01:38:20 +02:00
Gerald Raab 9d0b2c1f0c studienjahr_kurzbz added 2016-05-25 18:56:54 +02:00
Gerald Raab 54f8dfead7 studienjahr im rdf 2016-05-25 18:38:37 +02:00
paolo efe7355a4d Merge origin/ci into ci 2016-05-25 18:36:35 +02:00
paolo 00211ee647 - Added codeception test cases
- Moved old libraries to CI
2016-05-25 18:36:18 +02:00
Stefan Puraner dc991d7876 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 17:19:33 +02:00
Gerald Raab d47e506976 Ital. LV Bezeichnung 2016-05-24 17:05:48 +02:00
paolo 70fba4d267 - Added property hasSequence to class DB_Model.
This property is used to indicate if the represented table has a primary
  key that uses a sequence (true, otherwise false. Default is true).
- Method insert of DB_Model now checks the property hasSequence.
  If it is true it uses the method insert_id() to return the primary key
  of the row just inserted.
  For any other values the method returns the primary key inserted coping
  it directly from the parameters.
- Set the property hasSequence to false in the constructor of model Prestudentstatus
2016-05-24 16:56:14 +02:00
Stefan Puraner 932243ccef Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 15:33:23 +02:00
paolo e76e1af15c - Remove parameters "new" after checked it in method postPrestudentstatus of controller Prestudentstatus
- Method insert of DB_Model doesn't use anymore insert_id() from CI because it forces to have a sequence
  and doesn't return the primary key when it's composed by more columns
2016-05-24 15:04:35 +02:00
Stefan Puraner 1026447281 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 13:28:19 +02:00
Stefan Puraner eb845241d1 fixed error in save method 2016-05-24 13:26:07 +02:00
paolo 4f8826dc3f Merge origin/ci into ci
Conflicts:
	application/controllers/api/v1/crm/Prestudentstatus.php
2016-05-24 12:32:32 +02:00
paolo bb3f8ef617 - Added method getStudienplan to the controller Studienplan
- Introduced parameter new in method postPrestudentstatus of the controller Prestudentstatus
2016-05-24 12:28:49 +02:00
nscbrandb 58e9eb37a2 Merge pull request #3 from nscbrandb/ci
Ci
2016-05-24 11:48:09 +02:00
Stefan Puraner 71f3b91516 removed debugging code 2016-05-24 10:05:43 +02:00
Stefan Puraner facb7750d7 added method to get all data 2016-05-24 09:27:27 +02:00
paolo c6efbac308 - Added permission "basis/dms_version" for table campus.tbl_dms_version
- Added dms functionalities to relative controller and model
2016-05-23 15:34:59 +02:00
Stefan Puraner b07beff444 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 15:05:59 +02:00
Stefan Puraner fec722a481 fixed missing else clause 2016-05-23 15:03:44 +02:00
kindlm d899ccad08 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 12:25:14 +02:00
kindlm 4bff558c1f Versehentlich eingecheckt 2016-05-23 12:22:22 +02:00
kindlm abae24b0aa Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 12:07:34 +02:00
kindlm fc932b464d SQL in function getStudienplaeneFromSem adaptiert 2016-05-23 11:49:57 +02:00
kindlm 029395372b Add Param $studiensemester_kurzbz in function getAllForBewerbung 2016-05-23 11:49:21 +02:00
nscbrandb 42d0ef79fd undoing ci_hack.php 2016-05-23 11:44:03 +02:00
nscbrandb 419ca7ac46 Merge branch 'ci' of https://github.com/nscbrandb/FHC-Core into ci
Conflicts:
	ci_hack.php
2016-05-23 11:35:23 +02:00
paolo 489848c629 Merge origin/ci into ci 2016-05-23 10:32:50 +02:00
paolo a34f82fd3c - Added permission "basis/studienplan_semester" for table lehre.tbl_studienplan_semester
- Added method getStudienplaeneFromSem in controller Studienplan
- Added method getNextStudiensemester in controller Studiensemester
2016-05-23 10:32:21 +02:00
nscbrandb 3bf093fd2c Fix 2016-05-23 09:44:01 +02:00
Gerald Raab b231caca13 ital 2016-05-22 00:19:02 +02:00
Gerald Raab 80021520ce Ital phrase 2016-05-22 00:06:25 +02:00
Stefan Puraner cf272c0e40 added method to parse post data 2016-05-20 17:34:22 +02:00
Stefan Puraner dfea2bab26 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 16:11:56 +02:00
oesi 0e3cd3a54d Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-05-20 14:59:47 +02:00
oesi 3997dd55ce Fehler behoben bei der Anzeige der Dokumente im Bewerbertool 2016-05-20 14:54:29 +02:00
paolo 606bd3d342 Added method PrestudentByPersonID to Prestudent controller 2016-05-20 14:07:31 +02:00
Gerald Raab 103f3f10af New Template for Milano 2016-05-20 13:44:58 +02:00
paolo 3e6ac6987e Merge origin/ci into ci 2016-05-20 13:04:41 +02:00
paolo 6b1968ae5b Codesniffer compliant: if, for and while 2016-05-20 13:04:25 +02:00
Paminger e441886748 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 12:21:45 +02:00
Paminger f3a49e09e7 Demo 2016-05-20 12:21:04 +02:00
paolo cd10d96c91 - Added permissions and linked them to user admin in dump.sql
- Modified validate methods to public for classes benutzer, student and mitarbeiter
2016-05-20 12:09:18 +02:00
Gerald Raab f5f56056ca Ital. phrase 2016-05-20 11:28:02 +02:00
Stefan Puraner da8f7251e0 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 11:22:23 +02:00
paolo e5554ad1ba Merge origin/ci into ci 2016-05-20 11:05:12 +02:00
paolo ffac4458ef Added permissions for user amdin in the DB 2016-05-20 11:04:51 +02:00
Paminger ffac73c447 GitIgnore 2016-05-20 11:03:45 +02:00
paolo 3c6638fac6 Added permissions for user amdin in the DB 2016-05-20 11:01:52 +02:00
Paminger d4994c95e9 New Build Folder 2016-05-20 10:38:28 +02:00
Paminger bf1a16427c PHPCI 2016-05-20 10:33:19 +02:00
Gerald Raab da7036d33a Bugfix ExamReg, Geburtsort instudent xml, Hide Moodle-Icon if not used 2016-05-20 10:25:32 +02:00
Paminger 815d34ebb6 PHPCI 2016-05-20 10:25:10 +02:00
Stefan Puraner 9a4c03fd45 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 09:56:27 +02:00
Paminger 42e911b4fe CodeSniffer 2016-05-20 07:44:08 +02:00
paolo 39cbed0ca8 Added directory education and its relative controllers 2016-05-19 19:04:45 +02:00
paolo 32acc8a414 Fixed controllers parameters names and number 2016-05-19 15:51:15 +02:00
paolo 674e832392 disContinuous disIntegration 2016-05-18 16:09:47 +02:00
Stefan Puraner 9cf11673ae Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-18 15:41:33 +02:00
paolo e88da56dd7 Added method PreinteressentByPersonID to Preinteressent controller 2016-05-18 15:26:37 +02:00
oesi 5f540c2067 Plugin für Moodle 3.0 2016-05-18 15:03:38 +02:00
Stefan Puraner 01f73e5d57 bugfix bei noten von kompatiblen faechern 2016-05-18 13:20:16 +02:00
paolo a95d1f634b Fixed permission for lehre.vw_studienplan 2016-05-18 12:03:07 +02:00
paolo 5d7d79b086 - Renamed every controller that has conflicts with class name
- Added routes to renamed controllers
 - Fixed controllers parameters in get method
2016-05-18 11:24:10 +02:00
Stefan Puraner 0f3e299cf4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-18 10:24:50 +02:00
nscbrandb e34bda9649 Composer Merge-Plugin für AddOn-spezifische composer.json's 2016-05-17 15:47:33 +02:00
oesi 978ce062a2 Problem beim Download behoben wenn keine APZ eingetragen ist 2016-05-17 14:18:12 +02:00
oesi 15345588ad E-Mailversand bei Reihungstests berücksichtigt das EMAIL-Adresstrennzeichen aus dem Config 2016-05-17 13:30:57 +02:00
Gerald Raab 2bc42d7903 ital 2016-05-14 13:51:53 +02:00
Gerald Raab 6dab0aec8d Ital phrases 2016-05-14 11:16:00 +02:00
paolo de9e92e3b0 - Added permissions for every DB tables that has a model
- Added all controllers for every model
- All controller has a load and a insert/update method
2016-05-13 19:00:40 +02:00
paolo f76b83ef64 - Fixed include of ci_db_extra.php in ci_hack.php
- Added delete for table public.tbl_preinteressent in dump.sql
2016-05-12 16:55:21 +02:00
paolo d48f586af2 - Added new permission to access to tbl_preinteressent table using basis/preinteressent
- Added controller Preinteressent with method to read/write from/in the DB
2016-05-12 13:54:31 +02:00
Stefan Puraner b523a68fdc Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-12 10:21:07 +02:00
paolo 63db2326ed - Added new permission to access to tbl_studiengang table using basis/studiengang
- Added method getStudiengang to class Studiengang2 to get a studiengang from pk
- Added method addDistinct to class DB_Model to add the distinct clause to a query
2016-05-12 10:05:29 +02:00
Stefan Puraner ae80f2f1e9 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-12 09:07:04 +02:00
paolo 0132356094 - Added new permission to access to tbl_addresse table using basis/adresse
- Added adresse controller and model
2016-05-11 15:12:35 +02:00
Stefan Puraner bf4da6f43b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-11 11:58:09 +02:00
Stefan Puraner b0c1e50e47 added workaround for parsing data 2016-05-11 11:56:18 +02:00
paolo 4413a64860 - Added new permission to access to tbl_bundesland table using basis/nation
- Added bundesland controller and model
2016-05-11 10:40:08 +02:00
oesi d82ea3b9f4 Added missing FK to table lehre.tbl_studienplan_lehrveranstaltung 2016-05-11 09:42:06 +02:00
Stefan Puraner 64a822881a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-11 08:00:48 +02:00
oesi 951986bd51 Übersichtsseite über die Gültigkeit von Studienordnungen/Studienplänen 2016-05-11 06:45:21 +02:00
paolo 9168479912 - Moved class Studiengang to Studiengang2 to prevent class name conflicts
- Added a route rule to let to call Studiengang2 controller with the urn /api/v1/organisation/studiengang/
 - Moved Kontank controller to /api/v1/person
 - Kontakt controller has two method getKontakt and postKontakt
2016-05-10 15:30:00 +02:00
Paminger 4b1691361b Merge 2016-05-10 14:37:13 +02:00
Paminger 4b9d5d273b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/config/fhcomplete.php
	application/core/FHC_Model.php
2016-05-10 14:36:01 +02:00
Stefan Puraner 4d406ea389 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-10 14:12:54 +02:00
Paminger e624540c16 Message 2016-05-10 14:12:33 +02:00
Stefan Puraner 440cac91d6 person model: added method that return list of db columns 2016-05-10 13:46:01 +02:00
paolo 44ebe15c9c - Method getCheckBewerbung implemented with new standard
- Added new permission in fhcomplete.php config file
2016-05-10 13:05:02 +02:00
paolo 6d093dc4ed - DB_Model added new functionalities
- Codeception changed
 - Studiengang_model fixed message error
 - Removed File and File_model, they will be replaced by Dms and Dms_model
 - Added new permissions in fhcomplete config file
2016-05-09 18:19:58 +02:00
oesi 8ef0f07336 Beim Laden von Adressen werden Zustelladressen zuerst geliefert 2016-05-06 13:53:23 +02:00
paolo 28e1707b4e Change paths 2016-05-04 16:20:26 +02:00
paolo 85f3ea1dab Moving 2016-05-04 15:43:40 +02:00
paolo 030fe2ba74 Merge origin/ci into ci
Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php
2016-05-04 15:34:00 +02:00
paolo 53eab958dd New structure for CI controllers and models 2016-05-04 15:19:11 +02:00
Gerald Raab f0bee0d531 Ital Phrases, Error in Classfile localised 2016-05-04 14:42:09 +02:00
Paminger 1a36ce3dff Models 2016-05-04 07:17:07 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00
oesi 1b4f137587 Fehler im Kommentar behoben 2016-05-02 16:08:25 +02:00
Paminger a932cfd0ad Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-02 16:07:49 +02:00
Paminger fc6e2de1c9 ACL-System 2016-05-02 16:07:25 +02:00
Gerald Raab edc62cd25a Ital Phrases 2016-05-02 15:43:23 +02:00
Gerald Raab c7b791f160 Prüfungsverwaltung debugged 2016-05-02 15:23:36 +02:00
Stefan Puraner d06a7acdc3 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-02 13:00:58 +02:00
oesi deef6db1d7 Spalte LAS auf Numeric(5,2) geändert damit auch Kommazahlen gespeichert werden können 2016-05-02 11:46:19 +02:00
Paminger 5bd5ac4aad sparch model 2016-05-02 00:37:42 +02:00
Paminger a6d708a763 PG-Array 2016-05-02 00:36:59 +02:00
Paminger b52ffa8974 OE 2016-05-01 23:34:49 +02:00
Gerald Raab 75c8d82b73 Ital Phrase 2016-05-01 15:51:46 +02:00
Gerald Raab 44b4571aaf Prüfungsverwaltung 2016-05-01 15:31:23 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53:15 +02:00
Gerald Raab c0b7f3ba88 ital phrases 2016-04-29 18:00:50 +02:00
kindlm 9d4133a6ff Multilanguage-Atrributes for function "getAllDokumente" 2016-04-29 17:35:15 +02:00
kindlm 202fcec66d Bugfixes for Incoming-Tool
- Upload Picture fixed
- Multilanguage for document-upload
- Removed Picture from document-upload
- All courses are shown. Even those without vacancies
- Phrase for no vacancies
2016-04-29 17:33:51 +02:00
Paminger 2dada5200c Merge branch 'master' into ci
Conflicts:
	.gitignore
	composer.json
	include/prestudent.class.php
	include/securimage/securimage.php
	include/studienplan.class.php
	system/dbupdate_3.2.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidVariableNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
	tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
	tests/codesniffer/FHComplete/ruleset.xml
	tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
	tests/codesniffer/FHComplete/tests/TestHelper.php
	tests/codesniffer/FHComplete/tests/bootstrap.php
	tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
	tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
	tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
	tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
	tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
	tests/codesniffer/FHComplete/tests/files/control_structure_while.php
	tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
	tests/codesniffer/FHComplete/tests/files/double_space.php
	tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
	tests/codesniffer/FHComplete/tests/files/function_spacing.php
	tests/codesniffer/FHComplete/tests/files/mixing_indent.php
	tests/codesniffer/FHComplete/tests/files/multiple_use.php
	tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
	tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
	tests/codesniffer/FHComplete/tests/files/space_tab.php
	tests/codesniffer/FHComplete/tests/files/tab_space.php
	tests/codesniffer/FHComplete/tests/files/traits_no_order.php
	tests/codesniffer/FHComplete/tests/files/traits_pass.php
	tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
	tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
	tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_no_order.php
	tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
	tests/codesniffer/FHComplete/tests/files/use_with_commas.php
	tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
	tests/codesniffer/FHComplete/tests/ruleset.xml
2016-04-28 18:14:40 +02:00
Christian Paminger 30c96e3121 Update README.md 2016-04-28 15:23:55 +02:00
Paminger 482e20d2a2 Composer Lock 2016-04-28 07:14:20 +02:00
Paminger 091dede2dd Composer Fakery 2016-04-28 07:07:57 +02:00
Paminger 6c85973177 PreferDist 2016-04-28 07:00:46 +02:00
Paminger 3b2ead0aaa BugFix 2016-04-28 06:47:17 +02:00
Paminger 5300ae6e21 BugFix 2016-04-28 05:51:10 +02:00
Paminger b0a46179ba BugFix 2016-04-27 21:11:18 +02:00
Paminger eb141cec67 Move CodeceptionTests for PHPCI-Compatibility 2016-04-27 21:03:59 +02:00
Paminger 4bea2abf70 BugFix 2016-04-27 19:08:56 +02:00
Paminger 8261e397da Placeholder 2016-04-27 18:39:17 +02:00
Paminger 29546f6989 BugFi 2016-04-27 18:30:52 +02:00
Paminger 35de93b216 ButFix 2016-04-27 18:22:57 +02:00
Paminger 69e0a7c16f BugFix 2016-04-27 18:00:16 +02:00
Paminger 782c86d1a3 BugFix 2016-04-27 17:50:15 +02:00
Paminger 86bfa74ede BugFix 2016-04-27 17:33:48 +02:00
Paminger 3ae93df91d BugFix 2016-04-27 17:21:48 +02:00
Paminger bd097e9920 Neuer Versuch 2016-04-27 17:10:09 +02:00
Paminger 49122d1ba4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-27 16:53:15 +02:00
Paminger 728a78a6b6 BugFix 2016-04-27 16:52:53 +02:00
paolo 2a516b68cb Merge origin/ci into ci 2016-04-27 16:32:40 +02:00
paolo 0be0280c28 Codeception v1 working 2016-04-27 16:32:28 +02:00
kindlm cd71e69942 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-27 16:21:05 +02:00
kindlm bfe3e3e900 Removed NOT NULL constraint on verfasser_uid from public.tbl_notiz 2016-04-27 16:08:22 +02:00
oesi 7939d1db9e Lehrveranstaltungsverwaltung im Vilesci enthaelt nun auch die neuen Attribute Lehrauftrag/LVInfo und Benotung 2016-04-27 15:19:54 +02:00
oesi ccbff2b349 Status, Standort, ECTS, PflichSWS und PflichtLVS können jetzt auch über Vilesci GUI editiert werden 2016-04-27 14:49:05 +02:00
Paminger 5e812300d2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-27 14:46:31 +02:00
Paminger 8063964cec Install 2016-04-27 14:46:11 +02:00
kindlm 9dc5ef6f5b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-27 13:54:58 +02:00
kindlm 9826af257f Courses of ECI-Degree-Program shown in Incoming-Tool 2016-04-27 13:54:47 +02:00
kindlm 5ae5dd115c Titel_intern shown in FAS on documenttype "Sonst" 2016-04-27 13:53:50 +02:00
paolo 4146257917 Wrong .gitignore 2016-04-27 13:42:54 +02:00
paolo a0c06aa2c3 Merge origin/ci into ci
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
2016-04-27 12:06:59 +02:00
paolo 546483bed7 Merging time 2016-04-27 12:04:42 +02:00
paolo 549b0133c2 Merge origin/ci into ci
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
2016-04-27 11:54:20 +02:00
paolo 51774021b4 Codeception 2016-04-27 11:46:29 +02:00
Paminger 9d2c05bd3d PHPCI-Install 2016-04-27 10:34:49 +02:00
Paminger 70a3c43f7c PHPCI 2016-04-26 16:39:50 +02:00
Paminger 39f65875c6 PersonCept 2016-04-26 15:23:21 +02:00
Paminger fe227ebdcb Cepts 2016-04-26 15:03:09 +02:00
Paminger 5ab6a35372 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/config/config.php
2016-04-26 14:54:45 +02:00
Paminger 4799ec68de Autoload 2016-04-26 14:50:00 +02:00
paolo 932d48d95b FIXed Autoload function using spl_autoload_register 2016-04-26 14:04:10 +02:00
paolo d93dd1fb94 FIXed AddonAuthentication file inclusion 2016-04-26 11:14:38 +02:00
paolo 4cc83999ed - Moved class APIv1_Controller from FHC_Controller.php to APIv1_Controller.php
- Moved class DB_Model from FHC_Model.php to DB_Model.php
- load method of class person (person.class.php) now is calling getPerson
  method of the class Person_model
- getAllForBewerbung method of class studiengang (studiengang.class.php) now is calling getAllForBewerbung
  method of the class Studiengang_model
- getStudienplaene method of class studienplan (studienplan.class.php) now is calling getStudienplaene
  method of the class Studienplan_model
2016-04-25 18:25:03 +02:00
oesi 7bee4b02b7 Aliqoute Reduktion zeigt nun an ob ein Interviewbogen vorhanden/akzeptiert ist 2016-04-25 16:00:48 +02:00
paolo a3a9c42e99 - Renamed classes, methods and properties names in german
- All the controllers exends APIv1_Controller rather than REST_Controller
 - Codeceptions modified to be compliant to changes
2016-04-25 15:57:52 +02:00
Paminger ecff3747d0 Dontknow 2016-04-25 14:25:09 +02:00
kindlm 197064d44d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-25 12:23:14 +02:00
kindlm f58ee305dc Added span for Addon lehrmittel/software 2016-04-25 11:38:39 +02:00
kindlm 6940f72d58 Addon-Ability stpl_week.php for lehrmittel/software 2016-04-25 11:37:25 +02:00
kindlm b346bf4dfa PreStudentID for StudentPrintAusbildungsvertrag
- Function StudentPrintAusbildungsvertrag now uses PrestudentID instead
of UID. So the Ausbildungsvertrag can be printed at any time.
- Text-Changes in Ausbildungsvertrag
2016-04-25 11:31:15 +02:00
paolo f154e6dd5d Check permissions FIX 2016-04-22 16:43:01 +02:00
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +02:00
paolo f6f533a23b API Calls codeception
Fixed translations
2016-04-22 14:44:40 +02:00
paolo 346b8c82e1 JSON output improved 2016-04-22 11:08:38 +02:00
oesi 521611d671 Wenn keine genehmigte Studienordnung vorhanden ist, werden die alle LVs angezeigt und nur die Module herausgefiltert 2016-04-22 10:20:34 +02:00
oesi e8e3ab76c9 Vorerst werden im CIS nur noch Lehrveranstaltungen angzeigt die in genehmigten Studienplänen vorkommen 2016-04-22 10:01:31 +02:00
paolo 4e02a1105b Fixed wrong path in require statement 2016-04-22 10:00:24 +02:00
oesi 7af312bb8f Neuer Parameter genehmigt um nur Lehrveranstaltungen abfragen zu können die in genehmigten Studienordnungen verwendet werden 2016-04-22 09:19:09 +02:00
paolo 75e3590a09 This is not the best code in the world, it's only a beta version 2016-04-21 17:17:30 +02:00
Gerald Raab fbe9c5e9ed ital 2016-04-21 13:06:44 +02:00
Gerald Raab 0d937232a2 ital 2016-04-21 10:19:52 +02:00
Gerald Raab 906a383c30 ital phrases 2016-04-21 10:17:44 +02:00
Gerald Raab 1ffa831887 include generated pruefung.js.php 2016-04-21 09:36:00 +02:00
Gerald Raab 1d879f484a ital phrase 2016-04-21 09:27:43 +02:00
Gerald Raab 4cb468ed2b ital locale 2016-04-21 09:24:37 +02:00
Gerald Raab 9a5ca672f2 ital locale 2016-04-20 18:17:55 +02:00
paolo 78e4c2900b Merge origin/ci into ci
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
2016-04-20 17:57:55 +02:00
Gerald Raab ae2f6c21d8 statusbezeichnung mehrsprachig, prüfungsverwaltung mehrsprachig 2016-04-20 17:19:14 +02:00
oesi 07ebcebcf3 Neue Funktion hinzugefügt um zu Prüfen ob eine Lehrveranstaltung zur Bearbeitung gesperrt ist 2016-04-18 15:24:43 +02:00
Nikolaus Krondraf 0292f69d2b Mehrsprachigkeit der Statuswerte 2016-04-18 12:12:04 +02:00
Gerald Raab 825a03adaa Codingstyle 2016-04-18 11:29:15 +02:00
paolo 0ffe7fbcc6 Merge origin/ci into ci
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
2016-04-18 09:03:15 +02:00
paolo f12ce76194 Merging 2016-04-15 15:47:56 +02:00
paolo 9aef5dcc30 HTTP basic authentication
Set this as default authentication, providing codeception test case
2016-04-15 15:41:38 +02:00
oesi 87c021b693 Fehler behoben in der Anzeige der Lehrveranstaltungen im FAS wenn mehrere verschiedene Studienordnungen aktiv sind 2016-04-15 09:35:30 +02:00
oesi 3760195a58 Fehler behoben wodurch nicht alle Outgoing im Filter angezeigt wurden wenn diese länger als ein Semester im Ausland sind 2016-04-15 08:38:04 +02:00
Paminger ca65efe967 BugFix 2016-04-14 22:33:57 +02:00
paolo aec2e7b5ac HTTP digest authentication
The digest http authentication does not allow to use a password storing
systems, that do not successively allow to retrieve it, even if hashed
2016-04-14 15:24:53 +02:00
Gerald Raab 1585f92c64 formatting 2016-04-14 15:15:53 +02:00
Gerald Raab c6b6b45a0b corrected formatting 2016-04-14 15:08:10 +02:00
paolo 64de1ed4f4 HTTP digest authentication 2016-04-13 16:59:51 +02:00
Stefan Puraner 094a045310 fixed auth bug 2016-04-13 13:45:34 +02:00
Stefan Puraner cc88d3b5d5 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-13 13:09:57 +02:00
Paminger 5bfe253942 CS 2016-04-13 10:59:51 +02:00
Paminger 39c1d2771c PHPCI 2016-04-13 10:44:09 +02:00
root a13b51e02c Tests 2016-04-13 08:41:09 +02:00
Paminger ae6740cc32 Rolle Admin und Acceptance Test 2016-04-13 08:14:33 +02:00
Paminger 4b5211a9c6 FHC_Auth 2016-04-13 07:49:01 +02:00
Stefan Puraner b0c7619c61 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-12 15:33:41 +02:00
Stefan Puraner b579c14a5d save bewertung bugfix 2016-04-12 15:31:38 +02:00
Stefan Puraner 0597a5d9aa excluded api methods from auth 2016-04-12 15:16:33 +02:00
kindlm 3110921f75 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-11 18:04:10 +02:00
kindlm 9a24759fb3 Saving a content via ajax request
Necessary for addon Lehrmittel
2016-04-11 18:04:04 +02:00
paolo d689953b83 Merge origin/ci into ci
Conflicts:
	application/config/rest.php
	application/controllers/api/v1/APIAuth.php
2016-04-11 17:35:14 +02:00
paolo 7032d8be7f Authentication working with LDAP 2016-04-11 17:23:51 +02:00
Paminger 4e2e943ae2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 14:20:44 +02:00
Paminger df889c235b BugFix 2016-04-11 14:20:33 +02:00
Stefan Puraner 325243f165 pruefungstyp is now calculated by countinig past attempts 2016-04-11 13:27:37 +02:00
Stefan Puraner a2bc0c6f80 registration for exam 2016-04-11 10:53:15 +02:00
Stefan Puraner 55187700c2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 10:06:44 +02:00
Stefan Puraner a6031bbe2e merging message model 2016-04-11 10:05:19 +02:00
paolo cc905d9f77 Merge origin/ci into ci 2016-04-11 10:02:16 +02:00
paolo 8ee7df5eba Fixed ob_flush() notice error 2016-04-11 09:59:58 +02:00
root d952087979 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 09:54:32 +02:00
root 63a9e99a59 Message-Model conflict 2016-04-11 09:53:58 +02:00
Stefan Puraner 04e2b0dc8b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-11 09:11:37 +02:00
oesi 53b68ff7c7 Fehlende Attribute beim Laden der Lehrveranstaltung hinzugefügt 2016-04-11 09:02:07 +02:00
Stefan Puraner d4a33fc1f9 changed method to post 2016-04-11 08:43:29 +02:00
Paminger ae1dc93a14 API-Struktur und CodeSniffer Verbesserungen 2016-04-11 08:11:15 +02:00
Paminger 1f236b4b5a CodeCeption 2016-04-11 07:08:46 +02:00
Paminger 20ea242f35 Move Kontakt-Controller to person folder 2016-04-11 06:40:37 +02:00
Paminger 27af06cbb0 CodeSniffer 2016-04-10 21:43:45 +02:00
Paminger 705ee7c62c BugFix Migration 2016-04-10 19:46:35 +02:00
Paminger bf0a96f21a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/models/person/Person_model.php
	ci_hack.php
2016-04-10 18:20:43 +02:00
Paminger 0d91cdd132 GitIgnore 2016-04-10 18:12:40 +02:00
Paminger 3b39752ab7 Acceptance Tests 2016-04-10 18:11:09 +02:00
paolo 1131bff3ec Changes:
application/controllers/api/v1/Person.php
	Fixed conflicts

application/models/person/Person_model.php
	Fixed conflicts

ci_hack.php
	Load the language class otherwise some VileSci functionalities would crash
	Ex: Personen -> Zusammenlegen

tests/codesniffer/FHComplete/ruleset.xml
	Turned off ParamCommentFullStop option
2016-04-08 16:53:52 +02:00
oesi ccf79afdd0 FAS Lehrveranstaltungen verwenden Studienplanmatrix statt Studienordnungsmatrix 2016-04-08 16:51:37 +02:00
Gerald Raab 6283e92339 Codesniffer FHC-Standard 2016-04-08 16:37:00 +02:00
Paminger 5b3d3c401d Merge 2016-04-08 06:45:35 +02:00
Paminger 5e59fc3c17 PHPCI 2016-04-07 15:52:37 +02:00
Paminger 34db90ba19 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/config/autoload.php
	application/controllers/api/v1/Person.php
	application/models/person/Person_model.php
2016-04-07 15:20:08 +02:00
Paminger bcfae6b009 Shit 2016-04-07 15:17:26 +02:00
Stefan Puraner 9c9d862bc8 validation before printing studienblatt 2016-04-07 11:59:22 +02:00
Stefan Puraner 80c35f4b6b Anpassungen für KU Linz; Studienblatt, LV Zeugnis, Anzeige von Noten
kompatibler LVs im Studienplan
2016-04-07 10:57:03 +02:00
kindlm 874dd6652f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-06 15:59:22 +02:00
kindlm f6e7cbcdf3 Infotext für geliefert-Mail adaptiert 2016-04-06 15:58:50 +02:00
kindlm 19ef177d7b GUI-Verbesserungen in DMS 2016-04-06 15:58:13 +02:00
Stefan Puraner 97ddc838a8 added Kontakt Model; extended Person Model 2016-04-06 15:46:01 +02:00
Gerald Raab bd964771fb Bugfix 2016-04-05 15:22:09 +02:00
Gerald Raab 1ffee2dcda Course Registration icon if enrolled different, locale 2016-04-05 15:10:48 +02:00
Stefan Puraner 30a9e9882e Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-04-05 11:41:52 +02:00
Stefan Puraner 0a2df0127f reverted changes 2016-04-05 11:40:19 +02:00
Stefan Puraner bc427f7d2b fixed config bugs in rest client 2016-04-05 11:35:06 +02:00
Paminger c124348484 Message 2016-04-05 09:36:24 +02:00
oesi 8a9ac4a8d6 Fehler behoben bei dem VertragsID bei der Lehreinheitenvorrückung mitkopiert wurde 2016-04-04 11:07:47 +02:00
Gerald Raab 82c85e3ca2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-01 14:00:53 +02:00
Gerald Raab dac5cd55ad Italian days and months
show all projects in zeitaufzeichnung where user has ever been assigned  in a phase
2016-04-01 13:59:22 +02:00
oesi 9a6cf6ee7b Fehler behoben wodurch das Kopieren von Studienordnungen zu Fehlermeldungen führte 2016-04-01 08:08:07 +02:00
Stefan Puraner 093c70eeb4 fixed bugs 2016-03-31 11:57:50 +02:00
Stefan Puraner e286e70b0b changed default values of column lvinfo and benotung 2016-03-31 10:05:20 +02:00
gerryraab df551cf4af Update CHANGELOG.md 2016-03-29 12:15:16 +02:00
gerryraab e0177db7e9 Update CHANGELOG.md 2016-03-29 12:14:42 +02:00
Gerald Raab 1b5bbf4aee Zeitsperren Menu
wenn link zu 'resturlaub.php' benötigt --> über CMS anlegen
2016-03-29 12:02:32 +02:00
Gerald Raab 04aec20a45 set italian course name 2016-03-24 11:59:22 +01:00
Stefan Puraner 0c2ecb44a8 added column genehmigung 2016-03-23 16:33:14 +01:00
Stefan Puraner ff39c6ea31 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-23 16:24:24 +01:00
Stefan Puraner 21272960c9 added column genehmigung 2016-03-23 16:22:07 +01:00
oesi 7ed057b262 Tablesorter von Submodules entfernt und auf Meta Includes geändert 2016-03-22 12:12:37 +01:00
oesi ab1e082de9 Submodule für Tablesorter entfernt 2016-03-22 12:12:11 +01:00
kindlm 9c67c9346b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-22 11:21:14 +01:00
Stefan Puraner d1f03ec889 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-22 11:13:47 +01:00
Stefan Puraner d690fd8cb8 added method 2016-03-22 11:06:55 +01:00
Andreas Moik 50feec07ae cleanups 2016-03-21 15:26:51 +01:00
Paminger 3c1bcfa999 BugFix 2016-03-21 07:26:19 +01:00
Paminger 2885c4b129 No DocBlockChecker 2016-03-20 14:07:20 +01:00
Christian Paminger bbc2b74a65 Update README.md 2016-03-20 13:59:50 +01:00
Paminger c5c9b1b96d bugfix 2016-03-20 13:56:32 +01:00
Paminger 9689fd5a01 PHPCI 2016-03-20 12:53:17 +01:00
Gerald Raab 1a9d80274c LV-Bezeichnung für Italian 2016-03-19 15:46:25 +01:00
kindlm 7d78787b6c Reboot-Button bei Infoscreen 2016-03-18 17:38:49 +01:00
Andreas Moik 9c9a03c63d hint added to prestudentstatus-updatescript 2016-03-18 09:26:47 +01:00
Andreas Moik ea2276b984 fixed typo 2016-03-17 17:23:17 +01:00
oesi a6c848a560 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-03-17 17:06:59 +01:00
oesi 5fa70908d8 Fehler behoben wodurch die Lehrveranstaltungen nicht korrekt angezeigt wurden wenn der ganze Studiengang gewählt wird 2016-03-17 17:05:05 +01:00
Andreas Moik ea66e0944a some comments added to the aliquote reduction 2016-03-17 16:48:08 +01:00
Andreas Moik c2a96098a4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-17 16:20:00 +01:00
Andreas Moik ce4a0a7e3f updatescript for prestudentstatus studienplan_id 2016-03-17 16:05:25 +01:00
oesi df52c64021 Fehler behoben bei dem Studienordnungen nicht geändert werden konnten 2016-03-17 15:48:57 +01:00
stefan def7fc7292 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-17 10:55:27 +01:00
stefan cd9e9d4bd1 fixed bug at saving courses 2016-03-17 10:53:59 +01:00
Andreas Moik 8f12102ce1 comment update 2016-03-17 10:46:08 +01:00
Andreas Moik aa249a044d bugfix 2016-03-17 10:30:30 +01:00
oesi 5c04347cbe Fehler behoben wodruch das Update nicht funktioniert wenn Studienjahr NULL ist 2016-03-17 09:58:20 +01:00
oesi 224be4eb46 Problem beim Speichern der Abschlussarbeiten behoben wenn die Uhrzeit noch nicht gesetzt ist 2016-03-17 09:57:37 +01:00
oesi c4320ae53d Neue Icons hinzugefügt 2016-03-16 19:19:24 +01:00
oesi b9a08a12ae Fehler behoben bei dem die Projekt im Planner beim Starten nicht korrekt geladen wurden 2016-03-16 19:17:54 +01:00
oesi 834e63ca21 Fehler beim Speichern der Studienplan Lehrveranstaltung Zuordnung behoben 2016-03-16 16:45:36 +01:00
Andreas Moik 4ca4f347c5 cleanups 2016-03-16 16:17:20 +01:00
Stefan Puraner 527fb7fa4e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-16 12:39:17 +01:00
Stefan Puraner f42665f01f fixed table columns studienjahr 2016-03-16 12:34:57 +01:00
Andreas Moik dff4d3d0e6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-16 09:45:22 +01:00
kindlm 5917419cb7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	locale/de-AT/incoming.php
#	locale/en-US/incoming.php
2016-03-15 20:46:14 +01:00
kindlm 2464db338b Phrasen CIR 2016-03-15 20:44:39 +01:00
kindlm 2ba6c42ac0 Parameter aktiv bei function getFirmen 2016-03-15 20:43:56 +01:00
kindlm bacd07d8d3 Funktion getAktenDms
Liefert die Akten anhand der dms_id
2016-03-15 20:34:36 +01:00
kindlm c9096ce923 DMS-Download aus Bewerbungstool
Bewerber dürfen Dokumente aus Bewerbungsttol herunterladen, wenn
person_id aus Session und akte_id uebergeben wurde und person_id
Besitzer des Dokuments ist (person_id aus tbl_akte) und das Dokument in
der Onlinebewerbung hochgeladen werden kann
2016-03-15 20:34:15 +01:00
Paminger 0c3c47f848 BaseControllerConcept into config.php 2016-03-15 08:14:05 +01:00
kindlm cfb858f1d8 Phrasen 2016-03-14 17:38:59 +01:00
kindlm 678d1fa782 Legende bei Notenliste, was Markierung bedeutet 2016-03-14 17:35:33 +01:00
kindlm 680430510c Dipl-Urkunde Lehrgänge 2016-03-14 17:34:44 +01:00
kindlm c7d7f8670f Phrasen 2016-03-14 17:34:28 +01:00
kindlm c710b64eb3 Kleines L aus Securimage entfernt 2016-03-14 17:33:28 +01:00
Gerald Raab 8f038d53f5 NEW: edit ressource funktion 2016-03-14 15:13:22 +01:00
Andreas Moik be9e54b85f typo fix 2016-03-14 12:26:08 +01:00
Paminger d28f79e855 FHC ACL 2016-03-14 07:10:51 +01:00
Paminger f4aa42caa1 RestAuth 2016-03-12 07:12:46 +01:00
oesi c65c57b984 Studienplan kann von Addons ueberschrieben werden 2016-03-11 15:58:46 +01:00
oesi 3dfdce733f Incomingverwaltung
- Logo Pfad korrigiert
- Capture bei Incoming Registrierung hinzugefügt
- Mailtexte überarbeitet
2016-03-11 14:45:22 +01:00
Paminger 7ac944ec28 Language 2016-03-11 10:12:15 +01:00
Paminger 1a1776ca2a Libraries 2016-03-11 10:09:14 +01:00
Paminger 19129266b2 RESTv1 2016-03-11 10:08:34 +01:00
Andreas Moik 5903f68ef6 cleanup 2016-03-10 17:44:26 +01:00
Andreas Moik deab8fb0d8 fas changed from lehre.tbl_studienordnung_semester to lehre.tbl_studienplan_semester 2016-03-10 16:26:55 +01:00
Andreas Moik 0a38241d6b bugfix 2016-03-10 14:15:31 +01:00
Andreas Moik 312ae30f4a string correction 2016-03-10 11:27:50 +01:00
Andreas Moik 005be3df3c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-10 11:23:14 +01:00
Andreas Moik 48ecbaacfb automatic conversion from studienordnung_semester to studienplan_semester 2016-03-10 11:22:31 +01:00
Stefan Puraner 1469964a77 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-10 11:12:15 +01:00
Stefan Puraner 8f9fbee0e5 fixed foreign key name 2016-03-10 11:10:48 +01:00
Andreas Moik 8bfef285b0 postponed save and delete of study plan assignment from study regulations file to study plan file 2016-03-10 10:57:05 +01:00
Stefan Puraner 24756d9cf3 added port to db connection of codeigniter 2016-03-10 10:46:40 +01:00
Andreas Moik 64f10154af semester assignment for study plan 2016-03-10 10:45:59 +01:00
oesi 24c3e865d7 VarDump entfernt 2016-03-10 09:18:12 +01:00
oesi 8d81da253c Scripte zum Überschreiben von Core Funktionalitäten zu Template Addon hinzugefügt 2016-03-09 17:16:36 +01:00
oesi 9c0709681d Lehrveranstaltungsverwaltung kann über Addons manipuliert werden 2016-03-09 16:59:40 +01:00
kindlm 93bf5840f6 Ausbildungsvertrag Zweisprachig Lehrgänge 2016-03-09 16:25:33 +01:00
kindlm 886c4a7881 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-09 16:12:46 +01:00
kindlm 57f04e8794 Count für Anzahl Studierende korrigiert
Abbrecher und Unterbrecher werden sonst gezählt aber nicht auf der
Anwesenheitsliste grführt
2016-03-09 16:10:58 +01:00
kindlm 8b3a4fe9e9 Phrasenübersetzung 2016-03-09 16:09:07 +01:00
kindlm 2c9ca9d622 Changelog 2016-03-09 16:08:55 +01:00
kindlm 98ac2a51c9 Newsite-Tag entfernt
Führt bei Unoconv zu falscher Ausgabe
2016-03-09 16:08:44 +01:00
Andreas Moik f8f672052e cleanups in studienplan-class 2016-03-09 14:34:04 +01:00
Stefan Puraner 48e3a59b19 tabelle studienjahr inkl klasse hinzugefuegt 2016-03-09 08:18:17 +01:00
oesi 8f4af87dea Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-03-08 11:02:06 +01:00
oesi afae4a6146 Notenfreigabemail enthält jetzt die Anzahl der Noten und den Bearbeiter 2016-03-08 11:01:38 +01:00
Andreas Moik c40cfc83bc Excel-export for aliquote reduction 2016-03-08 10:59:50 +01:00
oesi 7f8d8c3fce Bei Punkteeingabe wird der Speichernbutton deaktiviert während die Note geladen wird damit es nicht vorkommen kann dass die Note nicht zu den Punkten passt wenn die Latenz zu hoch ist. 2016-03-08 10:38:23 +01:00
kindlm d70d2732bd Datum der Einzahlung auf Zahlungsbestätigung
In der Übersichtsliste im CIS wird nun das Zahlungsdatum anstatt des
Belastungsdatums angezeigt und auf der Zahlungsbestätigung (welche
Studierende drucken können) werden alle Auszahlungen zu einer Belastung
angedruckt
2016-03-08 10:16:54 +01:00
kindlm b3c440dcbf UID als Parameter uebergeben
Administratoren duerfen die UID als Parameter uebergeben um die
Zahlungsdetails von anderen Personen anzuzeigen
2016-03-08 10:14:19 +01:00
kindlm 178d50d09e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-07 17:34:20 +01:00
kindlm 46fe4bb86f UID als Parameter übergeben
Administratoren duerfen die UID als Parameter uebergeben um die
Dokumente und Zahlungen von anderen Personen anzuzeigen.
2016-03-07 17:34:15 +01:00
Andreas Moik 5cf53e2a16 refined reduction 2016-03-07 17:11:03 +01:00
Andreas Moik 42fca1820c fixed quoting-bug in interessentenimport.php 2016-03-07 14:36:31 +01:00
Andreas Moik ecf882e748 better automatic selection in the aliquote reduction 2016-03-07 14:04:14 +01:00
Andreas Moik c493de2c85 repaired invocation of aliquote reduction from FAS 2016-03-07 12:26:03 +01:00
Andreas Moik 2a24f20cce first preselection for the aliquote reduction 2016-03-07 12:18:38 +01:00
oesi 95cc74677f Anzeigefehler beim Eintragen von Prüfungen mit IE behoben 2016-03-07 12:04:38 +01:00
Gerald Raab 012ce5fd51 added Projektwuerdigkeitsanalyse 2016-03-07 11:58:17 +01:00
oesi 456589ac2d Breite des Lehrgangsbezeichnungsfeld angepasst 2016-03-07 09:24:19 +01:00
oesi 77a8fd8c0b Link zum Changelog hinzugefügt 2016-03-04 11:43:07 +01:00
oesi 4b9ff91ec5 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-03-04 11:40:35 +01:00
oesi c56c4538b9 Changelog hinzugefügt 2016-03-04 11:39:56 +01:00
Andreas Moik 87bc06383d einrückungen 2016-03-04 09:13:38 +01:00
Andreas Moik 506a05de92 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-03 17:02:09 +01:00
Andreas Moik 5501cdbecd First draft for aliquote reduction 2016-03-03 17:00:32 +01:00
kindlm 9a62d2b758 Bug beim zuteilen von Ansprechpartner zu Firmen 2016-03-03 16:48:59 +01:00
kindlm 7791e53278 Funktion getOrtByPlanbezeichnung in ort.class 2016-03-03 16:47:35 +01:00
kindlm 75cae4e4d7 Assistenzrecht bei Anwesenheitsliste 2016-03-03 16:46:36 +01:00
oesi cacef6fe5a Fehler beim Erstellen der HSV Verteiler behoben 2016-03-03 16:32:50 +01:00
Andreas Moik 2c2ad752a7 bugfix 2016-03-03 14:40:33 +01:00
Andreas Moik 5acbf1e199 added zgv_code foreign keys 2016-03-03 14:32:40 +01:00
Andreas Moik ec79066211 bugfix for datatypes in bis.tbl_zgvgruppe_zuordnung 2016-03-03 14:29:05 +01:00
Andreas Moik b95b083bb2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-03 13:34:25 +01:00
Andreas Moik 172fca2018 tables bis.tbl_zgvgruppe_zuordung and bis.tbl_zgvgruppe added 2016-03-03 13:33:19 +01:00
oesi 22c2c25ab4 Tippfehler bei Variablen behoben 2016-03-03 12:04:53 +01:00
Andreas Moik 0a200e1668 cleanups in studienplan-class 2016-03-03 11:49:07 +01:00
Stefan Puraner 552448c71f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-03 11:19:00 +01:00
Stefan Puraner c85a8e9455 bugfixes 2016-03-03 11:10:39 +01:00
Andreas Moik 8cb06f5587 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-02 15:06:28 +01:00
Stefan Puraner 147a90847a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-02 15:05:25 +01:00
Andreas Moik 72aac077f8 Automatic insert of studienplan_id in lehre.tbl_studienplan 2016-03-02 15:05:25 +01:00
Stefan Puraner f647ad4ae1 bugfixes 2016-03-02 15:04:12 +01:00
Andreas Moik 93fdb93774 adapted the 16-figured sv-nums in mitarbeiterimport 2016-03-01 15:13:32 +01:00
Andreas Moik 11985e8066 new columns APZ and studienplan_id in table lehre.tbl_studienplatz 2016-03-01 14:54:41 +01:00
Paminger 2355facd39 VilesciFrameset 2016-03-01 08:13:14 +01:00
Paminger 642ba3a2dc BugFix 2016-02-29 17:02:19 +01:00
Paminger eb84022abf CI Init 2016-02-29 16:51:21 +01:00
Paminger 2236ba7d26 DB-Migrate CI 2016-02-29 16:01:52 +01:00
Andreas Moik ede359bdca automatisiertes eintragen des Gebutsdatums anhand der SVNR auskommentiert 2016-02-29 14:55:07 +01:00
Paminger f9e3c37922 Codeigniter via Composer 2016-02-29 14:22:28 +01:00
Stefan Puraner 3b042657fd moved studienplanmatrix and bewerbtungstermine to core 2016-02-29 12:28:39 +01:00
kindlm a7c92ac7ce Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-02-25 15:58:10 +01:00
kindlm fc5ef29ea2 vbox der archivbuttons eine ID verpasst, damit sie mit addons erweitert werden kann 2016-02-25 15:56:42 +01:00
Gerald Raab 9e979d262a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-02-25 14:25:44 +01:00
Gerald Raab 32fec96d4b Identische Eintraege abfangen 2016-02-25 14:24:45 +01:00
Andreas Moik b001360d69 new meta-includes for angular, angular-tablesort, and ajax fe/be 2016-02-25 09:23:50 +01:00
oesi abdf91e675 - Infomail im Abgabetool an Zweitbegutachter wird nun an UID@DOMAIN geschickt wenn vorhanden. Nur wenn der Zweitbegutachter kein Mitarbeiter ist, wird die Private E-Mail Adresse beschickt
- Fehler behoben bei dem das FIX-Hackerl bei Terminserien nicht immer korrekt übernommen wurde
2016-02-24 16:44:52 +01:00
oesi c959b39443 Fehler behoben bei dem Personen ohne SVNR nicht mehr gespeichert werden konnten 2016-02-24 16:26:03 +01:00
oesi e316feb061 Berechtigungen für die anzeige von Menüpunkten im Vilesci korrigiert 2016-02-24 09:18:53 +01:00
kindlm 47231d69c6 Lehrveranstaltungszeugnis
Note als letzte Spalte; Lehrnergebnisse statt Lehrinhalte
2016-02-23 20:03:14 +01:00
kindlm 754f24ec7f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	include/lehreinheitmitarbeiter.class.php
2016-02-23 19:30:08 +01:00
kindlm 77a27f0bd5 cms/admin dms_id wird in dms.php übergeben
Popupfenster vergrößert
2016-02-23 19:19:57 +01:00
kindlm 9487cc3c87 Notenliste leere Klammern wenn keine Lehrform 2016-02-23 19:18:34 +01:00
kindlm ce79ed326d Master Thesis Umbenennung in Masterarbeit 2016-02-23 19:17:05 +01:00
kindlm d5ab2b7949 Studierendenvertretung in Studienvertretung umbenannt 2016-02-23 19:15:15 +01:00
kindlm ced15af985 ODT-Vorlage für Zeugnis Englisch Neu 2016-02-23 19:14:49 +01:00
kindlm a5756c27c0 Funktion getMitarbeiterLV um Lehreinheit_id erweitert
Benötigt für Anwesenheitsliste
2016-02-23 19:14:22 +01:00
kindlm 6e7aa8efa5 Funktion getStudentsOfLv um lehreinheit_id erweitert
Benötigt für Anwesenheitsliste
2016-02-23 19:11:45 +01:00
kindlm db1987d3b2 Lehrveranstaltungszeugnis in Unoconv 2016-02-23 19:10:26 +01:00
kindlm 2c9bb779b5 Bakk- und Diplomzeugnis Doppelpunkte entfernt 2016-02-23 19:00:31 +01:00
kindlm 12b28f750d Bakk- und Diplomzeugnis in Unoconv 2016-02-23 18:46:20 +01:00
kindlm fd55fbb4e9 Bakk- und Diplomurkunde in Unoconv 2016-02-23 18:33:33 +01:00
kindlm 4e92473cba Accountinfoblatt.odt 2016-02-23 18:31:42 +01:00
kindlm 3e47402f97 pdfExport prüfung auf outputformat
Darf der User Dokumente in einem NICHT-PDF-Format exportieren
2016-02-23 18:10:12 +01:00
kindlm 21242df766 Ausbildungsvertrag
Prüfung auf benötigte Datenfelder
Logo-Anpassungen
2016-02-23 17:59:48 +01:00
kindlm 7c471d77f9 Anwesenheitsliste in Unoconv 2016-02-23 17:26:32 +01:00
Andreas Moik d4ff12cd0f bugfixes in Eventkalender 2016-02-23 13:37:34 +01:00
kindlm 9f4917df14 Einzelvorlagen Inskription der Lehrgänge gelöscht
Es gibt nun eine Gesamtvorlage für alle Lehrgänge
2016-02-23 12:01:58 +01:00
kindlm e52d437380 Inskriptionsbestätigung für a.o. angepasst 2016-02-23 11:57:22 +01:00
kindlm 9f0e01cfbe Inskriptionsbestätigung für Lehrgänge
Vorlage wird mit xsl:call-template wiederholt
2016-02-23 10:16:40 +01:00
kindlm a9b55344cd Lehrauftrag mit Unoconv
Eigener Style wegen unterschiedlicher Logos GmbH
2016-02-23 10:10:25 +01:00
kindlm 98a5c00500 Lehrauftrag in Unoconv 2016-02-22 19:51:13 +01:00
kindlm 9d39da450a Prüfungsprotokolle Anpassungen an neues Logo 2016-02-22 19:34:24 +01:00
kindlm 3c57f1d05f Zeugnisvorlage Leerzeichen in Tabulatoren geändert 2016-02-22 19:32:21 +01:00
kindlm 96ebe8124f Übernahmebestätigung in Unoconv 2016-02-22 19:28:04 +01:00
kindlm 5f52768ee5 Zahlungsbestätigung in Unoconv 2016-02-22 19:22:41 +01:00
kindlm c1c027dd61 Zertifikat Freifaecher an neues Logo angepasst
Anpassungen an neues Zeugnispapier; Anrede Herr/Freu nun je nach
Geschlecht; Spalte "Note" nun zuletzt, Bei "Inhalte der
Lehrveranstaltung" werden nun die Lernergebnisse angezeigt; Nachname in
Kleinbuchstaben; Notenlegende angepasst; Stempelaufdruck
2016-02-22 18:59:27 +01:00
oesi 52c52d0be3 Phrasen hinzugefügt 2016-02-19 17:35:51 +01:00
kindlm 3c5e5e347d Zeugnisvorlage bearbeitet
Spalte Note als letzte Spalte; Nachname in Kleinbuchstaben
2016-02-19 16:49:45 +01:00
oesi 9af103272b Syntaxfehler behoben 2016-02-19 16:05:50 +01:00
Gerald Raab 1f674ded22 Prevent identical entries 2016-02-18 15:44:00 +01:00
oesi b23ed8466f Logo Anzeigefehler bei LVInformationen behoben
Tippfehler in Phrase behoben
FHTW spezifische Phrase entfernt
Warning bei LVInformationen entfernt wenn diese global aufgerufen werden
2016-02-18 15:30:54 +01:00
Andreas Moik 0a40c92047 Uhrzeit in treecol eingebaut 2016-02-18 12:52:48 +01:00
Andreas Moik cdf2c0fa80 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-02-18 12:40:43 +01:00
Andreas Moik d0eeba5afd TEIL 2: FAS-UI an 16 stellige SVNR angepasst + Uhrzeitfeld für Abschlusspruefung eingefügt 2016-02-18 12:36:42 +01:00
Andreas Moik bc33acb5ba FAS-UI an 16 stellige SVNR angepasst + Uhrzeitfeld für Abschlusspruefung eingefügt 2016-02-18 12:31:30 +01:00
kindlm 9a3bd988ca Orgformen DDP und PT hinzugefügt 2016-02-17 13:26:52 +01:00
kindlm 07194667bf Upload Dokumente ohne Zeugnis
Es ist nun möglich mit den Parameter "ohne_dok" einen kommagetrennten
String an Dokumenten zu übergeben, die nicht direkt bei den Dokumenten
hochgeladen werden sollen (zB Zeugnis, da dieses eine spezielle Funktion
hat).
2016-02-17 13:25:52 +01:00
Andreas Moik ae4599f76d changed svnr in tbl_person from char(10) to varchar(16) and added a check for char_len(10) || char_len(16) 2016-02-17 10:00:42 +01:00
Stefan Puraner 10ecfe1bc7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-02-16 13:50:31 +01:00
Stefan Puraner 1df5aa7106 bugfix in cleanTreeResult 2016-02-16 13:48:18 +01:00
oesi 8bd59301c5 Semesterplan öffnet sich nun wieder in einem eigenen Fenster 2016-02-16 10:25:16 +01:00
oesi 247adea514 Titel und Wochentag zu Ressourcen RDF hinzugefügt 2016-02-15 12:22:13 +01:00
oesi 7c1ebc4529 Termine Karteireiter und Export im FAS zeigt nun auch den Titel der Stunde 2016-02-15 10:58:16 +01:00
oesi 606949513c - LVPlan kann als Excel exportiert werden
- Stunden werden im Export (ICal, Caldav, etc) nicht mehr zu 4er Blöcken geblockt sondern auf die gesammte Länge
2016-02-15 10:19:20 +01:00
oesi 951e1bd976 Fehler behoben bei dem keine Zahlungsbestätigungen erstellt werden konnten 2016-02-11 09:55:41 +01:00
oesi d702a5a35d Distinct bei Ermittlung aller Lehrenden einer Lehrveranstaltung hinzugefügt 2016-02-10 15:19:40 +01:00
oesi 5775cbb68b Fehler behoben bei dem das Erstellen von Inskriptionsbestätigungen des Vorsemesters nicht möglich war wenn bereits die Studiengebühr für das aktuelle Semester erfasst wurde. 2016-02-10 14:12:04 +01:00
Stefan Puraner e63d99b63e new column curriculum 2016-02-10 13:49:53 +01:00
Stefan Puraner b06652c350 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-02-10 13:43:44 +01:00
Stefan Puraner a5239e2eb3 new column 'curriculum' 2016-02-10 13:42:12 +01:00
oesi fc9d3b68e5 LVPlanung Excel Export zeigt jetzt auch LVs an die nicht zu Instituten zugeordnet sind damit die Excel Version und HTML Version gleiche Ergebnisse liefert. 2016-02-09 14:55:01 +01:00
Andreas Moik 0b1b7dd346 checksystem
-benötigt nun die Berechtigung "admin"
	-bugfixes in dbupdate
	-bisorgfom ausgebessert auf bisorgfoRm
2016-02-04 11:50:55 +01:00
oesi acd81ef80e Pruefungen werden auf das aktuell ausgewaehlte Studiensemester gefiltert. Die Anzeige kann umgeschalten werden damit alle Pruefungen angezeigt werden 2016-02-02 11:15:38 +01:00
kindlm 321cffb8fa Neue TW-Logos, Text "LV-Infos gesperrt" 2016-02-02 11:14:31 +01:00
kindlm d47fb66c3f Erweiterte Benutzerberechtigung bei Zeitsperren
Überprüfung auf Recht Admin oder Mitarbeiter
2016-02-02 11:12:37 +01:00
kindlm 400e9ff174 SQL-Abfragen der Zeitaufzeichnung optimiert 2016-02-02 11:09:06 +01:00
oesi 768e3a212f LV-Plan Update Mail ist nun zweisprachig Deutsch/Englisch 2016-02-01 11:12:09 +01:00
oesi 1b52b7d751 Reihungstest Dropdown im FAS zeigt nur an wie viele Plätzte belegt/vorhanden sind 2016-02-01 11:10:47 +01:00
oesi bf435a0896 Es kann nun konfiguriert werden ob bei der Punkteübernahme aus dem Reihungstest Punkte oder Prozentpunkte übernommen werden sollen 2016-01-28 18:56:25 +01:00
oesi 364c7b39d3 DB Entwurf für Softwareverwaltung erstellt 2016-01-28 18:54:09 +01:00
Andreas Moik f0d0d607d0 git Beispiel in composer.json wurde in das Wiki verschoben 2016-01-27 11:39:12 +01:00
oesi e74dd2c5d7 Fehler behoben bei dem Kostenstellenberechtigungen in seltenen Fällen falsch angezeigt wurden 2016-01-27 10:37:07 +01:00
oesi 61ac5426dc Bei Gesamtnote kann eine zusätzliche Spalte eingeblendet werden zum Eintragen des 2. Nebenprüfungstermins 2016-01-27 08:13:45 +01:00
Andreas Moik 68f0f267fb Unterstützung für FHC_LANG_ARRAY 2016-01-26 15:03:21 +01:00
kindlm 5d78732127 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-01-25 17:59:33 +01:00
kindlm e1a1222ad8 Korrektur Root-Pfad 2016-01-25 17:59:27 +01:00
kindlm de1308f280 Neue Filter bei PreInteressenten
- Bewerbung nicht abgeschickt
- Bewerbung abgeschickt, Status unbestätigt
- Status bestätigt
2016-01-25 17:08:32 +01:00
kindlm 109bc2e938 Neue Struktur und Bezeichnungen im Menü "Dokumente" 2016-01-25 17:06:07 +01:00
kindlm 12b9c7a8e1 getAllForBewerbung holt nur aktive Studienpläne 2016-01-25 17:04:19 +01:00
kindlm 1454578d87 Berechtigungen ins DMS eingefügt 2016-01-25 17:02:31 +01:00
kindlm a2a473fb68 Dokumentzuteilung GUI Tablesorter 2016-01-25 17:01:14 +01:00
kindlm 17d5d37024 Default-Stunden für Projektarbeitsbetreuung
Wenn Master, dann 5, wenn Bakk dann 3, sonst 0
2016-01-25 16:55:11 +01:00
kindlm 58071dce52 Direkter Link ins Bewerbungstool, wenn Addon aktiv 2016-01-25 16:50:04 +01:00
kindlm 6da1762b63 Testtool neues Logo, Antworten löschen
Antworten eines bestimmten Prestudenten löschen, auch wenn dieser nicht
am aktuellen Tag zugeteilt ist.
2016-01-25 16:48:29 +01:00
kindlm 32c35a5566 Diplomasupplement neues Log und Lehrgänge 2016-01-25 16:37:33 +01:00
kindlm dccc3908ee Bakk- und Diplomurkunde neues Logo und Lehrgänge 2016-01-25 16:36:46 +01:00
kindlm 84bd2e1340 Studienerfolgsbest. neues Logo und Lehrgänge 2016-01-25 16:35:18 +01:00
kindlm 1eeef00a16 Zeugnis neues Logo und Lehrgänge 2016-01-25 16:33:58 +01:00
kindlm 9f78629b6a Studienblatt neues Logo und Lehrgänge 2016-01-25 16:19:11 +01:00
kindlm 999667a417 Ausbildungsvertrag neues Logo und Lehrgänge 2016-01-25 16:11:10 +01:00
kindlm 51676cb749 Accountinfoblatt anpassungen Design und neues Logo 2016-01-25 16:09:21 +01:00
Gerald Raab 04e75e981b Offset LehreExtern handled by casetime 2016-01-25 14:30:05 +01:00
oesi 4b09260e32 CIS LV Menue ist nun dynamisch aufgebaut und kann über Addons erweitert und veraendet werden 2016-01-25 08:33:38 +01:00
Nikolaus Krondraf 33408fc269 Bugfix 2016-01-22 14:45:36 +01:00
kindlm 9ef8618dd0 Phrasen jahrgangsvertretung und hochschulvertretung 2016-01-22 12:44:56 +01:00
kindlm 7e3bde5371 Korrektur Bezeichnung
Studierendenvertretung in Studienvertretung
2016-01-22 12:38:39 +01:00
kindlm cfc1fa1fc4 Anzeige CIS Funktionen "jgv" und "hsv"
Neue Funktionen "Jahrgangsvertretung" und "Hochschulvertretung" werden
auf der CIS angezeigt
2016-01-22 12:36:03 +01:00
Nikolaus Krondraf 00f5752291 Bugfix beim Aktualisieren von LVs 2016-01-21 15:58:32 +01:00
Stefan Puraner d17c089c24 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-01-19 10:40:37 +01:00
Stefan Puraner 7ea7d07ff8 bugfix in class lehrveranstaltung, added function to class akadgrad 2016-01-19 08:04:21 +01:00
oesi 6fc2397707 Inventar Excel Export zeigt nun auch die Person an zu der das Inventar zugeordnet ist 2016-01-18 15:14:40 +01:00
Stefan Puraner fc92c0bafb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-01-18 14:18:15 +01:00
Stefan Puraner dab52ae093 neue Spalten benotung und lvinfo fuer tbl_lehrveranstaltung 2016-01-18 14:16:50 +01:00
Nikolaus Krondraf 8fc0e20ef9 Generierung der Matrikelnummer implementiert 2016-01-18 09:55:50 +01:00
kindlm b886bd7e85 Check auf gleiche Antworten erzeugt warning statt error 2016-01-15 13:30:38 +01:00
Stefan Puraner fd7c8237f8 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-01-14 17:32:27 +01:00
Stefan Puraner 4443036e23 anpassungen KTU Buchungstypen 2016-01-14 17:30:58 +01:00
oesi 40f75bc068 Fehler behoben bei dem META Includes in machne Fällen nicht funktionierten 2016-01-14 09:58:18 +01:00
Nikolaus Krondraf 437fbace02 ZGV-Prüfung bei Statuswechsel kann deaktiviert werden 2016-01-13 13:05:33 +01:00
oesi 05a883a9e9 Anwesenheiten koennen bei Studierenden direkt im FAS geaendert werden 2016-01-12 14:25:24 +01:00
oesi 36b76ad34f Maximallaenge des Lehreinheiten DropDown bei Pruefungen gesetzt da sonst bei Lehreinheiten mit vielen Spezialgruppen der Pruefungstree nicht mehr sichtbar ist 2016-01-11 19:00:18 +01:00
oesi e5b532f741 Fehler behoben bei dem es vorkommen konnte, dass Anwesenheiten doppelt erfasst werden und daher die Berechnung der Anwesenheit nicht stimmt 2016-01-11 18:46:51 +01:00
kindlm 4cc0be40e9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-01-08 14:55:25 +01:00
kindlm a320ce23bc Berechtigungen kopieren 2016-01-08 14:55:19 +01:00
oesi c3c8d7163b Vorbereitung Phing Deployment 2016-01-07 18:05:25 +01:00
oesi b1800f7139 Änderung des Notenschlüssels wieder Rückgängig gemacht II 2016-01-07 18:00:45 +01:00
oesi d0c0f69f8e Änderung des Notenschlüssels wieder Rückgängig gemacht 2016-01-07 16:42:46 +01:00
kindlm 6cc390734e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-12-21 17:24:36 +01:00
kindlm dcd3e302b3 Anpassung an neue Notenstufen FHTW 2015-12-21 17:24:02 +01:00
kindlm 81796ae96f Syntaxerror in SQL behoben 2015-12-21 17:23:25 +01:00
kindlm 9f42252321 Text-Anpassung in GUI 2015-12-21 17:23:01 +01:00
Paminger 2bfe0ee98e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-12-15 08:10:43 +01:00
Paminger 099ee6d594 BugFix Redeclaration 2015-12-15 08:10:12 +01:00
kindlm 09f38186ac Filter bewerbungabgeschickt und statusbestaetigt
Filter bewerbungabgeschickt und statusbestaetigt im FAS eingebaut
2015-12-14 23:59:02 +01:00
kindlm 367657a9f4 Attribut bewerbung_abgeschicktamum
Neues Attribut bewerbung_abgeschicktamum in Klasse eingefügt
2015-12-14 23:56:52 +01:00
kindlm 4432880a54 Bugfix
Bezeichnung mehrsprachig zweimal deklariert
2015-12-14 23:55:13 +01:00
Paminger 5943b4dc5b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-12-14 20:42:36 +01:00
kindlm bc13543166 Bewerbung_abgeschicktamum bei tbl_prestudentstatus 2015-12-14 20:08:38 +01:00
kindlm 893a7b6e73 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
# Conflicts:
#	include/dokument.class.php
2015-12-14 19:53:40 +01:00
kindlm 88eaedf2f2 Notiz.class.php
Bewerbungstool-Notizen Abfrage auf insertvon='online' (ohne person_id)
2015-12-14 19:47:20 +01:00
kindlm 6e54bb4c23 Dokument.class.php
Bezeichnung und Beschreibung mehrsprachig eingefügt
2015-12-14 19:46:26 +01:00
Paminger 16d3442fae Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-12-14 12:53:23 +01:00
Paminger 73bee79349 Testuser 2015-12-14 12:52:58 +01:00
oesi 7975f77a1d Mehrsprachige Felder für Dokumentenbeschreibung können nun in der GUI editiert werden 2015-12-14 08:29:03 +01:00
kindlm 7722810b57 User versehentlich auf Pam gestellt 2015-12-11 16:06:32 +01:00
oesi dca82ad1bd Gewichtung für Lehreinheiten hinzugefügt 2015-12-11 08:21:22 +01:00
oesi c15132658f Persönlicher LVPlan zeigt nun den LVPlan des nächsten/vorigen Semesters abhängig von der Gruppenzuordnung korrekt an.
LVPlan Einträge mit Spezialgruppen sind dadurch auch vor Semesterstart bereits sichtbar.
2015-12-10 17:50:25 +01:00
Nikolaus Krondraf 38925cb19c Aufruf der Notenliste aus FAS heraus zeigt Noten aller Semester an 2015-12-07 12:05:24 +01:00
Nikolaus Krondraf 7912ff0e8c Prüfung ob Konstante existiert ergänzt 2015-12-07 11:46:50 +01:00
oesi 1afe231c5e Fehler behoben bei dem die Styles.xml Vorlage nicht korrekt geladen werden konnte 2015-12-07 11:08:02 +01:00
oesi 896c6f5024 Fehlerhaften Insert Befehl korrigiert 2015-12-07 11:05:49 +01:00
oesi 0f5fae37f4 Doppelten Default Config Eintrag entfernt 2015-12-07 11:05:11 +01:00
kindlm e260ff386a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-12-04 18:42:49 +01:00
kindlm 9951859b0a Spalte "Pflicht" bei den Dokumenten im FAS einblendbar
- "Nachgereicht" wird als icon dargestellt
2015-12-04 18:42:43 +01:00
Stefan Puraner b43d8f18fb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	include/dokument_export.class.php
	vendor/FHC-vendor/easyui/demo-mobile/accordion/_content.html
	vendor/FHC-vendor/easyui/demo-mobile/panel/_content.html
	vendor/FHC-vendor/easyui/demo/accordion/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/combotree/tree_data1.json
	vendor/FHC-vendor/easyui/demo/datagrid/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/layout/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/layout/propertygrid_data1.json
	vendor/FHC-vendor/easyui/demo/propertygrid/propertygrid_data1.json
	vendor/FHC-vendor/easyui/demo/tabs/_content.html
	vendor/FHC-vendor/easyui/demo/tabs/tree_data1.json
	vendor/FHC-vendor/easyui/demo/tooltip/_content.html
	vendor/FHC-vendor/easyui/demo/tree/tree_data1.json
	vendor/FHC-vendor/easyui/themes/bootstrap/datalist.css
	vendor/easyui/demo-mobile/accordion/_content.html
	vendor/easyui/demo-mobile/panel/_content.html
	vendor/easyui/demo/accordion/datagrid_data1.json
	vendor/easyui/demo/combotree/tree_data1.json
	vendor/easyui/demo/datagrid/datagrid_data1.json
	vendor/easyui/demo/layout/datagrid_data1.json
	vendor/easyui/demo/layout/propertygrid_data1.json
	vendor/easyui/demo/propertygrid/propertygrid_data1.json
	vendor/easyui/demo/tabs/tree_data1.json
	vendor/easyui/demo/tree/tree_data1.json
2015-12-03 11:20:52 +01:00
Stefan Puraner 1cb82aa653 merge 2015-12-03 10:49:00 +01:00
Stefan Puraner 1f3fba3d19 fixes for addon studiengangsverwaltung 2015-12-03 08:27:59 +01:00
Andreas Moik 63eb10446a META-Pfade korrigiert -> diesmal richtig 2015-12-02 12:10:08 +01:00
oesi a1e8a7241b HTTPS Ermittlung korrigiert 2015-12-02 10:11:41 +01:00
oesi 798c34efbe Diverse Funktionen hinzugefügt zur Ermittlung der Lektoren und Koordinatoren einer LV 2015-12-01 18:11:02 +01:00
Andreas Moik 11321ebd99 php-markdown in Composer 2015-11-30 17:18:47 +01:00
Andreas Moik a8a38dade5 diverse include-Umbauten
-vendor/FHC-vendor angelegt
	-.gitignore dementsprechend angepasst
	-easyui nach FHC-vendor verschoben
	-jquery meta-include angelegt
	-jquery-tablesorter meta-include angelegt
2015-11-30 15:54:44 +01:00
oesi cfda95c996 Neuen Parameter für Sortierung der Betriebsmittelperson Einträge hinzugefügt 2015-11-30 14:30:31 +01:00
oesi 7e0fab66c8 Sprache load Funktion laedt nun zusätzlich die Mehrsprachige Bezeichnung 2015-11-27 07:33:51 +01:00
oesi 8f559f03d5 - Fehler behoben bei dem der Master Ausstellungsstaat gemeldet wurde wenn Bachelor Studierende einen eingetragen haben anstatt des Bachlor Ausstellungsstaats
- Übersichtstabelle über die gemeldeten Teilnehmer bei der Lehrgangsmeldung hinzugefügt
2015-11-27 07:31:41 +01:00
Gerald Raab 523fccf036 Flag zum setzen gesamte lehre inkludiert 2015-11-26 17:54:44 +01:00
oesi 6dcf750e24 Fehler behoben bei dem SWS nicht korrekt summiert wurden wenn im Meldezeitraum 2 gleiche Verwendungen vorhanden sind 2015-11-26 15:57:13 +01:00
kindlm ab48587e91 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-24 20:54:06 +01:00
kindlm 8e4390ebed Hochkomma korrigiert 2015-11-24 20:53:54 +01:00
kindlm 60cbe5863f Bug bei Anzeige von exklusiven Einträgen behoben 2015-11-24 20:53:10 +01:00
kindlm 41efef6762 Mailverteiler fuer Akademisches Managementteam 2015-11-24 20:52:43 +01:00
oesi 944cf27ce2 Testtool Anpassungen:
- Löschen von Fragen
- Löschen von Gebieten
- Anlegen von Abläufen
- Löschen von Abläufen
2015-11-24 11:30:55 +01:00
oesi e8d2e8c48d DB Update Files korrigiert
Berechtigungen für Web User hinzugefügt
2015-11-24 11:27:18 +01:00
oesi a5dc0cd6dc Personenzusammenlegung kopiert WaWi Konto 2015-11-23 18:16:19 +01:00
oesi f709076071 Fehler behoben bei dem die Studienerfolgsbestätigung mit falschen Studiesemester erstellt wurde 2015-11-23 14:25:57 +01:00
oesi ada81af4d9 Kundennummern werden jetzt auf gst statt auf etw gehängt 2015-11-23 14:00:58 +01:00
oesi 829d634f19 Warning entfernt beim Anzeigen der Notenliste 2015-11-23 13:59:44 +01:00
oesi f399b3f0dd Versionsnummer korrigiert 2015-11-23 11:03:57 +01:00
oesi 1e5ee27ebb Zusaetzliche Funktion zur Ermittlung des LV-Leiters hinzugefuegt 2015-11-23 11:01:33 +01:00
oesi ff4b37a0f9 Neue Klasse fuer Dokumenten Export hinzugefuegt 2015-11-23 11:01:04 +01:00
Paminger 809fc443af Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-21 14:26:54 +01:00
Paminger 4dae1a59aa XUL-Tools Versionen 2015-11-21 14:26:12 +01:00
Gerald Raab c301764467 darstellung urlaubsblock leer - vorbereitung 2015-11-20 12:22:01 +01:00
Andreas Moik c7f8d98fab defaultconfig für phantom entfernt, da es in das reporting-Addon verschoben wurde 2015-11-20 09:19:10 +01:00
Paminger bc7c1af918 Touch Me 2015-11-19 17:32:56 +01:00
Gerald Raab 472bb6a082 Admin darf ZA sehen über Rechtesystem 2015-11-18 17:29:59 +01:00
Nikolaus Krondraf 014f113bd5 Bei Prüfungsanmeldung im CIS kann per Config gesteuert werden, ob gleichzeitig eine Anrechnung angelegt werden soll 2015-11-18 07:42:18 +01:00
oesi 56515bbd9b Reihenfolge im XML korrigiert die zu Problemen bei Master-Lehrgängen führte 2015-11-17 18:25:31 +01:00
oesi cfcee48d83 Fehler korrigiert bei dem in Master Lehrgängen die ZGV nicht korrekt geliefert wurde 2015-11-17 11:20:18 +01:00
oesi 2b4dee1949 Ausstellungsstaat bei BIS-Meldung Rücksicht auf getrennte Nationenfelder 2015-11-17 10:43:31 +01:00
Stefan Puraner cea6576f51 foerdervertrag moved to addon studiengangsverwaltung 2015-11-16 15:43:55 +01:00
Stefan Puraner 1c6e5e9f14 foerdervertrag moved to addon studiengangsverwaltung 2015-11-16 09:18:45 +01:00
kindlm 4819389f55 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	system/checksystem.php
2015-11-13 21:00:13 +01:00
kindlm b87f217571 Recht change_outputformat implementiert
Regelt, ob ein User ein Dokument zB als ODT oder DOC exportieren darf
2015-11-13 20:53:49 +01:00
kindlm e13c41969a Insertvon-User in Funktion getBewerbungstoolNotizen geändert 2015-11-13 20:46:13 +01:00
kindlm 793aa10e87 Attribute zur Dokumentbeschreibung
* Attribute dokumentbeschreibung_mehrsprachig und
beschreibung_mehrsprachig hinzugefügt
* Funktion getBeschreibungenDokumente hinzugefügt
* Funktion akzeptiert um Option "studiengang_kz" erweitert
* Whitespace-Korrekturen
2015-11-13 20:41:54 +01:00
kindlm 2e7f0d181b Bug behoben: Studiengangsklasse war nicht includiert 2015-11-13 20:38:12 +01:00
Paminger 37cd15e9b9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-13 13:27:16 +01:00
Paminger bd027a55c7 SFU FAS.DTD 2015-11-13 13:26:26 +01:00
Andreas Moik fb61636a05 dbupdate_3.2 2015-11-12 15:33:07 +01:00
Andreas Moik 2904feffdc DB-Check 2015-11-12 15:10:13 +01:00
Andreas Moik bb3553a7c5 Integration von Composer 2015-11-11 15:44:14 +01:00
Gerald Raab a315ecc873 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-11 14:15:47 +01:00
Gerald Raab deb2fe69c9 CSV Import: pausen außerhalb der Arbeitszeit werden gleich nach import wieder
gelöscht
2015-11-11 14:14:32 +01:00
Stefan Puraner 808c2a38b3 new database table foerdervertrag 2015-11-11 13:28:27 +01:00
Stefan Puraner 4f8fceeb1b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	system/checksystem.php
2015-11-11 13:21:40 +01:00
Stefan Puraner 13d1fb8fa0 Class Foerdervertrag added
added attribute studiensemester to reihungstest
new database table foerdervertrag
2015-11-11 12:56:44 +01:00
Andreas Moik ad0062fd40 jQuery EasyUI
-jQuery EasyUI in /include/js eingefügt
	-Metainclude für jQuery EasyUI in /include/meta angelegt welche alle nötigen jQuery EasyUI Dateien und die unterhalb beschriebene custom css als html Import bereitstellt
	-Custom css Datei für jQuery EasyUI in /include/vendor_custom/easyui angelegt
2015-11-11 10:49:31 +01:00
oesi ed7c62c648 DoubleDegree Studierende in reinen Vollzeitstudiengängen werden nun als VZ gemeldet anstatt als BB 2015-11-10 10:27:58 +01:00
kindlm 56d4dd211d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-09 15:01:28 +01:00
kindlm 00c603f0f5 Eigene Berechtigung ob Unoconv-Dokumente aus dem FAS als Nicht-PDF exportiert werden dürfen
Neue Spalte lgart_biscode
2015-11-09 15:01:22 +01:00
Gerald Raab bad13f27f9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-09 12:22:06 +01:00
Gerald Raab f2768b1bb4 Ansicht Lehresaldo 2015-11-09 12:21:42 +01:00
kindlm 0bb6e9e535 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-09 12:03:37 +01:00
kindlm ac6c45dea9 Studiengangskennzahl im Studienblatt passt nun auch für Lehrgänge 2015-11-06 19:11:05 +01:00
kindlm 3ad06bed01 Lehrgänge werden auch nach Lehrgangsart sortiert 2015-11-06 18:21:30 +01:00
oesi 4abc9ef67d Fehler behoben bei dem SWS zu zukünftigen Verwendungen zugeteilt wurden die nicht in den Meldezeitraum fallen 2015-11-06 17:33:42 +01:00
Robert Hofer 7e237ba4b3 google tag manager bewerbertool tracking 2015-11-06 16:56:41 +01:00
oesi 9c6a8c8b75 Korrekturen DB Design Addon LV-Evaluierung 2015-11-06 16:46:30 +01:00
kindlm 68f1821883 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-06 14:22:24 +01:00
kindlm 90a2a6cda0 Leerzeichen vor ORDER BY 2015-11-06 14:22:04 +01:00
kindlm 6feeab5ced Logikfehler behoben 2015-11-06 14:21:24 +01:00
kindlm 9a31038e10 Zugangscode in Personendetails sichtbar 2015-11-06 14:20:10 +01:00
kindlm 99cf61076b Grafiken, die als Dokumente hochgeladen wurden, werden als Download angeboten 2015-11-06 14:17:57 +01:00
kindlm be793a549c TW-Infoadressen aus default entfernt 2015-11-06 14:16:30 +01:00
kindlm 5cc359f181 Bug behoben "Karenziert" falsch ausgegeben 2015-11-06 14:13:51 +01:00
Gerald Raab cf9ecc01e1 Link zum DMS-Dokument 'fiktive Normalarbeitszeit' 2015-11-06 12:56:55 +01:00
Gerald Raab 981e9b45a4 Anzeie der Lehre-Saldi 2015-11-06 10:52:50 +01:00
oesi a1be5f7ff7 Fehler behoben bei dem der Lehreinheitenwechsel in der Studentensicht für Lektoren nicht korrekt funktionierte 2015-11-06 10:38:46 +01:00
oesi ee21ab1a9d Fehler behoben durch den der Speichern Button beim Prestudentstatus bei Mischformstudiengängen nicht im sichtbaren bereich war. 2015-11-05 17:15:40 +01:00
Nikolaus Krondraf 9b74ddf639 fehlende Spalten bei der Gegenprüfung ergänzt 2015-11-04 14:50:04 +01:00
oesi 21fe552ec4 Filter für nicht gedruckte Verträge zeigt nun keine Personen mehr an die nur Sonderhonorare haben 2015-11-03 16:32:51 +01:00
Stefan Puraner 9eb6f86405 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-03 08:09:35 +01:00
Stefan Puraner 73e49be88c Rechte Bugfix studienordnung 2015-11-03 08:07:38 +01:00
kindlm 7b18abb880 Configs fuer Bewerbertool
* Configeintrag BEWERBERTOOL_BEWERBUNG_EMPFAENGER (Wer soll beim
nachtraeglichen Upload von Dokumenten im Bewerbertool benachrichtigt
werden)
* Configeintrag BEWERBERTOOL_UPLOAD_EMPFAENGER (Array von Empfaengern
fuer das Abschicken von Bewerbungen aus dem Bewerbungstool)
2015-11-02 20:22:10 +01:00
kindlm c1e6c6e5fc Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-11-02 20:16:04 +01:00
oesi 0f60a4a34c Fehler behoben wodurch beim Speichern des Standorts der Name der Adresse verloren ging 2015-11-02 18:52:30 +01:00
oesi 3b530c284f Neue View hinzugefügt zum Abfragen von Berechtigungen 2015-11-02 14:50:32 +01:00
oesi b8ef3b7c4f - Excel Export der Noten zeigt nun bei Anrechnung ar statt 6 an
- Fehler behoben wenn bei aktivierter Punkteeingabe nicht numerische Werte importiert werden. Stattdessen wird nun geprueft ob es sich dabei um Spezialnoten handelt (ar, met, tg, ...) und diese ggf importiert anstatt der Punkte
2015-10-30 18:59:43 +01:00
oesi 3ee0dd7377 Mehrsprachigkeit und Aktiv für Aufmerksamdurch hinzugefügt 2015-10-30 18:41:10 +01:00
oesi e84d03fd09 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-10-30 14:29:45 +01:00
oesi 655325e627 Parameter User für Filter gequotet 2015-10-30 14:28:06 +01:00
Andreas Moik c189a60b49 Beispielconfig für den PhantomJS Server 2015-10-30 11:54:53 +01:00
oesi aed912b5f6 Mehrsprachige ZGV Bezeichnung auf 128 Zeichen verlängert 2015-10-29 19:37:01 +01:00
oesi c9e35a60c6 Beim Laden des Status wird die Anmerkung mitgeladen 2015-10-29 16:22:28 +01:00
Andreas Moik 13a004e784 ersetzen von $user mit dem Usernamen im Filter SQL-String 2015-10-29 09:34:45 +01:00
Stefan Puraner e8dd844856 webservicerecht hinzugefuegt 2015-10-28 12:47:20 +01:00
oesi 392fc572bf - Fehler behoben bei dem es nicht möglich war Lehreinheiten mit vielen Gruppen zu löschen da hier StundenplanIDs doppelt aufgeführt waren
- Wochen im Tempus laden nun erheblich schneller als zuvor wenn die Option "alle Einträge laden" aktiv ist
2015-10-27 18:16:35 +01:00
kindlm e8ce185c09 Bestätigungsdatum von Assistenz korrigierbar 2015-10-23 21:27:53 +02:00
oesi 6fa972288a Fehler behoben durch den Warnings im CIS LVPlan angezeigt wurden 2015-10-23 15:03:22 +02:00
oesi d73050f43b Retour-Datum zu XML Export hinzugefügt 2015-10-22 19:32:54 +02:00
oesi 59d28b701d Anwesenheitsliste im FAS zeigt nun auch Kommastellen an um Anwesenheitsgrenzen mit zB 69.22 Prozent erkennen zu können 2015-10-21 20:12:28 +02:00
oesi 84e2c8a9f9 Fehler behoben beim dem in seltenen Fällen Warnings angezeigt wurden wenn im Tempus ein Raumvorschlag erstellt wird 2015-10-21 20:11:29 +02:00
oesi 2924d85f4e DB Entwurf für LV-Evaluierung hinzugefügt 2015-10-21 19:05:38 +02:00
oesi 1bbdce28f6 Returnwert bei SOAP Fehler hinzugefügt 2015-10-20 18:44:16 +02:00
oesi 56ba00c984 Problem behoben bei dem keine Betriebsmittel angelegt werden konnten 2015-10-20 18:43:32 +02:00
oesi e7575c58f3 Option für Mailversand bei Mitarbeitern an private E-Mail Adresse hinzugefügt 2015-10-20 18:30:36 +02:00
kindlm acf651548b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-10-20 15:12:54 +02:00
kindlm e3e5b07999 Gegenprüfung public.tbl_vorlagestudiengang.aktiv 2015-10-20 15:12:49 +02:00
oesi 70b5cd8a37 Gruppen werden in der Notenliste als Text formatiert damit Gruppen mit E im Namen nicht als Exponentialzahl dargestellt werden 2015-10-20 11:09:16 +02:00
Andreas Moik 2c8b77e0fb getArray() hinzugefügt, welche die Statistikdaten als Array zurückgibt 2015-10-20 10:57:33 +02:00
oesi fbd7c6d689 Locale für Zahlen korrigiert damit Komma als Punkt dargestellt werden 2015-10-20 10:42:55 +02:00
kindlm 1f9e99221e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-10-19 20:07:57 +02:00
kindlm e1ea8652a1 Korrekturen Dokumente Lehrgänge 2015-10-19 20:07:49 +02:00
oesi 209fd02a90 Require für Sprache Klasse hinzugefügt 2015-10-19 18:13:53 +02:00
oesi 3a803db31c Fehler beim Anlegen von BIS-Verwendungen behoben 2015-10-19 17:19:37 +02:00
oesi 7fbf3f273f Fehler bei der Berechnung der Anwesenheiten behoben 2015-10-19 16:49:57 +02:00
Nikolaus Krondraf 99915459b1 Spalte code zum Standort hinzugefügt 2015-10-19 13:49:20 +02:00
Nikolaus Krondraf d3c970bd84 Spalte standort_id zur Organisationseinheit hinzugefügt 2015-10-19 13:19:18 +02:00
kindlm 9694f64f96 Bug beim Insert neuer OE-Vorlagen korrigiert 2015-10-19 09:37:58 +02:00
kindlm ef7bb766e1 Rückgängig OE zu Funktion-Berechtigung speichern
Rückgängig Commit f40a0eef14
Wenn eine OE bei der Berechtigung einer Funktion gespeichert wird, wird
diese genommen, ansonsten die von der Benutzerfunktion.
2015-10-16 16:40:35 +02:00
kindlm 361649195c Attribut Aktiv bei Dokumentvorlagen angelegt 2015-10-16 15:58:41 +02:00
kindlm 2cc11017f2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-10-16 12:20:51 +02:00
kindlm cbb3ee605d function load_lva um orgform erweitert 2015-10-16 12:20:42 +02:00
kindlm 30979447cd Logo von DEFAULT_STYLE; Neuer Ordner styles/default 2015-10-16 12:19:38 +02:00
kindlm 998ffeb025 CIS-Suche nach Telefonklappen von Räumen 2015-10-16 12:12:09 +02:00
kindlm e33349bd0d Dropdowns für Semester, Verband, Gruppe erweitert 2015-10-16 12:10:56 +02:00
kindlm b98bae2854 Dokumentvorlagen für Lehrgänge 2015-10-16 12:08:57 +02:00
Stefan Puraner 4bf36cc493 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-10-15 17:14:17 +02:00
Stefan Puraner 8b87c188b4 bugfix studienordnung 2015-10-15 17:13:08 +02:00
oesi a932bdb9c5 Korrektur bei Mailversand an Studierende
- Trennzeichen für E-Mail wird nun korrekt übernommen
- Fehler behoben bei dem in machen Fällen Gruppen doppelt angezeigt wurden
2015-10-15 15:04:08 +02:00
Stefan Puraner 0fc7be8d63 Bugfix und Rechte für Bearbeitung inaktiver Studienordnungen 2015-10-15 12:43:45 +02:00
oesi 7c62a869e5 Tagesinfo im Tempus kann ueber Config angepasst werden
Sonntage werden im Tempus als Feiertage markiert
2015-10-14 19:03:20 +02:00
oesi 89dc6d23d5 Mailversand bei Notenfreigabe angepasst:
- Wenn Punkteeingabe aktiv ist werden die Punkte im Mail mit angezeigt
- Studienplan wird im Betreff des Mails angezeigt um Filterregeln im Client erstellen zu können
- Bei der Lehrveranstaltung wird zusätzlich die Organisationsform angezeigt
- Es wird die volle Bezeichnung der Note angezeigt anstatt der ID
2015-10-14 17:44:03 +02:00
kindlm 974a561a5f Anmeldung zu Deutschkursen auskommentiert 2015-10-14 13:44:01 +02:00
oesi 92482dbf6c Mehrsprachige Bezeichnung für Zugangsvoraussetzungen 2015-10-14 13:35:16 +02:00
Stefan Puraner c914bfbfb3 Bugfix Studienordnungsverwaltung Berechtigungen 2015-10-13 08:42:57 +02:00
Stefan Puraner bf449d75a2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-10-13 08:07:33 +02:00
Stefan Puraner 44eb475768 Anpassungen Studienordnung; editieren von inaktiven STOs und direktes
erstellen neuer LVs
2015-10-13 08:05:21 +02:00
oesi f5ea13c35b Bereits verplante Lektoren können vom FAS aus aus dem LVPlan gelöscht werden. Zusätzlich wird im FAS angezeigt ob dieser Lektor bereits verplant ist 2015-10-12 16:43:00 +02:00
oesi 9d76dfc6c6 Neue Spalte bei BIS-Verwendung hinzugefügt um die Inkludierten Lehrestunden zu speichern 2015-10-12 15:55:50 +02:00
oesi 6d58e8d566 Fehler beim Verschieben von Lehrveranstaltungen im Studienplan behoben 2015-10-09 17:55:53 +02:00
oesi e515dd8572 Löschen der Letzten Gruppe aus LVPlan nicht mehr möglich
Löschen von Gruppen aus LVPlan nicht möglich wenn Ressorucen zugeteilt sind
2015-10-08 14:46:42 +02:00
oesi ae5ca1b6fc Falsch angezeigte \N entfernt bei Benotung von Projektarbeiten 2015-10-08 10:45:26 +02:00
Gerald Raab 85ca16723f DienstV: Bundesheer dazu 2015-10-07 12:31:31 +02:00
Nikolaus Krondraf c7d4133578 Sortierung der Studiensemester bei Bearbeitung des Prestudentstatus umgekehrt 2015-10-06 15:13:54 +02:00
Nikolaus Krondraf 389dfe94dd Anmerkung wird nun bei Prestudentstatus gespeichert 2015-10-06 07:59:11 +02:00
oesi 17f718e829 Urkunde und Inskriptionsbestätigung für Lehrgänge angepasst 2015-10-05 17:06:51 +02:00
oesi 5af54bc3db Errorhandling für SOAP Fehler hinzugefügt 2015-10-05 11:36:41 +02:00
oesi ceb8c55751 Anmerkung kann nun beim Anlegen von Prüfungsverträgen editiert werden 2015-10-05 11:32:39 +02:00
oesi 61533035ed Pruefungen werden nun auch angelegt wenn Noten Uebernommen oder importiert werden 2015-10-05 11:06:09 +02:00
kindlm f812fce994 Diverse optische Korrekturen (Zeilenumbrüche)
Schema Addon wird nicht mehr bei Gegenpruefung berücksichtigt
2015-10-01 18:11:27 +02:00
Nikolaus Krondraf c4df88d567 Kürzel der Lehrform an das Ende der LV-Bezeichnung verschoben 2015-10-01 07:59:25 +02:00
oesi 9daf4f74b5 Notenimport mit Spezialnoten (zB met, nb,...) ist nun auch im FAS möglich 2015-09-30 17:52:03 +02:00
oesi fc871c3976 Fehler behoben bei dem Studierende nicht über die Suche gefunden wurde wenn diese keinen Vornamen oder Nachnamen eingetragen haben 2015-09-30 17:29:48 +02:00
kindlm fa3dc7bd68 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-30 14:57:04 +02:00
kindlm 12721c3eed echo $qry gelöscht 2015-09-30 14:56:59 +02:00
oesi 753176cb23 Fehler behoben bei dem Zahlungen die auf 0 stehen als offen angezegit wurden 2015-09-30 13:10:58 +02:00
oesi 5c831f2afe Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-09-30 13:10:25 +02:00
Gerald Raab 9c70aa9e92 anzeige addon nur für inf raus 2015-09-30 11:38:21 +02:00
oesi c5aa9e022b Sortierung geändert damit nach Raumnummern sortiert wird 2015-09-30 10:54:33 +02:00
Gerald Raab f5aa31ea71 delete entries on csv-import 2015-09-30 10:18:17 +02:00
kindlm fd5ba07be6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-29 15:45:41 +02:00
kindlm baf8de5e82 echo $sql_query auskommentiert 2015-09-29 15:45:30 +02:00
kindlm b6c05b9a9d Einheitliche Mimetype-Icons für CIS und DMS
+ Mimtype auslesen über FINFO_FILE
2015-09-29 15:45:03 +02:00
kindlm 73fe5b6267 Alle eigenen Einträge löschen
Es dürfen nicht nur Einträge der eigenen UID gelöscht werden sondern
alle Einträge wo der USER=insertvon ist
2015-09-29 15:43:54 +02:00
kindlm 3802770110 Focus auf Rolle_kurzbz 2015-09-29 15:42:25 +02:00
oesi 9168de99a1 Notenimport akzeptiert nun auch die Notenkürzel (met, nb, ...) 2015-09-29 14:56:37 +02:00
oesi 270d6aa465 Neue Spalten für Datum des letzten Status und Bestätigungsdatum hinzugefügt um abgeschickte Bewerbungen besser Filtern zu können 2015-09-29 14:43:01 +02:00
oesi 9eb24e7093 Funktion hinzugefügt um Verträge zu ermitteln die falsche Beträge zugeordnet haben 2015-09-28 15:56:29 +02:00
oesi 34e0c62e75 Funktion hinzugefügt zum Laden der Lehrgangsarten
Fehler behoben bei dem Studiengänge nicht immer gespeichert werden konnten
2015-09-25 12:57:42 +02:00
oesi defde1382e Neues Logo 2015-09-25 10:38:37 +02:00
oesi c7a17f9945 Anpassung an XML Export damit auf der Ressourcenliste die Räume korrekt angezeigt werden 2015-09-24 17:09:27 +02:00
kindlm 0b5a7ea7b4 Prüfung auf Teilnehmer bei RT-Zuordnung 2015-09-24 13:15:23 +02:00
kindlm cf40d4fb77 OE-Suche kleinschreibung 2015-09-24 12:04:57 +02:00
kindlm 729916e983 Bemerkungsfeld größer 2015-09-24 12:03:30 +02:00
oesi 187367688d Fehler im Reihungstest behoben bei dem das Gebiet nicht korrekt gestartet wurde, wenn die maximale Fragenanzahl größer ist als die tatsächlich vorhandenen Fragen 2015-09-24 08:28:04 +02:00
oesi dca860740e Fehler behoben bei dem in manchen Fällen PHP Warnings angezeigt wurden 2015-09-23 19:19:17 +02:00
oesi 0693b6c74f Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-09-23 17:49:27 +02:00
oesi 31f88fa01b CSV Export funktioniert nun auch wenn Parameter an die Statistik übergeben werden 2015-09-23 17:48:28 +02:00
Stefan Puraner 71c62f6a95 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-23 11:12:56 +02:00
Stefan Puraner fca6162e39 Anpassungen für Einzahlungsprüfung auf mehrere Buchungstypen 2015-09-23 11:12:09 +02:00
oesi da29d8feae - Fehler behoben bei dem beim Speichern der Anwesenheit die Daten nicht korrekt gespeichert wurden wenn die fehlenden User per Scanner eingetragen wurden
- Anwesenheit wird nicht berücksichtigt von Stunden die Nebenprüfungstermine sind
2015-09-22 18:03:05 +02:00
oesi 2f15886b96 Einstellung hinzugefügt um Nachreichungen von Dokumenten zu deaktivieren 2015-09-21 18:37:23 +02:00
oesi 6de6cf95b1 Fehler behoben bei dem Anwesenheiten nicht korrekt erfasst werden konnten wenn die UID Punkte enthaelt 2015-09-21 17:26:25 +02:00
Stefan Puraner 9042fab9ba Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-21 09:54:06 +02:00
Stefan Puraner cbc5edd149 Anpassungen Anzeige Meine LV 2015-09-21 09:53:28 +02:00
kindlm 3c3a4878ed Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-18 19:30:29 +02:00
kindlm 387ae1c948 Neues FH-Logo 2015-09-18 19:30:21 +02:00
oesi 2cea824357 Funktion hinzugefügt um falsch zugeordnete Verträge zu ermitteln 2015-09-18 09:59:00 +02:00
oesi 2bf776de46 Fehlenden Strichpunkt hinzugefügt 2015-09-18 07:49:39 +02:00
oesi 262dc00efb Beim Löschen von Lektorenzuordnungen werden automatisch die Verträge mitgelöscht wenn bereits welche angelegt wurden 2015-09-18 07:34:38 +02:00
oesi 1eab041a46 Es kann nun eine Anwesenheitsbefreiung bei Studierenden eingetragen werden. Wenn diese eingetragen ist, wird kein Prüfungsantritt abgezogen wenn die Anwesenheit unter X% fällt. 2015-09-17 19:05:37 +02:00
oesi 14acd6459c Löschen von Verträgen hinzugefügt 2015-09-17 18:50:58 +02:00
oesi 2c993d924f Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-09-17 17:55:27 +02:00
oesi f77aebbd34 Fehler behoben bei dem die Abwesenheiten nicht korrekt ermittelt wurden 2015-09-17 17:55:03 +02:00
kindlm d62b9fc853 Meldung, wenn keine Vorlage im System 2015-09-17 15:45:53 +02:00
kindlm 9a875b0c3d Revert "Meldung, wenn keine Vorlage im System"
This reverts commit 76d94532fa.
2015-09-17 15:32:16 +02:00
kindlm 76d94532fa Meldung, wenn keine Vorlage im System 2015-09-17 15:26:24 +02:00
oesi 6705e4ff1d Vertragstyp kann nun beim Anlegen von Prüfungen ausgewählt werden 2015-09-17 08:04:30 +02:00
oesi eb639c1b55 Zusätzliche Filter für Mitarbeiterverträge hinzugefügt 2015-09-17 07:56:42 +02:00
oesi 865a0568cf Beim Senden von mails an Studierende im CIS wird nun das E-Mai-Adressentrennzeichen verwendet
Im Config kann das Default E-Mail-Adresstrennzeichen angegeben werden welches verwendet werden soll wenn der User keines gesetzt hat
2015-09-16 18:15:45 +02:00
oesi 311f914d0b Diverse Funktionen hinzugefügt die für die Verwendung in Addons benötigt werden 2015-09-16 17:55:01 +02:00
oesi c9228c7de0 Alte Menüeinträge für Moodle 1.9 aus Vilesci entfernt 2015-09-16 17:53:33 +02:00
oesi 84a86d3a06 DOC Extension für Studienordnung Dokument korrigiert
In der Word-Version der Studienordnung wird nun die Seitenanzahl korrekt angezeigt
2015-09-16 17:52:21 +02:00
oesi 28387ae474 Default Wert für Locale geändert damit Ordner mit Umlauten korrekt escaped werden und dadurch Ordner mit Umlauten korrekt gelöscht werden können 2015-09-16 17:51:15 +02:00
oesi a05a8314af Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-09-16 13:08:56 +02:00
oesi 67b0ea63de Fehler bei der Freigabe von PreInteressenten behoben 2015-09-16 13:08:22 +02:00
Andreas Moik 2d2e7475a3 Neue Logos hinzugefügt 2015-09-15 16:55:27 +02:00
Nikolaus Krondraf c40cf6e785 Fehlerbehebung bei der Anzeige von Terminkollisionen 2015-09-14 13:40:33 +02:00
kindlm 06165a3ed9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-11 16:15:54 +02:00
kindlm 13e94569fc Bug beim Neuanlegen von Dokumentvorlagen; Funktion getAktuelleVorlage macht jetzt ein Load für die OE, wenn eine Studiengangskennzahl übergeben wird 2015-09-11 16:15:06 +02:00
Gerald Raab 8876866428 generate timesheet div 2015-09-11 12:47:43 +02:00
oesi d5dfd025fd CSV Download Button für Statistiken hinzugefügt 2015-09-10 23:55:57 +02:00
oesi a0ef46b4a7 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-09-09 18:53:28 +02:00
oesi d6526bd9f4 Fehler behoben bei dem nicht zusammengehoerige Reservierungen im Export zusammengruppiert wurden
Fehler behoben bei dem in seltenen Fällen eine Kollision im Tempus angezeigt wurde obwohl keine vorhanden ist
2015-09-09 18:50:58 +02:00
kindlm 8d840203ef Merge branch 'NeuesLogo' 2015-09-09 17:17:19 +02:00
kindlm 0bf1c31d7e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-09 16:50:54 +02:00
kindlm bb4ab112ea Infotext CIS Reumreservierung 2015-09-09 16:50:45 +02:00
kindlm 8f45f26503 GUI-Überarbeitungen 2015-09-09 16:45:35 +02:00
kindlm 643db3d24c Infotext CIS-Reservierung 2015-09-09 16:45:16 +02:00
oesi 7b3d7e4c89 Bindestriche werden nun nicht mehr durch Aufzählungszeichen ersetzt wenn diese als Ergänzungsstrich oder Trennstrich am Wortende gesetzt sind 2015-09-08 19:52:16 +02:00
oesi 0fb322c632 Diverse Anpassungen an Studienordnungstemplate 2015-09-08 19:46:50 +02:00
Nikolaus Krondraf baa0e38e57 Outgoing Studenten aus Anwesenheitsliste entfernt 2015-09-08 13:23:26 +02:00
oesi 48168f6143 Fehler behoben bei dem NOT NULL Felder nicht korrekt gespeichert werden konnten 2015-09-04 17:00:19 +02:00
oesi 43da94f3c7 Fehler in der Anwesenheitsliste behoben bei dem nicht das korrekte Endedatum der Lehrveranstaltung angezeigt wurde wenn VON-Stunde und BIS-Stunde im Filter ausgefüllt wird 2015-09-04 17:01:35 +02:00
kindlm 344b3e0cd1 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-04 15:53:19 +02:00
oesi 9cb40651a2 Es werden nur Bilder im JPG Format auf die Fotoliste gedruckt da es sonst zu Fehlern bei der Erstellung der Liste kommt 2015-09-04 13:43:19 +02:00
oesi ebe2bfd6ca Anpassung an Verteileröffnung 2015-09-04 13:42:30 +02:00
Gerald Raab 19422c3a8c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-04 13:18:51 +02:00
Gerald Raab 5a63409e75 Listenaufbau summenzeile fixed 2015-09-04 13:18:30 +02:00
Andreas Moik 98e6bfe040 XSL Vorlagen für neues Studienordnungsdokument 2015-09-03 18:26:00 +02:00
Andreas Moik 79ba117b9e Anpassung Studienordnungsdokument 2015-09-03 18:19:34 +02:00
oesi 191ebddbec Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-09-03 14:24:04 +02:00
oesi 7b87c8b3e0 Neuen Cronjob hinzugefügt mit dem LVPlanwartung automatisiert werden kann 2015-09-03 14:21:13 +02:00
Gerald Raab 8cb0f5814f check abteilung zur anzeige der erweiterten liste 2015-09-03 13:31:23 +02:00
Nikolaus Krondraf 94b15b5112 Fehlerbehebung 2015-09-03 13:16:17 +02:00
Stefan Puraner 8f173d16e0 config eintrag hinzugefuegt 2015-09-03 11:13:12 +02:00
Nikolaus Krondraf df3491254f Outgoing Studenten aus Anwesenheitsliste entfernt 2015-09-03 09:05:59 +02:00
kindlm af7563da4f Rechtekorrektur 2015-09-02 18:29:04 +02:00
oesi 933dfc3477 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-09-01 16:38:30 +02:00
oesi db451a5618 Neue Spalte für LehrveranstaltungID bei Verträgen hinzugefügt um eine Verbindung zur LV bei Prüfungen zu haben 2015-09-01 16:37:19 +02:00
kindlm 6f538d7b2c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-01 16:37:02 +02:00
kindlm 3a7ccfa9a4 Berechtigungsabfrage auf OE-Ebene statt Studiengang 2015-09-01 16:36:42 +02:00
oesi 152271dfcf Updatevon korrigiert damit die LVPlanwartung auch bei Personen mit langen UIDs funktioniert 2015-09-01 16:36:19 +02:00
kindlm f40a0eef14 OE zu Funktion-Berechtigung speichern
Wenn eine OE bei der Berechtigung einer Funktion gespeichert wird, wird
diese genommen, ansonsten die von der Benutzerfunktion.
2015-09-01 16:35:41 +02:00
kindlm 50a4fe4c1e Tausch CIS-Logo 2015-09-01 16:31:51 +02:00
Nikolaus Krondraf 18af0ac7ba Dropdowns bei Raumreservierung werden dynamisch befüllt 2015-09-01 14:14:44 +02:00
Gerald Raab 8266ae615c zeitenfelder mit 0 vorne padden 2015-09-01 12:18:06 +02:00
Gerald Raab 613ddc81c9 Infoblock ergänzt 2015-09-01 11:11:11 +02:00
Gerald Raab 509ea57374 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-09-01 09:20:25 +02:00
Gerald Raab 30de27fb4a externeLehre anzeige als pausenzeit 2015-09-01 09:19:42 +02:00
oesi ad788b3c01 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-08-31 18:09:13 +02:00
oesi a4d652ed2c Fehler behoben bei der Bildanzeige wenn inhalt und DMS ID gesetzt ist 2015-08-31 18:08:49 +02:00
Gerald Raab 2d848ba750 hide csv import 2015-08-31 16:31:37 +02:00
Gerald Raab ca4366861e separate csv import link 2015-08-31 16:11:49 +02:00
Gerald Raab 31e7b9d03a mit handbuch 2015-08-31 15:19:51 +02:00
Gerald Raab 7cfe5f6e6d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-08-31 11:20:41 +02:00
Gerald Raab f58e272858 angepasste oberflaeche fuer gesamtorganisation
csv import
2015-08-31 11:03:06 +02:00
Nikolaus Krondraf 396faa4659 Bei offenen Zahlungen wird nun der Restbetrag angezeigt 2015-08-31 09:56:03 +02:00
oesi 232acc006b Bereits verplante Gruppen können nun direkt vom FAS heraus aus dem LV-Plan gelöscht werden wenn diese bereits verplant wurden.(Neues Recht lv-plan/gruppenentfernen)
Lektorenänderung: Lektoren die bereits verplant sind können jetzt auch dann direkt im FAS geändert werden, wenn dadurch eine Kollision entsteht. Vorraussetzung dafür ist, dass ignore_kollision true ist. Wenn ignore_kollision false ist, dann ist die Lektorenänderung nicht mehr möglich. Vorher wurde der Lektor in diesem Fall nur im FAS geändert aber nicht im LVPlan.
2015-08-28 14:49:15 +02:00
Nikolaus Krondraf fc637406a3 Bugfix bei Anzeige der Zahlungsbestätigung 2015-08-28 10:09:36 +02:00
Stefan Puraner 04213f4688 Anpassungen Studienplan 2015-08-27 08:27:10 +02:00
Stefan Puraner 709ee27bef Bugfix Honorarvertrag 2015-08-27 07:58:23 +02:00
oesi 0a7f06d410 Studiengang zu RDF hinzugefügt 2015-08-26 19:04:24 +02:00
kindlm 6011b9d73b Ladezeit bei Benutzerberechtigung optimiert
Es werden nicht mehr alle Dropdowns für jede Berechtigung geladen,
sondern erst wenn ein Eintrag gezielt editiert wird.
2015-08-26 17:04:24 +02:00
Nikolaus Krondraf 328c0a0595 Bugfix beim Wechsel auf den Tab Termine 2015-08-26 15:06:24 +02:00
oesi 6c937a4a21 Filter fuer Retournierte Vertraege liefert nur freie Lektoren 2015-08-26 08:14:34 +02:00
kindlm 9d7373e256 Merge remote-tracking branch 'origin/master' 2015-08-25 18:16:42 +02:00
oesi b3decd24fe Vertragsstati und Vertragstypen Codextabllen befuellt 2015-08-25 18:16:29 +02:00
kindlm 7014e51cde Alte XSL-Versionen gelöscht
Ab sofort wird für jede OE nur mehr die aktuellste Vorlage gespeichert.
Die Versionierung ist ohnehin in GitHub.
2015-08-25 18:14:40 +02:00
kindlm 47946fb527 Bugfix Chrome + Mails senden 2015-08-25 15:32:42 +02:00
kindlm cab6d8db3b Kartenverwaltung MA Studiensemester
In der Kartenverwaltung können nun die Studiensemester händisch
ausgewählt werden. Außerdem gibt es einen Filter für externe MA ohne
Lehrauftrag.
2015-08-25 15:32:41 +02:00
Nikolaus Krondraf 9d4b444aed Terminkollisionen werden farblich hervorgehoben 2015-08-25 15:04:21 +02:00
oesi a7579debd0 Numerierung startet bei jedem Ausbildungsvertrag wieder bei 1 anstatt weiter zu zählen 2015-08-25 15:02:34 +02:00
oesi fd857a7360 Part Time Organisationsform zu Vorlage hinzugefügt 2015-08-25 10:43:53 +02:00
oesi 7b9fd58226 Studienordnung Seitenmenues Resizeable
Icons bei aufgeklappten Eintraegen korrigiert
Wenn Spalten des Trees vergroessert werden, dann wird ein Scrollbalken angezeigt anstatt die Überschriften umzubrechen
2015-08-25 09:32:45 +02:00
oesi d50ba00fca getLastVerwendung liefert nun die letzte vorhanden Verwendung anstatt der letzten aktiven Verwendung 2015-08-24 15:04:47 +02:00
Nikolaus Krondraf 2cb0135164 Fehlerbehandlung bei Anlage von Prüfungshonoraren ergänzt 2015-08-21 15:15:15 +02:00
Nikolaus Krondraf ea009d8e8d Bugfix 2015-08-20 15:20:39 +02:00
Nikolaus Krondraf d86d2033d4 Verträge für Prüfungshonorare werden nach dem Speichern direkt in den Status retour gesetzt 2015-08-20 14:28:49 +02:00
oesi e3e79ff884 Farbe von beantworteten Fragen von Grün auf Blau geändert. 2015-08-19 11:31:42 +02:00
oesi 78c360280c Stundenplantabelle ist bei den Terminen umschaltbar.
Die eingestellte Tabelle wird pro User gespeichert
2015-08-19 09:09:10 +02:00
Nikolaus Krondraf d553305f49 Je nach Anwesenheit werden Prüfungstermine beim Notenimport angelegt 2015-08-19 08:21:57 +02:00
oesi 1007ee9aba Fehler behoben bei dem Unterbrecher/Abbrecher im falschen Studiensemester ins 0. Semester verschoben wurden 2015-08-18 17:13:00 +02:00
oesi 906daf09e0 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-08-18 11:27:31 +02:00
oesi 2ec1996b0f ext_id aus Save Funktionen entfernt damit diese beim Speichern von Datensätzen nicht verloren geht 2015-08-18 11:26:01 +02:00
Nikolaus Krondraf 5c4aa9f4fc Je nach Anwesenheit werden Prüfungstermine beim Eintragen von Noten angelegt 2015-08-18 10:56:45 +02:00
Nikolaus Krondraf 7a1ad9f86d Grenzwerte für Anwesenheit sind nun konfigurierbar 2015-08-18 10:56:45 +02:00
oesi 21b2b60fc2 Anpassungen damit Script über Cronjob ausgeführt werden kann 2015-08-18 09:37:30 +02:00
oesi b8dc17d8c3 Fachbereichsleiter können zu Moodle Kursen zugeordnet werden über eine Custom Role (11)
Fehlerbehandlung für SOAP Zugriffe hinzugefügt
2015-08-18 08:32:24 +02:00
oesi 9177655889 DB Indizes für Verträge hinzugefügt
Berechnung der Abwesenheitsstunden für Mitarbeiter korrigiert
Neue Funktion zur Ermittlung der Personen ohne Verträge hinzugefügt
2015-08-18 08:08:41 +02:00
oesi 3c555671c0 Filter bei Mitarbeitern hinzugefuegt für Vertraege die noch nicht retourniert wurden 2015-08-17 16:48:05 +02:00
oesi a338e8b99c Fehler beim Löschen von Dokumenten/Akten behoben bei dem versucht wurde das Dokumente doppelt zu löschen 2015-08-17 15:27:19 +02:00
oesi f15c64f6f1 Vertraege fuer Pruefungsbetreuungen koennen nun direkt bei der Noteneingabe angelegt werden 2015-08-14 09:57:39 +02:00
oesi 18415dddf7 Speichern der ext_id aus Klasse entfernt 2015-08-14 09:54:52 +02:00
Nikolaus Krondraf aff00ea07e Fehlerbehebungen 2015-08-13 15:08:25 +02:00
Nikolaus Krondraf a732b7a694 LVA-Filter für Anwesenheitsliste hinzugefügt 2015-08-13 15:03:55 +02:00
Nikolaus Krondraf f9c92cb6d2 Standort-Filter für Anwesenheitsliste hinzugefügt 2015-08-12 14:48:29 +02:00
oesi d112f3602c Neue Funktion zum Ermitteln der Zustelladresse hinzugefügt 2015-08-12 10:31:40 +02:00
oesi 7c01078573 Anwesenheitsliste mit Bilder in Fotoliste umbenannt 2015-08-12 10:31:15 +02:00
oesi 153f216d3a Fehler in der Bildanzeige behoben wenn kein Foto vorhanden ist 2015-08-12 10:30:05 +02:00
Nikolaus Krondraf ae0943d23f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	content/pdfExport.php
2015-08-11 15:21:41 +02:00
Nikolaus Krondraf d5210e34ed Filter für Anwesenheitsliste nach fix angestellten und nebenberuflichen Vortragenden hinzugefügt 2015-08-11 15:19:31 +02:00
oesi 4a5da20b99 Neue Berichte für Terminliste, Studienbuchblatt und Veranstaltungen hinzugefügt
Neue Parameter für form und standort
2015-08-11 09:20:34 +02:00
oesi 2e0e9f9da2 Terminlisten zeigen vollen Namen des Lektoren anstatt der UID 2015-08-10 17:15:35 +02:00
oesi fcb46df765 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-08-10 16:32:05 +02:00
oesi da2c348182 Fixangestellt Hackerl kann beim Anlegen von Mitarbeitern gleich gesetzt werden und kann bei der Generierung der UID berücksichtigt werden 2015-08-10 16:30:56 +02:00
Nikolaus Krondraf cfd0bd3059 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-08-10 15:26:17 +02:00
Nikolaus Krondraf 3c72d27e5b Fehler beim Scannen der Anwesenheitsliste behoben 2015-08-10 15:25:40 +02:00
oesi 74ec63ed2c Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-08-10 13:13:07 +02:00
oesi d287a9be8c - Lichtbilder die anstatt im Inhalt der Akte im DMS abgelegt sind werden jetzt auch korrekt angezeigt
- Fehler behoben bei dem die Bilder nicht übers CIS nicht korrekt gespeichert wurden
2015-08-10 13:11:08 +02:00
oesi 7471efa59a Anpassung der Vorlage damit der Ausdruck auf das Zeugnispapier passt 2015-08-07 10:14:11 +02:00
oesi e30526e0d6 Vorlage angepasst damit Lehrinhalte auf den Freifächer Zertifikaten korrekt angezeigt werden 2015-08-06 15:08:19 +02:00
oesi c9ca32b221 Commandozeilenparameter --sendmail false hinzugefügt damit bei cronjobs der Mailversand deaktiviert werden kann
Pfadkorrektur damit das Script über die Cronjobverwaltung gestartet werden kann
2015-08-06 10:04:53 +02:00
oesi a2b962d84e Fixed Upload Bugs 2015-08-05 15:32:54 +02:00
kindlm f389559d69 Kleine Korrekturen für Imagecropper
Berechtigungsüberprüfung in crop.php
Bild in skin/images verschoben
2015-07-31 18:20:23 +02:00
kindlm 75606c2d4f Merge Praktikant into Master 2015-07-31 13:15:53 +02:00
kindlm 717a95258f Merge checksystem with dokumentvorlagen 2015-07-24 15:59:08 +02:00
kindlm b22300881a Konstante CIS_LEHRVERANSTALTUNG_LVINFO_LEKTOR_EDIT 2015-07-24 15:45:03 +02:00
kindlm 903b7a3701 Fixed warning undefined variables 2015-07-24 15:42:43 +02:00
kindlm 5beb907801 Incoming-GUI überarbeitet
Projektarbeiten entfernt, Filter für Studiengang eingebaut. Admin kann
Plätze einzelner LVs auf 0 setzen
2015-07-24 15:32:40 +02:00
kindlm 6a38c0001c Prüfung doppelte Antworten Testtool
In der Funktion check_gebiet wird nun auch geprüft, ob eine Frage
mehrere gleiche Antworten hat
2015-07-24 15:27:45 +02:00
kindlm d80f51b446 PDF-Export prueft ob style in DB vorhanden
Wenn in der DB ein style hinterlegt ist, wird dieses verwendet,
ansonsten das xsl-style, welches übergeben wird.
2015-07-24 11:38:55 +02:00
kindlm 3a71ff8722 Tippfehler in der Phrasenbezeichnung 2015-07-15 11:05:36 +02:00
kindlm 47113b6686 Neue Funktion getOEsFromVorlage 2015-07-15 11:00:07 +02:00
kindlm 8e0f80e007 Diverse Korrekturen in Vorlagen 2015-07-10 15:29:27 +02:00
kindlm 1e9b2064f2 Korrektur in Abfrage
Es werden nun alle Sprachen bei der Berechnung berücksichtigt
2015-07-10 15:27:36 +02:00
Nikolaus Krondraf e38be472cb Tablesorter hinzugefügt 2015-07-10 08:34:25 +02:00
Stefan Puraner 311ed66622 Anzeige alternative Studiensemesterbezeichnung 2015-07-08 16:08:21 +02:00
oesi 6a696b7472 Fehler in der LVA Liste behoben der angezeigt wird, wenn Lehrauftraege für deaktivierte Studiengänge vorhanden sind 2015-07-03 12:47:13 +02:00
oesi 273bacb389 Studiengangsbezeichnung für Lehraufträge ohne Typ hinzugefügt
Technikum Wien Academy Logo hinzugefügt

Fehler bei der Anzeige von Lehreinheiten in der Lektorensicht behoben.
Hier wurden die Lehrveranstaltungen/Lehreinheiten angezeigt bei denen Gruppen des Studiengangs zugeordnet sind anstatt der Lehrveranstaltungen des Studiengangs.
Dies führt zu Fehlerhaften anzeigen wenn eine Lehrveranstaltung in mehreren Studienplänen verwendet wird und nur die Gruppe von einem Studiengang zugeordnet ist.
2015-07-03 09:36:35 +02:00
oesi 5751969fcf Anwesenheiten im FAS bei Studenten und Lehrveranstaltungen sichtbar 2015-07-01 19:33:54 +02:00
oesi 9c8ef52229 Bei Raumverschiebungen mit Ressourcen kollidiert die Ressource nicht mehr mit sich selbst 2015-07-01 09:30:07 +02:00
oesi 00453c1e34 Dokumenttyp korrigiert 2015-06-30 17:16:20 +02:00
oesi 9d450a17bd Falschen Link korrigiert 2015-06-30 11:30:40 +02:00
oesi f57b99252a Eintragen von Nachprüfungen auch dann möglich wenn nur eine Zeugnisnote vorhanden ist und noch keine lvgesamtnote 2015-06-30 11:15:27 +02:00
Stefan Puraner 80a133b970 improved security checks 2015-06-29 11:23:06 +02:00
Stefan Puraner ae895eb1d6 added foreign key for pruefungsanmeldung_anrechnung 2015-06-29 09:24:04 +02:00
oesi 1e613067f8 Dokumenttyp zahlung1 hinzugefügt 2015-06-26 15:20:49 +02:00
oesi 1e01800ad3 Config Eintrag fuer Zentrale Inskriptionsstelle hinzugefuegt 2015-06-25 16:27:19 +02:00
oesi 6aecf82087 Fehler bei der Ermittlung der Notenschlüssel von OEs behoben 2015-06-25 14:33:55 +02:00
oesi 2280ca6bbb EXTID wird beim Speichern nicht überschrieben 2015-06-25 14:33:17 +02:00
oesi 88ad000d5a Barcode Encoding Berechnung korrigiert 2015-06-24 11:20:12 +02:00
oesi e7166678c5 Syntaxfehler behoben 2015-06-24 07:02:12 +02:00
Paminger 0d8e16f644 MoodleSync 2015-06-23 09:08:11 +02:00
Paminger 0f860374e5 Smaller Button 2015-06-22 09:41:09 +02:00
Paminger 1925a52aa2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-06-22 07:52:48 +02:00
Paminger 3906e5711b Projekttask Markdown 2015-06-22 07:52:17 +02:00
kindlm 101067f339 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-06-18 16:01:48 +02:00
kindlm f4d9b74196 Filter für Orgform eingebaut 2015-06-18 16:01:23 +02:00
Stefan Puraner 57b464537a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	system/checksystem.php
2015-06-17 09:09:16 +02:00
Stefan Puraner 6d78878385 Anpassungen Pruefungsanmeldung 2015-06-17 08:53:19 +02:00
kindlm b133137b9e Mitarbeiterimport Jahreszahl
Mitarbeiterimport liefert falsche Jahreszahl, wenn
Sozialversicherungnummer 00.
Hier steht nun 20xx statt 19xx bei Jahrgängen nach 1955
2015-06-16 16:36:41 +02:00
kindlm 503939e2c5 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-06-10 19:50:22 +02:00
kindlm ccf7efeaa2 Kleiner Syntaxfehler 2015-06-10 19:49:23 +02:00
kindlm db8c1b9b55 Kleiner Fehler in Infoscreenverwaltung 2015-06-10 19:48:38 +02:00
kindlm c742ab7b42 Erste Version 2015-06-10 19:46:45 +02:00
Gerald Raab 604ea175ec simplify insert-ui 2015-06-10 15:17:33 +02:00
oesi 9250f01077 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-06-10 14:45:11 +02:00
oesi ad0a8b88dd Link zu Auswertung korrigiert 2015-06-10 14:44:44 +02:00
Nikolaus Krondraf fb3999c3ba Link zur CIS-Notenliste im FAS ergänzt 2015-06-10 14:37:12 +02:00
oesi 0b1be5ecc5 Fehler bei PHP5.3 behoben 2015-06-10 14:25:07 +02:00
Gerald Raab 53b8734b36 Reduced interface for Input 2015-06-10 09:50:11 +02:00
Nikolaus Krondraf cee05a2a6a Menüpunkt CIS ergänzt 2015-06-09 14:04:20 +02:00
oesi a923efdbd5 Stundengrenze für Fixe und Externe Lektoren wird jetzt ueber den OE-Baum verwaltet.
Es können unterschiedliche Grenzen für Abteilungen festgelegt werden.
Die Lehrauftragsliste kann jetzt getrennt für einzelen Organisationseinheiten-Bäume erstellt werden
2015-06-09 08:12:17 +02:00
oesi 525bd30b61 - Fehler behoben bei dem die STPL Details im Tempus nicht korrekt aktualisiert wurden
- Fehler behoben bei dem das Anmerkungs Icon im Tempus nicht immer angezeigt wurde
2015-06-09 08:09:35 +02:00
Nikolaus Krondraf 4a58d4fe4c FAS-Menüpunkt CIS eingebaut 2015-06-08 15:04:59 +02:00
Gerald Raab 528a79678f DienstV and PflegeU added to Zeitsperren
UI enhancements: datepicker, design
2015-06-08 12:37:42 +02:00
oesi d544aae0d1 Terminliste und Export bei Studierenden, Mitarbeitern und Lehrveranstaltungen/Lehreinheiten 2015-06-04 09:32:01 +02:00
Stefan Puraner b25059f933 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-06-03 08:37:03 +02:00
oesi 4453c2cf4c Bug Fixed 2015-06-02 15:34:58 +02:00
oesi fc7383a9e6 Icon nicht sichtbar wenn Leistungsbeurteilung/Anwesenheit nicht sichtbar 2015-06-02 15:31:06 +02:00
oesi f5ed1f15e4 Leistungsbeurteilung ausblendbar 2015-06-02 15:07:16 +02:00
oesi 35c779775d Warnings bei der Dokumentenanzeige von Outgoing behoben 2015-06-01 17:56:37 +02:00
oesi 57a644cf99 - Kollisionsfreie User werden in Verbandsansicht nicht mehr als Kollision angezeigt
- Drop auf Lehrstunde ist jetzt auch für bereits verplante Stunden möglich
- Stunde und Tag Info wird jetzt auch dann angezeigt wenn eine Stunde verschoben wird
2015-06-01 17:54:04 +02:00
Stefan Puraner 9077488560 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-06-01 09:41:35 +02:00
Stefan Puraner d51cf69035 Preparation for change in Pruefungsanmeldung 2015-06-01 09:40:30 +02:00
oesi 93473c8db4 Editieren LVInfo, Semesterplan und Moodle-Kursen für Lektoren deaktivierbar 2015-05-31 16:43:00 +02:00
oesi c14feb7aff Moodle Kurse fuer jede Lehreinheit anlegen bei der die Lehrform der LE=Lehrform der LV 2015-05-31 16:41:15 +02:00
oesi 9accf9a482 Parameter zum Pruefen von SVNR Nummern hinzugefügt damit beim Editieren die eigene Person nicht mitgeprüft wird 2015-05-29 14:29:21 +02:00
oesi 94d73b44f1 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-29 12:53:56 +02:00
oesi 0c266ad63d Wechseln von verplanten Lektoren aktualisiert ab sofort immer Stundenplandev anstatt der eingestellten STPL Table. 2015-05-29 12:52:31 +02:00
kindlm 4efa561017 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-28 18:50:49 +02:00
kindlm 09fcedef53 Korrektur bei Berechnung des Studienenendes 2015-05-28 18:50:10 +02:00
kindlm 5eacd9ef81 Neues Feature Exklusiv bei Infoscreen
Exklusive Einträge haben Vorrang von normalen Einträgen.
lehrform.class: Kleine Fehlerkorrektur
2015-05-28 18:49:21 +02:00
oesi 730a20d373 Default Wert für CIS_PRUEFUNG_MAIL_EMPFAENGER_ANMEDLUNG geändert 2015-05-28 17:24:05 +02:00
oesi 4b8af48052 - Fehlermeldung am Infoterminal entfernt
- Neuen Config Eintrag zum Ausblenden des Lageplans hinzugefuegt
2015-05-28 17:19:29 +02:00
oesi 2ddefb2e75 Fixed Broken JOIN 2015-05-28 16:02:08 +02:00
oesi b6cddb033e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-28 13:46:29 +02:00
oesi f0c458d597 Fehler bei der Anzeige von freien Räumen am Infoterminal korrigiert 2015-05-28 13:43:54 +02:00
oesi 0ddaa060a8 Fehler behoben bei dem keine neue Phasen angelegt werden konnten 2015-05-28 10:43:02 +02:00
oesi 7510a78f2c Einstellung zum Ueberschreiben des MAIL_FROM hinzugefügt 2015-05-28 10:40:23 +02:00
oesi f455b28bba Englische Bezeichnung hinzugefügt 2015-05-28 10:39:23 +02:00
oesi 8daf023954 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-05-27 11:17:26 +02:00
oesi 34b6a99bbb Absenderadresse von allen Mails kann ueber Config ueberschrieben werden 2015-05-27 11:16:46 +02:00
kindlm 999f0e528c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-26 20:34:20 +02:00
kindlm 1869ae4c51 GUI-Verbesserung in Benutzerberechtigung
Ampel kennzeichnet aktive und inaktive Berechtigungen (Endedatum);
Datepicker nur über Symbol;
Infobutton zeigt Insert- und Updatedatum
2015-05-26 20:33:57 +02:00
kindlm c1342af8b5 Korrektur Ausbildungsvertrag und StudienblattEng
Ausbildungsdauer bei Quereinsteigern ist kürzer deshalb neue Attribute
student_maxsemester und student_anzahljahre.
Studienblatt: Geschlecht, Orgform und Studierendenstatus werden auf
englisch ausgegeben.
2015-05-26 20:31:31 +02:00
oesi e8bd5e3d62 Neuer Config Eintrag fuer Bewerbertool zum Ausblenden der Berufstaetigkeit 2015-05-26 18:02:32 +02:00
kindlm 66cbd52879 Studienblatt englisch und Ausbildungsvertrag
Anpassungen für Zweisprachigen Ausbildungsvertrag und normal und AOs.
Englisches Studienblatt.
Confirm-Fenster bei der Erstellung des Studienblattes, wenn kein
Studienplan beim PreStudenten hinterlegt ist.
2015-05-26 14:13:58 +02:00
kindlm 77e9ba0c21 GUI-Verbesserungen Benotungstool 2015-05-26 09:57:05 +02:00
kindlm 4d322b003f GUI-Verbesserungen Benotungstool
Link zur Notenliste im Benotungstool
Anleitung linkt ins Dokuwiki
Notenliste.xls im Phrasenmodul
2015-05-26 09:55:17 +02:00
oesi 59c00f39ee Doppelten Tag entfernt 2015-05-26 09:55:09 +02:00
oesi 3b04890dea Neue Spalte Anwesenheit zu LVInfo RDF hinzugefügt 2015-05-26 09:52:17 +02:00
oesi 338070128c Zusätzliche Config Einstellungen für Onlinebewerbung 2015-05-22 19:50:14 +02:00
oesi 06f32e4ada Studiensemester kann fuer Onlinebewerbung freigeschalten werden
Neue Spalten für
- Kosten bei Raumtyp
- Mehrsprachige Bezeichnung von Dokumenten
- Onlinebewerbung bei Studiensemester
2015-05-22 15:41:46 +02:00
Gerald Raab 69d5fd46d1 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-21 16:42:24 +02:00
Gerald Raab e479553fc7 save type
save ressourve_id
select type from dropdown menu
2015-05-21 16:40:01 +02:00
Nikolaus Krondraf ae72a86e87 Funktion getAllDokumenteForPerson() um übersetzte Bezeichnung erweitert 2015-05-21 15:51:55 +02:00
oesi f826c2721f LVInfo Feld-Bezeichnungen in Locales ausgelagert damit diese von Addons ueberschrieben werden können 2015-05-21 08:14:03 +02:00
kindlm b0230feb34 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-20 11:11:40 +02:00
oesi 4c98f8ff96 Anwesenheitsliste ohne Bilder ist im CIS jetzt ueber Config ausblendbar 2015-05-20 10:05:47 +02:00
oesi 7f0b96307a Löschen von Vertragsstatus hinzugefügt
Fehler beim Laden von Verwendungen korrigiert
2015-05-19 19:33:58 +02:00
Paminger 57d0f238e3 uncoment console.log 2015-05-18 16:00:34 +02:00
Paminger 38536837e8 Projektphasentyp und Verantwortlich 2015-05-18 15:37:13 +02:00
Paminger 3b74768abb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	system/checksystem.php
2015-05-18 13:39:18 +02:00
kindlm ac95e958c2 Required permission in errormsg
The function isBerechtigt now returns the required permission in its
errormsg.
2015-05-15 11:35:31 +02:00
kindlm 71c35d226a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-15 11:21:49 +02:00
kindlm 4a9e86a74c getProjekteMitarbeiter um Phasen erweitert
Die funktion getProjekteMitarbeiter liefert nun auch optional die
Projekte, wenn ein Mitarbeiter zu einer Projektphase zugeteilt ist
2015-05-15 11:21:33 +02:00
Paminger f505e16dc5 Images for Planner 2015-05-13 17:49:47 +02:00
Paminger e79e19f1cf Planner Verantwortlichkeit 2015-05-13 17:47:32 +02:00
Nikolaus Krondraf 059a37fb5f Erweiterungen zum Abruf der Standorte für Bewerbertool 2015-05-13 12:07:58 +02:00
Nikolaus Krondraf 124f03cbbc add column to public.tbl_organisationseinheit and lehre.vw_studienplan 2015-05-13 07:34:49 +02:00
oesi 6c7d8ba603 Auswahl von Sem/Ver/Grp im LVPlan ist jetzt dynamisch 2015-05-12 17:48:58 +02:00
oesi a6a98ca0c5 Getter/Setter entfernt da diese zu Problemen in Verbindung mit der Funktion getTimestamp führen 2015-05-12 16:17:17 +02:00
oesi 8dee9ae897 Fehler behoben bei dem nach dem Anlegen von neuen Notizen nicht korrekt in den Editiermodus gewechselt wurde 2015-05-12 15:52:55 +02:00
oesi d5e61a0259 Menge wird nun auf ganze Zahl geprueft 2015-05-12 14:43:18 +02:00
oesi 80ea9f6b18 Datumsformat korrigiert 2015-05-12 13:24:27 +02:00
Stefan Puraner e2afff0a0b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-12 12:58:37 +02:00
Stefan Puraner b0fafd2013 preparation for addon externe Ausweise 2015-05-12 12:50:32 +02:00
oesi c742fc1231 Tempus:
- Kollisionscheck ueberarbeitet
- Kollisionsgrund wird nun im Tooltip angezeigt
- Ressourcenzuordnung zu Stunden
- Option hinzugefuegt um alle Einträge einer Stunde anzuzeigen (zB Incominggruppen)
- Option zum Drop auf bestehende Stunden hinzugefügt (UNR wird automatisch gleichgesetzt)
- Fehler behoben beim Anlegen von Gruppen mit Logins > 16 Zeichen
- Es koennen jetzt mehrere Lektoren definiert werden die nicht kollidieren sollen

Anwesenheitslisten mit Barcode koennen nur fuer alle Studiengaenge auf einmal erstellt werden
2015-05-12 12:28:34 +02:00
kindlm a172816057 Logikfehler beim UID-Parsen 2015-05-08 15:56:30 +02:00
kindlm 61fac03998 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-08 15:54:31 +02:00
kindlm 2c5acb74ef Logikfehler beim UID-Parsen
Wird nur eine einzelne UID als Parameter übergeben,  erkennt es
$student_obj->load($uids[1]) nicht als Array und liefert 0.

Rechteänderung bei stpl_week_anzahl_studenten.php
2015-05-08 15:54:09 +02:00
Stefan Puraner c50b685705 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-07 16:39:40 +02:00
Stefan Puraner b6be10f7d3 added attribute beschreibung to class studiensemester and database 2015-05-07 16:37:38 +02:00
Nikolaus Krondraf 0c81f2a16c changed config value 2015-05-07 11:47:16 +02:00
Nikolaus Krondraf f3177d6e85 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-07 11:43:23 +02:00
Nikolaus Krondraf b9c0f9ec63 add 2 new config values 2015-05-07 11:42:55 +02:00
kindlm f09073c658 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-07 10:58:17 +02:00
kindlm 6b6cbf682f Textänderung Studienblatt
"Gilt auch ohne Unterschrift und Stempel" hinzugefügt.
2015-05-07 10:57:45 +02:00
Stefan Puraner d4f66fb300 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-07 10:25:47 +02:00
Stefan Puraner d1b9d3cc89 changing attributes to public 2015-05-07 10:20:47 +02:00
Paminger ec47c2bca0 Prozessklasse 2015-05-07 08:25:06 +02:00
Paminger d44633bde8 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-07 08:19:46 +02:00
Paminger fb3909325a PG-Field-Name 2015-05-07 08:18:55 +02:00
Nikolaus Krondraf 50be41fcfb add view lehre.vw_studienplan 2015-05-06 12:57:47 +02:00
Nikolaus Krondraf 9c3dcbf382 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-05-05 15:07:43 +02:00
Nikolaus Krondraf 03aa653ef4 add function 2015-05-05 15:07:12 +02:00
Gerald Raab 866541de2c sperrdatum in zeitaufzeichnung 2015-05-05 13:11:08 +02:00
oesi 53e6395323 Warning CSS hinzugefügt 2015-05-04 16:39:26 +02:00
oesi 7fb8687727 Javascript Warning bei Lehrveranstaltungsverwaltung entfernt 2015-05-04 16:38:49 +02:00
oesi 9539a06fa7 Escaped Shell Arguments 2015-05-04 16:37:08 +02:00
oesi 79e4ea661d HTML Zeichen in Statistiken werden jetzt konvertiert 2015-05-04 16:34:15 +02:00
oesi 7d2f976699 Prüfscript zum Aufdecken von Inkonsitenten Datenbestaenden 2015-05-04 16:31:49 +02:00
oesi 96388c97a7 ECTS Punkte und Semester der LV werden im Studentennoten Karteireiter mit angezeigt 2015-05-04 16:29:51 +02:00
Stefan Puraner 86835040e5 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-30 14:56:52 +02:00
Stefan Puraner ec877b7d42 protected attributes and getter/setter 2015-04-30 14:55:22 +02:00
oesi bb78764bef Sicherheitslücke beim Löschen von Reservierungen behoben 2015-04-28 18:26:29 +02:00
kindlm 07855b59e0 Recht für mitarbeiter/persoenlich im Checkscript 2015-04-28 11:56:58 +02:00
kindlm 9e88180df4 Merge remote-tracking branch 'origin/master' into Persoenliche_Daten 2015-04-27 18:57:30 +02:00
kindlm f373ec7a67 CIS-Suche nach Organisationseinheiten 2015-04-27 18:56:24 +02:00
kindlm d3e768575f Ausbildungsverträge Deutsch, Zweisprachig und AOs
Aktualisierte Ausbildungsverträge für Deutsch, Zweisprachig und
Außerordentliche Studierende (De und Zweisprachig)
2015-04-27 18:56:22 +02:00
oesi 3ec4fab663 XSS Lücke geschlossen 2015-04-27 18:17:44 +02:00
oesi 00b2902265 Fehler in der Berechnung der Gesamtstunden einer Lehreinheit behoben bei dem bei mehreren Gruppen die Stunden doppelt gezählt wurden 2015-04-24 11:48:51 +02:00
Gerald Raab fee48d1f6f Dienstverhinderungen auch in Zeitaufzeichnung anzeigen 2015-04-24 10:39:44 +02:00
oesi 4950f74c0b Fixed Locale 2015-04-24 10:33:29 +02:00
kindlm 80dfb7c62a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-24 10:29:49 +02:00
kindlm bc289aa68c Nachname im Filename; Fehler im Unlink behoben 2015-04-24 10:29:33 +02:00
kindlm 03c5960c15 Ausbildungsvertrag über pdfExport.php
Tasten-Event bei Dokumenterstellung (Umschalt u. Strg)
2015-04-24 10:28:09 +02:00
oesi f056a2b24a Lint v2 2015-04-24 08:36:54 +02:00
oesi 79d1989cc0 Lint 2015-04-24 08:34:37 +02:00
oesi 83daff6876 Tab ersetzt durch leerzeichen 2015-04-24 08:29:36 +02:00
oesi 59aa35d9ac Stundenangabe bei der Erstellung von Anwesenheitslisten hinzugefuegt
Beim Erfassen der Anwesenheitslisten kann nun zusätzlich per DropDown die Lehrstunde gewählt werden
GUI im CIS zur Anzeige der Anwesenheiten ueberarbeitet
Als Admin können nun auch Anwesenheiten von anderen eingesehen werden
2015-04-23 18:42:06 +02:00
oesi da46969eed Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-04-23 17:22:57 +02:00
oesi 1ebcb58d54 Lint Test to PHPCI Added 2015-04-23 17:22:19 +02:00
oesi 6102ee59e3 Vorhandene Rechnungen werden auch angezeigt wenn die Bestellung noch nicht freigegeben wurde 2015-04-23 16:10:54 +02:00
oesi 5303a976f8 STIP Testclient hinzugefügt um Error Messages zu simulieren
Error werden nur per Mail an Admins versandt wenn tatsaechlich ein Error auftritt
2015-04-23 11:48:24 +02:00
Nikolaus Krondraf f52eb5ee9c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-22 14:40:27 +02:00
Nikolaus Krondraf 3a0f479cc2 Beim Statuswechsel zu Abbrecher/Unterbrecher werden fehlende Noten eingetragen 2015-04-22 14:38:19 +02:00
oesi adb27735c9 Stip Schnittstelle überarbeitet
- korrektur der Passwortpruefung
- Gesendete Daten werden zusätzlich geloggt
- Empfaenger bei Error korrigiert
2015-04-22 14:36:59 +02:00
oesi d6df024f37 - Umlaute werden korrekt in XLS Export dargestellt
- Inkonsistenzen in HTML und Excel Liste beseitigt
- Tippfehler korrigiert
2015-04-22 14:27:18 +02:00
oesi 4399564ca6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-22 13:40:16 +02:00
oesi f8ea792281 Fehler behoben bei dem das Eintragen von Prüfungsnoten bei deaktivierter Punkteeingabe nicht möglich ist 2015-04-22 13:39:23 +02:00
Stefan Puraner 841f28e33b Bugfix CIS LV-Infos 2015-04-22 12:48:59 +02:00
Stefan Puraner 5d9cd477c2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-22 12:44:22 +02:00
Stefan Puraner aa7f27802b Bugfix CIS LV-Info 2015-04-22 12:42:48 +02:00
oesi 17a62cadea Fehler behoben bei dem die Default Sprache aus dem Addon nicht korrekt geladen wurde 2015-04-22 10:06:54 +02:00
Stefan Puraner 54c03c33c9 Squashed commit of the following:
commit 943952ca60e210877276054579b507d36d6bb979
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Wed Apr 22 09:19:39 2015 +0200

    Bugfixes
2015-04-22 09:28:23 +02:00
oesi 8c7009adb2 Warnung behoben wenn nicht alle Parameter uebergeben werden 2015-04-21 17:53:12 +02:00
oesi 800eeb4dfd Dateien in Addon Bewerbung verschoben
Warning behoben wenn Zahlungen auf nicht aktiven Studiengang vorhanden sind
2015-04-21 12:28:21 +02:00
Stefan Puraner 586bb1fd3f Squashed commit of the following:
commit f8bc2388095b1b41f56dd9bda8abd4fdd86e4a4c
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Tue Apr 21 11:17:25 2015 +0200

    Refactoring Suche nach Zahlungsreferenz

commit ed1b8608c5bdbb08d6e3ce02ba63359f7b28d7ae
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Tue Apr 21 10:59:13 2015 +0200

    Mitarbeiter anlegen mit Personalnummer NULL möglich;
    FAS-Suche um Parameter Zahlungsreferenz erweitert;

commit 652ba355e6dd0504402c7c20364a8ce25f766d83
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Mon Apr 13 09:42:35 2015 +0200

    Datumsfeld für manulles Buchungsdatum bei Gegenbuchungen hinzugefügt
2015-04-21 11:23:34 +02:00
oesi a2cc845a77 Authenthifizierung ohne Passwort generell abbrechen 2015-04-20 16:11:09 +02:00
kindlm d34fa4fea0 pdfExport: Fehler im unlink; Nachname im Filename
Bei der Erstellung der Dokumente wird der Nachname im Filename
hinzugefügt, wenn er eindeutig ist.
2015-04-20 13:32:13 +02:00
Nikolaus Krondraf 48813b4e41 Prüfung der Berechtigung für LVA berücksichtigt nun Studienpläne der LVA 2015-04-20 11:05:45 +02:00
kindlm 69fcb0144c Löschen von Gebieten schreibt Log und Undo
Wenn in der Testtool-Administration die Antworten eines Gebiets eines
Kandidaten gelöscht werden, wird ein Log-Eintrag in der DB samt
UNDO-Befehl erstellt.
2015-04-17 19:43:06 +02:00
kindlm c37d2852ff Formatierung Datumsfelder 2015-04-17 18:14:11 +02:00
kindlm 81ccf8374a Korrekturen Testtool Auswertung und Login 2015-04-17 18:01:04 +02:00
kindlm d86e1ec4d3 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-17 12:27:25 +02:00
kindlm 8d7a1134a1 Excel-Export Spalte Isodatum 2015-04-17 12:26:10 +02:00
kindlm 44be65f08e Persönliche Daten 2015-04-17 12:11:29 +02:00
oesi b2d2cd109f Fehler behoben beim Ändern von Stati von Interessenten 2015-04-17 09:46:33 +02:00
oesi 494861b3d2 Vorlage für Lehrgang angepasst 2015-04-17 08:33:57 +02:00
oesi 1f1a5ca9eb Fehler behoben bei dem das Tempus nicht mehr startet wenn Seamonkey 1.1.18 verwendet wird 2015-04-17 08:33:11 +02:00
oesi b50d4c27d1 Fehler behoben bei dem ErrorMsgs beim Reihungstest angezeigt wurden 2015-04-17 08:32:08 +02:00
oesi 9367afebec Feldbezeichnung für ZGV Nation angepasst 2015-04-16 12:08:52 +02:00
Gerald Raab a753ec4d77 ZA anzeigen und syncen 2015-04-16 11:21:09 +02:00
Paminger e1c6e97629 For OdooExtensions
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2015-04-16 10:33:56 +02:00
Paminger e8a7acd2b4 Extensions for AddOn Odoo 2015-04-16 10:33:33 +02:00
kindlm c34dc97451 Wording 2015-04-15 20:23:55 +02:00
oesi 0292f00409 - Stundenplandb und Ignore-Kollision Status wird jetzt auch direkt nach dem Tempus start farblich korrekt markiert
- Fehlermeldung beim Eintragen von max-kollision behoben wenn die Variable vorher nicht gesetzt war
- alten Link auf ToDo Liste aus Tempus-Menü entfernt
2015-04-15 18:55:38 +02:00
kindlm f5e700606d Stgl und Orgform in student.rdf
Task 0001880;
Task 0001187;
Task 0001750;
2015-04-15 17:54:25 +02:00
oesi bda227b9c5 Fixed Typo 2015-04-15 14:52:05 +02:00
oesi d85e9cd335 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-04-15 14:47:12 +02:00
oesi 62e80c7ce2 Fehler bei der Anzeige der Verplanten Stunden behoben wenn die Stundengrenze pro Semester ueberschritten wurde 2015-04-15 14:46:33 +02:00
kindlm 8463603f4d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-14 19:17:50 +02:00
kindlm 75ae4df5de Fehler beim löschen eines Prestudenten
db_parse_bool hinzugefügt
2015-04-14 19:17:26 +02:00
oesi ab00219a52 Added LICENSE File 2015-04-14 17:24:27 +02:00
oesi 42c2696dca Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-04-14 15:27:48 +02:00
oesi 61459af880 Neue Spalten für mehrsprachige Bezeichnung der Lehrformen hinzugefügt 2015-04-14 15:26:40 +02:00
kindlm fb32d1e059 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-14 14:46:28 +02:00
kindlm feb227e336 Studienblatt RDF Fehler bei Sonderzeichen
Fehler bei Sonderzeichen in Anmerkung Prestudent
2015-04-14 14:45:59 +02:00
oesi 8512a6a899 Bug behoben bei dem im Tempus beim Ziehen einer Stunde der Hintergrund weiss wird
Bug behoben bei dem in der neuen Seamonkey Version die Anzeige bei aktivierten Kollissionscheck und Stundenplan-Tabelle nicht rot wird
Bug behoben bei dem das Kontextmenü bei den Stundenplandetails transparent angezeigt wurde
2015-04-14 10:10:52 +02:00
oesi efaaa56d94 Neuen Config Eintrag hinzugefügt ob die LV-Note vom Lektor eingetragen werden darf wenn bereis eine Zeugnisnote vorhanden ist 2015-04-14 10:08:47 +02:00
Nikolaus Krondraf ebb1eced99 add missing primary key for table public.tbl_notiz_dokument 2015-04-13 07:55:16 +02:00
oesi 0cd6d7aca4 Fehlende FK für ZGVNationen hinzugefügt
Ausstellungsstaat wird fuer neue ZGV Nation übernommen
2015-04-10 17:24:43 +02:00
oesi 63aaa62d84 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2015-04-10 17:14:53 +02:00
oesi 9aae1085df Fehlende Spalten und Tabellen hinzugefügt 2015-04-10 17:13:12 +02:00
kindlm c60df58328 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-10 15:53:11 +02:00
kindlm 3bf7e7396a Flash-Player aus Testtool entfernen
Audio ab sofort über HTML5-Tags.
Kleiner Fehler beim Sprachenwechsel behoben.
2015-04-10 15:51:28 +02:00
oesi cad7a714c1 Addon Hooks für LV-Detail Seite hinzugefügt 2015-04-09 19:04:27 +02:00
oesi e728daf034 Fehler in der Caldav Schnittstelle behoben bei der die Termine nicht immer korrekt exportiert wurden wenn zur selben Zeit ein LVPlan Eintrag und eine Reservierung vorhanden ist 2015-04-09 19:01:55 +02:00
oesi 31371eab5e Documents Folder added to ignore List 2015-04-09 19:01:00 +02:00
oesi 47802e2b03 AktenUpload in Bewerbungstool Addon verschoben
Warnungen behoben
2015-04-09 17:10:23 +02:00
Stefan Puraner ad6cebfa94 Squashed commit of the following:
commit 94761687c9b9a75c74ec7311bfa9023b651bd0fd
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Thu Apr 9 12:56:25 2015 +0200

    Prüfungsanmelung: Studenten können durch Lektor hinzugefügt werden; Es
    kann eine Liste aller Anmeldungen erstellt und ausgedruckt werden. Desing
    Änderungen

commit 27bb213c8c70ec81916cf4a3b3dabf3e325c1dad
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Thu Apr 9 10:57:57 2015 +0200

    Lageplan kann im Infoterminal ausgeblendet werden

commit 471a39f816c4951b478b95f035dca85124fe5642
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Thu Apr 9 10:39:27 2015 +0200

    Drucken des Studienblattes im CIS

commit 58c283a389c0b18ca5186e6fd012afa0cdc84103
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Wed Mar 25 16:15:59 2015 +0100

    Studenten können durch Lektor/Sekretariat manuell zu Prüfungen hinzugefügt
    werden.

commit fc9ae291c5e13ce4cd7a65baf43242ba5124616f
Author: Stefan Puraner <puraner@technikum-wien.at>
Date:   Tue Mar 24 08:55:55 2015 +0100

    Änderungen/Löschen von Noten werden im Undo-Log protokolliert
    und können rückgängig gemacht werden.
2015-04-09 13:00:59 +02:00
Nikolaus Krondraf ab98e6422a Extended class DMS so it can delete files in the filesystem 2015-04-09 12:44:15 +02:00
Nikolaus Krondraf 04021e36f6 Upload documents for notes in FAS 2015-04-09 09:04:08 +02:00
oesi 4cc1ff2915 Fixed PHP Warning 2015-04-08 14:10:38 +02:00
oesi dba3e1eae8 Fixed Remote Code Execution Lücke 2015-04-07 14:22:44 +02:00
oesi 597b410582 Upload von phtml Dateien verhindert 2015-04-07 12:52:40 +02:00
kindlm 4ea49a43a0 Testtool Style 2015-04-03 12:54:24 +02:00
kindlm 861482a230 Testtool Style 2015-04-03 12:03:56 +02:00
kindlm 27873b2756 Vorschaukorrektur in CMS und CIS
CMS Vorschau immer anzeigen, auch wenn Content unsichtbar.
CIS nur anzeigen, wenn Content sichtbar.
2015-04-02 20:20:13 +02:00
kindlm 312fe6a887 GIT-Ignored files 2015-04-01 20:00:15 +02:00
kindlm e7956d4bc2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-04-01 19:56:45 +02:00
kindlm f500d1b4ac Anpassungen im Template Studienordnung
+ Testtool Auswertung Detail Spalte "gesamt" getrennt nach m/w
2015-04-01 19:56:30 +02:00
Nikolaus Krondraf 3a548a9955 Beim Anlegen einer neuen Lehreinheit wird Sprache der LVA übernommen 2015-04-01 09:52:48 +02:00
Paminger 06c58d55ef Extensions on Class stunde 2015-03-31 19:51:26 +02:00
kindlm e2e022be3c Anpassungen im Template Studienordnung
Englische LV-Infos im rdf
2015-03-30 17:56:23 +02:00
Robert Hofer 29f2b98877 ausstellungsstaat, zgv nation 2015-03-25 18:41:06 +01:00
oesi 6ea4218853 Accountinfoblatt wird per Default als PDF erstellt 2015-03-25 14:00:05 +01:00
kindlm 16f617b234 Vorschaukorrektur im CMS 2015-03-24 21:35:52 +01:00
kindlm 50d8cdee07 Inaktive OEs ausgrauen, doppelte CSS einträge 2015-03-24 21:06:29 +01:00
kindlm 4ff56af61e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-03-24 20:01:39 +01:00
kindlm 43aeb7fe7e Keine Vorschau im CMS
Parameter "sichtbar" wurde falsch ausgelesen
2015-03-24 20:01:20 +01:00
Robert Hofer 95d8967855 nation attribute for ZGV 2015-03-24 18:07:43 +01:00
kindlm 5b58fce5de Kleiner Fehler bei Detailauswertung, Korrektur CMS
ParseBool bei Detailauswertung eingefügt.
Vorschau bei CMS-Admin auch, wenn Content nicht sichtbar
2015-03-24 15:44:04 +01:00
kindlm a96cabd501 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	content/pdfExport.php
2015-03-24 15:38:29 +01:00
kindlm ccb21c3127 Anpassungen Laufzettel BFI
Addonfähigkeit in PDF-Export eingebaut.
Neue function load_mas in zgc.class.
Textkorrektur in akte.class
2015-03-24 15:32:14 +01:00
oesi c40fb16fdf Debug Output entfernt 2015-03-24 09:41:58 +01:00
oesi d284e2b025 Fehler behoben bei dem im SS und im WS unterschiedliche Erfolgsnachweise erstellt wurden 2015-03-24 09:36:46 +01:00
oesi bc1c27f95e Brechtigungen für tbl_notiz für Web User hinzugefügt 2015-03-23 13:32:23 +01:00
Robert Hofer 9e57867d08 flag "required" for documents in onlineapplication 2015-03-20 14:34:55 +01:00
Robert Hofer 8b4c82c0e3 get types of a list of studiengaenge
get zgv for all prestudents of one student
2015-03-20 13:37:27 +01:00
Robert Hofer 61dca94bf2 new method for application form 2015-03-20 10:44:56 +01:00
Robert Hofer dde1fc6daf page reload after uploading documents 2015-03-19 15:45:16 +01:00
Stefan Puraner d13b622268 Anpassungen Dokumente KTU 2015-03-19 12:11:41 +01:00
oesi d0a0d0e4d9 PreInteressent Übernahme
Fehler behoben bei dem Personen nicht in der Übernahmeliste aufscheinen wenn diese sich bereits vorher für diesen Studiengang interessiert haben.
2015-03-18 11:56:56 +01:00
oesi 1efc856941 Hinweistexte hinzugefügt 2015-03-17 15:56:40 +01:00
oesi 399ada5a4a Bugfix beim Ermitteln der Anwesenheiten 2015-03-17 15:56:09 +01:00
oesi fee4706b87 Fehler behoben bei dem Standalone Cronjobs nicht ausgefuehrt werden 2015-03-17 12:06:21 +01:00
oesi 3401f270fa Fehlende Ext_ids hinzugefügt 2015-03-17 10:35:28 +01:00
oesi 2d1e5c2376 Anmerkung bei Prestudentstatus im FAS sichtbar und editierbar 2015-03-16 18:05:11 +01:00
oesi e6b7b50a83 Remove Mail sending Files 2015-03-16 13:54:06 +01:00
oesi d604e82338 Removed old Files 2015-03-16 13:50:00 +01:00
oesi fbf344ee62 Remove old Scripts 2015-03-16 13:41:20 +01:00
oesi b416aa467c Removed old Scripts 2015-03-16 13:27:00 +01:00
oesi 1316c2a6b5 Inskriptionsbestätigung wird jetzt als PDF geliefert wenn diese mit unoconv erstellt wird 2015-03-13 17:01:37 +01:00
oesi b54aee666e Fehler beim Raumvorschlag behoben wenn in den Raumtypen keine Räume vorhanden sind 2015-03-13 16:52:05 +01:00
oesi f30068c764 Fehler behoben bei dem der Funktionen Karteireiter bei Mitarbeitern nicht immer korrekt geladen wurde 2015-03-13 16:39:44 +01:00
oesi bc1ad0345d Gruppenverwaltung Bugfixes
Nach dem Anlegen wird wieder an die Stelle gesprungen an der die Gruppe ist damit das eintragen mehrerer Gruppen erleichtert wird
Bei Spezialgruppen können jetzt keine Sonderzeichen mehr eingegeben werden
2015-03-13 16:23:08 +01:00
Robert Hofer 6c3b5403ae column tbl_prestudent.anmerkung
is called "anmerkung_status" in php object
2015-03-13 14:44:20 +01:00
Robert Hofer 6066462044 load prestudent 2015-03-12 11:36:24 +01:00
Robert Hofer 570bbf7527 studiengang infos 2015-03-10 20:21:36 +01:00
kindlm d504b9f916 Protect Video in CMS, Orgform und Stgl in Student.rdf
<video>-Tags werden nun in Tinymce im CMS-Admin geschützt
Orgform und Studiengangsleitung im student.rdf.php hinzugefügt
2015-03-10 18:50:18 +01:00
Robert Hofer 2238af4b39 new flag onlinebewerbung
new column onlinebewerbung
view studiengang_details refactored
change flag onlinebewerbung in vilesci
2015-03-10 14:26:31 +01:00
oesi 6eb904cb5c Fehler behoben wenn mehrere Spacer im Menü vorkommen 2015-03-09 13:58:56 +01:00
Nikolaus Krondraf 7a849184e2 FAS-Reiter Anrechnungen nur mehr mit Berechtigung sichtbar 2015-03-06 10:39:27 +01:00
oesi a1ddf46f19 Korrekturen für Noteneingabe
Wenn keine Note ausgewählt wird erscheint ein Infofenster
Fehler beim ermitteln der Note 0 behoben
Punkte werden in der Liste der Studierenden als eigene Spalte angzeigt
Dezimalpunkte werden aus Moodle korrekt übertragen
2015-03-05 16:41:24 +01:00
oesi 12d906d621 Merge branch 'oefilter' 2015-03-05 15:45:13 +01:00
oesi 5f2efcfccf Organisationsform Filter bei Studiengängen wird nun auch im Tempus berücksichtigt 2015-03-05 15:43:53 +01:00
oesi 3b525ad301 Vorlage Lehrgang 2015-03-05 14:23:42 +01:00
oesi 63391a5809 Fehler beim Löschen von Newseinträgen behoben 2015-03-04 10:11:26 +01:00
oesi ef85b10faa Fehler behoben bei dem die Registrierung mit Fehlermeldung abbricht 2015-03-03 16:32:54 +01:00
Nikolaus Krondraf 0a7930581c add tables for Anrechnungen 2015-03-03 09:01:46 +01:00
oesi 04f324187e Upload Hilfetext erweitert 2015-03-02 17:11:21 +01:00
kindlm 68b770830c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-03-02 13:48:53 +01:00
kindlm 0eff7742bb Config CIS_LVINFO_TERMINE_ANZEIGEN
Neuer Config-Eintrag CIS_LVINFO_TERMINE_ANZEIGEN bestimmt, ob die
Termine der einzelnen LVs laut Stundenplan in den LV-Infos angezeigt
werden
2015-03-02 13:48:38 +01:00
nkrondraf fc0f28e2d5 add feature Anrechnungen in FAS 2015-03-02 11:47:11 +01:00
kindlm 9ee56e34c1 Kompetenzerwerb in Lernergebnisse umbenannt
Kompetenzerwerb in Lernergebnisse umbenannt
2015-03-02 11:21:29 +01:00
kindlm e21a02f38c Neue Spalte "Anwesenheit" in den LV-Infos 2015-02-27 22:25:36 +01:00
kindlm 83f94266ac pdfExport Dateiname
Wenn Bezeichnung in tbl_vorlage vorhanden dann diese nehmen, sonst
vorlage_kurzbz;
Wenn Studienordnung erstellt wird, dann Dokument "Template STO
Studienplan_STG" nennen.
2015-02-27 21:46:06 +01:00
kindlm c027308d60 Studienordnung
Neues Dokument Studienordnung + umbenennen von "Kompetenzerwerb" in
"Lernergebnisse" bei den LV-Infos
2015-02-27 21:30:38 +01:00
kindlm f216e96216 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-02-27 20:42:32 +01:00
kindlm 60d7305339 Servicekatalog, Testtool, Vorlagen, CMS
Nur Services mit Content_ID anzeigen;
Testtool Fragen-Detailauswertung geschlechterspezifisch + Gebietdetails;
Diplomasupplement Stempel mit Textfluss;
Dokumentanpassungen Lehrgänge;
CMS Neu: Child-Eintrag hinzufügen;
2015-02-27 20:42:12 +01:00
Gerald Raab 0ddfae15ea Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-02-27 16:32:00 +01:00
Gerald Raab b35f7c25af fixed: sortierung einträge, show-all-button aus formular raus, projektübersicht ausgeblendet
added: link für tageseintrag
2015-02-27 16:25:55 +01:00
Robert Hofer f0def299a3 pivottable as a submodule 2015-02-27 15:36:51 +01:00
Robert Hofer 2ed8771450 bootstrap as submodule 2015-02-27 15:20:30 +01:00
Robert Hofer 2dc8e8a7a6 new column "anmerkung" in tbl_prestudentstatus 2015-02-26 16:57:18 +01:00
Gerald Raab d8cbcd3d45 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-02-26 16:29:10 +01:00
Gerald Raab dd4d8de686 uid rein 2015-02-26 16:26:02 +01:00
Robert Hofer 78a1d641a5 translations application 2015-02-26 16:02:43 +01:00
Gerald Raab ed8715ebb6 Zeitaufzeichnung alle Tage werden angezeigt, Fehler und Feiertage angezeigt 2015-02-26 15:32:49 +01:00
oesi 98679cf161 Config Eintrag für Punkteeingabe hinzugefügt 2015-02-25 10:16:49 +01:00
Robert Hofer 557ce44d70 application is now in: FHC-AddOn-Bewerbung 2015-02-24 17:24:46 +01:00
oesi 8f069c435a Fehler behoben bei dem das Autocomplete im Urlaubstool nicht funktioniert 2015-02-24 14:56:47 +01:00
Robert Hofer 9d829dd4d2 submodules from https 2015-02-24 12:09:49 +01:00
oesi 2e33064b5c - Notendurchschnitt wird nicht mehr Anhand des Index oder der Anmerkung berechnet sondern anhand des Notenwerts.
- Problem behoben bei dem unter MS Office 2013 die Hintergrundfarben am Notenspiegel nicht korrekt angezeigt wurden.
2015-02-24 11:01:31 +01:00
oesi dd45519c32 Import der Noten im FAS und CIS importiert jetzt entweder Noten oder Punkte
Wenn die Punkteeingabe aktiviert ist, werden Punkte importiert sonst Noten
2015-02-24 11:01:31 +01:00
oesi 52addd5738 Bei der Notenübernahme aus Moodle wird nun ein zusätzlicher Parameter übergeben der angibt ob Noten oder Prozentpunkte übernommen werden sollen.
Moodle Plugin erweitert für die Verwendung mit Moodle 2.8
2015-02-24 11:01:31 +01:00
oesi a4cca5f1e6 Punkteeingabe im FAS
Punkteeingabe bei Pruefungen
Notenschluessel wird im CIS angezeigt
2015-02-24 11:01:31 +01:00
oesi 41827a3307 - Notenauswahl bei Pruefungsterminen per DropDown
- Der Notenimport liest die Daten jetzt nicht mehr aus der Zwischenablage sondern aus einem Textfeld damit der Import mit allen Browsern wieder funktioniert
2015-02-24 11:01:30 +01:00
oesi ede34194aa Punkteeingabe im CIS und Anzeige im FAS 2015-02-24 11:01:30 +01:00
Stefan Puraner a4b7f8d3ff Anpassungen für neue Abschlussurkunden der KTU
Anpassungen RDF Schnittstelle für KTU Dokumente
2015-02-24 10:51:37 +01:00
oesi 9cf34d8c2b Fehler behoben bei dem im Tempus eine Fehlermeldung angezeigt wird, wenn bei den Zeitsperren Sonderzeichen eingetragen werden 2015-02-23 16:53:23 +01:00
oesi f8208bc072 Lehrform wird in der Notenliste jetzt vor der Bezeichnung der LV angezeigt 2015-02-23 15:48:12 +01:00
Robert Hofer 254ca59c59 tablesorter from submodule 2015-02-20 16:48:15 +01:00
oesi 0620d55696 Fixed Path in Unit test 2015-02-20 13:40:12 +01:00
oesi 9346ddf3cb Fix Tests 2015-02-20 13:36:42 +01:00
oesi 02be99d9b8 Fixed Test 2015-02-20 13:01:35 +01:00
oesi 48706ec3a1 Unit test 2015-02-20 12:58:55 +01:00
Paminger f1dd6dd7b4 LOC 2015-02-20 12:51:39 +01:00
oesi daf2cf3ecd Add Acceptance Test 2015-02-20 12:38:01 +01:00
Paminger 965fccb6c5 Codeception 2015-02-20 12:30:26 +01:00
Paminger 9a230cd02c Keine Tabs 2015-02-20 12:10:10 +01:00
Paminger 7887f7fde8 Tabs not allowed 2015-02-20 12:07:31 +01:00
Paminger 5f2928c00e PHPCI Config 2015-02-20 12:03:52 +01:00
oesi 199cc69f8e fixed Warning 2015-02-20 11:46:17 +01:00
oesi 483d719f7d Quadratmeter, Gebaeudeteil und Organisationseinheit zu Ort hinzugefügt 2015-02-20 07:40:40 +01:00
oesi fa77c8f51d Alte/Falsche Menüpunkte entfernt; Fehler behoben bei dem Rechte nicht korrekt geprüft werden 2015-02-19 14:27:54 +01:00
oesi 97fe551309 Fehler behoben bei dem die SWS aufgrund der Semesterwochen des Studiengangs des Studierenden anstatt des Studiengangs der Lehrveranstaltung berechnet wurden.
Fehler behoben bei dem die SWS Summe fehlerhaft ist wenn die Locale Einstellung des Servers geändert wird
2015-02-19 14:21:09 +01:00
oesi f4dd6c9146 fixed typo 2015-02-19 11:11:37 +01:00
oesi e088196ec9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2015-02-18 15:40:42 +01:00
oesi a4319c476e Anpassungen Mailverteiler
- Verteiler für weibliche Mitarbeiterinnen hinzugefügt
- Lektorenverteiler enthaelt nun alle Lektoren des aktuellen Studiensemesters und dem naheliegendem andern Studiensemester
- Fehler behoben bei dem die Moodle Gruppe täglich gelöscht und wieder angelegt wurde
2015-02-18 15:38:09 +01:00
Paminger 3144d7170e LV-Info RDF Erweiterungen 2015-02-18 11:35:20 +01:00
oesi 0d51193a1a Fehler beim Drucken von Zutrittskarten unter Windows behoben wenn die Person keine OE-Zuordnung hat 2015-02-17 09:21:25 +01:00
oesi 8cc75aa3b9 Fehler behoben bei dem das Detailfelder der Lehrveranstaltungen immer weiter nach unten rutscht 2015-02-16 11:42:00 +01:00
kindlm 1d0591da47 Vorlagenanpassung Lehrgänge 2015-02-13 15:35:38 +01:00
3465 changed files with 456878 additions and 100731 deletions
+23 -2
View File
@@ -1,2 +1,23 @@
.htaccess
/nbproject/
.htaccess
.htaccessbak
bin
/nbproject/
/vendor/*
!/vendor/FHC-vendor
/.idea/
documents/
.settings
.project
.buildpath
application/config/development/
tests/codeception/_output/*
!/tests/codeception/_output/.placeholder
tests/codeception/codeception.yml
tests/codeception/tests/api.suite.yml
tests/codeception/tests/functional.suite.yml
tests/codeception/tests/acceptance.suite.yml
tests/codeception/tests/unit.suite.yml
/submodules/d3
bin
/application/logs/
/sparks/*
+6
View File
@@ -0,0 +1,6 @@
[submodule "submodules/bootstrap"]
path = submodules/bootstrap
url = https://github.com/twbs/bootstrap.git
[submodule "submodules/pivottable"]
path = submodules/pivottable
url = https://github.com/nicolaskruchten/pivottable.git
Executable
+106
View File
@@ -0,0 +1,106 @@
# Change Log
## [3.2]
### Added
- **[FAS]** Unterstützung für gemeinsame Studien hinzugefügt
- **[FAS]** Inaktive Mitarbeiter sind jetzt ausgegraut
- **[FAS]** Anmerkungsfeld bei Konto-Buchungen hinzugefügt
- **[CIS]** Lehrveranstaltung Menü auf Studienplan Basis und Modularisiert
- **[CIS]** Ampeln koennen nun verpflichtend sein und Sperren die GUI
- **[FAS]** Bei Mitarbeitern können Notizen erfasst werden
- **[FAS]** Im FAS gibt es einen neuen Karteireiter Messages. Hier können Nachrichten an Studierende übermittelt werden. Die Kommunikation des Aufnahme Addons wird über Messages abgewickelt.
- **[FAS]** Neuer Karteireiter Aufnahmetermine ersetzt die Reihungstestauswahl im Karteireiter Prestudent
- **[CORE]** Es können nun beliebig viele Reihungstests pro Person gespeichert werden.
- **[CORE]** Reihungstests können mehrere Räume zugeteilt werden. Die angemeldeten Studierenden können auf diese Räume aufgeteilt werden. Es gibt dann getrennte Anwesenheitslisten für jeden Raum
- **[CORE]** Reihungstests haben jetzt verschiedene Stufen
- **[CORE]** Reihungstests können Studiensemestern zugeordnet werden
- **[CORE]** Reihungstests können Studienpläne zugeordnet werden. Dies legt fest welche Personen sich zu diesen Reihungstests anmelden können.
- **[CORE]** Es gibt eine Anmeldefrist für Reihungstests
- **[CORE]** Codeigniter Framework wird als neue Basis verwendet.
- **[CORE]** REST API für Zugriff auf alle Daten
- **[CORE]** Neues Phrasenmodul für Orgform spezifische Phrasen
- **[CORE]** Der Zugriff auf Reports kann mitgeloggt werden
- **[CORE]** Der Zugriff auf CMS Seiten kann mitgeloggt werden
- **[FAS]** Es ist möglich bei Statusänderungen im FAS automatisierte Nachrichten an die Studierenden zu senden
- **[FAS]** Bewerberakt - Erstellung eines Akts mit allen hochgeladenen Dokumenten einer Person
- **[FAS]** Bewerbungsfristen für einzelen Studienpläne
- **[FAS]** Beim Statuswechsel kann ein Statusgrund hinterlegt werden.
- **[FAS]** Es kann pro Studiengang hinterlegt werden ob ein Dokument nachreichbar ist oder nicht
- **[FAS]** Arbeitsplätze bei Räumen (zB für EDV Säle mit 50 Plätzen aber nur 25 PCs)
- **[FAS]** Zuteilung von Prestudenten zu Aufnahmegruppen
- **[FAS]** Zusätzliches Feld für Uhrzeit bei Abschlussprüfung
- **[FAS]** Reihungstest Dropdown zeigt verfügbare/belegte Plätze an
- **[CORE]** Reihungstest Punkteübernahme oder Prozentpunkte ist konfigurierbar
- **[CIS]** LVPlan Export für Excel
- **[FAS]** Termine Karteireiter im FAS zeigt die Anmerkung aus dem LVPlan an
- **[CIS]** Onlinebewerbungstool greift auf mehrsprachige Statusbezeichnungen zu.
- **[CIS]** Config-Einträge für die Tabellenspalten beim Eintragen der Gesamtnote hinzugefügt.
- **[CIS]** Prüfungsverwaltung: Config-Eintrag hinzugefügt um die Accordion-Elemente ein- und auszublenden.
### Changed
- **[FAS]** Dokumente Menü im FAS neu sortiert um den Lebenszyklus des Studierenden abzubilden
- **[CORE]** LVPlan Update Mail ist nun zweisprachig Deutsch/Englisch
- **[FAS]** Prüfungen im FAS werden nur noch vom aktuell ausgewählten Studiensemester angezeigt. Umschalten auf volle Ansicht möglich
- **[CIS]** LVPlan Begrenzung der 4er Blockung aufgehoben.
- **[CIS]** Im Menü 'Zeitsperren' Link zu Resturlaubsübersicht entfernt. Falls benötigt Verlinkung über CMS möglich.
- **[CORE]** Removed NOT NULL constraint on 'verfasser\_uid' from public.tbl\_notiz
- **[CIS]** Studienplanansicht: Wenn eine LV nicht benotet ist, aber eine kompatible LV mit vorhandener Anrechnung benotet ist wird diese Note angezeigt.
- **[FAS]** Die RDF-Schnittstelle für das Zeugnis prüft bei Anrechnungen ob, die ECTS-Punkte übereinstimmen und wählt bei ungleichen Werten jene der angerechneten LV.
- **[FAS]** Der Ausbildungsvertrag kann nun jederzeit erstellt werden, auch wenn eine Person noch kein Student ist. Wenn in der Vorlage des Ausbildungsvertrags ein Attribut des Studenten-Datensatzen (zB Personenkennzeichen) abgefragt wird und eine Person noch nicht Student ist, kann dieses nicht angedruckt werden und sollte aus der Vorlage entfernt werden.
- **[CORE]** Check Constraint in der Datenbank für SVNR - Diese muss 10, 12 oder 16 Zeichen lang sein
### Updateinfo
- **[FAS]** Für Lehraufträge muss eine Unoconv-Vorlage erstellt werden, da der für xsl-fo notwendige Seitenumbruch-Tag aus dem RDF entfernt wurde.
- **[FAS]** Mehrsprachigkeitsspalte tbl_status.bezeichnung_mehrsprachig wird durch das Updatescript automatisch in den ersten beiden Sprachen mit der status_kurzbz vorbefüllt. Übersetzungen sind anzupassen.
- **[MOODLE]** Neue Webservicefunktion core_user_update_users wird benötigt
- **[CORE]** Kommune wurde aus Core entfernt
- **[DEPRECATED]]** WaWi wurde in ein Addon (FHC-ADDON-WAWI) ausgelagert. Die Funktionalität im Core wird demnächst entfernt.
- **[DEPRECATED]]** LV-Informationen (FHC-ADDON-LVINFO) wurde in ein Addon ausgelagert. Die Funktionalität im Core wird demnächst entfernt
- **[DEPRECATED]]** Punkte1, Punkte2 und Punkte3 in tbl_prestudent werden nicht mehr verwendet und in zukünftigen Versionen entfernt. Diese werden jetzt in tbl_rt_person gespeichert
- **[DEPRECATED]]** anmeldungreihungstest in tbl_prestudent wird nicht mehr verwendet und in zukünftigen Versionen entfernt
- **[CORE]** Spalte php und r wurde aus tbl_statistik entfernt
- **[DEPRECATED]** Spalte ort_kurzbz in tbl_reihungstest wird nicht mehr verwendet und in zukünftigen Versionen entfernt
Zum Update auf diese Version folgen Sie den Anweisungen auf folgender Seite:
http://fhcomplete.technikum-wien.at/dokuwiki/doku.php?id=fh-complete:codeigniter
## [3.1.0] - 2015-11-12
### Added
- **[FAS]** Bei Noten können zusätzlich Punkte gespeichert werden. Notenschlüssel für Gesamtnote kann hinterlegt werden
- **[FAS]** Anwesenheiten von Studierenden können erfasst werden
- **[FAS]** Vertragsverwaltung bei Mitarbeiter
- **[FAS]** Dokumente im FAS können mit SHIFT bzw STRG statt als PDF auch als DOC oder ODT erstellt werden
- **[BERECHTIGUNG]** system/changeoutputformat Legt fest ob Dokumente als DOC/ODT exportiert werden dürfen
- **[FAS]** Termine Karteireiter im FAS zeigt den LVPlan von Studierenden/Lehrveranstaltungen
- **[FAS]** Bereits verplante Lektoren können vom FAS aus, aus dem LVPlan gelöscht werden. Zusätzlich wird im FAS angezeigt ob dieser Lektor bereits verplant ist
- **[FAS]** Bereits verplante Gruppen können direkt vom FAS heraus aus dem LV-Plan gelöscht werden wenn diese bereits verplant wurden.
- **[TEMPUS]** Drop auf Lehrstunde Feature für 2 Gruppen die zur selben Zeit im gleichen Raum unterricht haben (Setzt UNR gleich damit es nicht als kollision angezeigt wird)
- **[TEMPUS]** Option zum Anzeigen von allen Einträgen damit auch Incominggruppen und Gruppen aus anderen Studiengängen sichtbar sind
- **[FAS]** Bei Notizen können jetzt zusätzlich Dokumente hochgeladen werden
- **[CORE]** Bei Dokumentenvorlagen können nun Style und content.xml auf einmal erfasst werden, Dokumente können deaktiviert werden, Eigene GUI im Vilesci zum Verwalten der Dokumentenvorlagen
- **[CORE]** Mehrsprachigkeit bei diversen Tabellen (Dokumente, ZGV, ...) hinzugefügt
### Fixed
- **[TEMPUS]** Kollisionsfreie User werden in Verbandsansicht nicht mehr als Kollision angezeigt
### Changed
- **[FAS]** Stundenobergrenze für Lektoren kann jetzt pro Organisationseinheit festgelegt werden. (warn_semesterstunden_frei/fix tbl_organisationseinheit)
- **[BERECHTIGUNG]** lv-plan/gruppenentfernen Lektorenänderung: Lektoren die bereits verplant sind können jetzt auch dann direkt im FAS geändert werden, wenn dadurch eine Kollision entsteht. Vorraussetzung dafür ist, dass ignore_kollision true ist. Wenn ignore_kollision false ist, dann ist die Lektorenänderung nicht mehr möglich. Vorher wurde der Lektor in diesem Fall nur im FAS geändert aber nicht im LVPlan.
- **[FAS]** Ausstellungsstaat der ZGV wird jetzt getrennt für Bachelor und Master erfasst
## [3.0.0] - 2015-02-13
### Added
- **[CORE]** Studienordnungen / Studienpläne
- **[CORE]** Module
- **[CIS]** CIS Redesign
- **[CORE]** Unterstützung für Addons
- **[FAS]** Notizsystem
### Fixed
- **[CORE]** Diverse Bugfixes
+675
View File
@@ -0,0 +1,675 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
{one line to give the program's name and a brief idea of what it does.}
Copyright (C) {year} {name of author}
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
{project} Copyright (C) {year} {fullname}
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-23
View File
@@ -1,23 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
</head>
<body>
<h1 style="text-align: center;"><br>
</h1>
<h1 style="text-align: center;"><br>
</h1>
<h1 style="text-align: center;"><big>System-Umstellung</big></h1>
<br>
<h2 style="text-align: center;">Ende der Umstellung ist vorraussichtlich <big><span style="text-decoration: underline;">
Dienstag 6.2.2007 19:00 Uhr</span></big></h2>
<br>
<div style="text-align: right;">
<h3><br>
</h3>
<h3><br>
</h3>
<h3>Wir bitten um Ihr Verst&auml;ndnis!</h3>
</div>
</body>
</html>
+3
View File
@@ -1,4 +1,7 @@
# FH-Complete
[![Build Status](http://phpci.fhcomplete.org/build-status/image/1)](http://phpci.fhcomplete.org/project/view/1)
* [FH-Complete Homepage](http://www.fhcomplete.org)
* [Wiki](http://fhcomplete.technikum-wien.at/dokuwiki/)
* [Changelog](CHANGELOG.md)
+44
View File
@@ -0,0 +1,44 @@
<?php
/* Copyright (C) 2015 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
*/
/**
* Initialisierung des Addons
*/
?>
if(typeof addon =='undefined')
var addon=Array();
addon.push(
{
init: function(page, params)
{
// Diese Funktion wird nach dem Laden der Seite im CIS aufgerufen
/*
switch(page)
{
case 'cis/private/tools/zeitaufzeichnung.php':
break;
default:
break;
}
*/
}
});
+44
View File
@@ -0,0 +1,44 @@
<?php
/* Copyright (C) 2015 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
*/
/**
* Initialisierung des Addons
*/
?>
if(typeof addon =='undefined')
var addon=Array();
addon.push(
{
init: function(page, params)
{
// Diese Funktion wird nach dem Laden der Seite im Vilesci aufgerufen
/*
switch(page)
{
case 'vilesci/lehre/lehrveranstaltung.php':
break;
default:
break;
}
*/
}
});
@@ -44,20 +44,20 @@ function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
* @param $nachname Nachname
* @param $lektor Boolean true wenn Lektor sonst false
*/
function generateMitarbeiterUID($vorname, $nachname, $lektor)
function generateMitarbeiterUID($vorname, $nachname, $lektor, $fixangestellt=true)
{
$bn = new benutzer();
$uid='';
// Wenn ein Bindestrich vorhanden ist (Doppelname), dort abschneiden
if(mb_strpos($nachname,'-')!==false)
if(mb_strpos($nachname,'-')!==false)
$nachname = mb_substr($nachname, 0, mb_strpos($nachname,'-'));
// Nachname wird so lange verkuerzt bis eine eindeutige UID entsteht die noch nicht vergeben ist
for($nn=18;$nn!=0;$nn--)
{
$uid = mb_substr($vorname,0,1);
$uid .= mb_substr($nachname,0,$nn);
$uid = mb_str_replace(' ','',$uid);
$uid = mb_str_replace('-','',$uid);
Vendored Executable
+11
View File
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>403 Forbidden</title>
</head>
<body>
<p>Directory access is forbidden.</p>
</body>
</html>
+132
View File
@@ -0,0 +1,132 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| AUTO-LOADER
| -------------------------------------------------------------------
| This file specifies which systems should be loaded by default.
|
| In order to keep the framework as light-weight as possible only the
| absolute minimal resources are loaded by default. For example,
| the database is not connected to automatically since no assumption
| is made regarding whether you intend to use it. This file lets
| you globally define which systems you would like loaded with every
| request.
|
| -------------------------------------------------------------------
| Instructions
| -------------------------------------------------------------------
|
| These are the things you can load automatically:
|
| 1. Packages
| 2. Libraries
| 3. Drivers
| 4. Helper files
| 5. Custom config files
| 6. Language files
| 7. Models
|
*/
/*
| -------------------------------------------------------------------
| Auto-load Packages
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
|
*/
$autoload['packages'] = array();
/*
| -------------------------------------------------------------------
| Auto-load Libraries
| -------------------------------------------------------------------
| These are the classes located in system/libraries/ or your
| application/libraries/ directory, with the addition of the
| 'database' library, which is somewhat of a special case.
|
| Prototype:
|
| $autoload['libraries'] = array('database', 'email', 'session');
|
| You can also supply an alternative library name to be assigned
| in the controller:
|
| $autoload['libraries'] = array('user_agent' => 'ua');
*/
//$autoload['libraries'] = array();
$autoload['libraries'] = array('Session', 'FHC_Auth', 'TemplateLib');
/*
| -------------------------------------------------------------------
| Auto-load Drivers
| -------------------------------------------------------------------
| These classes are located in system/libraries/ or in your
| application/libraries/ directory, but are also placed inside their
| own subdirectory and they extend the CI_Driver_Library class. They
| offer multiple interchangeable driver options.
|
| Prototype:
|
| $autoload['drivers'] = array('cache');
*/
$autoload['drivers'] = array();
/*
| -------------------------------------------------------------------
| Auto-load Helper Files
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['helper'] = array('url', 'file');
*/
//$autoload['helper'] = array();
$autoload['helper'] = array('url', 'language');
/*
| -------------------------------------------------------------------
| Auto-load Config files
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['config'] = array('config1', 'config2');
|
| NOTE: This item is intended for use ONLY if you have created custom
| config files. Otherwise, leave it blank.
|
*/
$autoload['config'] = array('fhcomplete');
/*
| -------------------------------------------------------------------
| Auto-load Language files
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['language'] = array('lang1', 'lang2');
|
| NOTE: Do not include the "_lang" part of your file. For example
| "codeigniter_lang.php" would be referenced as array('codeigniter');
|
*/
$autoload['language'] = array('fhcomplete');
/*
| -------------------------------------------------------------------
| Auto-load Models
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['model'] = array('first_model', 'second_model');
|
| You can also supply an alternative model name to be assigned
| in the controller:
|
| $autoload['model'] = array('first_model' => 'first');
*/
$autoload['model'] = array();
+517
View File
@@ -0,0 +1,517 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| Base Site URL
|--------------------------------------------------------------------------
|
| URL to your CodeIgniter root. Typically this will be your base URL,
| WITH a trailing slash:
|
| http://example.com/
|
| If this is not set then CodeIgniter will try guess the protocol, domain
| and path to your installation. However, you should always configure this
| explicitly and never rely on auto-guessing, especially in production
| environments.
|
*/
$config['base_url'] = 'http://phpci.fhcomplete.org/build/fhcomplete/';
/*
|--------------------------------------------------------------------------
| Index File
|--------------------------------------------------------------------------
|
| Typically this will be your index.php file, unless you've renamed it to
| something else. If you are using mod_rewrite to remove the page set this
| variable so that it is blank.
|
*/
$config['index_page'] = 'index.ci.php';
/*
|--------------------------------------------------------------------------
| URI PROTOCOL
|--------------------------------------------------------------------------
|
| This item determines which server global should be used to retrieve the
| URI string. The default setting of 'REQUEST_URI' works for most servers.
| If your links do not seem to work, try one of the other delicious flavors:
|
| 'REQUEST_URI' Uses $_SERVER['REQUEST_URI']
| 'QUERY_STRING' Uses $_SERVER['QUERY_STRING']
| 'PATH_INFO' Uses $_SERVER['PATH_INFO']
|
| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
*/
$config['uri_protocol'] = 'REQUEST_URI';
/*
|--------------------------------------------------------------------------
| URL suffix
|--------------------------------------------------------------------------
|
| This option allows you to add a suffix to all URLs generated by CodeIgniter.
| For more information please see the user guide:
|
| http://codeigniter.com/user_guide/general/urls.html
*/
$config['url_suffix'] = '';
/*
|--------------------------------------------------------------------------
| Default Language
|--------------------------------------------------------------------------
|
| This determines which set of language files should be used. Make sure
| there is an available translation if you intend to use something other
| than english.
|
*/
$config['language'] = 'de-AT';
/*
|--------------------------------------------------------------------------
| Default Character Set
|--------------------------------------------------------------------------
|
| This determines which character set is used by default in various methods
| that require a character set to be provided.
|
| See http://php.net/htmlspecialchars for a list of supported charsets.
|
*/
$config['charset'] = 'UTF-8';
/*
|--------------------------------------------------------------------------
| Enable/Disable System Hooks
|--------------------------------------------------------------------------
|
| If you would like to use the 'hooks' feature you must enable it by
| setting this variable to TRUE (boolean). See the user guide for details.
|
*/
$config['enable_hooks'] = FALSE;
/*
|--------------------------------------------------------------------------
| Class Extension Prefix
|--------------------------------------------------------------------------
|
| This item allows you to set the filename/classname prefix when extending
| native libraries. For more information please see the user guide:
|
| http://codeigniter.com/user_guide/general/core_classes.html
| http://codeigniter.com/user_guide/general/creating_libraries.html
|
*/
$config['subclass_prefix'] = 'FHC_';
/*
|--------------------------------------------------------------------------
| Composer auto-loading
|--------------------------------------------------------------------------
|
| Enabling this setting will tell CodeIgniter to look for a Composer
| package auto-loader script in application/vendor/autoload.php.
|
| $config['composer_autoload'] = TRUE;
|
| Or if you have your vendor/ directory located somewhere else, you
| can opt to set a specific path as well:
|
| $config['composer_autoload'] = '/path/to/vendor/autoload.php';
|
| For more information about Composer, please visit http://getcomposer.org/
|
| Note: This will NOT disable or override the CodeIgniter-specific
| autoloading (application/config/autoload.php)
*/
$config['composer_autoload'] = FALSE;
/*
|--------------------------------------------------------------------------
| Allowed URL Characters
|--------------------------------------------------------------------------
|
| This lets you specify which characters are permitted within your URLs.
| When someone tries to submit a URL with disallowed characters they will
| get a warning message.
|
| As a security measure you are STRONGLY encouraged to restrict URLs to
| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
|
| Leave blank to allow all characters -- but only if you are insane.
|
| The configured value is actually a regular expression character group
| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
|
| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
|
*/
$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
/*
|--------------------------------------------------------------------------
| Enable Query Strings
|--------------------------------------------------------------------------
|
| By default CodeIgniter uses search-engine friendly segment based URLs:
| example.com/who/what/where/
|
| By default CodeIgniter enables access to the $_GET array. If for some
| reason you would like to disable it, set 'allow_get_array' to FALSE.
|
| You can optionally enable standard query string based URLs:
| example.com?who=me&what=something&where=here
|
| Options are: TRUE or FALSE (boolean)
|
| The other items let you set the query string 'words' that will
| invoke your controllers and its functions:
| example.com/index.php?c=controller&m=function
|
| Please note that some of the helpers won't work as expected when
| this feature is enabled, since CodeIgniter is designed primarily to
| use segment based URLs.
|
*/
$config['allow_get_array'] = TRUE;
$config['enable_query_strings'] = FALSE;
$config['controller_trigger'] = 'c';
$config['function_trigger'] = 'm';
$config['directory_trigger'] = 'd';
/*
|--------------------------------------------------------------------------
| Error Logging Threshold
|--------------------------------------------------------------------------
|
| You can enable error logging by setting a threshold over zero. The
| threshold determines what gets logged. Threshold options are:
|
| 0 = Disables logging, Error logging TURNED OFF
| 1 = Error Messages (including PHP errors)
| 2 = Debug Messages
| 3 = Informational Messages
| 4 = All Messages
|
| You can also pass an array with threshold levels to show individual error types
|
| array(2) = Debug Messages, without Error Messages
|
| For a live site you'll usually only enable Errors (1) to be logged otherwise
| your log files will fill up very fast.
|
*/
$config['log_threshold'] = 1;
/*
|--------------------------------------------------------------------------
| Error Logging Directory Path
|--------------------------------------------------------------------------
|
| Leave this BLANK unless you would like to set something other than the default
| application/logs/ directory. Use a full server path with trailing slash.
|
*/
$config['log_path'] = '';
/*
|--------------------------------------------------------------------------
| Log File Extension
|--------------------------------------------------------------------------
|
| The default filename extension for log files. The default 'php' allows for
| protecting the log files via basic scripting, when they are to be stored
| under a publicly accessible directory.
|
| Note: Leaving it blank will default to 'php'.
|
*/
$config['log_file_extension'] = 'log';
/*
|--------------------------------------------------------------------------
| Log File Permissions
|--------------------------------------------------------------------------
|
| The file system permissions to be applied on newly created log files.
|
| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
| integer notation (i.e. 0700, 0644, etc.)
*/
$config['log_file_permissions'] = 0644;
/*
|--------------------------------------------------------------------------
| Date Format for Logs
|--------------------------------------------------------------------------
|
| Each item that is logged has an associated date. You can use PHP date
| codes to set your own date formatting
|
*/
$config['log_date_format'] = 'Y-m-d H:i:s';
/*
|--------------------------------------------------------------------------
| Error Views Directory Path
|--------------------------------------------------------------------------
|
| Leave this BLANK unless you would like to set something other than the default
| application/views/errors/ directory. Use a full server path with trailing slash.
|
*/
$config['error_views_path'] = '';
/*
|--------------------------------------------------------------------------
| Cache Directory Path
|--------------------------------------------------------------------------
|
| Leave this BLANK unless you would like to set something other than the default
| application/cache/ directory. Use a full server path with trailing slash.
|
*/
$config['cache_path'] = '';
/*
|--------------------------------------------------------------------------
| Cache Include Query String
|--------------------------------------------------------------------------
|
| Whether to take the URL query string into consideration when generating
| output cache files. Valid options are:
|
| FALSE = Disabled
| TRUE = Enabled, take all query parameters into account.
| Please be aware that this may result in numerous cache
| files generated for the same page over and over again.
| array('q') = Enabled, but only take into account the specified list
| of query parameters.
|
*/
$config['cache_query_string'] = FALSE;
/*
|--------------------------------------------------------------------------
| Encryption Key
|--------------------------------------------------------------------------
|
| If you use the Encryption class, you must set an encryption key.
| See the user guide for more info.
|
| http://codeigniter.com/user_guide/libraries/encryption.html
|
*/
$config['encryption_key'] = '';
/*
|--------------------------------------------------------------------------
| Session Variables
|--------------------------------------------------------------------------
|
| 'sess_driver'
|
| The storage driver to use: files, database, redis, memcached
|
| 'sess_cookie_name'
|
| The session cookie name, must contain only [0-9a-z_-] characters
|
| 'sess_expiration'
|
| The number of SECONDS you want the session to last.
| Setting to 0 (zero) means expire when the browser is closed.
|
| 'sess_save_path'
|
| The location to save sessions to, driver dependent.
|
| For the 'files' driver, it's a path to a writable directory.
| WARNING: Only absolute paths are supported!
|
| For the 'database' driver, it's a table name.
| Please read up the manual for the format with other session drivers.
|
| IMPORTANT: You are REQUIRED to set a valid save path!
|
| 'sess_match_ip'
|
| Whether to match the user's IP address when reading the session data.
|
| 'sess_time_to_update'
|
| How many seconds between CI regenerating the session ID.
|
| 'sess_regenerate_destroy'
|
| Whether to destroy session data associated with the old session ID
| when auto-regenerating the session ID. When set to FALSE, the data
| will be later deleted by the garbage collector.
|
| Other session cookie settings are shared with the rest of the application,
| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
|
*/
$config['sess_driver'] = 'files';
$config['sess_cookie_name'] = 'ci_session';
$config['sess_expiration'] = 7200;
$config['sess_save_path'] = NULL;
$config['sess_match_ip'] = FALSE;
$config['sess_time_to_update'] = 300;
$config['sess_regenerate_destroy'] = FALSE;
/*
|--------------------------------------------------------------------------
| Cookie Related Variables
|--------------------------------------------------------------------------
|
| 'cookie_prefix' = Set a cookie name prefix if you need to avoid collisions
| 'cookie_domain' = Set to .your-domain.com for site-wide cookies
| 'cookie_path' = Typically will be a forward slash
| 'cookie_secure' = Cookie will only be set if a secure HTTPS connection exists.
| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
|
| Note: These settings (with the exception of 'cookie_prefix' and
| 'cookie_httponly') will also affect sessions.
|
*/
$config['cookie_prefix'] = '';
$config['cookie_domain'] = '';
$config['cookie_path'] = '/';
$config['cookie_secure'] = FALSE;
$config['cookie_httponly'] = FALSE;
/*
|--------------------------------------------------------------------------
| Standardize newlines
|--------------------------------------------------------------------------
|
| Determines whether to standardize newline characters in input data,
| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value.
|
| This is particularly useful for portability between UNIX-based OSes,
| (usually \n) and Windows (\r\n).
|
*/
$config['standardize_newlines'] = FALSE;
/*
|--------------------------------------------------------------------------
| Global XSS Filtering
|--------------------------------------------------------------------------
|
| Determines whether the XSS filter is always active when GET, POST or
| COOKIE data is encountered
|
| WARNING: This feature is DEPRECATED and currently available only
| for backwards compatibility purposes!
|
*/
$config['global_xss_filtering'] = FALSE;
/*
|--------------------------------------------------------------------------
| Cross Site Request Forgery
|--------------------------------------------------------------------------
| Enables a CSRF cookie token to be set. When set to TRUE, token will be
| checked on a submitted form. If you are accepting user data, it is strongly
| recommended CSRF protection be enabled.
|
| 'csrf_token_name' = The token name
| 'csrf_cookie_name' = The cookie name
| 'csrf_expire' = The number in seconds the token should expire.
| 'csrf_regenerate' = Regenerate token on every submission
| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
*/
$config['csrf_protection'] = FALSE;
$config['csrf_token_name'] = 'csrf_test_name';
$config['csrf_cookie_name'] = 'csrf_cookie_name';
$config['csrf_expire'] = 7200;
$config['csrf_regenerate'] = TRUE;
$config['csrf_exclude_uris'] = array();
/*
|--------------------------------------------------------------------------
| Output Compression
|--------------------------------------------------------------------------
|
| Enables Gzip output compression for faster page loads. When enabled,
| the output class will test whether your server supports Gzip.
| Even if it does, however, not all browsers support compression
| so enable only if you are reasonably sure your visitors can handle it.
|
| Only used if zlib.output_compression is turned off in your php.ini.
| Please do not use it together with httpd-level output compression.
|
| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
| means you are prematurely outputting something to your browser. It could
| even be a line of whitespace at the end of one of your scripts. For
| compression to work, nothing can be sent before the output buffer is called
| by the output class. Do not 'echo' any values with compression enabled.
|
*/
$config['compress_output'] = FALSE;
/*
|--------------------------------------------------------------------------
| Master Time Reference
|--------------------------------------------------------------------------
|
| Options are 'local' or any PHP supported timezone. This preference tells
| the system whether to use your server's local time as the master 'now'
| reference, or convert it to the configured one timezone. See the 'date
| helper' page of the user guide for information regarding date handling.
|
*/
$config['time_reference'] = 'local';
/*
|--------------------------------------------------------------------------
| Rewrite PHP Short Tags
|--------------------------------------------------------------------------
|
| If your PHP installation does not have short tag support enabled CI
| can rewrite the tags on-the-fly, enabling you to utilize that syntax
| in your view files. Options are TRUE or FALSE (boolean)
|
| Note: You need to have eval() enabled for this to work.
|
*/
$config['rewrite_short_tags'] = FALSE;
/*
|--------------------------------------------------------------------------
| Reverse Proxy IPs
|--------------------------------------------------------------------------
|
| If your server is behind a reverse proxy, you must whitelist the proxy
| IP addresses from which CodeIgniter should trust headers such as
| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
| the visitor's IP address.
|
| You can use both an array or a comma-separated list of proxy addresses,
| as well as specifying whole subnets. Here are a few examples:
|
| Comma-separated: '10.0.1.200,192.168.5.0/24'
| Array: array('10.0.1.200', '192.168.5.0/24')
*/
$config['proxy_ips'] = '';
/*
|--------------------------------------------------------------------------
| Autoload Custom Controllers
|--------------------------------------------------------------------------
|
| It's working, so don't delete this :D
*/
spl_autoload_register(function ($class) {
if (substr($class,0,3) !== 'CI_' && substr($class,0,4) !== 'FHC_')
if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
require_once $file;
});
+105
View File
@@ -0,0 +1,105 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| FH-Complete Constants
|--------------------------------------------------------------------------
|
| These constants are used for internal messages. It are also be used
| and translated in the language files.
|
*/
define('FHC_SUCCESS', 0); // General Success Message
define('FHC_ERROR', 1); // General Error Message
define('FHC_MODEL_ERROR', 2); // Model Error
define('FHC_DB_ERROR', 3); // Database Error
define('FHC_NODBTABLE', 4); // No DB-Table is set
define('FHC_NORIGHT', 5); // No rights
define('FHC_INVALIDID', 6); // Invalid or no ID (key)
define('FHC_NOPK', 7); // No primary key
/*
|--------------------------------------------------------------------------
| File and Directory Modes
|--------------------------------------------------------------------------
|
| These prefs are used when checking and setting modes when working
| with the file system. The defaults are fine on servers with proper
| security, but you may wish (or even need) to change the values in
| certain environments (Apache running a separate process for each
| user, PHP under CGI with Apache suEXEC, etc.). Octal values should
| always be used to set the mode correctly.
|
*/
define('FILE_READ_MODE', 0644);
define('FILE_WRITE_MODE', 0666);
define('DIR_READ_MODE', 0755);
define('DIR_WRITE_MODE', 0755);
/*
|--------------------------------------------------------------------------
| File Stream Modes
|--------------------------------------------------------------------------
|
| These modes are used when working with fopen()/popen()
|
*/
define('FOPEN_READ', 'rb');
define('FOPEN_READ_WRITE', 'r+b');
define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
define('FOPEN_WRITE_CREATE', 'ab');
define('FOPEN_READ_WRITE_CREATE', 'a+b');
define('FOPEN_WRITE_CREATE_STRICT', 'xb');
define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
/*
|--------------------------------------------------------------------------
| Display Debug backtrace
|--------------------------------------------------------------------------
|
| If set to TRUE, a backtrace will be displayed along with php errors. If
| error_reporting is disabled, the backtrace will not display, regardless
| of this setting
|
*/
define('SHOW_DEBUG_BACKTRACE', TRUE);
/*
|--------------------------------------------------------------------------
| Exit Status Codes
|--------------------------------------------------------------------------
|
| Used to indicate the conditions under which the script is exit()ing.
| While there is no universal standard for error codes, there are some
| broad conventions. Three such conventions are mentioned below, for
| those who wish to make use of them. The CodeIgniter defaults were
| chosen for the least overlap with these conventions, while still
| leaving room for others to be defined in future versions and user
| applications.
|
| The three main conventions used for determining exit status codes
| are as follows:
|
| Standard C/C++ Library (stdlibc):
| http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html
| (This link also contains other GNU-specific conventions)
| BSD sysexits.h:
| http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits
| Bash scripting:
| http://tldp.org/LDP/abs/html/exitcodes.html
|
*/
define('EXIT_SUCCESS', 0); // no errors
define('EXIT_ERROR', 1); // generic error
define('EXIT_MODEL', 2); // model error
define('EXIT_CONFIG', 3); // configuration error
define('EXIT_UNKNOWN_FILE', 4); // file not found
define('EXIT_UNKNOWN_CLASS', 5); // unknown class
define('EXIT_UNKNOWN_METHOD', 6); // unknown class member
define('EXIT_USER_INPUT', 7); // invalid user input
define('EXIT_DATABASE', 8); // database error
define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+122
View File
@@ -0,0 +1,122 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
defined('DB_HOST') OR require_once './config/system.config.inc.php'; // For CLI-Migrations
/*
| -------------------------------------------------------------------
| DATABASE CONNECTIVITY SETTINGS
| -------------------------------------------------------------------
| This file will contain the settings needed to access your database.
|
| For complete instructions please consult the 'Database Connection'
| page of the User Guide.
|
| -------------------------------------------------------------------
| EXPLANATION OF VARIABLES
| -------------------------------------------------------------------
|
| ['dsn'] The full DSN string describe a connection to the database.
| ['hostname'] The hostname of your database server.
| ['username'] The username used to connect to the database
| ['password'] The password used to connect to the database
| ['database'] The name of the database you want to connect to
| ['dbdriver'] The database driver. e.g.: mysqli.
| Currently supported:
| cubrid, ibase, mssql, mysql, mysqli, oci8,
| odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
| ['dbprefix'] You can add an optional prefix, which will be added
| to the table name when using the Query Builder class
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
| ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
| ['cache_on'] TRUE/FALSE - Enables/disables query caching
| ['cachedir'] The path to the folder where cache files should be stored
| ['char_set'] The character set used in communicating with the database
| ['dbcollat'] The character collation used in communicating with the database
| NOTE: For MySQL and MySQLi databases, this setting is only used
| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
| (and in table creation queries made with DB Forge).
| There is an incompatibility in PHP with mysql_real_escape_string() which
| can make your site vulnerable to SQL injection if you are using a
| multi-byte character set and are running versions lower than these.
| Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
| ['encrypt'] Whether or not to use an encrypted connection.
|
| 'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
| 'mysqli' and 'pdo/mysql' drivers accept an array with the following options:
|
| 'ssl_key' - Path to the private key file
| 'ssl_cert' - Path to the public key certificate file
| 'ssl_ca' - Path to the certificate authority file
| 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
| 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
| 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
|
| ['compress'] Whether or not to use client compression (MySQL only)
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
| - good for ensuring strict SQL while developing
| ['ssl_options'] Used to set various SSL options that can be used when making SSL connections.
| ['failover'] array - A array with 0 or more data for connections if the main should fail.
| ['save_queries'] TRUE/FALSE - Whether to "save" all executed queries.
| NOTE: Disabling this will also effectively disable both
| $this->db->last_query() and profiling of DB queries.
| When you run a query, with this setting set to TRUE (default),
| CodeIgniter will store the SQL statement for debugging purposes.
| However, this may cause high memory usage, especially if you run
| a lot of SQL queries ... disable this to avoid that problem.
|
| The $active_group variable lets you choose which connection group to
| make active. By default there is only one group (the 'default' group).
|
| The $query_builder variables lets you determine whether or not to load
| the query builder class.
*/
$active_group = 'default';
$query_builder = TRUE;
$db['default'] = array(
'dsn' => '',
'hostname' => DB_HOST,
'username' => DB_USER,
'password' => DB_PASSWORD,
'port' => DB_PORT,
'database' => DB_NAME,
'dbdriver' => 'postgre',
'dbprefix' => '',
'pconnect' => DB_CONNECT_PERSISTENT,
'db_debug' => (ENVIRONMENT !== 'production'),
'cache_on' => FALSE,
'cachedir' => '',
'char_set' => 'utf8',
'dbcollat' => 'utf8_general_ci',
'swap_pre' => '',
'encrypt' => FALSE,
'compress' => FALSE,
'stricton' => FALSE,
'failover' => array(),
'save_queries' => TRUE
);
$db['system'] = array(
'dsn' => '',
'hostname' => DB_HOST,
'username' => 'fhcomplete',
'password' => 'fhcomplete',
'database' => DB_NAME,
'port' => DB_PORT,
'dbschema' => 'public',
'dbdriver' => 'postgre',
'dbprefix' => '',
'pconnect' => DB_CONNECT_PERSISTENT,
'db_debug' => (ENVIRONMENT !== 'production'),
'cache_on' => FALSE,
'cachedir' => '',
'char_set' => 'utf8',
'dbcollat' => 'utf8_general_ci',
'swap_pre' => '',
'encrypt' => FALSE,
'compress' => FALSE,
'stricton' => FALSE,
'failover' => array(),
'save_queries' => TRUE
);
+24
View File
@@ -0,0 +1,24 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
$_doctypes = array(
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
'xhtml1-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
'xhtml1-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
'xhtml1-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
'xhtml-basic11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
'html5' => '<!DOCTYPE html>',
'html4-strict' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
'html4-trans' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
'html4-frame' => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
'mathml1' => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
'mathml2' => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
'svg10' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
'svg11' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
'svg11-basic' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
'svg11-tiny' => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
'xhtml-rdfa-1' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
'xhtml-rdfa-2' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">'
);
+246
View File
@@ -0,0 +1,246 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
$config['fhc_version'] = '3.2';
$config['fhc_acl'] = array
(
'bis.tbl_archiv' => 'basis/archiv',
'bis.tbl_ausbildung' => 'basis/ausbildung',
'bis.tbl_berufstaetigkeit' => 'basis/berufstaetigkeit',
'bis.tbl_beschaeftigungsausmass' => 'basis/beschaeftigungsausmass',
'bis.tbl_besqual' => 'basis/besqual',
'bis.tbl_bisfunktion' => 'basis/bisfunktion',
'bis.tbl_bisio' => 'basis/bisio',
'bis.tbl_bisorgform' => 'basis/bisorgform',
'bis.tbl_bisverwendung' => 'basis/bisverwendung',
'bis.tbl_bundesland' => 'basis/bundesland',
'bis.tbl_entwicklungsteam' => 'basis/entwicklungsteam',
'bis.tbl_gemeinde' => 'basis/gemeinde',
'bis.tbl_hauptberuf' => 'basis/hauptberuf',
'bis.tbl_lgartcode' => 'basis/lgartcode',
'bis.tbl_mobilitaetsprogramm' => 'basis/mobilitaetsprogramm',
'bis.tbl_nation' => 'basis/nation',
'bis.tbl_orgform' => 'basis/orgform',
'bis.tbl_verwendung' => 'basis/verwendung',
'bis.tbl_zgv' => 'basis/zgv',
'bis.tbl_zgvdoktor' => 'basis/zgvdoktor',
'bis.tbl_zgvgruppe' => 'basis/zgvgruppe',
'bis.tbl_zgvmaster' => 'basis/zgvmaster',
'bis.tbl_zweck' => 'basis/zweck',
'campus.tbl_abgabe' => 'basis/abgabe',
'campus.tbl_anwesenheit' => 'basis/anwesenheit',
'campus.tbl_beispiel' => 'basis/beispiel',
'campus.tbl_content' => 'basis/content',
'campus.tbl_contentchild' => 'basis/contentchild',
'campus.tbl_contentgruppe' => 'basis/contentgruppe',
'campus.tbl_contentlog' => 'basis/contentlog',
'campus.tbl_contentsprache' => 'basis/contentsprache',
'campus.tbl_coodle' => 'basis/coodle',
'campus.tbl_dms' => 'basis/dms',
'campus.tbl_dms_version' => 'basis/dms_version',
'campus.tbl_erreichbarkeit' => 'basis/erreichbarkeit',
'campus.tbl_feedback' => 'basis/feedback',
'campus.tbl_freebusy' => 'basis/freebusy',
'campus.tbl_freebusytyp' => 'basis/freebusytyp',
'campus.tbl_infoscreen' => 'basis/infoscreen',
'campus.tbl_legesamtnote' => 'basis/legesamtnote',
'campus.tbl_lvgesamtnote' => 'basis/lvgesamtnote',
'campus.tbl_lvinfo' => 'basis/lvinfo',
'campus.tbl_news' => 'basis/news',
'campus.tbl_notenschluessel' => 'basis/notenschluessel',
'campus.tbl_notenschluesseluebung' => 'basis/notenschluesseluebung',
'campus.tbl_paabgabe' => 'basis/paabgabe',
'campus.tbl_paabgabetyp' => 'basis/paabgabetyp',
'campus.tbl_pruefung' => 'basis/pruefung',
'campus.tbl_pruefungsanmeldung' => 'basis/pruefungsanmeldung',
'campus.tbl_pruefungsfenster' => 'basis/pruefungsfenster',
'campus.tbl_pruefungsstatus' => 'basis/pruefungsstatus',
'campus.tbl_pruefungstermin' => 'basis/pruefungstermin',
'campus.tbl_reservierung' => 'basis/reservierung',
'campus.tbl_resturlaub' => 'basis/resturlaub',
'campus.tbl_studentbeispiel' => 'basis/studentbeispiel',
'campus.tbl_studentuebung' => 'basis/studentuebung',
'campus.tbl_template' => 'basis/template',
'campus.tbl_uebung' => 'basis/uebung',
'campus.tbl_veranstaltung' => 'basis/veranstaltung',
'campus.tbl_veranstaltungskategorie' => 'basis/veranstaltungskategorie',
'campus.tbl_zeitaufzeichnung' => 'basis/zeitaufzeichnung',
'campus.tbl_zeitsperre' => 'basis/zeitsperre',
'campus.tbl_zeitsperretyp' => 'basis/zeitsperretyp',
'campus.tbl_zeitwunsch' => 'basis/zeitwunsch',
'fue.tbl_aktivitaet' => 'basis/aktivitaet',
'fue.tbl_aufwandstyp' => 'basis/aufwandstyp',
'fue.tbl_projekt' => 'basis/projekt',
'fue.tbl_projekt_ressource' => 'basis/projekt_ressource',
'fue.tbl_projektphase' => 'basis/projektphase',
'fue.tbl_projekttask' => 'basis/projekttask',
'fue.tbl_ressource' => 'basis/ressource',
'fue.tbl_scrumsprint' => 'basis/scrumsprint',
'fue.tbl_scrumteam' => 'basis/scrumteam',
'lehre.tbl_abschlussbeurteilung' => 'basis/abschlussbeurteilung',
'lehre.tbl_abschlusspruefung' => 'basis/abschlusspruefung',
'lehre.tbl_akadgrad' => 'basis/akadgrad',
'lehre.tbl_anrechnung' => 'basis/anrechnung',
'lehre.tbl_betreuerart' => 'basis/betreuerart',
'lehre.tbl_ferien' => 'basis/ferien',
'lehre.tbl_lehreinheit' => 'basis/lehreinheit',
'lehre.tbl_lehreinheitgruppe' => 'basis/lehreinheitgruppe',
'lehre.tbl_lehreinheitmitarbeiter' => 'basis/lehreinheitmitarbeiter',
'lehre.tbl_lehrfach' => 'basis/lehrfach',
'lehre.tbl_lehrform' => 'basis/lehrform',
'lehre.tbl_lehrfunktion' => 'basis/lehrfunktion',
'lehre.tbl_lehrmittel' => 'basis/lehrmittel',
'lehre.tbl_lehrtyp' => 'basis/lehrtyp',
'lehre.tbl_lehrveranstaltung' => 'basis/lehrveranstaltung',
'lehre.tbl_lvangebot' => 'basis/lvangebot',
'lehre.tbl_lvregel' => 'basis/lvregel',
'lehre.tbl_lvregeltyp' => 'basis/lvregeltyp',
'lehre.tbl_moodle' => 'basis/moodle',
'lehre.tbl_note' => 'basis/note',
'lehre.tbl_notenschluessel' => 'basis/notenschluessel',
'lehre.tbl_notenschluesselaufteilung' => 'basis/notenschluesselaufteilung',
'lehre.tbl_notenschluesselzuordnung' => 'basis/notenschluesselzuordnung',
'lehre.tbl_projektarbeit' => 'basis/projektarbeit',
'lehre.tbl_projektbetreuer' => 'basis/projektbetreuer',
'lehre.tbl_projekttyp' => 'basis/projekttyp',
'lehre.tbl_pruefung' => 'basis/pruefung',
'lehre.tbl_pruefungstyp' => 'basis/pruefungstyp',
'lehre.tbl_studienordnung' => 'lehre/studienordnung',
'lehre.tbl_studienordnungstatus' => 'lehre/studienordnungstatus',
'lehre.tbl_studienplan' => 'lehre/studienplan',
'lehre.tbl_studienplatz' => 'basis/studienplatz',
'lehre.tbl_studienplan_semester' => 'lehre/studienplan_semester',
'lehre.tbl_stunde' => 'basis/stunde',
'lehre.tbl_stundenplan' => 'basis/stundenplan',
'lehre.tbl_stundenplandev' => 'basis/stundenplandev',
'lehre.tbl_vertrag' => 'basis/vertrag',
'lehre.tbl_vertragsstatus' => 'basis/vertragsstatus',
'lehre.tbl_vertragstyp' => 'basis/vertragstyp',
'lehre.tbl_zeitfenster' => 'basis/zeitfenster',
'lehre.tbl_zeugnis' => 'basis/zeugnis',
'lehre.tbl_zeugnisnote' => 'basis/zeugnisnote',
'lehre.vw_studienplan' => 'lehre/studienplan',
'public.tbl_adresse' => 'basis/adresse',
'public.tbl_akte' => 'basis/akte',
'public.tbl_ampel' => 'basis/ampel',
'public.tbl_aufmerksamdurch' => 'basis/aufmerksamdurch',
'public.tbl_aufnahmeschluessel' => 'basis/aufnahmeschluessel',
'public.tbl_aufnahmetermin' => 'basis/aufnahmetermin',
'public.tbl_aufnahmetermintyp' => 'basis/aufnahmetermintyp',
'public.tbl_bankverbindung' => 'basis/bankverbindung',
'public.tbl_benutzer' => 'basis/benutzer',
'public.tbl_benutzerfunktion' => 'basis/benutzerfunktion',
'public.tbl_benutzergruppe' => 'basis/benutzergruppe',
'public.tbl_bewerbungstermine' => 'basis/bewerbungstermine',
'public.tbl_buchungstyp' => 'basis/buchungstyp',
'public.tbl_dokument' => 'basis/dokument',
'public.tbl_dokumentprestudent' => 'basis/dokumentprestudent',
'public.tbl_dokumentstudiengang' => 'basis/dokumentstudiengang',
'public.tbl_erhalter' => 'basis/erhalter',
'public.tbl_fachbereich' => 'basis/fachbereich',
'public.tbl_filter' => 'basis/filter',
'public.tbl_firma' => 'basis/firma',
'public.tbl_firmatag' => 'basis/firmatag',
'public.tbl_firmentyp' => 'basis/firmentyp',
'public.tbl_fotostatus' => 'basis/fotostatus',
'public.tbl_funktion' => 'basis/funktion',
'public.tbl_geschaeftsjahr' => 'basis/geschaeftsjahr',
'public.tbl_gruppe' => 'basis/gruppe',
'public.tbl_kontakt' => 'basis/kontakt',
'public.tbl_kontaktmedium' => 'basis/kontaktmedium',
'public.tbl_kontakttyp' => 'basis/kontakttyp',
'public.tbl_konto' => 'basis/konto',
'public.tbl_lehrverband' => 'basis/lehrverband',
'public.tbl_log' => 'basis/log',
'public.tbl_mitarbeiter' => 'basis/mitarbeiter',
'public.tbl_msg_message' => 'basis/message',
'public.tbl_msg_recipient' => 'basis/message',
'public.tbl_msg_status' => 'basis/message',
'public.tbl_msg_attachment' => 'basis/message',
'public.tbl_notiz' => 'basis/notiz',
'public.tbl_notizzuordnung' => 'basis/notizzuordnung',
'public.tbl_organisationseinheit' => 'basis/organisationseinheit',
'public.tbl_organisationseinheittyp' => 'basis/organisationseinheittyp',
'public.tbl_ort' => 'basis/ort',
'public.tbl_ortraumtyp' => 'basis/ortraumtyp',
'public.tbl_person' => 'basis/person',
'public.tbl_personfunktionstandort' => 'basis/personfunktionstandort',
'public.tbl_preincoming' => 'basis/preincoming',
'public.tbl_preinteressent' => 'basis/preinteressent',
'public.tbl_preinteressentstudiengang' => 'basis/preinteressentstudiengang',
'public.tbl_preoutgoing' => 'basis/preoutgoing',
'public.tbl_prestudent' => 'basis/prestudent',
'public.tbl_prestudentstatus' => 'basis/prestudentstatus',
'public.tbl_raumtyp' => 'basis/raumtyp',
'public.tbl_reihungstest' => 'basis/reihungstest',
'public.tbl_semesterwochen' => 'basis/semesterwochen',
'public.tbl_service' => 'basis/service',
'public.tbl_sprache' => 'basis/sprache',
'public.tbl_standort' => 'basis/standort',
'public.tbl_statistik' => 'basis/statistik',
'public.tbl_status' => 'basis/status',
'public.tbl_status_grund' => 'basis/status',
'public.tbl_student' => 'basis/student',
'public.tbl_studentlehrverband' => 'basis/studentlehrverband',
'public.tbl_studiengang' => 'basis/studiengang',
'public.tbl_studiengangstyp' => 'basis/studiengangstyp',
'public.tbl_studienjahr' => 'basis/studienjahr',
'public.tbl_studiensemester' => 'basis/studiensemester',
'public.tbl_tag' => 'basis/tag',
'public.tbl_variable' => 'basis/variable',
'public.tbl_vorlage' => 'system/vorlage',
'public.tbl_vorlagedokument' => 'system/vorlagestudiengang',
'public.tbl_vorlagestudiengang' => 'system/vorlagestudiengang',
'public.tbl_rt_person' => 'basis/person',
'public.vw_studiensemester' => 'basis/studiensemester',
'system.tbl_app' => 'system/app',
'system.tbl_appdaten' => 'system/appdaten',
'system.tbl_benutzerrolle' => 'basis/benutzerrolle',
'system.tbl_berechtigung' => 'basis/berechtigung',
'system.tbl_cronjob' => 'basis/cronjob',
'system.tbl_phrase' => 'system/phrase',
'system.tbl_phrasentext' => 'system/phrase',
'system.tbl_rolle' => 'basis/rolle',
'system.tbl_rolleberechtigung' => 'basis/rolleberechtigung',
'system.tbl_server' => 'basis/server',
'system.tbl_webservicelog' => 'basis/webservicelog',
'system.tbl_webservicerecht' => 'basis/webservicerecht',
'system.tbl_webservicetyp' => 'basis/webservicetyp',
'testtool.tbl_ablauf' => 'basis/ablauf',
'testtool.tbl_antwort' => 'basis/antwort',
'testtool.tbl_frage' => 'basis/frage',
'testtool.tbl_gebiet' => 'basis/gebiet',
'testtool.tbl_kategorie' => 'basis/kategorie',
'testtool.tbl_kriterien' => 'basis/kriterien',
'testtool.tbl_pruefling' => 'basis/pruefling',
'testtool.tbl_vorschlag' => 'basis/vorschlag',
'wawi.tbl_aufteilung' => 'basis/aufteilung',
'wawi.tbl_bestelldetail' => 'basis/bestelldetail',
'wawi.tbl_bestelldetailtag' => 'basis/bestelldetailtag',
'wawi.tbl_bestellstatus' => 'basis/bestellstatus',
'wawi.tbl_bestellung' => 'basis/bestellung',
'wawi.tbl_bestellungtag' => 'basis/bestellungtag',
'wawi.tbl_betriebsmittel' => 'basis/betriebsmittel',
'wawi.tbl_betriebsmittelperson' => 'basis/betriebsmittelperson',
'wawi.tbl_betriebsmittelstatus' => 'basis/betriebsmittelstatus',
'wawi.tbl_betriebsmitteltyp' => 'basis/betriebsmitteltyp',
'wawi.tbl_buchung' => 'basis/buchung',
'wawi.tbl_buchungstyp' => 'basis/buchungstyp',
'wawi.tbl_budget' => 'basis/budget',
'wawi.tbl_konto' => 'basis/konto',
'wawi.tbl_kostenstelle' => 'basis/kostenstelle',
'wawi.tbl_rechnung' => 'basis/rechnung',
'wawi.tbl_rechnungsbetrag' => 'basis/rechnungsbetrag',
'wawi.tbl_rechnungstyp' => 'basis/rechnungstyp',
'wawi.tbl_zahlungstyp' => 'basis/zahlungstyp',
DMS_PATH => 'fs/dms',
'public.tbl_sprache' => 'admin',
'PhrasesLib.getPhrase' => 'system/PhrasesLib'
);
$config['addons_aufnahme_url'] = 'http://debian.dev/build/addons/aufnahme/cis/index.php';
+103
View File
@@ -0,0 +1,103 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| Foreign Characters
| -------------------------------------------------------------------
| This file contains an array of foreign characters for transliteration
| conversion used by the Text helper
|
*/
$foreign_characters = array(
'/ä|æ|ǽ/' => 'ae',
'/ö|œ/' => 'oe',
'/ü/' => 'ue',
'/Ä/' => 'Ae',
'/Ü/' => 'Ue',
'/Ö/' => 'Oe',
'/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά|Ả|Ạ|Ầ|Ẫ|Ẩ|Ậ|Ằ|Ắ|Ẵ|Ẳ|Ặ|А/' => 'A',
'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά|ả|ạ|ầ|ấ|ẫ|ẩ|ậ|ằ|ắ|ẵ|ẳ|ặ|а/' => 'a',
'/Б/' => 'B',
'/б/' => 'b',
'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
'/ç|ć|ĉ|ċ|č/' => 'c',
'/Д/' => 'D',
'/д/' => 'd',
'/Ð|Ď|Đ|Δ/' => 'Dj',
'/ð|ď|đ|δ/' => 'dj',
'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/' => 'E',
'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/' => 'e',
'/Ф/' => 'F',
'/ф/' => 'f',
'/Ĝ|Ğ|Ġ|Ģ|Γ|Г|Ґ/' => 'G',
'/ĝ|ğ|ġ|ģ|γ|г|ґ/' => 'g',
'/Ĥ|Ħ/' => 'H',
'/ĥ|ħ/' => 'h',
'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ|Ỉ|Ị|И|Ы/' => 'I',
'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/' => 'i',
'/Ĵ/' => 'J',
'/ĵ/' => 'j',
'/Ķ|Κ|К/' => 'K',
'/ķ|κ|к/' => 'k',
'/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/' => 'L',
'/ĺ|ļ|ľ|ŀ|ł|λ|л/' => 'l',
'/М/' => 'M',
'/м/' => 'm',
'/Ñ|Ń|Ņ|Ň|Ν|Н/' => 'N',
'/ñ|ń|ņ|ň|ʼn|ν|н/' => 'n',
'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ|Ο|Ό|Ω|Ώ|Ỏ|Ọ|Ồ|Ố|Ỗ|Ổ|Ộ|Ờ|Ớ|Ỡ|Ở|Ợ|О/' => 'O',
'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ|ỏ|ọ|ồ|ố|ỗ|ổ|ộ|ờ|ớ|ỡ|ở|ợ|о/' => 'o',
'/П/' => 'P',
'/п/' => 'p',
'/Ŕ|Ŗ|Ř|Ρ|Р/' => 'R',
'/ŕ|ŗ|ř|ρ|р/' => 'r',
'/Ś|Ŝ|Ş|Ș|Š|Σ|С/' => 'S',
'/ś|ŝ|ş|ș|š|ſ|σ|ς|с/' => 's',
'/Ț|Ţ|Ť|Ŧ|τ|Т/' => 'T',
'/ț|ţ|ť|ŧ|т/' => 't',
'/Þ|þ/' => 'th',
'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/' => 'U',
'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/' => 'u',
'/Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/' => 'Y',
'/ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/' => 'y',
'/В/' => 'V',
'/в/' => 'v',
'/Ŵ/' => 'W',
'/ŵ/' => 'w',
'/Ź|Ż|Ž|Ζ|З/' => 'Z',
'/ź|ż|ž|ζ|з/' => 'z',
'/Æ|Ǽ/' => 'AE',
'/ß/' => 'ss',
'/IJ/' => 'IJ',
'/ij/' => 'ij',
'/Œ/' => 'OE',
'/ƒ/' => 'f',
'/ξ/' => 'ks',
'/π/' => 'p',
'/β/' => 'v',
'/μ/' => 'm',
'/ψ/' => 'ps',
'/Ё/' => 'Yo',
'/ё/' => 'yo',
'/Є/' => 'Ye',
'/є/' => 'ye',
'/Ї/' => 'Yi',
'/Ж/' => 'Zh',
'/ж/' => 'zh',
'/Х/' => 'Kh',
'/х/' => 'kh',
'/Ц/' => 'Ts',
'/ц/' => 'ts',
'/Ч/' => 'Ch',
'/ч/' => 'ch',
'/Ш/' => 'Sh',
'/ш/' => 'sh',
'/Щ/' => 'Shch',
'/щ/' => 'shch',
'/Ъ|ъ|Ь|ь/' => '',
'/Ю/' => 'Yu',
'/ю/' => 'yu',
'/Я/' => 'Ya',
'/я/' => 'ya'
);
+35
View File
@@ -0,0 +1,35 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
//For view all the languages go to the folder assets/grocery_crud/languages/
$config['grocery_crud_default_language'] = 'english';
// There are only three choices: "uk-date" (dd/mm/yyyy), "us-date" (mm/dd/yyyy) or "sql-date" (yyyy-mm-dd)
$config['grocery_crud_date_format'] = 'uk-date';
// The default per page when a user firstly see a list page
$config['grocery_crud_default_per_page'] = 10;
$config['grocery_crud_file_upload_allow_file_types'] = 'gif|jpeg|jpg|png|tiff|doc|docx|txt|odt|xls|xlsx|pdf|ppt|pptx|pps|ppsx|mp3|m4a|ogg|wav|mp4|m4v|mov|wmv|flv|avi|mpg|ogv|3gp|3g2';
$config['grocery_crud_file_upload_max_file_size'] = '20MB'; //ex. '10MB' (Mega Bytes), '1067KB' (Kilo Bytes), '5000B' (Bytes)
//You can choose 'ckeditor','tinymce' or 'markitup'
$config['grocery_crud_default_text_editor'] = 'ckeditor';
//You can choose 'minimal' or 'full'
$config['grocery_crud_text_editor_type'] = 'full';
//The character limiter at the list page, zero(0) value if you don't want character limiter at your list page
$config['grocery_crud_character_limiter'] = 30;
//All the forms are opening with dialog forms without refreshing the page once again.
//IMPORTANT: PLease be aware that this functionality is still in BETA phase and it is
//not suggested to use this in production mode
$config['grocery_crud_dialog_forms'] = false;
//Having some options at the list paging. This is the default one that all the websites are using.
//Make sure that the number of grocery_crud_default_per_page variable is included to this array.
$config['grocery_crud_paging_options'] = array('10','25','50','100');
//Default theme for grocery CRUD
$config['grocery_crud_default_theme'] = 'flexigrid';
//The environment is important so we can have specific configurations for specific environments
$config['grocery_crud_environment'] = 'production';
+13
View File
@@ -0,0 +1,13 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| Hooks
| -------------------------------------------------------------------------
| This file lets you define "hooks" to extend CI without hacking the core
| files. Please see the user guide for info:
|
| http://codeigniter.com/user_guide/general/hooks.html
|
*/
+11
View File
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>403 Forbidden</title>
</head>
<body>
<p>Directory access is forbidden.</p>
</body>
</html>
+31
View File
@@ -0,0 +1,31 @@
<?php
// Define constants
define('EMAIL_CONFIG_INDEX', 'mail');
// Define configuration parameters
$config['email_number_to_sent'] = 1000; // Number of emails to sent each time sendAll is called
$config['email_number_per_time_range'] = 1; // Number of emails to sent before pause
$config['email_time_range'] = 1; // Length of the pause in seconds
$config['email_from_system'] = 'no-reply@technikum-wien.at';
// Smtp: if the CI email library has to connect to a smtp server
// Mail: if the system is setup to send emails with the standard php mail function
// Sendmail: if the system is setup to send email via Sendmail (or similar)
$config['protocol'] = ''; // mail, sendmail, or smtp
// If protocol is set to sendmail
$config['mailpath'] = ''; // SThe server path to Sendmail (or similar)
// If protocol is set to smtp
$config['smtp_host'] = 'localhost'; // SMTP Server Address
$config['smtp_port'] = 25;
$config['smtp_timeout'] = 5; // in seconds
$config['smtp_keepalive'] = false; // Enable persistent SMTP connections
$config['smtp_user'] = '';
$config['smtp_pass'] = '';
$config['wordwrap'] = true; // {unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
$config['wrapchars'] = 76; // Character count to wrap at.
$config['mailtype'] = 'html'; // html or text
$config['priority'] = 3; // Email Priority. 1 = highest. 5 = lowest. 3 = normal
$config['validate'] = false; // If true then the email address will be validated
+19
View File
@@ -0,0 +1,19 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| Memcached settings
| -------------------------------------------------------------------------
| Your Memcached servers can be specified below.
|
| See: http://codeigniter.com/user_guide/libraries/caching.html#memcached
|
*/
$config = array(
'default' => array(
'hostname' => '127.0.0.1',
'port' => '11211',
'weight' => '1',
),
);
+65
View File
@@ -0,0 +1,65 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
$config['msg_delivery'] = true; // Default true
$config['send_immediately'] = false; // If the message should be sent immediately. Default false
$config['system_person_id'] = 1; // Dummy sender, used for sending messages from the system
$config['redirect_view_message_url'] = 'index.ci.php/Redirect/redirectByToken/'; //
$config['message_html_view_url'] = 'index.ci.php/ViewMessage/toHTML/';
$config['assistent_function'] = 'ass';
define('EMAIL_KONTAKT_TYPE', 'email'); // Email kontakt type
define('SENT_INFO_NEWLINE', '\n'); // tbl_msg_recipient->sentInfo separator
/*
|--------------------------------------------------------------------------
| Constants for Messaging System
|--------------------------------------------------------------------------
|
| Statuses
| Priority
| Return Codes
|
*/
// Message statuses
define('MSG_STATUS_UNREAD', 0);
define('MSG_STATUS_READ', 1);
define('MSG_STATUS_ARCHIVED', 2);
define('MSG_STATUS_DELETED', 3);
// Priority
define('PRIORITY_LOW', 1);
define('PRIORITY_NORMAL', 2);
define('PRIORITY_HIGH', 3);
define('PRIORITY_URGENT', 4);
// Status return message codes
define('MSG_SUCCESS', 0);
define('MSG_ERROR', 1);
define('MSG_MESSAGE_SENT', 10);
define('MSG_STATUS_UPDATE', 11);
define('MSG_PARTICIPANT_ADDED', 30);
define('MSG_ERR_PARTICIPANT_EXISTS', 31);
define('MSG_ERR_PARTICIPANT_NONSYSTEM', 32);
define('MSG_PARTICIPANT_REMOVED', 33);
define('MSG_ERR_SUBJECT_EMPTY', 40);
define('MSG_ERR_BODY_EMPTY', 41);
define('MSG_ERR_TEMPLATE_NOT_FOUND', 42);
define('MSG_ERR_DELIVERY_MESSAGE', 43);
define('MSG_ERR_CONTACT_NOT_FOUND', 44);
define('MSG_ERR_OU_CONTACTS_NOT_FOUND', 45);
define('MSG_ERR_INVALID_USER_ID', 100);
define('MSG_ERR_INVALID_MSG_ID', 101);
define('MSG_ERR_INVALID_THREAD_ID', 102);
define('MSG_ERR_INVALID_STATUS_ID', 103);
define('MSG_ERR_INVALID_SENDER_ID', 104);
define('MSG_ERR_INVALID_RECIPIENTS', 105);
define('MSG_ERR_INVALID_RECEIVER_ID', 106);
define('MSG_ERR_INVALID_OU', 107);
define('MSG_ERR_INVALID_TEMPLATE', 108);
define('MSG_ERR_INVALID_TOKEN', 109);
+85
View File
@@ -0,0 +1,85 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| Enable/Disable Migrations
|--------------------------------------------------------------------------
|
| Migrations are disabled by default for security reasons.
| You should enable migrations whenever you intend to do a schema migration
| and disable it back when you're done.
|
*/
$config['migration_enabled'] = TRUE;
/*
|--------------------------------------------------------------------------
| Migrations version
|--------------------------------------------------------------------------
|
| This is used to set migration version that the file system should be on.
| If you run $this->migration->current() this is the version that schema will
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = '014';
/*
|--------------------------------------------------------------------------
| Migration Type
|--------------------------------------------------------------------------
|
| Migration file names may be based on a sequential identifier or on
| a timestamp. Options are:
|
| 'sequential' = Sequential migration naming (001_add_blog.php)
| 'timestamp' = Timestamp migration naming (20121031104401_add_blog.php)
| Use timestamp format YYYYMMDDHHIISS.
|
| Note: If this configuration value is missing the Migration library
| defaults to 'sequential' for backward compatibility with CI2.
|
*/
$config['migration_type'] = 'sequential';
/*
|--------------------------------------------------------------------------
| Migrations table
|--------------------------------------------------------------------------
|
| This is the name of the table that will store the current migrations state.
| When migrations runs it will store in a database table which migration
| level the system is at. It then compares the migration level in this
| table to the $config['migration_version'] if they are not the same it
| will migrate up. This must be set.
|
*/
//$config['migration_table'] = 'system.ci_migrations'; // A missing feature or a bug cannot use another schema than public. Bug: tableExists only looks in the public schema.
$config['migration_table'] = 'ci_migrations';
/*
|--------------------------------------------------------------------------
| Auto Migrate To Latest
|--------------------------------------------------------------------------
|
| If this is set to TRUE when you load the migrations class and have
| $config['migration_enabled'] set to TRUE the system will auto migrate
| to your latest migration (whatever $config['migration_version'] is
| set to). This way you do not have to call migrations anywhere else
| in your code to have the latest migration.
|
*/
$config['migration_auto_latest'] = FALSE;
/*
|--------------------------------------------------------------------------
| Migrations Path
|--------------------------------------------------------------------------
|
| Path to your migrations folder.
| Typically, it will be within your application path.
| Also, writing permission is required within the migrations path.
|
*/
$config['migration_path'] = APPPATH.'migrations/';
+158
View File
@@ -0,0 +1,158 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| MIME TYPES
| -------------------------------------------------------------------
| This file contains an array of mime types. It is used by the
| Upload class to help identify allowed file types.
|
*/
return array(
'hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'),
'cpt' => 'application/mac-compactpro',
'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel', 'text/plain'),
'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'),
'dms' => 'application/octet-stream',
'lha' => 'application/octet-stream',
'lzh' => 'application/octet-stream',
'exe' => array('application/octet-stream', 'application/x-msdownload'),
'class' => 'application/octet-stream',
'psd' => array('application/x-photoshop', 'image/vnd.adobe.photoshop'),
'so' => 'application/octet-stream',
'sea' => 'application/octet-stream',
'dll' => 'application/octet-stream',
'oda' => 'application/oda',
'pdf' => array('application/pdf', 'application/force-download', 'application/x-download', 'binary/octet-stream'),
'ai' => array('application/pdf', 'application/postscript'),
'eps' => 'application/postscript',
'ps' => 'application/postscript',
'smi' => 'application/smil',
'smil' => 'application/smil',
'mif' => 'application/vnd.mif',
'xls' => array('application/vnd.ms-excel', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'),
'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint', 'application/vnd.ms-office', 'application/msword'),
'pptx' => array('application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/x-zip', 'application/zip'),
'wbxml' => 'application/wbxml',
'wmlc' => 'application/wmlc',
'dcr' => 'application/x-director',
'dir' => 'application/x-director',
'dxr' => 'application/x-director',
'dvi' => 'application/x-dvi',
'gtar' => 'application/x-gtar',
'gz' => 'application/x-gzip',
'gzip' => 'application/x-gzip',
'php' => array('application/x-httpd-php', 'application/php', 'application/x-php', 'text/php', 'text/x-php', 'application/x-httpd-php-source'),
'php4' => 'application/x-httpd-php',
'php3' => 'application/x-httpd-php',
'phtml' => 'application/x-httpd-php',
'phps' => 'application/x-httpd-php-source',
'js' => array('application/x-javascript', 'text/plain'),
'swf' => 'application/x-shockwave-flash',
'sit' => 'application/x-stuffit',
'tar' => 'application/x-tar',
'tgz' => array('application/x-tar', 'application/x-gzip-compressed'),
'z' => 'application/x-compress',
'xhtml' => 'application/xhtml+xml',
'xht' => 'application/xhtml+xml',
'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed', 'application/s-compressed', 'multipart/x-zip'),
'rar' => array('application/x-rar', 'application/rar', 'application/x-rar-compressed'),
'mid' => 'audio/midi',
'midi' => 'audio/midi',
'mpga' => 'audio/mpeg',
'mp2' => 'audio/mpeg',
'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
'aif' => array('audio/x-aiff', 'audio/aiff'),
'aiff' => array('audio/x-aiff', 'audio/aiff'),
'aifc' => 'audio/x-aiff',
'ram' => 'audio/x-pn-realaudio',
'rm' => 'audio/x-pn-realaudio',
'rpm' => 'audio/x-pn-realaudio-plugin',
'ra' => 'audio/x-realaudio',
'rv' => 'video/vnd.rn-realvideo',
'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'),
'bmp' => array('image/bmp', 'image/x-bmp', 'image/x-bitmap', 'image/x-xbitmap', 'image/x-win-bitmap', 'image/x-windows-bmp', 'image/ms-bmp', 'image/x-ms-bmp', 'application/bmp', 'application/x-bmp', 'application/x-win-bitmap'),
'gif' => 'image/gif',
'jpeg' => array('image/jpeg', 'image/pjpeg'),
'jpg' => array('image/jpeg', 'image/pjpeg'),
'jpe' => array('image/jpeg', 'image/pjpeg'),
'png' => array('image/png', 'image/x-png'),
'tiff' => 'image/tiff',
'tif' => 'image/tiff',
'css' => array('text/css', 'text/plain'),
'html' => array('text/html', 'text/plain'),
'htm' => array('text/html', 'text/plain'),
'shtml' => array('text/html', 'text/plain'),
'txt' => 'text/plain',
'text' => 'text/plain',
'log' => array('text/plain', 'text/x-log'),
'rtx' => 'text/richtext',
'rtf' => 'text/rtf',
'xml' => array('application/xml', 'text/xml', 'text/plain'),
'xsl' => array('application/xml', 'text/xsl', 'text/xml'),
'mpeg' => 'video/mpeg',
'mpg' => 'video/mpeg',
'mpe' => 'video/mpeg',
'qt' => 'video/quicktime',
'mov' => 'video/quicktime',
'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'),
'movie' => 'video/x-sgi-movie',
'doc' => array('application/msword', 'application/vnd.ms-office'),
'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword', 'application/x-zip'),
'dot' => array('application/msword', 'application/vnd.ms-office'),
'dotx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'),
'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip', 'application/vnd.ms-excel', 'application/msword', 'application/x-zip'),
'word' => array('application/msword', 'application/octet-stream'),
'xl' => 'application/excel',
'eml' => 'message/rfc822',
'json' => array('application/json', 'text/json'),
'pem' => array('application/x-x509-user-cert', 'application/x-pem-file', 'application/octet-stream'),
'p10' => array('application/x-pkcs10', 'application/pkcs10'),
'p12' => 'application/x-pkcs12',
'p7a' => 'application/x-pkcs7-signature',
'p7c' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
'p7m' => array('application/pkcs7-mime', 'application/x-pkcs7-mime'),
'p7r' => 'application/x-pkcs7-certreqresp',
'p7s' => 'application/pkcs7-signature',
'crt' => array('application/x-x509-ca-cert', 'application/x-x509-user-cert', 'application/pkix-cert'),
'crl' => array('application/pkix-crl', 'application/pkcs-crl'),
'der' => 'application/x-x509-ca-cert',
'kdb' => 'application/octet-stream',
'pgp' => 'application/pgp',
'gpg' => 'application/gpg-keys',
'sst' => 'application/octet-stream',
'csr' => 'application/octet-stream',
'rsa' => 'application/x-pkcs7',
'cer' => array('application/pkix-cert', 'application/x-x509-ca-cert'),
'3g2' => 'video/3gpp2',
'3gp' => array('video/3gp', 'video/3gpp'),
'mp4' => 'video/mp4',
'm4a' => 'audio/x-m4a',
'f4v' => 'video/mp4',
'webm' => 'video/webm',
'aac' => 'audio/x-acc',
'm4u' => 'application/vnd.mpegurl',
'm3u' => 'text/plain',
'xspf' => 'application/xspf+xml',
'vlc' => 'application/videolan',
'wmv' => array('video/x-ms-wmv', 'video/x-ms-asf'),
'au' => 'audio/x-au',
'ac3' => 'audio/ac3',
'flac' => 'audio/x-flac',
'ogg' => 'audio/ogg',
'kmz' => array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'),
'kml' => array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml'),
'ics' => 'text/calendar',
'ical' => 'text/calendar',
'zsh' => 'text/x-scriptzsh',
'7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'),
'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'),
'svg' => array('image/svg+xml', 'application/xml', 'text/xml'),
'vcf' => 'text/x-vcard',
'srt' => array('text/srt', 'text/plain'),
'vtt' => array('text/vtt', 'text/plain'),
'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon')
);
+37
View File
@@ -0,0 +1,37 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
* Pagination Config Bootstrap 3 CSS Style
* harviacode.com
*/
$config['query_string_segment'] = 'start';
$config['full_tag_open'] = '<nav><ul class="pagination" style="margin-top:0px">';
$config['full_tag_close'] = '</ul></nav>';
$config['first_link'] = 'First';
$config['first_tag_open'] = '<li>';
$config['first_tag_close'] = '</li>';
$config['last_link'] = 'Last';
$config['last_tag_open'] = '<li>';
$config['last_tag_close'] = '</li>';
$config['next_link'] = 'Next';
$config['next_tag_open'] = '<li>';
$config['next_tag_close'] = '</li>';
$config['prev_link'] = 'Prev';
$config['prev_tag_open'] = '<li>';
$config['prev_tag_close'] = '</li>';
$config['cur_tag_open'] = '<li class="active"><a>';
$config['cur_tag_close'] = '</a></li>';
$config['num_tag_open'] = '<li>';
$config['num_tag_close'] = '</li>';
/* End of file pagination.php */
/* Location: ./application/config/pagination.php */
+14
View File
@@ -0,0 +1,14 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| Profiler Sections
| -------------------------------------------------------------------------
| This file lets you determine whether or not various sections of Profiler
| data are displayed when the Profiler is enabled.
| Please see the user guide for info:
|
| http://codeigniter.com/user_guide/general/profiling.html
|
*/
+519
View File
@@ -0,0 +1,519 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| HTTP protocol
|--------------------------------------------------------------------------
|
| Set to force the use of HTTPS for REST API calls
|
*/
$config['force_https'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST Output Format
|--------------------------------------------------------------------------
|
| The default format of the response
|
| 'array': Array data structure
| 'csv': Comma separated file
| 'json': Uses json_encode(). Note: If a GET query string
| called 'callback' is passed, then jsonp will be returned
| 'html' HTML using the table library in CodeIgniter
| 'php': Uses var_export()
| 'serialized': Uses serialize()
| 'xml': Uses simplexml_load_string()
|
*/
$config['rest_default_format'] = 'json';
/*
|--------------------------------------------------------------------------
| REST Supported Output Formats
|--------------------------------------------------------------------------
|
| The following setting contains a list of the supported/allowed formats.
| You may remove those formats that you don't want to use.
| If the default format $config['rest_default_format'] is missing within
| $config['rest_supported_formats'], it will be added silently during
| REST_Controller initialization.
|
*/
$config['rest_supported_formats'] = [
'json',
'array',
'csv',
'html',
'jsonp',
'php',
'serialized',
'xml',
];
/*
|--------------------------------------------------------------------------
| REST Status Field Name
|--------------------------------------------------------------------------
|
| The field name for the status inside the response
|
*/
$config['rest_status_field_name'] = 'status';
/*
|--------------------------------------------------------------------------
| REST Message Field Name
|--------------------------------------------------------------------------
|
| The field name for the message inside the response
|
*/
$config['rest_message_field_name'] = 'error';
/*
|--------------------------------------------------------------------------
| Enable Emulate Request
|--------------------------------------------------------------------------
|
| Should we enable emulation of the request (e.g. used in Mootools request)
|
*/
$config['enable_emulate_request'] = TRUE;
/*
|--------------------------------------------------------------------------
| REST Realm
|--------------------------------------------------------------------------
|
| Name of the password protected REST API displayed on login dialogs
|
| e.g: My Secret REST API
|
*/
$config['rest_realm'] = 'FHC REST API';
/*
|--------------------------------------------------------------------------
| REST Login
|--------------------------------------------------------------------------
|
| Set to specify the REST API requires to be logged in
|
| FALSE No login required
| 'basic' Unsecure login
| 'digest' More secure login
| 'session' Check for a PHP session variable. See 'auth_source' to set the
| authorization key
|
*/
$config['rest_auth'] = 'basic';
/*
|--------------------------------------------------------------------------
| REST Login Source
|--------------------------------------------------------------------------
|
| Is login required and if so, the user store to use
|
| '' Use config based users or wildcard testing, only for testing purpose
| it would be very unsecure to let unset in a production environment
| 'ldap' Use LDAP authentication
| 'library' Use a authentication library
|
| Note: If 'rest_auth' is set to 'session' then change 'auth_source' to the name of the session variable
|
*/
$config['auth_source'] = 'library';
/*
|--------------------------------------------------------------------------
| REST Login Class and Function
|--------------------------------------------------------------------------
|
| If library authentication is used define the class and function name
|
| The function should accept two parameters: class->function($username, $password)
| In other cases override the function _perform_library_auth in your controller
|
| For digest authentication the library function should return already a stored
| password for that username, even if it is hashed
|
*/
$config['auth_library_class'] = 'FHC_Auth';
// rest_auth is basic
$config['auth_library_function'] = 'basicAuthentication';
// rest_auth is digest
//$config['auth_library_function'] = 'digestAuthentication';
/*
|--------------------------------------------------------------------------
| Override auth types for specific class/method
|--------------------------------------------------------------------------
|
| Set specific authentication types for methods within a class (controller)
|
| Set as many config entries as needed. Any methods not set will use the default 'rest_auth' config value.
|
| e.g:
|
| $config['auth_override_class_method']['deals']['view'] = 'none';
| $config['auth_override_class_method']['deals']['insert'] = 'digest';
| $config['auth_override_class_method']['accounts']['user'] = 'basic';
| $config['auth_override_class_method']['dashboard']['*'] = 'none|digest|basic';
|
| Here 'deals', 'accounts' and 'dashboard' are controller names, 'view', 'insert' and 'user' are methods within.
* An asterisk may also be used to specify an authentication method for an entire classes methods.
* Ex: $config['auth_override_class_method']['dashboard']['*'] = 'basic'; (NOTE: leave off the '_get' or '_post' from the end
* of the method name)
| Acceptable values are; 'none', 'digest' and 'basic'.
|
*/
// $config['auth_override_class_method']['deals']['view'] = 'none';
// $config['auth_override_class_method']['deals']['insert'] = 'digest';
// $config['auth_override_class_method']['accounts']['user'] = 'basic';
// $config['auth_override_class_method']['dashboard']['*'] = 'basic';
// ---Uncomment list line for the wildard unit test
// $config['auth_override_class_method']['wildcard_test_cases']['*'] = 'basic';
/*
|--------------------------------------------------------------------------
| Override auth types for specfic 'class/method/HTTP method'
|--------------------------------------------------------------------------
|
| example:
|
| $config['auth_override_class_method_http']['deals']['view']['get'] = 'none';
| $config['auth_override_class_method_http']['deals']['insert']['post'] = 'none';
| $config['auth_override_class_method_http']['deals']['*']['options'] = 'none';
*/
// ---Uncomment list line for the wildard unit test
// $config['auth_override_class_method_http']['wildcard_test_cases']['*']['options'] = 'basic';
/*
|--------------------------------------------------------------------------
| REST Login Usernames
|--------------------------------------------------------------------------
|
| Array of usernames and passwords for login, if ldap (even library) is configured this is ignored
|
*/
//$config['rest_valid_logins'] = ['admin' => '1234', 'test' => 'test'];
/*
|--------------------------------------------------------------------------
| Global IP Whitelisting
|--------------------------------------------------------------------------
|
| Limit connections to your REST server to whitelisted IP addresses
|
| Usage:
| 1. Set to TRUE and select an auth option for extreme security (client's IP
| address must be in whitelist and they must also log in)
| 2. Set to TRUE with auth set to FALSE to allow whitelisted IPs access with no login
| 3. Set to FALSE but set 'auth_override_class_method' to 'whitelist' to
| restrict certain methods to IPs in your whitelist
|
*/
$config['rest_ip_whitelist_enabled'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST IP Whitelist
|--------------------------------------------------------------------------
|
| Limit connections to your REST server with a comma separated
| list of IP addresses
|
| e.g: '123.456.789.0, 987.654.32.1'
|
| 127.0.0.1 and 0.0.0.0 are allowed by default
|
*/
$config['rest_ip_whitelist'] = '';
/*
|--------------------------------------------------------------------------
| Global IP Blacklisting
|--------------------------------------------------------------------------
|
| Prevent connections to the REST server from blacklisted IP addresses
|
| Usage:
| 1. Set to TRUE and add any IP address to 'rest_ip_blacklist'
|
*/
$config['rest_ip_blacklist_enabled'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST IP Blacklist
|--------------------------------------------------------------------------
|
| Prevent connections from the following IP addresses
|
| e.g: '123.456.789.0, 987.654.32.1'
|
*/
$config['rest_ip_blacklist'] = '';
/*
|--------------------------------------------------------------------------
| REST Database Group
|--------------------------------------------------------------------------
|
| Connect to a database group for keys, logging, etc. It will only connect
| if you have any of these features enabled
|
*/
$config['rest_database_group'] = 'default';
/*
|--------------------------------------------------------------------------
| REST API Keys Table Name
|--------------------------------------------------------------------------
|
| The table name in your database that stores API keys
|
*/
$config['rest_keys_table'] = 'ci_apikey';
/*
|--------------------------------------------------------------------------
| REST Enable Keys
|--------------------------------------------------------------------------
|
| When set to TRUE, the REST API will look for a column name called 'key'.
| If no key is provided, the request will result in an error. To override the
| column name see 'rest_key_column'
|
| Default table schema:
| CREATE TABLE `keys` (
| `id` INT(11) NOT NULL AUTO_INCREMENT,
| `key` VARCHAR(40) NOT NULL,
| `level` INT(2) NOT NULL,
| `ignore_limits` TINYINT(1) NOT NULL DEFAULT '0',
| `is_private_key` TINYINT(1) NOT NULL DEFAULT '0',
| `ip_addresses` TEXT NULL DEFAULT NULL,
| `date_created` INT(11) NOT NULL,
| PRIMARY KEY (`id`)
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
*/
$config['rest_enable_keys'] = TRUE;
/*
|--------------------------------------------------------------------------
| REST Table Key Column Name
|--------------------------------------------------------------------------
|
| If not using the default table schema in 'rest_enable_keys', specify the
| column name to match e.g. my_key
|
*/
$config['rest_key_column'] = 'key';
/*
|--------------------------------------------------------------------------
| REST API Limits method
|--------------------------------------------------------------------------
|
| Specify the method used to limit the API calls
|
| Available methods are :
| $config['rest_limits_method'] = 'API_KEY'; // Put a limit per api key
| $config['rest_limits_method'] = 'METHOD_NAME'; // Put a limit on method calls
| $config['rest_limits_method'] = 'ROUTED_URL'; // Put a limit on the routed URL
|
*/
$config['rest_limits_method'] = 'ROUTED_URL';
/*
|--------------------------------------------------------------------------
| REST Key Length
|--------------------------------------------------------------------------
|
| Length of the created keys. Check your default database schema on the
| maximum length allowed
|
| Note: The maximum length is 40
|
*/
$config['rest_key_length'] = 40;
/*
|--------------------------------------------------------------------------
| REST API Key Variable
|--------------------------------------------------------------------------
|
| Custom header to specify the API key
| Note: Custom headers with the X- prefix are deprecated as of
| 2012/06/12. See RFC 6648 specification for more details
|
*/
$config['rest_key_name'] = 'FHC-API-KEY';
/*
|--------------------------------------------------------------------------
| REST Enable Logging
|--------------------------------------------------------------------------
|
| When set to TRUE, the REST API will log actions based on the column names 'key', 'date',
| 'time' and 'ip_address'. This is a general rule that can be overridden in the
| $this->method array for each controller
|
| Default table schema:
| CREATE TABLE `logs` (
| `id` INT(11) NOT NULL AUTO_INCREMENT,
| `uri` VARCHAR(255) NOT NULL,
| `method` VARCHAR(6) NOT NULL,
| `params` TEXT DEFAULT NULL,
| `api_key` VARCHAR(40) NOT NULL,
| `ip_address` VARCHAR(45) NOT NULL,
| `time` INT(11) NOT NULL,
| `rtime` FLOAT DEFAULT NULL,
| `authorized` VARCHAR(1) NOT NULL,
| `response_code` smallint(3) DEFAULT '0',
| PRIMARY KEY (`id`)
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
*/
$config['rest_enable_logging'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST API Logs Table Name
|--------------------------------------------------------------------------
|
| If not using the default table schema in 'rest_enable_logging', specify the
| table name to match e.g. my_logs
|
*/
$config['rest_logs_table'] = 'logs';
/*
|--------------------------------------------------------------------------
| REST Method Access Control
|--------------------------------------------------------------------------
| When set to TRUE, the REST API will check the access table to see if
| the API key can access that controller. 'rest_enable_keys' must be enabled
| to use this
|
| Default table schema:
| CREATE TABLE `access` (
| `id` INT(11) unsigned NOT NULL AUTO_INCREMENT,
| `key` VARCHAR(40) NOT NULL DEFAULT '',
| `controller` VARCHAR(50) NOT NULL DEFAULT '',
| `date_created` DATETIME DEFAULT NULL,
| `date_modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
| PRIMARY KEY (`id`)
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
*/
$config['rest_enable_access'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST API Access Table Name
|--------------------------------------------------------------------------
|
| If not using the default table schema in 'rest_enable_access', specify the
| table name to match e.g. my_access
|
*/
$config['rest_access_table'] = 'access';
/*
|--------------------------------------------------------------------------
| REST API Param Log Format
|--------------------------------------------------------------------------
|
| When set to TRUE, the REST API log parameters will be stored in the database as JSON
| Set to FALSE to log as serialized PHP
|
*/
$config['rest_logs_json_params'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST Enable Limits
|--------------------------------------------------------------------------
|
| When set to TRUE, the REST API will count the number of uses of each method
| by an API key each hour. This is a general rule that can be overridden in the
| $this->method array in each controller
|
| Default table schema:
| CREATE TABLE `limits` (
| `id` INT(11) NOT NULL AUTO_INCREMENT,
| `uri` VARCHAR(255) NOT NULL,
| `count` INT(10) NOT NULL,
| `hour_started` INT(11) NOT NULL,
| `api_key` VARCHAR(40) NOT NULL,
| PRIMARY KEY (`id`)
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| To specify the limits within the controller's __construct() method, add per-method
| limits with:
|
| $this->method['METHOD_NAME']['limit'] = [NUM_REQUESTS_PER_HOUR];
|
| See application/controllers/api/example.php for examples
*/
$config['rest_enable_limits'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST API Limits Table Name
|--------------------------------------------------------------------------
|
| If not using the default table schema in 'rest_enable_limits', specify the
| table name to match e.g. my_limits
|
*/
$config['rest_limits_table'] = 'limits';
/*
|--------------------------------------------------------------------------
| REST Ignore HTTP Accept
|--------------------------------------------------------------------------
|
| Set to TRUE to ignore the HTTP Accept and speed up each request a little.
| Only do this if you are using the $this->rest_format or /format/xml in URLs
|
*/
$config['rest_ignore_http_accept'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST AJAX Only
|--------------------------------------------------------------------------
|
| Set to TRUE to allow AJAX requests only. Set to FALSE to accept HTTP requests
|
| Note: If set to TRUE and the request is not AJAX, a 505 response with the
| error message 'Only AJAX requests are accepted.' will be returned.
|
| Hint: This is good for production environments
|
*/
$config['rest_ajax_only'] = FALSE;
/*
|--------------------------------------------------------------------------
| REST Language File
|--------------------------------------------------------------------------
|
| Language file to load from the language directory
|
*/
$config['rest_language'] = 'en-US';
+51
View File
@@ -0,0 +1,51 @@
<?php
if (! defined('BASEPATH'))
exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| Standard ROLES in FH-Complete and their persmissions
| -------------------------------------------------------------------------
|
*/
$config['roles'] = array
(
array
(
'rolle_kurzbz' => 'admin',
'berechtigung' => array
(
'admin', 'assistenz', 'basis/addon', 'basis/ampel', 'basis/ampeluebersicht',
'basis/benutzer', 'basis/berechtigung', 'basis/betriebsmittel', 'basis/cms',
'basis/cms_review', 'basis/cms_sperrfreigabe', 'basis/cronjob', 'basis/dms',
'basis/fas', 'basis/ferien', 'basis/fhausweis','basis/firma',
'basis/infoscreen', 'basis/moodle', 'basis/moodle','basis/news', 'basis/notiz',
'basis/organisationseinheit', 'basis/ort', 'basis/person', 'basis/planner',
'basis/service', 'basis/statistik', 'basis/studiengang', 'basis/studiensemester', 'basis/tempus',
'basis/testtool', 'basis/variable', 'basis/vilesci', 'buchung/typen',
'buchung/mitarbeiter', 'inout/incoming', 'inout/outgoing', 'inout/uebersicht',
'lehre', 'lehre/abgabetool', 'lehre/freifach', 'lehre/lehrfach',
'lehre/lehrveranstaltung', 'lehre/lvplan', 'lehre/lvinfo',
'lehre/pruefungsanmeldungAdmin', 'lehre/pruefungsbeurteilung',
'lehre/pruefungsbeurteilungAdmin', 'lehre/pruefungsterminAdmin',
'lehre/pruefungsfenster', 'lehre/reihungstest', 'lehre/reservierung',
'lehre/studienordnung', 'lehre/studienordnungInaktiv', 'lehre/studienplan',
'lehre/vorrueckung', 'lv-plan', 'lv-plan/gruppenentfernen',
'lv-plan/lektorentfernen', 'mitarbeiter', 'mitarbeiter/bankdaten',
'mitarbeiter/personalnummer', 'mitarbeiter/stammdaten', 'mitarbeiter/urlaube',
'mitarbeiter/zeitsperre', 'news', 'planner', 'preinteressent', 'raumres',
'reihungstest', 'sdTools', 'soap/lv', 'soap/lvplan', 'soap/mitarbeiter',
'soap/ort', 'soap/pruefungsfenster', 'soap/student', 'soap/studienordnung',
'soap/benutzer', 'soap/buchungen', 'student/bankdaten', 'student/anrechnung',
'student/anwesenheit', 'student/dokumente', 'student/noten', 'system/phrase',
'system/vorlage', 'system/vorlagestudiengang', 'student/stammdaten',
'student/vorrueckung', 'system/developer', 'system/loginasuser',
'user', 'veranstaltung', 'vertrag/mitarbeiter', 'vertrag/typen',
'wawi/berichte', 'wawi/bestellung', 'wawi/bestellung_advanced', 'wawi/budget',
'wawi/delete_advanced', 'wawi/firma', 'wawi/freigabe',
'wawi/freigabe_advanced', 'wawi/inventar', 'wawi/konto', 'wawi/kostenstelle',
'wawi/rechnung', 'wawi/rechnung_freigeben', 'wawi/rechnung_transfer',
'wawi/storno'
)
)
);
+62
View File
@@ -0,0 +1,62 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| URI ROUTING
| -------------------------------------------------------------------------
| This file lets you re-map URI requests to specific controller functions.
|
| Typically there is a one-to-one relationship between a URL string
| and its corresponding controller class/method. The segments in a
| URL normally follow this pattern:
|
| example.com/class/method/id/
|
| In some instances, however, you may want to remap this relationship
| so that a different class/function is called than the one
| corresponding to the URL.
|
| Please see the user guide for complete details:
|
| http://codeigniter.com/user_guide/general/routing.html
|
| -------------------------------------------------------------------------
| RESERVED ROUTES
| -------------------------------------------------------------------------
|
| There are three reserved routes:
|
| $route['default_controller'] = 'welcome';
|
| This route indicates which controller class should be loaded if the
| URI contains no data. In the above example, the "welcome" class
| would be loaded.
|
| $route['404_override'] = 'errors/page_missing';
|
| This route will tell the Router which controller/method to use if those
| provided in the URL cannot be matched to a valid route.
|
| $route['translate_uri_dashes'] = FALSE;
|
| This is not exactly a route, but allows you to automatically route
| controller and method names that contain dashes. '-' isn't a valid
| class or method name character, so it requires translation.
| When you set this option to TRUE, it will replace ALL dashes in the
| controller and method URI segments.
|
| Examples: my-controller/index -> my_controller/index
| my-controller/my-method -> my_controller/my_method
*/
$route['default_controller'] = 'Vilesci';
$route['404_override'] = '';
$route['translate_uri_dashes'] = FALSE;
// Class name conflicts
$route['api/v1/organisation/[S|s]tudiengang/(:any)'] = 'api/v1/organisation/studiengang2/$1';
$route['api/v1/organisation/[F|f]achbereich/(:any)'] = 'api/v1/organisation/fachbereich2/$1';
$route['api/v1/organisation/[G|g]eschaeftsjahr/(:any)'] = 'api/v1/organisation/geschaeftsjahr2/$1';
$route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisation/organisationseinheit2/$1';
$route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
$route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
+64
View File
@@ -0,0 +1,64 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| SMILEYS
| -------------------------------------------------------------------
| This file contains an array of smileys for use with the emoticon helper.
| Individual images can be used to replace multiple smileys. For example:
| :-) and :) use the same image replacement.
|
| Please see user guide for more info:
| http://codeigniter.com/user_guide/helpers/smiley_helper.html
|
*/
$smileys = array(
// smiley image name width height alt
':-)' => array('grin.gif', '19', '19', 'grin'),
':lol:' => array('lol.gif', '19', '19', 'LOL'),
':cheese:' => array('cheese.gif', '19', '19', 'cheese'),
':)' => array('smile.gif', '19', '19', 'smile'),
';-)' => array('wink.gif', '19', '19', 'wink'),
';)' => array('wink.gif', '19', '19', 'wink'),
':smirk:' => array('smirk.gif', '19', '19', 'smirk'),
':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'),
':-S' => array('confused.gif', '19', '19', 'confused'),
':wow:' => array('surprise.gif', '19', '19', 'surprised'),
':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'),
':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'),
'%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'),
';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'),
':P' => array('raspberry.gif', '19', '19', 'raspberry'),
':blank:' => array('blank.gif', '19', '19', 'blank stare'),
':long:' => array('longface.gif', '19', '19', 'long face'),
':ohh:' => array('ohh.gif', '19', '19', 'ohh'),
':grrr:' => array('grrr.gif', '19', '19', 'grrr'),
':gulp:' => array('gulp.gif', '19', '19', 'gulp'),
'8-/' => array('ohoh.gif', '19', '19', 'oh oh'),
':down:' => array('downer.gif', '19', '19', 'downer'),
':red:' => array('embarrassed.gif', '19', '19', 'red face'),
':sick:' => array('sick.gif', '19', '19', 'sick'),
':shut:' => array('shuteye.gif', '19', '19', 'shut eye'),
':-/' => array('hmm.gif', '19', '19', 'hmmm'),
'>:(' => array('mad.gif', '19', '19', 'mad'),
':mad:' => array('mad.gif', '19', '19', 'mad'),
'>:-(' => array('angry.gif', '19', '19', 'angry'),
':angry:' => array('angry.gif', '19', '19', 'angry'),
':zip:' => array('zip.gif', '19', '19', 'zipper'),
':kiss:' => array('kiss.gif', '19', '19', 'kiss'),
':ahhh:' => array('shock.gif', '19', '19', 'shock'),
':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'),
':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'),
':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'),
':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'),
':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'),
':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'),
':vampire:' => array('vampire.gif', '19', '19', 'vampire'),
':snake:' => array('snake.gif', '19', '19', 'snake'),
':exclaim:' => array('exclaim.gif', '19', '19', 'exclaim'),
':question:' => array('question.gif', '19', '19', 'question')
);
+15
View File
@@ -0,0 +1,15 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| Template configuration
|--------------------------------------------------------------------------
| This file will contain the settings for the template library.
|
| 'parser' = if you want your main template file to be parsed, set to TRUE
| 'template' = the filename of the default template file
| 'cache_ttl' = the time all partials should be cache in seconds, 0 means no global caching
*/
$config['parser'] = TRUE;
$config['template'] = 'templates/vilesci';
$config['cache_ttl'] = 0;
+211
View File
@@ -0,0 +1,211 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| USER AGENT TYPES
| -------------------------------------------------------------------
| This file contains four arrays of user agent data. It is used by the
| User Agent Class to help identify browser, platform, robot, and
| mobile device data. The array keys are used to identify the device
| and the array values are used to set the actual name of the item.
*/
$platforms = array(
'windows nt 10.0' => 'Windows 10',
'windows nt 6.3' => 'Windows 8.1',
'windows nt 6.2' => 'Windows 8',
'windows nt 6.1' => 'Windows 7',
'windows nt 6.0' => 'Windows Vista',
'windows nt 5.2' => 'Windows 2003',
'windows nt 5.1' => 'Windows XP',
'windows nt 5.0' => 'Windows 2000',
'windows nt 4.0' => 'Windows NT 4.0',
'winnt4.0' => 'Windows NT 4.0',
'winnt 4.0' => 'Windows NT',
'winnt' => 'Windows NT',
'windows 98' => 'Windows 98',
'win98' => 'Windows 98',
'windows 95' => 'Windows 95',
'win95' => 'Windows 95',
'windows phone' => 'Windows Phone',
'windows' => 'Unknown Windows OS',
'android' => 'Android',
'blackberry' => 'BlackBerry',
'iphone' => 'iOS',
'ipad' => 'iOS',
'ipod' => 'iOS',
'os x' => 'Mac OS X',
'ppc mac' => 'Power PC Mac',
'freebsd' => 'FreeBSD',
'ppc' => 'Macintosh',
'linux' => 'Linux',
'debian' => 'Debian',
'sunos' => 'Sun Solaris',
'beos' => 'BeOS',
'apachebench' => 'ApacheBench',
'aix' => 'AIX',
'irix' => 'Irix',
'osf' => 'DEC OSF',
'hp-ux' => 'HP-UX',
'netbsd' => 'NetBSD',
'bsdi' => 'BSDi',
'openbsd' => 'OpenBSD',
'gnu' => 'GNU/Linux',
'unix' => 'Unknown Unix OS',
'symbian' => 'Symbian OS'
);
// The order of this array should NOT be changed. Many browsers return
// multiple browser types so we want to identify the sub-type first.
$browsers = array(
'OPR' => 'Opera',
'Flock' => 'Flock',
'Edge' => 'Spartan',
'Chrome' => 'Chrome',
// Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
'Opera.*?Version' => 'Opera',
'Opera' => 'Opera',
'MSIE' => 'Internet Explorer',
'Internet Explorer' => 'Internet Explorer',
'Trident.* rv' => 'Internet Explorer',
'Shiira' => 'Shiira',
'Firefox' => 'Firefox',
'Chimera' => 'Chimera',
'Phoenix' => 'Phoenix',
'Firebird' => 'Firebird',
'Camino' => 'Camino',
'Netscape' => 'Netscape',
'OmniWeb' => 'OmniWeb',
'Safari' => 'Safari',
'Mozilla' => 'Mozilla',
'Konqueror' => 'Konqueror',
'icab' => 'iCab',
'Lynx' => 'Lynx',
'Links' => 'Links',
'hotjava' => 'HotJava',
'amaya' => 'Amaya',
'IBrowse' => 'IBrowse',
'Maxthon' => 'Maxthon',
'Ubuntu' => 'Ubuntu Web Browser'
);
$mobiles = array(
// legacy array, old values commented out
'mobileexplorer' => 'Mobile Explorer',
// 'openwave' => 'Open Wave',
// 'opera mini' => 'Opera Mini',
// 'operamini' => 'Opera Mini',
// 'elaine' => 'Palm',
'palmsource' => 'Palm',
// 'digital paths' => 'Palm',
// 'avantgo' => 'Avantgo',
// 'xiino' => 'Xiino',
'palmscape' => 'Palmscape',
// 'nokia' => 'Nokia',
// 'ericsson' => 'Ericsson',
// 'blackberry' => 'BlackBerry',
// 'motorola' => 'Motorola'
// Phones and Manufacturers
'motorola' => 'Motorola',
'nokia' => 'Nokia',
'palm' => 'Palm',
'iphone' => 'Apple iPhone',
'ipad' => 'iPad',
'ipod' => 'Apple iPod Touch',
'sony' => 'Sony Ericsson',
'ericsson' => 'Sony Ericsson',
'blackberry' => 'BlackBerry',
'cocoon' => 'O2 Cocoon',
'blazer' => 'Treo',
'lg' => 'LG',
'amoi' => 'Amoi',
'xda' => 'XDA',
'mda' => 'MDA',
'vario' => 'Vario',
'htc' => 'HTC',
'samsung' => 'Samsung',
'sharp' => 'Sharp',
'sie-' => 'Siemens',
'alcatel' => 'Alcatel',
'benq' => 'BenQ',
'ipaq' => 'HP iPaq',
'mot-' => 'Motorola',
'playstation portable' => 'PlayStation Portable',
'playstation 3' => 'PlayStation 3',
'playstation vita' => 'PlayStation Vita',
'hiptop' => 'Danger Hiptop',
'nec-' => 'NEC',
'panasonic' => 'Panasonic',
'philips' => 'Philips',
'sagem' => 'Sagem',
'sanyo' => 'Sanyo',
'spv' => 'SPV',
'zte' => 'ZTE',
'sendo' => 'Sendo',
'nintendo dsi' => 'Nintendo DSi',
'nintendo ds' => 'Nintendo DS',
'nintendo 3ds' => 'Nintendo 3DS',
'wii' => 'Nintendo Wii',
'open web' => 'Open Web',
'openweb' => 'OpenWeb',
// Operating Systems
'android' => 'Android',
'symbian' => 'Symbian',
'SymbianOS' => 'SymbianOS',
'elaine' => 'Palm',
'series60' => 'Symbian S60',
'windows ce' => 'Windows CE',
// Browsers
'obigo' => 'Obigo',
'netfront' => 'Netfront Browser',
'openwave' => 'Openwave Browser',
'mobilexplorer' => 'Mobile Explorer',
'operamini' => 'Opera Mini',
'opera mini' => 'Opera Mini',
'opera mobi' => 'Opera Mobile',
'fennec' => 'Firefox Mobile',
// Other
'digital paths' => 'Digital Paths',
'avantgo' => 'AvantGo',
'xiino' => 'Xiino',
'novarra' => 'Novarra Transcoder',
'vodafone' => 'Vodafone',
'docomo' => 'NTT DoCoMo',
'o2' => 'O2',
// Fallback
'mobile' => 'Generic Mobile',
'wireless' => 'Generic Mobile',
'j2me' => 'Generic Mobile',
'midp' => 'Generic Mobile',
'cldc' => 'Generic Mobile',
'up.link' => 'Generic Mobile',
'up.browser' => 'Generic Mobile',
'smartphone' => 'Generic Mobile',
'cellphone' => 'Generic Mobile'
);
// There are hundreds of bots but these are the most common.
$robots = array(
'googlebot' => 'Googlebot',
'msnbot' => 'MSNBot',
'baiduspider' => 'Baiduspider',
'bingbot' => 'Bing',
'slurp' => 'Inktomi Slurp',
'yahoo' => 'Yahoo',
'ask jeeves' => 'Ask Jeeves',
'fastcrawler' => 'FastCrawler',
'infoseek' => 'InfoSeek Robot 1.0',
'lycos' => 'Lycos',
'yandex' => 'YandexBot',
'mediapartners-google' => 'MediaPartners Google',
'CRAZYWEBCRAWLER' => 'Crazy Webcrawler',
'adsbot-google' => 'AdsBot Google',
'feedfetcher-google' => 'Feedfetcher Google',
'curious george' => 'Curious George'
);
+571
View File
@@ -0,0 +1,571 @@
<?php
if (! defined('BASEPATH'))
exit('No direct script access allowed');
/**
* Database Class
*
*/
class DBTools extends FHC_Controller
{
private $cli = false;
/**
* Path to seed classes
*
* @var string
*/
protected $seed_path;
/**
* Seed basename regex
*
* @var string
*/
protected $seed_regex = '/^\d{3}_(\w+)$/';
/**
* Initialize DB-Tools Class
*
* @return void
*/
public function __construct()
{
parent::__construct();
$this->seed_path = APPPATH.'seeds/';
if ($this->input->is_cli_request())
{
$cli = true;
}
else
{
//$this->output->set_status_header(403, 'Migrations must be run from the CLI');
//exit;
}
// can only be run in the development environment
if (ENVIRONMENT == 'production')
exit('Wowsers! You don\'t want to do that!');
$this->load->database('system'); //Use the system-Connection for DB-Manipulation
$this->config->load('migration');
$this->load->library('migration');
// If not set, set it
$this->seed_path !== '' OR $this->seed_path = APPPATH.'seeds/';
// Add trailing slash if not set
$this->seed_path = rtrim($this->seed_path, '/').'/';
// Load seed language
$this->lang->load('seed');
// initiate faker
$this->faker = \Faker\Factory::create();
// load any required models
//$this->load->model('person/Person_model');
log_message('info', 'DB-Tools Controller Initialized');
}
/**
* Main function index as help
*
* @return void
*/
public function index()
{
$result = "The following are the available command line interface commands\n\n";
$result .= "php index.ci.php DBTools migrate [\"version_number\"] Run migrations. (latest/current) ";
$result .= "The version number is optional.\n";
$result .= "php index.ci.php DBTools seed [\"file_name\"] Run the specified seed (Name of Seed. expl: 'Organisation').\n";
echo $result.PHP_EOL;
}
/**
* Migrate to latest or current version
*
* @param string $version [optional] One of either "latest" or "current"
* @return void
*/
public function migrate($version = 'latest')
{
echo 'DB-Migration';
if ($version != 'latest' && $version != 'current')
{
$this->__failed('Migration version must be either latest or current');
}
elseif ($this->cli && !$this->migration->$version())
{
show_error($this->migration->error_string());
}
elseif (!$this->migration->$version())
{
$this->__failed();
}
$this->__succeeded();
}
/**
* Migrate to a specific version
*
* @return void
*/
public function version()
{
if ($version == 'latest' || $version == 'current')
{
$this->index($version);
exit;
}
if (!$this->migrate->version($version))
{
$this->__failed();
}
$this->__succeeded();
}
/**
* Roll-back to the last version before current
*
* @param int $version The migration to rollback to, defaults to previous
* @return void
*/
public function rollback($version = null)
{
if (is_null($version))
{
$version = $this->__getVersion() ?: 1;
$version--;
}
// Check it's definitely false, we could be rolling back to v0
if (false === $this->migration->version($version))
{
$this->__failed();
}
$this->__succeeded('rolled back');
}
/**
* ROLLBACK ALL THE THINGS!
*
* @return void
*/
public function uninstall()
{
$this->rollback(0);
}
/**
* Seeds DB with Testdata
*
* @param string $name Name of the seed file.
* @return bool
*/
public function seed($name = null)
{
$seeds = $this->findSeeds();
if (empty($seeds))
{
$this->_error_string = $this->lang->line('seed_none_found');
return false;
}
$method = 'seed';
$pending = array();
foreach ($seeds as $number => $file)
{
include_once($file);
$class = 'Seed_'.ucfirst(strtolower($this->_getSeedName(basename($file, '.php'))));
// Validate the seed file structure
if (! class_exists($class, false))
{
$this->_error_string = sprintf($this->lang->line('seed_class_doesnt_exist'), $class);
return false;
}
// method_exists() returns true for non-public methods,
// while is_callable() can't be used without instantiating.
// Only get_class_methods() satisfies both conditions.
elseif (! in_array($method, array_map('strtolower', get_class_methods($class))))
{
$this->_error_string = sprintf($this->lang->line('seed_missing_'.$method.'_method'), $class);
return false;
}
$pending[$number] = array($class, $method);
}
// Now just run the necessary seeds
foreach ($pending as $number => $seed)
{
if (is_null($name))
{
log_message('debug', 'Seeding '.$method);
$seed[0] = new $seed[0];
call_user_func($seed);
}
elseif ($seed[0] == 'Seed_'.$name)
{
log_message('debug', 'Seeding '.$method);
$seed[0] = new $seed[0];
call_user_func($seed);
}
}
}
/**
* Retrieves list of available seed files
*
* @return array list of seed file paths sorted by version
*/
public function findSeeds()
{
$seeds = array();
// Load all *_*.php files in the seeds path
foreach (glob($this->seed_path.'*_*.php') as $file)
{
$name = basename($file, '.php');
// Filter out non-seed files
if (preg_match($this->seed_regex, $name))
{
$number = $this->_getSeedNumber($name);
// There cannot be duplicate seed numbers
if (isset($seeds[$number]))
{
$this->_error_string = sprintf($this->lang->line('seed_multiple_version'), $number);
show_error($this->_error_string);
}
$seeds[$number] = $file;
}
}
ksort($seeds);
return $seeds;
}
/**
* Truncate DB from Testdata
*
* @param string $name Name of the seed file.
* @return bool
*/
public function truncate($name)
{
$seeds = $this->findSeeds();
if (empty($name))
{
$this->_error_string = $this->lang->line('seed_none_found');
return false;
}
$method = 'truncate';
$pending = array();
foreach ($seeds as $number => $file)
{
include_once($file);
$class = 'Seed_'.ucfirst(strtolower($this->_getSeedName(basename($file, '.php'))));
// Validate the seed file structure
if (! class_exists($class, false))
{
$this->_error_string = sprintf($this->lang->line('seed_class_doesnt_exist'), $class);
return false;
}
// method_exists() returns true for non-public methods,
// while is_callable() can't be used without instantiating.
// Only get_class_methods() satisfies both conditions.
elseif (! in_array($method, array_map('strtolower', get_class_methods($class))))
{
$this->_error_string = sprintf($this->lang->line('seed_missing_'.$method.'_method'), $class);
return false;
}
$pending[$number] = array($class, $method);
}
// Now just run the necessary seeds
foreach ($pending as $number => $seed)
{
if (is_null($name))
{
log_message('debug', 'Seeding '.$method);
$seed[0] = new $seed[0];
call_user_func($seed);
}
elseif ($seed[0] == 'Seed_'.$name)
{
log_message('debug', 'Seeding '.$method);
$seed[0] = new $seed[0];
call_user_func($seed);
}
}
}
/**
* Extracts the seed number from a filename
*
* @param string $seed Filename of the seed.
* @return string Numeric portion of a seed filename
*/
protected function _getSeedNumber($seed)
{
return sscanf($seed, '%[0-9]+', $number)
? $number : '0';
}
/**
* Extracts the seed class name from a filename
*
* @param string $seed Filename of the seed.
* @return string text portion of a migration filename
*/
protected function _getSeedName($seed)
{
$parts = explode('_', $seed);
array_shift($parts);
return implode('_', $parts);
}
/**
* Yay, it worked! Tell the user.
*
* @param string $task What did we just do? We...
* @return void
*/
private function __succeeded($task = 'migrated')
{
$version = $this->__getVersion();
exit('Successfully '.$task.' to version '.$version);
}
/**
* Output an error message when it all goes tits up
*
* @param string $message Error to output (default to CI's migration error)
* @return void
*/
private function __failed($message = null)
{
$message = $message ?: $this->migration->error_string();
show_error($message);
}
/**
* Carbon copy of parent::__getVersion, but that's protected.
*
* @return int Currently installed migration number
*/
private function __getVersion()
{
$row = $this->db->get($this->config->item('migration_table'))->row();
return $row ? $row->version : 0;
}
/**
* Check DB for different things like permissions or roles
*
* @param string $action What to check.
* @return void
*/
public function check($action = 'schema')
{
echo 'DB-Check';
switch ($action)
{
// **** Permission ****
// ToDo: Check Persmissions in the bottom of this file
case 'permissions':
//var_dump($this->config->item('fhc_acl'));
echo ' Permissions!';
//$this->config->load('roles');
foreach ($this->config->item('fhc_acl') as $b)
{
$qry = "SELECT * FROM system.tbl_berechtigung
WHERE berechtigung_kurzbz='".$b."';";
if($result = $this->db->query($qry))
{
if($result->num_rows($result)==0)
{
// Nicht vorhanden -> anlegen
$qry_insert="INSERT INTO system.tbl_berechtigung (berechtigung_kurzbz) VALUES('".$b."');";
if($this->db->query($qry_insert))
{
echo '<br>Recht '.$b.' <b>hinzugefügt</b>';
$neue=true;
}
else
echo '<br><span class="error">Fehler: Recht '.$b.' hinzufügen nicht möglich</span>';
}
else
echo "- $b -";
}
}
break;
// **** Roles ****
case 'roles':
echo ' Roles!';
$this->config->load('roles');
foreach ($this->config->item('roles') as $role)
foreach ($role['berechtigung'] as $b)
{
$qry = "SELECT * FROM system.tbl_rolleberechtigung
WHERE rolle_kurzbz='".$role['rolle_kurzbz']."'
AND berechtigung_kurzbz='".$b."';";
if($result = $this->db->query($qry))
{
if($result->num_rows($result)==0)
{
// Nicht vorhanden -> anlegen
$qry_insert="INSERT INTO system.tbl_rolleberechtigung (rolle_kurzbz, berechtigung_kurzbz, art) VALUES ('".$role['rolle_kurzbz']."','".$b."', 'suid');";
if($this->db->query($qry_insert))
{
echo '<br>'.$role['rolle_kurzbz'].' -> '.$b.' <b>hinzugefügt</b>';
$neue=true;
}
else
echo '<br><span class="error">Fehler: '.$role['rolle_kurzbz'].' -> '.$b.' hinzufügen nicht möglich</span>';
}
else
echo "- $b -";
}
}
break;
// **** Default ****
default: echo ' what? roles or permisssions?';
exit();
}
exit('Succesfully checked!');
}
/**
* Create User in DB
*
* @param string $action What to check.
* @return void
*/
public function createadminuser($uid, $person_id = 1)
{
echo 'Create User!';
$qry = "SELECT * FROM public.tbl_benutzer
WHERE uid='".$uid."';";
if ($result = $this->db->query($qry))
{
if ($result->num_rows($result)==0)
{
// Nicht vorhanden -> anlegen
$qry_insert="INSERT INTO public.tbl_benutzer (uid, person_id) VALUES('".$uid."', ".$person_id.");";
if($this->db->query($qry_insert))
echo '<br>User '.$uid.' <b>angelegt</b>';
else
echo '<br><span class="error">Fehler: User '.$uid.' anlegen nicht möglich!</span>';
// Join Role Admin
$qry_insert="INSERT INTO system.tbl_benutzerrolle (rolle_kurzbz, uid) VALUES('admin','".$uid."');";
if($this->db->query($qry_insert))
echo '<br>Rolle Admin für User '.$uid.' <b>hinzugefügt</b>';
else
echo '<br><span class="error">Rolle Admin hinzufügen für User '.$b.' hinzufügen nicht möglich</span>';
}
}
exit('Succesfully created User!');
}
}
/* Check also this permissions:
basis/fhausweis -> Verwaltungstools für FH Ausweis Kartentausch, Bildpruefung, Druck hinzugefügt
buchung/typen -> Verwaltung von Buchungstypen hinzugefügt
buchung/mitarbeiter -> Verwaltung von Buchungen fuer Mitarbeiter hinzugefügt
inout/incoming -> Incomingverwaltung hinzugefügt
inout/outgoing -> Outgoingverwaltung hinzugefügt
inout/uebersicht -> Verbandsanzeige fuer Incoming/Outgoing im FAS hinzugefügt
lehre/lehrfach:begrenzt -> Lehrfachverwaltung - nur aktiv aenderbar, nur aktive LF werden angezeigt hinzugefügt
lehre/pruefungsanmeldungAdmin -> Erlaubt die Verwaltung der Prüfungsanmeldungen. hinzugefügt
lehre/pruefungsbeurteilung -> Erlaubt dem Benutzer Beurteilungen zu Prüfungen einzutragen. hinzugefügt
lehre/pruefungsbeurteilungAdmin -> Erlaubt dem Benutzer für alle Prüfungen Beurteilungen einzutragen. hinzugefügt
lehre/pruefungsterminAdmin -> Recht für jeden Lektor eine Prüfung anzulegen hinzugefügt
lehre/pruefungsfenster -> Erlaubt dem Benutzer Prüfungsfenster anzulegen. hinzugefügt
lv-plan/gruppenentfernen -> Erlaut das Entfernen von Gruppen aus LVPlan vom FAS aus hinzugefügt
lv-plan/lektorentfernen -> Erlaut das Entfernen von Lektoren aus LVPlan vom FAS aus hinzugefügt
mitarbeiter/bankdaten -> Bankdaten für Mitarbeiter und Studierende anzeigen hinzugefügt
mitarbeiter/personalnummer -> Editieren der Personalnummer im FAS hinzugefügt
mitarbeiter/urlaube -> Mit diesem Recht werden im CIS die Urlaube von allen Mitarbeiter sichtbar hinzugefügt
planner -> Planner Verwaltung hinzugefügt
reihungstest -> Recht für Anzeige des Reihungstests im Vilesci hinzugefügt
sdTools -> Recht für Anzeige der SD-Tools im Vilesci hinzugefügt
soap/lv -> Recht für LV Webservice hinzugefügt
soap/lvplan -> Recht für LV-Plan Webservice hinzugefügt
soap/mitarbeiter -> Recht für Mitarbeiter-Webservice hinzugefügt
soap/ort -> Recht für Ort Webservice hinzugefügt
soap/pruefungsfenster -> Recht für Pruefungsfenster Webservice hinzugefügt
soap/student -> Recht für Student Webservice hinzugefügt
soap/studienordnung -> Recht für Studienordnung Webservice hinzugefügt
soap/benutzer -> Berechtigung für Bentutzerabfrage Addon Kontoimport hinzugefügt
soap/buchungen -> Berechtigung für Buchungsabfrage Addon Kontoimport hinzugefügt
student/bankdaten -> Bankdaten des Studenten hinzugefügt
student/anrechnung -> Anrechnungen des Studenten hinzugefügt
student/anwesenheit -> Anwesenheiten im FAS hinzugefügt
system/developer -> Anzeige zusätzlicher Developerinfos hinzugefügt
system/loginasuser -> Berechtigung zum Einloggen als anderer User hinzugefügt
vertrag/mitarbeiter -> Verwalten von Vertraegen hinzugefügt
vertrag/typen -> Verwalten von Vertragstypen hinzugefügt
wawi/berichte -> Alle Berichte anzeigen hinzugefügt
wawi/delete_advanced -> Loeschen von freigegebenen Bestellungen hinzugefügt
Webservice Berechtigungen pruefen
soap/studienordnung/load_lva_oe->lehrveranstaltung hinzugefügt
soap/studienordnung/load->lehrveranstaltung hinzugefügt
soap/studienordnung/deleteStudienplanLehrveranstaltung->studienplan hinzugefügt
soap/studienordnung/containsLehrveranstaltung->studienplan hinzugefügt
soap/studienordnung/loadStudienplanLehrveranstaltung->studienplan hinzugefügt
soap/studienordnung/saveStudienplanLehrveranstaltung->studienplan hinzugefügt
soap/studienordnung/loadStudienordnung->studienordnung hinzugefügt
soap/studienordnung/delete->lvregel hinzugefügt
soap/studienordnung/save->lvregel hinzugefügt
soap/studienordnung/load->lvregel hinzugefügt
soap/studienordnung/loadLVRegelTypen->lvregel hinzugefügt
soap/studienordnung/load_lva->lehrveranstaltung hinzugefügt
soap/studienordnung/getAll->lehrtyp hinzugefügt
soap/studienordnung/getAll->organisationseinheit hinzugefügt
soap/studienordnung/getLVRegelTree->lvregel hinzugefügt
soap/studienordnung/save->studienplan hinzugefügt
soap/studienordnung/save->studienordnung hinzugefügt
soap/studienordnung/loadStudienplanSTO->studienplan hinzugefügt
soap/studienordnung/loadStudienordnungSTG->studienordnung hinzugefügt
soap/studienordnung/loadStudienordnungSTGInaktiv->studienordnung hinzugefügt
soap/studienordnung/loadStudienplan->studienplan hinzugefügt
soap/studienordnung/saveSemesterZuordnung->studienordnung hinzugefügt
soap/studienordnung/deleteSemesterZuordnung->studienordnung hinzugefügt
soap/studienordnung/getLVkompatibel->lehrveranstaltung hinzugefügt
soap/studienordnung/getLvTree->lehrveranstaltung hinzugefügt
soap/pruefungsfenster/getByStudiensemester->pruefungsfenster hinzugefügt
soap/studienordnung/exists->lvregel hinzugefügt
soap/studienordnung/saveSortierung->studienplan hinzugefügt
soap/benutzer/search->benutzer hinzugefügt
soap/buchungen/getBuchungen-> */
+34
View File
@@ -0,0 +1,34 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined("BASEPATH")) exit("No direct script access allowed");
class MailJob extends FHC_Controller
{
/**
* API constructor
*/
public function __construct()
{
parent::__construct();
// Loads MessageLib
$this->load->library("MessageLib");
}
public function sendMessages($numberToSent = null, $numberPerTimeRange = null, $email_time_range = null, $email_from_system = null)
{
$this->messagelib->sendAll($numberToSent, $numberPerTimeRange, $email_time_range, $email_from_system);
}
}
+37
View File
@@ -0,0 +1,37 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Redirect extends FHC_Controller
{
/**
* API constructor
*/
public function __construct()
{
parent::__construct();
// Loads config file fhcomplete
$this->config->load('fhcomplete');
}
public function redirectByToken($token)
{
if (isset($token))
{
redirect($this->config->item('addons_aufnahme_url') . '?token=' . $token);
}
}
}
+52
View File
@@ -0,0 +1,52 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class ViewMessage extends CI_Controller
{
/**
* API constructor
*/
public function __construct()
{
parent::__construct();
// Loading config file message
$this->config->load('message');
// Load model MessageToken_model
$this->load->model('system/MessageToken_model', 'MessageTokenModel');
}
public function toHTML($token)
{
$msg = $this->MessageTokenModel->getMessageByToken($token);
if ($msg->error)
{
show_error($msg->retval);
}
if (is_array($msg->retval) && count($msg->retval) > 0)
{
$data = array (
'message' => $msg->retval[0],
'href' => APP_ROOT . $this->config->item('redirect_view_message_url') . $token
);
$this->load->view('system/messageHTML.php', $data);
}
}
}
+29
View File
@@ -0,0 +1,29 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
class Vilesci extends FHC_Controller
{
/**
* Index Page for this controller.
*
* Maps to the following URL
* http://example.com/index.php/welcome
* - or -
* http://example.com/index.php/welcome/index
* - or -
* Since this controller is set as the default controller in
* config/routes.php, it's displayed at http://example.com/
*
* So any other public methods not prefixed with an underscore will
* map to /index.php/welcome/<method_name>
* @see http://codeigniter.com/user_guide/general/urls.html
* @return void
*/
public function index()
{
$this->load->view('templates/header');
$this->load->view('vilesci_frameset');
$this->load->view('templates/footer');
}
}
+11
View File
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>403 Forbidden</title>
</head>
<body>
<p>Directory access is forbidden.</p>
</body>
</html>
@@ -0,0 +1,44 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class CheckUserAuth extends APIv1_Controller
{
/**
* Course API constructor.
*/
public function __construct()
{
parent::__construct();
$this->load->model('CheckUserAuth_model', 'CheckUserAuthModel');
}
public function getCheckByUsernamePassword()
{
$username = $this->get("username");
$password = $this->get("password");
if (isset($username) && isset($password))
{
$result = $this->CheckUserAuthModel->checkByUsernamePassword($username, $password);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
}
+52
View File
@@ -0,0 +1,52 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
//require_once APPPATH . '/libraries/REST_Controller.php';
/**
* Testing class for REST calls and authentication
*/
class Test extends APIv1_Controller
{
public function __construct()
{
parent::__construct();
}
/**
* Test HTTP GET method
* It responses whith the HTTP status 200 and prints this JSON string
* {"success":true,"message":"API HTTP GET call test succeed"}
*
* @return void
*/
public function getTest()
{
$payload = [
'success' => TRUE,
'message' => 'API HTTP GET call test succeed',
'error' => 0
];
$httpstatus = REST_Controller::HTTP_OK;
$this->response($payload, $httpstatus);
}
/**
* Test HTTP POST method
* * It responses whith the HTTP status 200 and prints this JSON string
* {"success":true,"message":"API HTTP POST call test succeed"}
*
* @return void
*/
public function postTest()
{
$payload = [
'success' => TRUE,
'message' => 'API HTTP POST call test succeed',
'error' => 0
];
$httpstatus = REST_Controller::HTTP_OK;
$this->response($payload, $httpstatus);
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufteilung extends APIv1_Controller
{
/**
* Aufteilung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model AufteilungModel
$this->load->model('accounting/aufteilung_model', 'AufteilungModel');
}
/**
* @return void
*/
public function getAufteilung()
{
$aufteilungID = $this->get('aufteilung_id');
if (isset($aufteilungID))
{
$result = $this->AufteilungModel->load($aufteilungID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postAufteilung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['aufteilung_id']))
{
$result = $this->AufteilungModel->update($this->post()['aufteilung_id'], $this->post());
}
else
{
$result = $this->AufteilungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($aufteilung = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestelldetail extends APIv1_Controller
{
/**
* Bestelldetail API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BestelldetailModel
$this->load->model('accounting/bestelldetail_model', 'BestelldetailModel');
}
/**
* @return void
*/
public function getBestelldetail()
{
$bestelldetailID = $this->get('bestelldetail_id');
if (isset($bestelldetailID))
{
$result = $this->BestelldetailModel->load($bestelldetailID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBestelldetail()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bestelldetail_id']))
{
$result = $this->BestelldetailModel->update($this->post()['bestelldetail_id'], $this->post());
}
else
{
$result = $this->BestelldetailModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bestelldetail = NULL)
{
return true;
}
}
@@ -0,0 +1,77 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestelldetailtag extends APIv1_Controller
{
/**
* Bestelldetailtag API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BestelldetailtagModel
$this->load->model('accounting/bestelldetailtag_model', 'BestelldetailtagModel');
}
/**
* @return void
*/
public function getBestelldetailtag()
{
$bestelldetail_id = $this->get('bestelldetail_id');
$tag = $this->get('tag');
if (isset($bestelldetail_id) && isset($tag))
{
$result = $this->BestelldetailtagModel->load(array($bestelldetail_id, $tag));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBestelldetailtag()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bestelldetailtag_id']))
{
$result = $this->BestelldetailtagModel->update($this->post()['bestelldetailtag_id'], $this->post());
}
else
{
$result = $this->BestelldetailtagModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bestelldetailtag = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestellstatus extends APIv1_Controller
{
/**
* Bestellstatus API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BestellstatusModel
$this->load->model('accounting/bestellstatus_model', 'BestellstatusModel');
}
/**
* @return void
*/
public function getBestellstatus()
{
$bestellstatus_kurzbz = $this->get('bestellstatus_kurzbz');
if (isset($bestellstatus_kurzbz))
{
$result = $this->BestellstatusModel->load($bestellstatus_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBestellstatus()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bestellstatus_kurzbz']))
{
$result = $this->BestellstatusModel->update($this->post()['bestellstatus_kurzbz'], $this->post());
}
else
{
$result = $this->BestellstatusModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bestellstatus = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestellung extends APIv1_Controller
{
/**
* Bestellung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BestellungModel
$this->load->model('accounting/bestellung_model', 'BestellungModel');
}
/**
* @return void
*/
public function getBestellung()
{
$bestellungID = $this->get('bestellung_id');
if (isset($bestellungID))
{
$result = $this->BestellungModel->load($bestellungID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBestellung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bestellung_id']))
{
$result = $this->BestellungModel->update($this->post()['bestellung_id'], $this->post());
}
else
{
$result = $this->BestellungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bestellung = NULL)
{
return true;
}
}
@@ -0,0 +1,77 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bestellungtag extends APIv1_Controller
{
/**
* Bestellungtag API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BestellungtagModel
$this->load->model('accounting/bestellungtag_model', 'BestellungtagModel');
}
/**
* @return void
*/
public function getBestellungtag()
{
$bestellung_id = $this->get('bestellung_id');
$tag = $this->get('tag');
if (isset($bestellung_id) && isset($tag))
{
$result = $this->BestellungtagModel->load(array($bestellung_id, $tag));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBestellungtag()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bestellungtag_id']))
{
$result = $this->BestellungtagModel->update($this->post()['bestellungtag_id'], $this->post());
}
else
{
$result = $this->BestellungtagModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bestellungtag = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Buchung extends APIv1_Controller
{
/**
* Buchung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BuchungModel
$this->load->model('accounting/buchung_model', 'BuchungModel');
}
/**
* @return void
*/
public function getBuchung()
{
$buchungID = $this->get('buchung_id');
if (isset($buchungID))
{
$result = $this->BuchungModel->load($buchungID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBuchung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['buchung_id']))
{
$result = $this->BuchungModel->update($this->post()['buchung_id'], $this->post());
}
else
{
$result = $this->BuchungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($buchung = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Buchungstyp extends APIv1_Controller
{
/**
* Buchungstyp API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BuchungstypModel
$this->load->model('accounting/buchungstyp_model', 'BuchungstypModel');
}
/**
* @return void
*/
public function getBuchungstyp()
{
$buchungstyp_kurzbz = $this->get('buchungstyp_kurzbz');
if (isset($buchungstyp_kurzbz))
{
$result = $this->BuchungstypModel->load($buchungstyp_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBuchungstyp()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['buchungstyp_kurzbz']))
{
$result = $this->BuchungstypModel->update($this->post()['buchungstyp_kurzbz'], $this->post());
}
else
{
$result = $this->BuchungstypModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($buchungstyp = NULL)
{
return true;
}
}
@@ -0,0 +1,77 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Budget extends APIv1_Controller
{
/**
* Budget API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BudgetModel
$this->load->model('accounting/budget_model', 'BudgetModel');
}
/**
* @return void
*/
public function getBudget()
{
$kostenstelle_id = $this->get('kostenstelle_id');
$geschaeftsjahr_kurzbz = $this->get('geschaeftsjahr_kurzbz');
if (isset($kostenstelle_id) && isset($geschaeftsjahr_kurzbz))
{
$result = $this->BudgetModel->load(array($kostenstelle_id, $geschaeftsjahr_kurzbz));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBudget()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['budget_id']) && isset($this->post()['geschaeftsjahr_kurzbz']))
{
$result = $this->BudgetModel->update(array($this->post()['budget_id'], $this->post()['geschaeftsjahr_kurzbz']), $this->post());
}
else
{
$result = $this->BudgetModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($budget = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Konto extends APIv1_Controller
{
/**
* Konto API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model KontoModel
$this->load->model('accounting/konto_model', 'KontoModel');
}
/**
* @return void
*/
public function getKonto()
{
$kontoID = $this->get('konto_id');
if (isset($kontoID))
{
$result = $this->KontoModel->load($kontoID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postKonto()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['konto_id']))
{
$result = $this->KontoModel->update($this->post()['konto_id'], $this->post());
}
else
{
$result = $this->KontoModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($konto = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Kostenstelle extends APIv1_Controller
{
/**
* Kostenstelle API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model KostenstelleModel
$this->load->model('accounting/kostenstelle_model', 'KostenstelleModel');
}
/**
* @return void
*/
public function getKostenstelle()
{
$kostenstelleID = $this->get('kostenstelle_id');
if (isset($kostenstelleID))
{
$result = $this->KostenstelleModel->load($kostenstelleID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postKostenstelle()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['kostenstelle_id']))
{
$result = $this->KostenstelleModel->update($this->post()['kostenstelle_id'], $this->post());
}
else
{
$result = $this->KostenstelleModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($kostenstelle = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Rechnung extends APIv1_Controller
{
/**
* Rechnung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model RechnungModel
$this->load->model('accounting/rechnung_model', 'RechnungModel');
}
/**
* @return void
*/
public function getRechnung()
{
$rechnungID = $this->get('rechnung_id');
if (isset($rechnungID))
{
$result = $this->RechnungModel->load($rechnungID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postRechnung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['rechnung_id']))
{
$result = $this->RechnungModel->update($this->post()['rechnung_id'], $this->post());
}
else
{
$result = $this->RechnungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($rechnung = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Rechnungsbetrag extends APIv1_Controller
{
/**
* Rechnungsbetrag API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model RechnungsbetragModel
$this->load->model('accounting/rechnungsbetrag_model', 'RechnungsbetragModel');
}
/**
* @return void
*/
public function getRechnungsbetrag()
{
$rechnungsbetragID = $this->get('rechnungsbetrag_id');
if (isset($rechnungsbetragID))
{
$result = $this->RechnungsbetragModel->load($rechnungsbetragID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postRechnungsbetrag()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['rechnungsbetrag_id']))
{
$result = $this->RechnungsbetragModel->update($this->post()['rechnungsbetrag_id'], $this->post());
}
else
{
$result = $this->RechnungsbetragModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($rechnungsbetrag = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Rechnungstyp extends APIv1_Controller
{
/**
* Rechnungstyp API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model RechnungstypModel
$this->load->model('accounting/rechnungstyp_model', 'RechnungstypModel');
}
/**
* @return void
*/
public function getRechnungstyp()
{
$rechnungstyp_kurzbz = $this->get('rechnungstyp_kurzbz');
if (isset($rechnungstyp_kurzbz))
{
$result = $this->RechnungstypModel->load($rechnungstyp_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postRechnungstyp()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['rechnungstyp_kurzbz']))
{
$result = $this->RechnungstypModel->update($this->post()['rechnungstyp_kurzbz'], $this->post());
}
else
{
$result = $this->RechnungstypModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($rechnungstyp = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Vertrag extends APIv1_Controller
{
/**
* Vertrag API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model VertragModel
$this->load->model('accounting/vertrag_model', 'VertragModel');
}
/**
* @return void
*/
public function getVertrag()
{
$vertragID = $this->get('vertrag_id');
if (isset($vertragID))
{
$result = $this->VertragModel->load($vertragID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postVertrag()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['vertrag_id']))
{
$result = $this->VertragModel->update($this->post()['vertrag_id'], $this->post());
}
else
{
$result = $this->VertragModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($vertrag = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Vertragsstatus extends APIv1_Controller
{
/**
* Vertragsstatus API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model VertragsstatusModel
$this->load->model('accounting/vertragsstatus_model', 'VertragsstatusModel');
}
/**
* @return void
*/
public function getVertragsstatus()
{
$vertragsstatus_kurzbz = $this->get('vertragsstatus_kurzbz');
if (isset($vertragsstatus_kurzbz))
{
$result = $this->VertragsstatusModel->load($vertragsstatus_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postVertragsstatus()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['vertragsstatus_kurzbz']))
{
$result = $this->VertragsstatusModel->update($this->post()['vertragsstatus_kurzbz'], $this->post());
}
else
{
$result = $this->VertragsstatusModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($vertragsstatus = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Vertragstyp extends APIv1_Controller
{
/**
* Vertragstyp API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model VertragstypModel
$this->load->model('accounting/vertragstyp_model', 'VertragstypModel');
}
/**
* @return void
*/
public function getVertragstyp()
{
$vertragstyp_kurzbz = $this->get('vertragstyp_kurzbz');
if (isset($vertragstyp_kurzbz))
{
$result = $this->VertragstypModel->load($vertragstyp_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postVertragstyp()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['vertragstyp_kurzbz']))
{
$result = $this->VertragstypModel->update($this->post()['vertragstyp_kurzbz'], $this->post());
}
else
{
$result = $this->VertragstypModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($vertragstyp = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zahlungstyp extends APIv1_Controller
{
/**
* Zahlungstyp API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ZahlungstypModel
$this->load->model('accounting/zahlungstyp_model', 'ZahlungstypModel');
}
/**
* @return void
*/
public function getZahlungstyp()
{
$zahlungstyp_kurzbz = $this->get('zahlungstyp_kurzbz');
if (isset($zahlungstyp_kurzbz))
{
$result = $this->ZahlungstypModel->load($zahlungstyp_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postZahlungstyp()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['zahlungstyp_kurzbz']))
{
$result = $this->ZahlungstypModel->update($this->post()['zahlungstyp_kurzbz'], $this->post());
}
else
{
$result = $this->ZahlungstypModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($zahlungstyp = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Akadgrad extends APIv1_Controller
{
/**
* Akadgrad API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model AkadgradModel
$this->load->model('codex/akadgrad_model', 'AkadgradModel');
}
/**
* @return void
*/
public function getAkadgrad()
{
$akadgradID = $this->get('akadgrad_id');
if (isset($akadgradID))
{
$result = $this->AkadgradModel->load($akadgradID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postAkadgrad()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['akadgrad_id']))
{
$result = $this->AkadgradModel->update($this->post()['akadgrad_id'], $this->post());
}
else
{
$result = $this->AkadgradModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($akadgrad = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Archiv extends APIv1_Controller
{
/**
* Archiv API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ArchivModel
$this->load->model('codex/archiv_model', 'ArchivModel');
}
/**
* @return void
*/
public function getArchiv()
{
$archivID = $this->get('archiv_id');
if (isset($archivID))
{
$result = $this->ArchivModel->load($archivID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postArchiv()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['archiv_id']))
{
$result = $this->ArchivModel->update($this->post()['archiv_id'], $this->post());
}
else
{
$result = $this->ArchivModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($archiv = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufmerksamdurch extends APIv1_Controller
{
/**
* Aufmerksamdurch API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model AufmerksamdurchModel
$this->load->model('codex/aufmerksamdurch_model', 'AufmerksamdurchModel');
}
/**
* @return void
*/
public function getAufmerksamdurch()
{
$aufmerksamdurch_kurzbz = $this->get('aufmerksamdurch_kurzbz');
if (isset($aufmerksamdurch_kurzbz))
{
$result = $this->AufmerksamdurchModel->load($aufmerksamdurch_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postAufmerksamdurch()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['aufmerksamdurch_kurzbz']))
{
$result = $this->AufmerksamdurchModel->update($this->post()['aufmerksamdurch_kurzbz'], $this->post());
}
else
{
$result = $this->AufmerksamdurchModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($aufmerksamdurch = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Ausbildung extends APIv1_Controller
{
/**
* Ausbildung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model AusbildungModel
$this->load->model('codex/ausbildung_model', 'AusbildungModel');
}
/**
* @return void
*/
public function getAusbildung()
{
$ausbildungcode = $this->get('ausbildungcode');
if (isset($ausbildungcode))
{
$result = $this->AusbildungModel->load($ausbildungcode);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postAusbildung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['ausbildungcode']))
{
$result = $this->AusbildungModel->update($this->post()['ausbildungcode'], $this->post());
}
else
{
$result = $this->AusbildungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($ausbildung = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Berufstaetigkeit extends APIv1_Controller
{
/**
* Berufstaetigkeit API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BerufstaetigkeitModel
$this->load->model('codex/berufstaetigkeit_model', 'BerufstaetigkeitModel');
}
/**
* @return void
*/
public function getBerufstaetigkeit()
{
$berufstaetigkeit_code = $this->get('berufstaetigkeit_code');
if (isset($berufstaetigkeit_code))
{
$result = $this->BerufstaetigkeitModel->load($berufstaetigkeit_code);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBerufstaetigkeit()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['berufstaetigkeit_code']))
{
$result = $this->BerufstaetigkeitModel->update($this->post()['berufstaetigkeit_code'], $this->post());
}
else
{
$result = $this->BerufstaetigkeitModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($berufstaetigkeit = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Beschaeftigungsausmass extends APIv1_Controller
{
/**
* Beschaeftigungsausmass API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BeschaeftigungsausmassModel
$this->load->model('codex/beschaeftigungsausmass_model', 'BeschaeftigungsausmassModel');
}
/**
* @return void
*/
public function getBeschaeftigungsausmass()
{
$beschausmasscode = $this->get('beschausmasscode');
if (isset($beschausmasscode))
{
$result = $this->BeschaeftigungsausmassModel->load($beschausmasscode);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBeschaeftigungsausmass()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['beschausmasscode']))
{
$result = $this->BeschaeftigungsausmassModel->update($this->post()['beschausmasscode'], $this->post());
}
else
{
$result = $this->BeschaeftigungsausmassModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($beschaeftigungsausmass = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Besqual extends APIv1_Controller
{
/**
* Besqual API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BesqualModel
$this->load->model('codex/besqual_model', 'BesqualModel');
}
/**
* @return void
*/
public function getBesqual()
{
$besqualcode = $this->get('besqualcode');
if (isset($besqualcode))
{
$result = $this->BesqualModel->load($besqualcode);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBesqual()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['besqualcode']))
{
$result = $this->BesqualModel->update($this->post()['besqualcode'], $this->post());
}
else
{
$result = $this->BesqualModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($besqual = NULL)
{
return true;
}
}
@@ -0,0 +1,77 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisfunktion extends APIv1_Controller
{
/**
* Bisfunktion API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BisfunktionModel
$this->load->model('codex/bisfunktion_model', 'BisfunktionModel');
}
/**
* @return void
*/
public function getBisfunktion()
{
$studiengang_kz = $this->get('studiengang_kz');
$bisverwendung_id = $this->get('bisverwendung_id');
if (isset($studiengang_kz) && isset($bisverwendung_id))
{
$result = $this->BisfunktionModel->load(array($studiengang_kz, $bisverwendung_id));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBisfunktion()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['studiengang_kz']) && isset($this->post()['bisverwendung_id']))
{
$result = $this->BisfunktionModel->update(array($this->post()['studiengang_kz'], $this->post()['bisverwendung_id']), $this->post());
}
else
{
$result = $this->BisfunktionModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bisfunktion = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisio extends APIv1_Controller
{
/**
* Bisio API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BisioModel
$this->load->model('codex/bisio_model', 'BisioModel');
}
/**
* @return void
*/
public function getBisio()
{
$bisioID = $this->get('bisio_id');
if (isset($bisioID))
{
$result = $this->BisioModel->load($bisioID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBisio()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bisio_id']))
{
$result = $this->BisioModel->update($this->post()['bisio_id'], $this->post());
}
else
{
$result = $this->BisioModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bisio = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisorgform extends APIv1_Controller
{
/**
* Bisorgform API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BisorgformModel
$this->load->model('codex/bisorgform_model', 'BisorgformModel');
}
/**
* @return void
*/
public function getBisorgform()
{
$bisorgform_kurzbz = $this->get('bisorgform_kurzbz');
if (isset($bisorgform_kurzbz))
{
$result = $this->BisorgformModel->load($bisorgform_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBisorgform()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bisorgform_kurzbz']))
{
$result = $this->BisorgformModel->update($this->post()['bisorgform_kurzbz'], $this->post());
}
else
{
$result = $this->BisorgformModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bisorgform = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bisverwendung extends APIv1_Controller
{
/**
* Bisverwendung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model BisverwendungModel
$this->load->model('codex/bisverwendung_model', 'BisverwendungModel');
}
/**
* @return void
*/
public function getBisverwendung()
{
$bisverwendungID = $this->get('bisverwendung_id');
if (isset($bisverwendungID))
{
$result = $this->BisverwendungModel->load($bisverwendungID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postBisverwendung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['bisverwendung_id']))
{
$result = $this->BisverwendungModel->update($this->post()['bisverwendung_id'], $this->post());
}
else
{
$result = $this->BisverwendungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($bisverwendung = NULL)
{
return true;
}
}
@@ -0,0 +1,35 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Bundesland extends APIv1_Controller
{
/**
* Course API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model PersonModel
$this->load->model('codex/bundesland_model', 'BundeslandModel');
}
public function getAll()
{
$result = $this->BundeslandModel->load();
$this->response($result, REST_Controller::HTTP_OK);
}
}
@@ -0,0 +1,77 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Entwicklungsteam extends APIv1_Controller
{
/**
* Entwicklungsteam API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model EntwicklungsteamModel
$this->load->model('codex/entwicklungsteam_model', 'EntwicklungsteamModel');
}
/**
* @return void
*/
public function getEntwicklungsteam()
{
$studiengang_kz = $this->get('studiengang_kz');
$mitarbeiter_uid = $this->get('mitarbeiter_uid');
if (isset($studiengang_kz) && isset($mitarbeiter_uid))
{
$result = $this->EntwicklungsteamModel->load(array($studiengang_kz, $mitarbeiter_uid));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postEntwicklungsteam()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['studiengang_kz']) && isset($this->post()['mitarbeiter_uid']))
{
$result = $this->EntwicklungsteamModel->update(array($this->post()['entwicklungsteam_id'], $this->post()['mitarbeiter_uid']), $this->post());
}
else
{
$result = $this->EntwicklungsteamModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($entwicklungsteam = NULL)
{
return true;
}
}
@@ -0,0 +1,96 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined("BASEPATH")) exit("No direct script access allowed");
class Gemeinde extends APIv1_Controller
{
/**
* Gemeinde API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model GemeindeModel
$this->load->model("codex/gemeinde_model", "GemeindeModel");
}
/**
* @return void
*/
public function getGemeinde()
{
$gemeindeID = $this->get("gemeinde_id");
$this->GemeindeModel->addOrder("plz");
if (isset($gemeindeID))
{
$result = $this->GemeindeModel->load($gemeindeID);
}
else
{
$result = $this->GemeindeModel->load();
}
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getGemeindeByPlz()
{
$plz = $this->get("plz");
if (is_numeric($plz))
{
$result = $this->GemeindeModel->getGemeindeByPlz($plz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postGemeinde()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()["gemeinde_id"]))
{
$result = $this->GemeindeModel->update($this->post()["gemeinde_id"], $this->post());
}
else
{
$result = $this->GemeindeModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($gemeinde = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Hauptberuf extends APIv1_Controller
{
/**
* Hauptberuf API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model HauptberufModel
$this->load->model('codex/hauptberuf_model', 'HauptberufModel');
}
/**
* @return void
*/
public function getHauptberuf()
{
$hauptberufcode = $this->get('hauptberufcode');
if (isset($hauptberufcode))
{
$result = $this->HauptberufModel->load($hauptberufcode);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postHauptberuf()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['hauptberufcode']))
{
$result = $this->HauptberufModel->update($this->post()['hauptberufcode'], $this->post());
}
else
{
$result = $this->HauptberufModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($hauptberuf = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Lehrform extends APIv1_Controller
{
/**
* Lehrform API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model LehrformModel
$this->load->model('codex/lehrform_model', 'LehrformModel');
}
/**
* @return void
*/
public function getLehrform()
{
$lehrform_kurzbz = $this->get('lehrform_kurzbz');
if (isset($lehrform_kurzbz))
{
$result = $this->LehrformModel->load($lehrform_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postLehrform()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['lehrform_kurzbz']))
{
$result = $this->LehrformModel->update($this->post()['lehrform_kurzbz'], $this->post());
}
else
{
$result = $this->LehrformModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($lehrform = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Lgartcode extends APIv1_Controller
{
/**
* Lgartcode API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model LgartcodeModel
$this->load->model('codex/lgartcode_model', 'LgartcodeModel');
}
/**
* @return void
*/
public function getLgartcode()
{
$lgartcode = $this->get('lgartcode');
if (isset($lgartcode))
{
$result = $this->LgartcodeModel->load($lgartcode);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postLgartcode()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['lgartcode']))
{
$result = $this->LgartcodeModel->update($this->post()['lgartcode'], $this->post());
}
else
{
$result = $this->LgartcodeModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($lgartcode = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Mobilitaetsprogramm extends APIv1_Controller
{
/**
* Mobilitaetsprogramm API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model MobilitaetsprogrammModel
$this->load->model('codex/mobilitaetsprogramm_model', 'MobilitaetsprogrammModel');
}
/**
* @return void
*/
public function getMobilitaetsprogramm()
{
$mobilitaetsprogramm_code = $this->get('mobilitaetsprogramm_code');
if (isset($mobilitaetsprogramm_code))
{
$result = $this->MobilitaetsprogrammModel->load($mobilitaetsprogramm_code);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postMobilitaetsprogramm()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['mobilitaetsprogramm_code']))
{
$result = $this->MobilitaetsprogrammModel->update($this->post()['mobilitaetsprogramm_code'], $this->post());
}
else
{
$result = $this->MobilitaetsprogrammModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($mobilitaetsprogramm = NULL)
{
return true;
}
}
@@ -0,0 +1,70 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Nation extends APIv1_Controller
{
/**
* Course API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model NationModel
$this->load->model('codex/nation_model', 'NationModel');
}
public function getNation()
{
$nation_code = $this->get("nation_code");
if (isset($nation_code))
{
$result = $this->NationModel->loadWhere(array('nation_code' => $nation_code));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
public function getAll()
{
if (!$this->get('orderEnglish'))
{
$result = $this->NationModel->addOrder('kurztext');
}
else
{
$result = $this->NationModel->addOrder('engltext');
}
if (isSuccess($result))
{
if ($this->get('ohnesperre'))
{
$result = $this->NationModel->loadWhere('sperre IS NULL');
}
else
{
$result = $this->NationModel->load();
}
}
$this->response($result, REST_Controller::HTTP_OK);
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Note extends APIv1_Controller
{
/**
* Note API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model NoteModel
$this->load->model('codex/note_model', 'NoteModel');
}
/**
* @return void
*/
public function getNote()
{
$note = $this->get('note');
if (isset($note))
{
$result = $this->NoteModel->load($note);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postNote()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['note']))
{
$result = $this->NoteModel->update($this->post()['note'], $this->post());
}
else
{
$result = $this->NoteModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($note = NULL)
{
return true;
}
}
@@ -0,0 +1,96 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Orgform extends APIv1_Controller
{
/**
* Orgform API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model OrgformModel
$this->load->model('codex/orgform_model', 'OrgformModel');
}
/**
* @return void
*/
public function getOrgform()
{
$orgform_kurzbz = $this->get('orgform_kurzbz');
if (isset($orgform_kurzbz))
{
$result = $this->OrgformModel->load($orgform_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function getAll()
{
$result = $this->OrgformModel->load();
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function getOrgformLV()
{
$result = $this->OrgformModel->getOrgformLV();
$this->response($result, REST_Controller::HTTP_OK);
}
/**
* @return void
*/
public function postOrgform()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['orgform_kurzbz']))
{
$result = $this->OrgformModel->update($this->post()['orgform_kurzbz'], $this->post());
}
else
{
$result = $this->OrgformModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($orgform = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Verwendung extends APIv1_Controller
{
/**
* Verwendung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model VerwendungModel
$this->load->model('codex/verwendung_model', 'VerwendungModel');
}
/**
* @return void
*/
public function getVerwendung()
{
$verwendung_code = $this->get('verwendung_code');
if (isset($verwendung_code))
{
$result = $this->VerwendungModel->load($verwendung_code);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postVerwendung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['verwendung_code']))
{
$result = $this->VerwendungModel->update($this->post()['verwendung_code'], $this->post());
}
else
{
$result = $this->VerwendungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($verwendung = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgv extends APIv1_Controller
{
/**
* Zgv API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ZgvModel
$this->load->model('codex/zgv_model', 'ZgvModel');
}
/**
* @return void
*/
public function getZgv()
{
$zgv_code = $this->get('zgv_code');
if (isset($zgv_code))
{
$result = $this->ZgvModel->load($zgv_code);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postZgv()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['zgv_code']))
{
$result = $this->ZgvModel->update($this->post()['zgv_code'], $this->post());
}
else
{
$result = $this->ZgvModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($zgv = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgvdoktor extends APIv1_Controller
{
/**
* Zgvdoktor API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ZgvdoktorModel
$this->load->model('codex/zgvdoktor_model', 'ZgvdoktorModel');
}
/**
* @return void
*/
public function getZgvdoktor()
{
$zgvdoktor_code = $this->get('zgvdoktor_code');
if (isset($zgvdoktor_code))
{
$result = $this->ZgvdoktorModel->load($zgvdoktor_code);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postZgvdoktor()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['zgvdoktor_code']))
{
$result = $this->ZgvdoktorModel->update($this->post()['zgvdoktor_code'], $this->post());
}
else
{
$result = $this->ZgvdoktorModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($zgvdoktor = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgvgruppe extends APIv1_Controller
{
/**
* Zgvgruppe API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ZgvgruppeModel
$this->load->model('codex/zgvgruppe_model', 'ZgvgruppeModel');
}
/**
* @return void
*/
public function getZgvgruppe()
{
$gruppe_kurzbz = $this->get('gruppe_kurzbz');
if (isset($gruppe_kurzbz))
{
$result = $this->ZgvgruppeModel->load($gruppe_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postZgvgruppe()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['zgvgruppe_id']))
{
$result = $this->ZgvgruppeModel->update($this->post()['zgvgruppe_id'], $this->post());
}
else
{
$result = $this->ZgvgruppeModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($zgvgruppe = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zgvmaster extends APIv1_Controller
{
/**
* Zgvmaster API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ZgvmasterModel
$this->load->model('codex/zgvmaster_model', 'ZgvmasterModel');
}
/**
* @return void
*/
public function getZgvmaster()
{
$zgvmas_code = $this->get('zgvmas_code');
if (isset($zgvmas_code))
{
$result = $this->ZgvmasterModel->load($zgvmas_code);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postZgvmaster()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['zgvmas_code']))
{
$result = $this->ZgvmasterModel->update($this->post()['zgvmas_code'], $this->post());
}
else
{
$result = $this->ZgvmasterModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($zgvmaster = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Zweck extends APIv1_Controller
{
/**
* Zweck API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ZweckModel
$this->load->model('codex/zweck_model', 'ZweckModel');
}
/**
* @return void
*/
public function getZweck()
{
$zweck_code = $this->get('zweck_code');
if (isset($zweck_code))
{
$result = $this->ZweckModel->load($zweck_code);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postZweck()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['zweck_code']))
{
$result = $this->ZweckModel->update($this->post()['zweck_code'], $this->post());
}
else
{
$result = $this->ZweckModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($zweck = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Ampel extends APIv1_Controller
{
/**
* Ampel API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model AmpelModel
$this->load->model('content/ampel_model', 'AmpelModel');
}
/**
* @return void
*/
public function getAmpel()
{
$ampelID = $this->get('ampel_id');
if (isset($ampelID))
{
$result = $this->AmpelModel->load($ampelID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postAmpel()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['ampel_id']))
{
$result = $this->AmpelModel->update($this->post()['ampel_id'], $this->post());
}
else
{
$result = $this->AmpelModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($ampel = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Content extends APIv1_Controller
{
/**
* Content API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ContentModel
$this->load->model('content/content_model', 'ContentModel');
}
/**
* @return void
*/
public function getContent()
{
$contentID = $this->get('content_id');
if (isset($contentID))
{
$result = $this->ContentModel->load($contentID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postContent()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['content_id']))
{
$result = $this->ContentModel->update($this->post()['content_id'], $this->post());
}
else
{
$result = $this->ContentModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($content = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentchild extends APIv1_Controller
{
/**
* Contentchild API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ContentchildModel
$this->load->model('content/contentchild_model', 'ContentchildModel');
}
/**
* @return void
*/
public function getContentchild()
{
$contentchildID = $this->get('contentchild_id');
if (isset($contentchildID))
{
$result = $this->ContentchildModel->load($contentchildID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postContentchild()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['contentchild_id']))
{
$result = $this->ContentchildModel->update($this->post()['contentchild_id'], $this->post());
}
else
{
$result = $this->ContentchildModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($contentchild = NULL)
{
return true;
}
}
@@ -0,0 +1,77 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentgruppe extends APIv1_Controller
{
/**
* Contentgruppe API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ContentgruppeModel
$this->load->model('content/contentgruppe_model', 'ContentgruppeModel');
}
/**
* @return void
*/
public function getContentgruppe()
{
$gruppe_kurzbz = $this->get('gruppe_kurzbz');
$content_id = $this->get('content_id');
if (isset($gruppe_kurzbz) && isset($content_id))
{
$result = $this->ContentgruppeModel->load(array($gruppe_kurzbz, $content_id));
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postContentgruppe()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['gruppe_kurzbz']) && isset($this->post()['content_id']))
{
$result = $this->ContentgruppeModel->update(array($this->post()['gruppe_kurzbz'], $this->post()['content_id']), $this->post());
}
else
{
$result = $this->ContentgruppeModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($contentgruppe = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentlog extends APIv1_Controller
{
/**
* Contentlog API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ContentlogModel
$this->load->model('content/contentlog_model', 'ContentlogModel');
}
/**
* @return void
*/
public function getContentlog()
{
$contentlogID = $this->get('contentlog_id');
if (isset($contentlogID))
{
$result = $this->ContentlogModel->load($contentlogID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postContentlog()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['contentlog_id']))
{
$result = $this->ContentlogModel->update($this->post()['contentlog_id'], $this->post());
}
else
{
$result = $this->ContentlogModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($contentlog = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Contentsprache extends APIv1_Controller
{
/**
* Contentsprache API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model ContentspracheModel
$this->load->model('content/contentsprache_model', 'ContentspracheModel');
}
/**
* @return void
*/
public function getContentsprache()
{
$contentspracheID = $this->get('contentsprache_id');
if (isset($contentspracheID))
{
$result = $this->ContentspracheModel->load($contentspracheID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postContentsprache()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['contentsprache_id']))
{
$result = $this->ContentspracheModel->update($this->post()['contentsprache_id'], $this->post());
}
else
{
$result = $this->ContentspracheModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($contentsprache = NULL)
{
return true;
}
}
@@ -0,0 +1,142 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Dms extends APIv1_Controller
{
/**
*
*/
public function __construct()
{
parent::__construct();
// Load library DmsLib
$this->load->library('DmsLib');
}
/**
*
*/
public function getDms()
{
$dms_id = $this->get('dms_id');
$version = $this->get('version');
if (isset($dms_id))
{
$result = $this->dmslib->read($dms_id, $version);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
*
*/
public function getAktenAcceptedDms()
{
$person_id = $this->get('person_id');
$dokument_kurzbz = $this->get('dokument_kurzbz');
if (isset($person_id))
{
$result = $this->dmslib->getAktenAcceptedDms($person_id, $dokument_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
*
*/
public function postDms()
{
$dms = $this->post();
if ($this->_validatePost($dms))
{
$result = $this->dmslib->save($dms);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
*
*/
public function postDelDms()
{
$dms = $this->post();
if ($this->_validateDelete($this->post()))
{
$result = $this->dmslib->delete($dms['person_id'], $dms['dms_id']);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validatePost($dms = null)
{
if (!isset($dms))
{
return false;
}
if (!isset($dms['file_content']) || (isset($dms['file_content']) && $dms['file_content'] == ''))
{
return false;
}
if (!isset($dms['name']) || (isset($dms['name']) && $dms['name'] == ''))
{
return false;
}
return true;
}
private function _validateDelete($dms = null)
{
if (!isset($dms))
{
return false;
}
if (!isset($dms['person_id']) || !is_numeric($dms['person_id']))
{
return false;
}
if (!isset($dms['dms_id']) || !is_numeric($dms['dms_id']))
{
return false;
}
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Infoscreen extends APIv1_Controller
{
/**
* Infoscreen API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model InfoscreenModel
$this->load->model('content/infoscreen_model', 'InfoscreenModel');
}
/**
* @return void
*/
public function getInfoscreen()
{
$infoscreenID = $this->get('infoscreen_id');
if (isset($infoscreenID))
{
$result = $this->InfoscreenModel->load($infoscreenID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postInfoscreen()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['infoscreen_id']))
{
$result = $this->InfoscreenModel->update($this->post()['infoscreen_id'], $this->post());
}
else
{
$result = $this->InfoscreenModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($infoscreen = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class News extends APIv1_Controller
{
/**
* News API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model NewsModel
$this->load->model('content/news_model', 'NewsModel');
}
/**
* @return void
*/
public function getNews()
{
$newsID = $this->get('news_id');
if (isset($newsID))
{
$result = $this->NewsModel->load($newsID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postNews()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['news_id']))
{
$result = $this->NewsModel->update($this->post()['news_id'], $this->post());
}
else
{
$result = $this->NewsModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($news = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Template extends APIv1_Controller
{
/**
* Template API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model TemplateModel
$this->load->model('content/template_model', 'TemplateModel');
}
/**
* @return void
*/
public function getTemplate()
{
$template_kurzbz = $this->get('template_kurzbz');
if (isset($template_kurzbz))
{
$result = $this->TemplateModel->load($template_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postTemplate()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['template_kurzbz']))
{
$result = $this->TemplateModel->update($this->post()['template_kurzbz'], $this->post());
}
else
{
$result = $this->TemplateModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($template = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Veranstaltung extends APIv1_Controller
{
/**
* Veranstaltung API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model VeranstaltungModel
$this->load->model('content/veranstaltung_model', 'VeranstaltungModel');
}
/**
* @return void
*/
public function getVeranstaltung()
{
$veranstaltungID = $this->get('veranstaltung_id');
if (isset($veranstaltungID))
{
$result = $this->VeranstaltungModel->load($veranstaltungID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postVeranstaltung()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['veranstaltung_id']))
{
$result = $this->VeranstaltungModel->update($this->post()['veranstaltung_id'], $this->post());
}
else
{
$result = $this->VeranstaltungModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($veranstaltung = NULL)
{
return true;
}
}
@@ -0,0 +1,76 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Veranstaltungskategorie extends APIv1_Controller
{
/**
* Veranstaltungskategorie API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model VeranstaltungskategorieModel
$this->load->model('content/veranstaltungskategorie_model', 'VeranstaltungskategorieModel');
}
/**
* @return void
*/
public function getVeranstaltungskategorie()
{
$veranstaltungskategorie_kurzbz = $this->get('veranstaltungskategorie_kurzbz');
if (isset($veranstaltungskategorie_kurzbz))
{
$result = $this->VeranstaltungskategorieModel->load($veranstaltungskategorie_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postVeranstaltungskategorie()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['veranstaltungskategorie_kurzbz']))
{
$result = $this->VeranstaltungskategorieModel->update($this->post()['veranstaltungskategorie_kurzbz'], $this->post());
}
else
{
$result = $this->VeranstaltungskategorieModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($veranstaltungskategorie = NULL)
{
return true;
}
}
+122
View File
@@ -0,0 +1,122 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Akte extends APIv1_Controller
{
/**
* Akte API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model AkteModel
$this->load->model('crm/akte_model', 'AkteModel');
}
/**
* @return void
*/
public function getAkte()
{
$akteID = $this->get('akte_id');
if (isset($akteID))
{
$result = $this->AkteModel->load($akteID);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function getAkten()
{
$person_id = $this->get('person_id');
$dokument_kurzbz = $this->get('dokument_kurzbz');
$stg_kz = $this->get('stg_kz');
$prestudent_id = $this->get('prestudent_id');
if (isset($person_id))
{
$result = $this->AkteModel->getAkten($person_id, $dokument_kurzbz, $stg_kz, $prestudent_id);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function getAktenAccepted()
{
$person_id = $this->get('person_id');
$dokument_kurzbz = $this->get('dokument_kurzbz');
if (isset($person_id))
{
$result = $this->AkteModel->getAktenAccepted($person_id, $dokument_kurzbz);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postAkte()
{
if ($akte = $this->_validate($this->post()))
{
if (isset($akte['akte_id']))
{
$result = $this->AkteModel->update($akte['akte_id'], $akte);
}
else
{
$result = $this->AkteModel->insert($akte);
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($akte = null)
{
unset($akte['accepted']);
return $akte;
}
}
@@ -0,0 +1,78 @@
<?php
/**
* FH-Complete
*
* @package FHC-API
* @author FHC-Team
* @copyright Copyright (c) 2016, fhcomplete.org
* @license GPLv3
* @link http://fhcomplete.org
* @since Version 1.0
* @filesource
*/
// ------------------------------------------------------------------------
if (!defined('BASEPATH')) exit('No direct script access allowed');
class Aufnahmeschluessel extends APIv1_Controller
{
/**
* Aufnahmeschluessel API constructor.
*/
public function __construct()
{
parent::__construct();
// Load model AufnahmeschluesselModel
$this->load->model('crm/aufnahmeschluessel_model', 'AufnahmeschluesselModel');
}
/**
* @return void
*/
public function getAufnahmeschluessel()
{
$aufnahmeschluessel = $this->get('aufnahmeschluessel');
if (isset($aufnahmeschluessel))
{
$result = $this->AufnahmeschluesselModel->load($aufnahmeschluessel);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
/**
* @return void
*/
public function postAufnahmeschluessel()
{
if ($this->_validate($this->post()))
{
if (isset($this->post()['aufnahmeschluessel']))
{
$result = $this->AufnahmeschluesselModel->update($this->post()['aufnahmeschluessel'], $this->post());
}
else
{
$result = $this->AufnahmeschluesselModel->insert($this->post());
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($aufnahmeschluessel = NULL)
{
return true;
}
}

Some files were not shown because too many files have changed in this diff Show More