Commit Graph

  • 65c3a83a20 Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag hainberg 2019-10-30 08:24:05 +01:00
  • fff1025eed Adapted FAS to display status 'Geändert' when CHANGED HOURS (and NO betrag) Cris 2019-10-29 18:12:16 +01:00
  • a02c1cd579 Added FORMATTER form_formatNullToStringNumber: formats NULL to '0.00' Cris 2019-10-29 17:40:12 +01:00
  • 998dbe7528 Added FORMATTER form_formatNullToStringNumber: formats NULL to '0.00' Cris 2019-10-29 17:40:12 +01:00
  • 3129707a10 Adapted GUI and filter to UPDATE also CHANGED HOURS Cris 2019-10-29 16:21:13 +01:00
  • 49f7f61273 Merge branch 'feature-3801/Use_different_source_CI_REST' Andreas Österreicher 2019-10-29 15:17:38 +01:00
  • bc05f32d5e Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken' Andreas Österreicher 2019-10-29 15:04:02 +01:00
  • e9b20283b5 Berechtigung in FAS einbauen Manfred Kindl 2019-10-29 14:53:40 +01:00
  • d760df8198 Merge branch 'feature-4960/Javascript_Timestamp' Andreas Österreicher 2019-10-29 14:50:19 +01:00
  • 5be68be408 Added Anti-Cache Functionality Andreas Österreicher 2019-10-29 14:49:35 +01:00
  • 8d2c85734e Adapted Controller to UPDATE also CHANGED HOURS Cris 2019-10-29 13:16:38 +01:00
  • 3897f120ee Merge branch 'feature-4152/CIS_Funktionen_Wochenstunden' Andreas Österreicher 2019-10-29 11:09:12 +01:00
  • 31850ebfa1 Added param validation to Vertrag_model methods & minor code improvement Cris 2019-10-29 10:43:52 +01:00
  • 438b7b5b9e Moved methods from Vertrag_model to Vertragvertragsstatus_model Cris 2019-10-29 10:39:37 +01:00
  • 22a517b88d Added LogsViewer to CI Menu Andreas Österreicher 2019-10-29 06:51:36 +01:00
  • 4d248f3a1e - cis/private/profile/index.php: Wochenstunden on profile are only shown to own user or admin alex 2019-10-28 17:29:09 +01:00
  • 9e9612d317 Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets' Andreas Österreicher 2019-10-28 16:28:57 +01:00
  • ab947cf5f1 Fixed: Tooltip of geaenderte LA will show up now Cris 2019-10-28 16:26:38 +01:00
  • 720f117312 Added/Extended PERMISSION-checks to Lehrauftraege Cris 2019-10-28 16:23:31 +01:00
  • c55f790d4a - Only zeugnisrelevante Noten are shown in Notenspiegel (for excluding e.g. ECI LVs) alex 2019-10-28 16:24:10 +01:00
  • 85b6c7556f Merge branch 'feature-4404/Dieter_Dummy_umbenennen' Andreas Österreicher 2019-10-28 15:23:05 +01:00
  • a18d9ccced Merge branch 'feature-4027/Personen_zusammenlegen_Pruefling' Andreas Österreicher 2019-10-28 14:59:44 +01:00
  • c179655124 Merge branch 'feature-4562/Extends_helper_hlp_authentication_helper' Andreas Österreicher 2019-10-28 14:52:30 +01:00
  • 2d68d2ffeb Adapted Header and Background Style for CIS-CI Pages Andreas Österreicher 2019-10-28 14:43:05 +01:00
  • ff856315d1 - uid for Projektliste Zeitaufzeichnung Export is passed already when calling the Zeitaufzeichnung with uid parameter alex 2019-10-28 11:38:46 +01:00
  • 25c2d57993 Added missing Phrases for Password Change Andreas Österreicher 2019-10-28 07:42:10 +01:00
  • 4b6e290c5b Merge branch 'TempusLektorFilter' Manfred Kindl 2019-10-25 19:55:52 +02:00
  • 08cdd48510 Merge branch 'master' into TempusLektorFilter Manfred Kindl 2019-10-25 19:54:11 +02:00
  • acf132da39 Merge branch 'feature-3778/PunkteübertragReihungstestpunkteFAS' Manfred Kindl 2019-10-25 19:52:57 +02:00
  • 7c0e3867b6 Merge branch 'master' into feature-3778/PunkteübertragReihungstestpunkteFAS Manfred Kindl 2019-10-25 19:50:48 +02:00
  • f373ffb529 Merge branch 'feature-4366' Manfred Kindl 2019-10-25 19:47:59 +02:00
  • 3760af9394 Merge branch 'master' into feature-4366 Manfred Kindl 2019-10-25 19:47:32 +02:00
  • 4e9588cf76 Alte Vorlagen Ausbildungsverträge in Core gelöscht Manfred Kindl 2019-10-25 19:45:43 +02:00
  • c9a3886e07 Nachgereichte Dokumente in FAS löschen Manfred Kindl 2019-10-25 19:45:09 +02:00
  • 9d70d4c30f Dokumenttyp "ZgvMaPre" hinzugefügt Manfred Kindl 2019-10-25 19:44:22 +02:00
  • 754868da90 Usability-Verbesserungen Manfred Kindl 2019-10-25 19:42:27 +02:00
  • 3c13dafa47 - zeitaufzeichnung_projektliste.php: uid wird übergeben sodass Admin Zeitaufzeichnungen aller Nutzer sehen kann alex 2019-10-25 17:14:20 +02:00
  • 7cf812deae Minor GUI change for better usability Cris 2019-10-25 12:33:06 +02:00
  • ae313175c8 Fixed: 'Alle auswählen'-button filters now correctly Cris 2019-10-25 12:29:38 +02:00
  • 89ad21b1ef - Infocenter uebersicht bugfix: tablesorter filter storage is the same for homepage with and without "/index" (for keeping tablesorter filter when coming back from details page) alex 2019-10-25 10:26:54 +02:00
  • 1971ec8ed1 - Infocenter.php bugfix: GET parameter list is separated by "&" and not by ? (params filter_id, reloadDataset) alex 2019-10-25 10:20:56 +02:00
  • 5b72ccdea1 Fixed: Unfolding LV-list was broken when certain config var -> fixed now Cris 2019-10-25 09:52:54 +02:00
  • fe94cfc350 Avoided removing lector on Key-press 'Entf', when contract exists Cris 2019-10-25 08:35:07 +02:00
  • b6bd2dd104 Changed STORNO: Now cancelling always possible (since contract exists) Cris 2019-10-25 08:24:43 +02:00
  • 2b18be33af Button zur Bestätigung nur mehr unterhalb des Textes raab 2019-10-24 17:31:25 +02:00
  • 172421f4a9 Fixed: Size of password field now visible also when resizing Cris 2019-10-24 16:05:22 +02:00
  • f3006d4760 Minor doc changes Cris 2019-10-24 15:59:30 +02:00
  • 30ef50fa4c Fixed: BIG AMOUNT of Lehrauftrage not causing POST param limit issue anymore Cris 2019-10-24 15:57:50 +02:00
  • 9d0944b717 Reduced posting data (client-side) Cris 2019-10-24 15:48:08 +02:00
  • 89fc2ecd0a Fixed: Corrected number of rows in CSV download Cris 2019-10-24 14:49:17 +02:00
  • 5936476dd5 Minor GUI optimizations Cris 2019-10-24 14:19:05 +02:00
  • 746f082121 Fixed: Excluded dummy lectors from all selections/filters Cris 2019-10-24 14:14:48 +02:00
  • bceb11b420 Added INITIAL FILTER to LA akzeptieren Cris 2019-10-24 14:08:23 +02:00
  • e68337c685 Added INITIAL FILTER to LA erteilen hainberg 2019-10-24 14:04:57 +02:00
  • 7cf02c3566 Added INITIAL FILTER to LA bestellen Cris 2019-10-24 14:03:08 +02:00
  • 9a71c29ca2 Added FOOTER to tabulator with CSV download and adapted GUI to LA akzeptieren Cris 2019-10-24 13:51:43 +02:00
  • a5e915066a Added FOOTER to tabulator with CSV download and adapted GUI to LA erteilen Cris 2019-10-24 13:47:30 +02:00
  • 83eb4bd5f3 Added FOOTER to tabulator with CSV download and adapted GUI to LA bestellen Cris 2019-10-24 13:44:05 +02:00
  • 92cfa521f7 Fixed DB-error when vertragsbetrag IS NULL Cris 2019-10-24 13:28:18 +02:00
  • fbec49a663 - bugfix: parking & zurückstellen datepicker: current day cannot be selected, because default time is 00:00, and it would be immediately exceeded alex 2019-10-24 11:43:10 +02:00
  • 4de5f1533f - parking and zurückstellen date and buttons: adapted layout for correct line breaking alex 2019-10-24 11:29:38 +02:00
  • 771fb6f823 Phrase Manfred Kindl 2019-10-23 13:48:17 +02:00
  • 7ccffc24ee - Added database column statistik_kurzbz in system.tbl_filters - Added row 'report' for app in system.tbl_app alex 2019-10-23 13:16:24 +02:00
  • d3e22185e3 Changed wording: akzeptiert -> angenommen Cris 2019-10-22 16:41:16 +02:00
  • 0dcf1980ca Optimized HEADER FILTER in tabulator to use COMPARISON OPERATORS Cris 2019-10-22 16:27:27 +02:00
  • 836c61e3b8 Changed user icons in filter- and status buttons (PNG icons) Cris 2019-10-22 12:06:32 +02:00
  • fd3f74807b Added font-awsome 5.9.0. USER ICONS in PNG format 150x150 Cris 2019-10-22 11:59:38 +02:00
  • b59ba3f156 erlaube Terminkollision bei Raumreservierung Nikolaus Krondraf 2019-10-22 07:20:36 +02:00
  • e65fc08e31 Merge remote-tracking branch 'origin/master' Manfred Kindl 2019-10-21 18:24:28 +02:00
  • e22d560134 Quickfix Export Studienblatt als .doc Manfred Kindl 2019-10-21 18:21:35 +02:00
  • a3ba7e381f BugFix Betreuertyp BetreuerPraktik Manfred Kindl 2019-10-21 18:20:49 +02:00
  • 49be024ca9 Coodle Manfred Kindl 2019-10-21 18:19:57 +02:00
  • 325f7dd09a Changed order of displaying status in Lehrauftrag akzeptieren Cris 2019-10-21 17:35:55 +02:00
  • ce84e0bea4 Removed unused vertrag data from queries and filters Cris 2019-10-21 17:33:41 +02:00
  • 06f31997f2 Added bestellt_von/erteilt_von/akzeptiert_von columns and TOOLTIPS Cris 2019-10-21 17:29:23 +02:00
  • af29146bb5 Fixed: now variable erteilt is initialized correctly Cris 2019-10-21 17:19:50 +02:00
  • cc28a92205 Added update of status icon directly after bestellen/erteilen/akzeptieren Cris 2019-10-21 10:07:23 +02:00
  • 790065a281 Added phrases for password change page Paolo 2019-10-18 14:42:08 +02:00
  • fde9af3eed Anmeldebutton wird erst ab 2 Monaten vor Prüfung angezeigt Nikolaus Krondraf 2019-10-17 12:42:22 +02:00
  • 383558f262 new config variable Nikolaus Krondraf 2019-10-17 07:41:28 +02:00
  • b3748fb910 Added focus on clicked filter button Cris 2019-10-16 17:23:42 +02:00
  • 49f7ac1c72 Minor changes: Changed tooltip text / Enhanced code Cris 2019-10-16 15:13:46 +02:00
  • 8881f799c3 Adapted filter select-all to select also geaenderte Lehrauftraege Cris 2019-10-16 14:53:49 +02:00
  • 4f065c9234 revert change Nikolaus Krondraf 2019-10-16 14:47:42 +02:00
  • fbfa3badf1 Berechtigung korrigiert beim Löschen von Reservierungen direkt aus der Wochenplanansicht Andreas Österreicher 2019-10-16 14:36:25 +02:00
  • 19a88a8648 Added filter button for geaenderte Lehrauftraege to LA bestellen/erteilen Cris 2019-10-16 12:42:13 +02:00
  • 58ec6f8f31 SaveSort in Dokumentezuteilung Manfred Kindl 2019-10-16 12:08:20 +02:00
  • 809b2b3e64 Anpassung FHTW Incomings auslesen Manfred Kindl 2019-10-16 12:07:52 +02:00
  • 280c4ca19f Adapted filters for DUMMY lectors Cris 2019-10-16 12:00:40 +02:00
  • aa6946bfff Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag erteilen hainberg 2019-10-16 11:59:09 +02:00
  • 9f8921e186 Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag bestellen Cris 2019-10-16 11:58:44 +02:00
  • ed2a029139 Added GUI for DUMMY lectors in Lehrauftrag erteilen Cris 2019-10-16 11:57:39 +02:00
  • 5ccd23f68d Added GUI for DUMMY lectors in Lehrauftrag bestellen Cris 2019-10-16 11:56:26 +02:00
  • 70605a83e1 Removed uncommented doc text! Cris 2019-10-16 09:00:08 +02:00
  • 9fc3d165db Added status icons/tooltip/formats for GEAENDERTE in Lehrauftrag erteilen Cris 2019-10-16 08:58:11 +02:00
  • 5030f0b1ed Major addition of tabulator functionality methods III / Enhanced code Cris 2019-10-16 08:53:37 +02:00
  • 745b227c1a Merge branch 'hotfix-4790/FAS_UDF_tab_saving_is_broken' Andreas Österreicher 2019-10-15 16:06:48 +02:00
  • 7daac696b3 - Renamed controller system/UDF.php to system/FAS_UDF.php - Renamed view system/udf.php to system/fas_udf.php - Adapted code with new names - Added model system/FAS_UDF_model with only FAS functionalities - Removed FAS functionalities from model system/UDF_model - Fixed session problems in controller system/FAS_UDF Paolo 2019-10-15 15:40:47 +02:00
  • 733685b67e Merge branch 'feature-2533/ZeitaufzeichnungCSVImport' Andreas Österreicher 2019-10-15 14:10:27 +02:00
  • 6d14423b82 Merge branch 'feature-4210/BIS_UHSTAT2_Erweiterungen' Andreas Österreicher 2019-10-15 13:56:38 +02:00