blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-20 18:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 858b985765 Merge remote-tracking branch 'origin/master' Manfred Kindl 2019-08-09 14:13:32 +02:00
  • 87f4824f8a BugFix User story #3776 Manfred Kindl 2019-08-09 14:13:28 +02:00
  • 467c8b60cc - statistik.class.php, fixed error: only non-published statistiken were loaded by default, now all are loaded alex 2019-08-07 16:49:57 +02:00
  • 7ac68bb66c Merge branch 'StatusabhaengigerDokumentenupload' Manfred Kindl 2019-08-06 19:05:04 +02:00
  • 1af701cf75 Merge branch 'master' into TempusLektorFilter Manfred Kindl 2019-08-06 19:01:00 +02:00
  • 026bec29c4 Merge branch 'master' into feature-3778/PunkteübertragReihungstestpunkteFAS Manfred Kindl 2019-08-06 19:00:24 +02:00
  • ee39f4479c Merge branch 'master' into StatusabhaengigerDokumentenupload Manfred Kindl 2019-08-06 18:59:31 +02:00
  • 2898039b73 Removed duplicated constant STATUSGRUND_ID_EINSTIEG_SOMMERSEMESTER Manfred Kindl 2019-08-06 18:58:43 +02:00
  • 310493fbe4 Liste ohne Namen der Studenten ergänzt Nikolaus Krondraf 2019-08-06 14:24:16 +02:00
  • 49a5a8d78c Studiengangskürzel pro Student in Liste ergänzt Nikolaus Krondraf 2019-08-06 14:23:15 +02:00
  • 37d4ad032a Phrasen ergänzt bzw. angepasst Nikolaus Krondraf 2019-08-06 14:22:09 +02:00
  • 69c22e9a17 Beschriftung OE raab 2019-08-06 12:05:31 +02:00
  • 90864e7f99 Merge branch 'master' into fb-4148/ZeitaufzeichnungAktivitaeten raab 2019-08-02 17:26:37 +02:00
  • d7c37d20cb Zeitaufzeichnung nach differenzierten Aktivitäten raab 2019-08-02 17:18:09 +02:00
  • 561de90844 Merge branch 'feature-3925/Sonstiges_Sprint_144' Andreas Österreicher 2019-08-02 08:40:41 +02:00
  • 694ed5a19b Merge branch 'master' into feature-3925/Sonstiges_Sprint_144 Andreas Österreicher 2019-08-02 08:29:23 +02:00
  • 757ba05bc7 Started Lehrauftrag data query [PRE-ALPHA-VERSION] Cris 2019-08-01 15:49:23 +02:00
  • bb99d7b722 Started Lehrauftrag View [PRE-ALPHA-VERSION] Cris 2019-08-01 15:47:47 +02:00
  • 157237963b Lehrauftrag Controller [PRE-ALPHA-VERSION] Cris 2019-08-01 15:45:06 +02:00
  • a81098f884 Added method getSTGLByUID(uid) to Benutzerfunktion_model Cris 2019-08-01 15:38:33 +02:00
  • 2daef49e52 Extended usability of Studiengang_widget [PRE-ALPHA-VERSION] hainberg 2019-08-01 15:34:06 +02:00
  • cf5177e5e1 Added method getNext() to Studiensemester_model Cris 2019-08-01 15:25:52 +02:00
  • d2e8b01e30 - codeigniter-restserver is now provided and loaded via composer (libraries/REST_Controller.php, config/rest.php, language/english/rest_controller_lang.php, libraries/Format.php, etc) - Added new core controller core/RESTFul_Controller.php that extends REST_Controller and partially overrides part of the latter - Changed application/config/rest.php to keep the minimal useful set of configs - Controllers core/APIv1_Controller, controllers/api/v1/CheckUserAuth.php and controllers/api/v1/Test.php now extend core/RESTFul_Controller - Changed method _remap interface for core/APIv1_Controller - Removed application/core/REST_Controller.php - Removed application/libraries/Format.php - Removed application/language/english/rest_controller_lang.php Paolo 2019-07-31 14:46:31 +02:00
  • d0605ba3cf Fixed broken group search Andreas Österreicher 2019-07-31 08:30:57 +02:00
  • bb966a1f13 Falsche Dokumentenvorlage korrigiert Andreas Österreicher 2019-07-30 13:56:30 +02:00
  • 1e856773b9 Fixed broken Session on Infoterminal Andreas Österreicher 2019-07-29 15:38:28 +02:00
  • b18d1576c1 Merge branch 'master' into StatusabhaengigerDokumentenupload Manfred Kindl 2019-07-26 13:53:39 +02:00
  • f9dcbbb6c9 Correct sorting behaviour Manfred Kindl 2019-07-26 13:53:07 +02:00
  • 81947b3df2 Tempus Filter nach LektorIn Manfred Kindl 2019-07-26 13:48:09 +02:00
  • 9faa2e0077 Gruppenverwaltung: Direktsuche nach Gruppen implementiert Manfred Kindl 2019-07-26 13:42:05 +02:00
  • c3a3125e49 Suche nach direkten IDs vorübergehend auskommentiert Manfred Kindl 2019-07-26 13:41:19 +02:00
  • c6dd9199c8 Übersichtsseite, wo Contents verwendet werden Manfred Kindl 2019-07-26 13:40:33 +02:00
  • 970744464d Added jqueryui to home.php, now required from AjaxLib.js Paolo 2019-07-18 16:33:01 +02:00
  • 4f119c8d92 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag hainberg 2019-07-18 12:11:07 +02:00
  • 6752dc649f Now is possible to have more than one FilterWidget in a single page Paolo 2019-07-17 11:38:47 +02:00
  • 96f285ad4b Merge branch 'master' into StatusabhaengigerDokumentenupload Manfred Kindl 2019-07-16 15:56:31 +02:00
  • e60e61a11e Neuer Tablesorter und Parser für Sortierung nach Datum Manfred Kindl 2019-07-16 15:54:28 +02:00
  • af08e06ade English und Stufe in Funktion getStudiengaengeDokument Manfred Kindl 2019-07-16 15:53:20 +02:00
  • 7e1052ecc2 Neuer Tablesorter und parser für Datum, Betrag uns Studiensemester Manfred Kindl 2019-07-16 15:52:19 +02:00
  • 2013c86ad3 Added jQuery wrapper to tabulator Paolo 2019-07-12 18:03:04 +02:00
  • 9cb1062275 Added new option hideMenu to FilterWidget Paolo 2019-07-11 12:59:30 +02:00
  • 31caf460ec Removed extra divs from views/widgets/filter/tableDataset.php Paolo 2019-07-11 12:14:35 +02:00
  • 2691c4b7da Anonymisiert Unknown 2019-07-11 11:45:20 +02:00
  • 73220d8dd6 More options to hide or show filter widget settings panel Paolo 2019-07-11 09:42:13 +02:00
  • cbac8c450c Aus Livesystem aktualisiert Manfred Kindl 2019-07-10 18:16:48 +02:00
  • 2c773b7035 SQL der Auswertung angepasst. Buttons eingebaut Manfred Kindl 2019-07-10 18:13:18 +02:00
  • bea28d9971 Kopieren von Berechtigungen, Neu-Formular oben Manfred Kindl 2019-07-10 18:09:00 +02:00
  • b2e5b2a0bb Letzter Status Abgewiesener -> Kein Mail an Assistenz Manfred Kindl 2019-07-10 18:08:21 +02:00
  • 2daf745ad5 - Moved controller system/Filters to widgets/Filters - Renamed FiltersLib to FilterWidgetLib - Adapted code in widgets/FilterWidget, public/js/FilterWidget.js and public/js/infocenter/infocenterPersonDataset.js Paolo 2019-07-10 14:39:59 +02:00
  • 7050def0bb public/js/FilterWidget.js: fixes Paolo 2019-07-10 13:35:34 +02:00
  • 9fd91c2888 FilterWidget + Tabulator final version Paolo 2019-07-09 16:21:08 +02:00
  • 2922aa26fe Added tabulator to composer, FHC-Header and a CSS for it Paolo 2019-07-09 11:57:52 +02:00
  • f0ee8b0161 Added Tabulator to FilterWidget (alpha version) Paolo 2019-07-09 11:30:16 +02:00
  • 7f7c554fd8 Added Vertragsstunden/VertragsstundenStudiensemester in FAS hainberg 2019-07-08 17:24:07 +02:00
  • a08f450330 Corrected sorting order Manfred Kindl 2019-07-08 17:06:45 +02:00
  • 68b8d018de Minor Layout Fix Manfred Kindl 2019-07-08 17:05:17 +02:00
  • 651bbb681b Ändern der Stufe per Ajax Manfred Kindl 2019-07-08 17:03:28 +02:00
  • 93d49822af Merge branch 'master' into StatusabhaengigerDokumentenupload Manfred Kindl 2019-07-08 17:01:55 +02:00
  • d0f40a1cf2 Added columns vertragsstunden/vertragsstunden_studiensemester_kurzbz in tbl_vertrag hainberg 2019-07-08 15:11:23 +02:00
  • 61e21d605e Fixes Paolo 2019-07-08 10:47:54 +02:00
  • 2f846796b6 Work in prorgess on _manageTableColumns Paolo 2019-07-05 17:29:48 +02:00
  • 93a6652c5f Gradelist - Max-ECTS-Sum includes ECTS of assigned Courses without Grades Andreas Österreicher 2019-07-05 17:07:06 +02:00
  • 02693ed790 Infotext im Tempus angepasst bei Lektoren mit Selbstverwalteter Pause (SVP) Andreas Österreicher 2019-07-05 16:28:58 +02:00
  • 96783da013 Bugfix to get old Sabredav working with php7 Andreas Österreicher 2019-07-05 16:12:27 +02:00
  • e9e58decee Changed file naming convention for table files Paolo 2019-07-05 11:56:43 +02:00
  • ebea830f14 Merge branch 'fb-3922/ZeitwunschZustimmung' Andreas Österreicher 2019-07-05 09:16:01 +02:00
  • b5c1512d68 Merge branch 'master' into fb-3922/ZeitwunschZustimmung raab 2019-07-05 09:11:46 +02:00
  • 19425b93f0 Employees can now also be assigned directly to Courses (for Elective Courses) Andreas Österreicher 2019-07-05 07:29:03 +02:00
  • 638a0a90a4 - Berechtigungscheck for reservation deletion on "meine Reservierungen anzeigen"-page corrected - removed "Alle Reservierungen anzeigen" Link alex 2019-07-04 17:25:24 +02:00
  • ddaa129bab - Removed controllers api/v1/system/CallerLibrary.php and api/v1/system/CallerModel.php - Removed library libraries/CallerLib.php Paolo 2019-07-04 17:25:13 +02:00
  • 48bcc77c97 - Added CSS public/css/Tabulator.css and public/css/TinyMCE.css - Added these new CSS to views/templates/FHC-Header.php - Unified messages CSS in public/css/messaging/message.css - Messages Inbox/Outbox GUI beautified Paolo 2019-07-04 17:18:01 +02:00
  • 48c5713688 geteilte arbeitszeit konfigurierbar raab 2019-07-04 17:02:11 +02:00
  • 18ea98416f From/To toggle tabulator columns Paolo 2019-07-04 15:11:58 +02:00
  • d4828cf615 Merge branch 'ausbildungsvertragdocuments' alex 2019-07-04 13:33:51 +02:00
  • 5a0943534d Merge branch 'master' into ausbildungsvertragdocuments alex 2019-07-04 13:29:25 +02:00
  • f664f1442f - public/js/DialogLib.js: if dialog already present, it is removed before new one is attached (if dialogs are displayed on same page one afte another) alex 2019-07-04 11:25:32 +02:00
  • 71615770f1 Merge remote-tracking branch 'origin/master' alex 2019-07-04 11:21:50 +02:00
  • 8f5b32ee94 education/Lehreinheit_model: getLesForLv method: Lehreinheiten ordered by lehreinheit_id by default alex 2019-07-04 11:21:30 +02:00
  • c62b4dc018 - Added new public method setMessageRead to system/messages/MessageClient - system/Recipient_model methods getReceivedMessages and getSentMessages now retrieve person_id from tbl_msg_status - Added new public method setMessageRead to CL/Messages_model - Improved code in public/js/messaging/read.js Paolo 2019-07-04 11:15:07 +02:00
  • f8ecc0b916 matr_nr bei Studenten ergänzt Nikolaus Krondraf 2019-07-04 10:40:38 +02:00
  • 12d0bbfa52 Fixed invalid Session Handling on Infoterminal Page Andreas Österreicher 2019-07-03 18:07:29 +02:00
  • b495a4bffd Merge remote-tracking branch 'origin/master' Manfred Kindl 2019-07-01 16:03:58 +02:00
  • c3cd354f4c Spalte "Fixangestellt" hinzugefügt Manfred Kindl 2019-07-01 16:03:52 +02:00
  • a8f7199ee8 nur für fixangestellte, neuer text raab 2019-07-01 15:53:57 +02:00
  • c4c361e94c Merge branch 'master' into fb-3922/ZeitwunschZustimmung raab 2019-07-01 15:52:49 +02:00
  • 71791ada4b Infotext Phrase für Notendurchschnitt angepasst Andreas Oesterreicher 2019-07-01 14:42:27 +02:00
  • 7886cfc9e3 Tooltiptext für Notendurchschnitt auf Gradeliste hinzugefügt. Menüpunkt im FAS gegendert Andreas Oesterreicher 2019-07-01 14:37:14 +02:00
  • 99e541d506 Fixed receiver/sender retrieved from database Paolo 2019-06-28 19:18:18 +02:00
  • 34dc82766a - Renamed public/js/messaging/messageClient.js to public/js/messaging/read.js - Added new JS public/js/messaging/write.js used in view application/views/system/messages/ajaxWrite.php - Added new public method write, listReceivedMessages, listSentMessages and sendMessageToOU to controller system/messages/MessageClient.php - Removed private method _getReceiversByOekurzbz from MessageLib - Fixed method sendMessageOU of MessageLib - Added new public method prepareAjaxWrite to model CL/Messages_model - Fixed method prepareAjaxReadReceived of model CL/Messages_model - Added new public method prepareAjaxReadSent to model CL/Messages_model - Changed method CL/Messages_model->_personLog interface - Added new public method getOrganisationunitsByPersonId to crm/Prestudent_model - Added new public method getReceivedMessages to model system/Recipient_model - Changed getReceivedMessages method of model system/Recipient_model - Changed view system/messages/ajaxRead.php - Added new view system/messages/ajaxWrite.php Paolo 2019-06-28 19:01:25 +02:00
  • 93ecdaaf0b Ergänzung BugFix Manfred Kindl 2019-06-28 16:23:14 +02:00
  • 779b05dab2 Merge branch 'master' into StatusabhaengigerDokumentenupload Manfred Kindl 2019-06-28 15:58:55 +02:00
  • d333555d06 Added Stufe to Function getStudiengaengeDokument Manfred Kindl 2019-06-28 15:58:18 +02:00
  • 6fca967be0 Vorlage Bestätigung der Lehrtätigkeit gegendert Manfred Kindl 2019-06-28 15:55:27 +02:00
  • b27ed8abd0 Uncomment check for Levelgleichverteilung Manfred Kindl 2019-06-28 15:55:01 +02:00
  • 45947dfca2 Added DiplomasupplementDebug Manfred Kindl 2019-06-28 15:54:36 +02:00
  • 162b935b8c Bugfix RT-Auswertung Manfred Kindl 2019-06-28 15:49:45 +02:00
  • fff467536f - correct mitarbeiter uid when deleting reservierung - reservierung data saved correctly alex 2019-06-28 13:38:10 +02:00
  • e0b5f0ba8e - Only assistance who created the reservation or for whom is reserved can delete reservierungen - logging every time a reservation is deleted alex 2019-06-28 13:23:00 +02:00
  • f32d2ac56b Merge branch 'issue-3823/Lehrveranstaltungssuche' Andreas Österreicher 2019-06-27 17:55:54 +02:00
  • 04ba491508 Merge branch 'master' into issue-3823/Lehrveranstaltungssuche Andreas Österreicher 2019-06-27 17:51:09 +02:00