Commit Graph

12123 Commits

Author SHA1 Message Date
Paolo 9fd91c2888 FilterWidget + Tabulator final version 2019-07-09 16:21:08 +02:00
Paolo 2922aa26fe Added tabulator to composer, FHC-Header and a CSS for it 2019-07-09 11:57:52 +02:00
Paolo f0ee8b0161 Added Tabulator to FilterWidget (alpha version) 2019-07-09 11:30:16 +02:00
hainberg 7f7c554fd8 Added Vertragsstunden/VertragsstundenStudiensemester in FAS
Added two hidden fields
. Vertragsstunden
  (tbl_vertrag.verstragsstunden)
. VertragsstundenStudiensemester
  (tbl_vertrag.vertragsstunden_studiensemester_kurzbz)
to FAS-tab Verträge, which can be displayed by the user.
2019-07-08 17:24:07 +02:00
Manfred Kindl a08f450330 Corrected sorting order 2019-07-08 17:06:45 +02:00
Manfred Kindl 68b8d018de Minor Layout Fix 2019-07-08 17:05:17 +02:00
Manfred Kindl 651bbb681b Ändern der Stufe per Ajax 2019-07-08 17:03:28 +02:00
Manfred Kindl 93d49822af Merge branch 'master' into StatusabhaengigerDokumentenupload 2019-07-08 17:01:55 +02:00
hainberg d0f40a1cf2 Added columns vertragsstunden/vertragsstunden_studiensemester_kurzbz in tbl_vertrag 2019-07-08 15:11:23 +02:00
Paolo 61e21d605e Fixes 2019-07-08 10:47:54 +02:00
Paolo 2f846796b6 Work in prorgess on _manageTableColumns 2019-07-05 17:29:48 +02:00
Andreas Österreicher 93a6652c5f Gradelist - Max-ECTS-Sum includes ECTS of assigned Courses without Grades 2019-07-05 17:07:06 +02:00
Andreas Österreicher 02693ed790 Infotext im Tempus angepasst bei Lektoren mit Selbstverwalteter Pause (SVP) 2019-07-05 16:28:58 +02:00
Andreas Österreicher 96783da013 Bugfix to get old Sabredav working with php7 2019-07-05 16:12:27 +02:00
Paolo e9e58decee Changed file naming convention for table files 2019-07-05 11:56:43 +02:00
Andreas Österreicher ebea830f14 Merge branch 'fb-3922/ZeitwunschZustimmung' 2019-07-05 09:16:01 +02:00
raab b5c1512d68 Merge branch 'master' into fb-3922/ZeitwunschZustimmung 2019-07-05 09:11:46 +02:00
Andreas Österreicher 19425b93f0 Employees can now also be assigned directly to Courses (for Elective Courses) 2019-07-05 07:29:03 +02:00
alex 638a0a90a4 - Berechtigungscheck for reservation deletion on "meine Reservierungen anzeigen"-page corrected
- removed "Alle Reservierungen anzeigen" Link
2019-07-04 17:25:24 +02:00
Paolo ddaa129bab - Removed controllers api/v1/system/CallerLibrary.php and api/v1/system/CallerModel.php
- Removed library libraries/CallerLib.php
2019-07-04 17:25:13 +02:00
Paolo 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
2019-07-04 17:18:01 +02:00
raab 48c5713688 geteilte arbeitszeit konfigurierbar 2019-07-04 17:02:11 +02:00
Paolo 18ea98416f From/To toggle tabulator columns 2019-07-04 15:11:58 +02:00
alex d4828cf615 Merge branch 'ausbildungsvertragdocuments' 2019-07-04 13:33:51 +02:00
alex 5a0943534d Merge branch 'master' into ausbildungsvertragdocuments 2019-07-04 13:29:25 +02:00
alex 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) 2019-07-04 11:25:32 +02:00
alex 71615770f1 Merge remote-tracking branch 'origin/master' 2019-07-04 11:21:50 +02:00
alex 8f5b32ee94 education/Lehreinheit_model: getLesForLv method: Lehreinheiten ordered by lehreinheit_id by default 2019-07-04 11:21:30 +02:00
Paolo 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
2019-07-04 11:15:07 +02:00
Nikolaus Krondraf f8ecc0b916 matr_nr bei Studenten ergänzt 2019-07-04 10:40:38 +02:00
Andreas Österreicher 12d0bbfa52 Fixed invalid Session Handling on Infoterminal Page 2019-07-03 18:07:29 +02:00
Manfred Kindl b495a4bffd Merge remote-tracking branch 'origin/master' 2019-07-01 16:03:58 +02:00
Manfred Kindl c3cd354f4c Spalte "Fixangestellt" hinzugefügt 2019-07-01 16:03:52 +02:00
raab a8f7199ee8 nur für fixangestellte, neuer text 2019-07-01 15:53:57 +02:00
raab c4c361e94c Merge branch 'master' into fb-3922/ZeitwunschZustimmung 2019-07-01 15:52:49 +02:00
Andreas Oesterreicher 71791ada4b Infotext Phrase für Notendurchschnitt angepasst 2019-07-01 14:42:27 +02:00
Andreas Oesterreicher 7886cfc9e3 Tooltiptext für Notendurchschnitt auf Gradeliste hinzugefügt.
Menüpunkt im FAS gegendert
2019-07-01 14:37:14 +02:00
Paolo 99e541d506 Fixed receiver/sender retrieved from database 2019-06-28 19:18:18 +02:00
Paolo 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
2019-06-28 19:01:25 +02:00
Manfred Kindl 93ecdaaf0b Ergänzung BugFix 2019-06-28 16:23:14 +02:00
Manfred Kindl 779b05dab2 Merge branch 'master' into StatusabhaengigerDokumentenupload 2019-06-28 15:58:55 +02:00
Manfred Kindl d333555d06 Added Stufe to Function getStudiengaengeDokument 2019-06-28 15:58:18 +02:00
Manfred Kindl 6fca967be0 Vorlage Bestätigung der Lehrtätigkeit gegendert 2019-06-28 15:55:27 +02:00
Manfred Kindl b27ed8abd0 Uncomment check for Levelgleichverteilung 2019-06-28 15:55:01 +02:00
Manfred Kindl 45947dfca2 Added DiplomasupplementDebug
Shows just Table of Records with Course ID
2019-06-28 15:54:36 +02:00
Manfred Kindl 162b935b8c Bugfix RT-Auswertung 2019-06-28 15:49:45 +02:00
alex fff467536f - correct mitarbeiter uid when deleting reservierung
- reservierung data saved correctly
2019-06-28 13:38:10 +02:00
alex e0b5f0ba8e - Only assistance who created the reservation or for whom is reserved can delete reservierungen
- logging every time a reservation is deleted
2019-06-28 13:23:00 +02:00
Andreas Österreicher f32d2ac56b Merge branch 'issue-3823/Lehrveranstaltungssuche' 2019-06-27 17:55:54 +02:00
Andreas Österreicher 04ba491508 Merge branch 'master' into issue-3823/Lehrveranstaltungssuche 2019-06-27 17:51:09 +02:00