blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-18 04:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,589 Commits 226 Branches 6 Tags
bd4c35f7ee3e288a91c4e3bd89f2f7e5b9dd4904
Commit Graph

8589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paolo bd4c35f7ee Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-28 14:41:26 +01:00
cris-technikum db14c86a77 Merge after last Commit 2018-02-28 14:39:33 +01:00
Paolo 9a3a33feb0 FilterWidget fixed drag&drop 2018-02-28 14:08:20 +01:00
cris-technikum dc3d71fdfb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-28 11:11:02 +01:00
cris-technikum ef331e1580 AMPELSYSTEM: new GUI with Sancho; new logic 
. new GUI with Sancho and collapsable panel
. new logic:
1. popup only for notifications that are:
----  mandatory
----  unconfirmed
----  not expired
----  not before vorlaufszeit
2. overall display for all notifications that are
---- not before vorlaufszeit
-> confirmed and/or expired notifications are displayed serperately and only readable
 2018-02-28 10:47:45 +01:00
Paolo b8e7599888 - Added method rowNumber to controller system/Filters 
- Fixed JSs to count the number of record in InfoCenter and to send messages
 2018-02-28 09:59:56 +01:00
Paolo c66ed6dd8f FilterWidget header uses bootstrap CSS now 2018-02-27 19:31:36 +01:00
Paolo f9e3aeb021 FilterWidget bugfixes 2018-02-27 18:57:41 +01:00
Paolo 7869113396 - FilterWidget: bugfixes 
- Added column StgAbgeschickt to formatRaw in system/infocenter/infocenterData.php
 2018-02-27 18:48:21 +01:00
Paolo bf46abdcc0 Removed columnsAliases parameter from views/system/infocenter/infocenterData.php 2018-02-27 18:38:48 +01:00
Paolo a5059f0d27 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-27 18:37:51 +01:00
Paolo b8c1aae251 Changed FilterWidget to be more responsive with Javascript 2018-02-27 18:37:16 +01:00
Andreas Österreicher 7f1108fe2f Added Mail List 2018-02-27 15:03:25 +01:00
Andreas Österreicher 07a20257b4 Kommentare fuer Datenbanktabellen hinzugefügt 
Nicht mehr zu verwendende Datenbanktabelle und Spalten als Deprecated
markiert
 2018-02-27 11:34:54 +01:00
alex 959b90ca68 Merge remote-tracking branch 'origin/master' 2018-02-26 17:53:55 +01:00
alex 6f99a0ff0c fixed bug with zgvdatum when datum null and infoonly 2018-02-26 17:53:46 +01:00
Manfred Kindl 64663ed82b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-26 17:45:26 +01:00
Manfred Kindl 3e92378922 Bestellnummer und Lieferfirma auf Übernahmebestätigung 2018-02-26 17:45:07 +01:00
Andreas Österreicher 34bc23b284 Bugfix für Text-Messages beim Versand von einzelnen Mails 2018-02-26 17:12:32 +01:00
alex 5a4659c2b8 Merge remote-tracking branch 'origin/master' 2018-02-26 16:54:52 +01:00
alex 8f6ee06b9d added "zgv uebernehmen" for prefill of zgv with latest edited zgv, optimized sort of zgvs 2018-02-26 16:54:41 +01:00
Andreas Österreicher ac1f55b19c Web User fuer tbl_msg_status berechtigt damit der Message-Status gesetzt 
werden kann
 2018-02-26 15:37:23 +01:00
