Commit Graph

12123 Commits

Author SHA1 Message Date
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