Manfred Kindl bf005a54a7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-26 11:16:06 +01:00
Manfred Kindl 526cacbe96 Adding "anrede" to CIS-search and profile 2018-02-26 11:15:26 +01:00
Andreas Österreicher 67ae79d4e0 Infocenter Spalte fuer abgeschickte Studiengaenge hinzugefügt 2018-02-26 10:40:55 +01:00
oesi a07fa5e8ba Problem behoben wodurch UDF bei Mitarbeitern nicht korrekt ausgeblendet wurden 2018-02-26 09:56:28 +01:00
oesi 1a15c134d1 Problem behoben beim Prüfen der Vertrags-Beträge wenn Stundensatz oder Semesterstunden NULL sind 2018-02-23 15:41:23 +01:00
Manfred Kindl d1acd76baa Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-23 11:22:09 +01:00
Manfred Kindl feb3a4be08 Funktion getStudiengaengeDokument ignoriert Abgewiesene und Abbrecher 2018-02-23 11:13:10 +01:00
Manfred Kindl 74702d27ca Termindauer wird auf Auswahlseite angezeigt 2018-02-23 11:04:26 +01:00
alex 93a581e301 Merge remote-tracking branch 'origin/master' 2018-02-23 10:06:56 +01:00
alex 53fcda3504 added infomail when interessent freigegeben 2018-02-23 10:06:46 +01:00
Paolo 75d1a60401 - Removed parameter alternativeMarkRowClass from FilterWidget 
- Now the parameter markRow must be a function that returns directly the class to mark records in FilterWidget
- Changed InfoCenter to mark locked record with the new markRow function
 2018-02-22 13:54:30 +01:00
Andreas Österreicher 206725b491 Problem behoben beim Erstellen von Auslandssemesterzeugnissen wenn 
Sonderzeichen im Ort oder in der Universität vorkommen
 2018-02-22 08:13:16 +01:00
Andreas Österreicher 0a8285ed03 Messaging Mail Template can be overwritten in the Database 2018-02-21 23:53:50 +01:00
Andreas Österreicher 45485ee02a Fixed Bug where wrong Messages are sent if they are not sent immediately 
Messages are only sent with the Employee-Adress of the Sender instead of
the private Address. If the Sender is not an Employee, the Messages are
sent with the System-EMail
 2018-02-21 23:27:24 +01:00
Andreas Österreicher b86aaf735c Added Permissions to Infocenter Role 2018-02-21 23:26:05 +01:00
Paolo 983a73fa48 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-21 18:02:48 +01:00
Paolo 72bb40e786 - Added method escapeLike to DB_Model to escape strings for LIKE operator 
- Added JS include jqueryui to InfoCenter
- Added left join to system.tbl_person_lock in infocenterData.php
- Added field LockDate to InfoCenter filter
- Added parameter markRow to InfoCenter filter
- Added DragNDrop to FilterWidget to sort/remove the selected filter fields
- FilterWidget now display the name of the loaded filter if available
- Added the property "name" to the jsonb of filters to display the name of the loaded filter
- Added the static method displayFilterName to the FilterWidget to display the name of the loaded filter
- The collapsible panel in FilterWidget now shows/hides the fields selection, the filter operators and the inputs to save the custom filter
- The GUI remembers if the collapsible panel should be closed or open
- Added the "Apply" button to the filter operators
- Added the markRow parameter to the FilterWidget, used to mark a row if one or more conditions are matched
- Added the alternativeMarkRowClass to use a different class to mark a row
- Added the public static function markRow to the FilterWidget
 2018-02-21 17:48:03 +01:00
alex cca4fee51e mark header red if locked by other person, locking is possible either generally (app null) or only for certain apps. 2018-02-21 13:44:44 +01:00
Andreas Österreicher f7593653ea Maillib Added support for overriding the Mail FROM 2018-02-21 07:16:03 +01:00
Andreas Österreicher dd70f02791 Added Permission to Infocenter-role 2018-02-21 07:14:53 +01:00
Andreas Österreicher 7c2445dc89 Messages im FAS werden nach Datum sortiert anstatt nach Betreff 2018-02-20 18:42:23 +01:00
alex 695e7f60af added lock mechanism for persons, outsourced infocenter code to javascript 2018-02-20 18:05:36 +01:00
alex d9f6bfb76b statusgrund is shown for every status not only for abgewiesener 2018-02-20 18:00:37 +01:00
alex c987773f8f removed line 2018-02-20 17:58:03 +01:00
alex eb4c7cda61 Merge remote-tracking branch 'origin/master' 2018-02-20 17:39:19 +01:00
alex 4b4dcfff59 added lock tbl.person_lock for locking person 2018-02-20 17:39:00 +01:00
Andreas Österreicher bd2318bd38 MailDebug now also "works" with invalid Mail 
Fixed Typo and Intendation
 2018-02-20 17:17:56 +01:00
alex 6830e5f51d renamed column in nachrichten 2018-02-19 13:02:14 +01:00