Commit Graph

9809 Commits

Author SHA1 Message Date
hainberg 6b1e225991 Added private methods to send mail when ordering Lehrauftraege
These two methods will send email to 1. authorized Kompetenzleiter or
2. Departmentleiter with data about
. study semester
. study program
. amount of Lehrauftraege
2019-09-12 13:30:04 +02:00
Cris 0703984fa6 Added Controller method orderLehrauftrag 2019-09-12 13:26:29 +02:00
Cris 6c2cc7412d Enhanced tabulator selection/filtering functionality
. Added buttons "select all" and "deselect all"
. Now filtering will deselect previously selected rows (before: if user
selected rows and filtered after, the previously selected rows were kept
causing misleading Lehrauftrag orderings)
. Added bottom calculations
2019-09-03 10:26:24 +02:00
hainberg 6dcf97c848 Added using of specific, limited studiengang-array in Dropdown-Widget
By passing an array of studiengang_kz the dropdown-menu will only be
populated with them.
2019-08-29 14:22:34 +02:00
hainberg aad5f7bd5e Amended Lehrauftrag Controller - GUI with Tabulator-table
Amended the Lehrauftrag Controller GUI:
. corrected DB query
. corrected processing of GET-params
. corrected filter of tabulator (LE-ID caused problems -> now LE_ID)
. now stg are retrieved by permission entitlement of user
. implemented Tabulator filter and other properties/functions
. minor GUI adaptations
. added phrase
2019-08-29 14:19:01 +02:00
hainberg b910f220ac Added method getSTG_isEntitledFor to retrieve STG by entitlement of user 2019-08-29 14:07:45 +02:00
hainberg 16e8bf9606 Added lehrauftrag-permissions to tbl_berechtigung
Permissios
. lehrauftrag_bestellen
. lehrauftrag_erteilen
2019-08-28 11:57:46 +02:00
hainberg 6f5ad2bbe1 Adapted filter for Lehrauftragsstatus
Added
. name "Lehrauftragsstatus" and
. columns "LE-ID" and "Gruppe"
2019-08-28 11:33:58 +02:00
hainberg 441c9350e4 Added app 'lehrauftrag' to syystem.tbl_app 2019-08-28 11:30:17 +02:00
Cris 44258aef5e Added 3 Vertragsstati: bestellt / erteilt / akzeptiert 2019-08-21 14:37:37 +02:00
Cris 757ba05bc7 Started Lehrauftrag data query [PRE-ALPHA-VERSION]
Started: Building the Lehrauftrag data query to populate the
tabulator-table.
2019-08-01 15:49:23 +02:00
Cris bb99d7b722 Started Lehrauftrag View [PRE-ALPHA-VERSION]
Started: Building the Lehrauftrag view.
2019-08-01 15:47:47 +02:00
Cris 157237963b Lehrauftrag Controller [PRE-ALPHA-VERSION]
Started: Building the Lehrauftrag Controller.
2019-08-01 15:45:06 +02:00
Cris a81098f884 Added method getSTGLByUID(uid) to Benutzerfunktion_model
The method getSTGLByUID(uid) gets information of all STG of which a given
user is in charge of as a study course manager.
2019-08-01 15:38:33 +02:00
hainberg 2daef49e52 Extended usability of Studiengang_widget [PRE-ALPHA-VERSION]
Started: Extended Studiengang_widget to be used with specific given
array of studiengaenge.
2019-08-01 15:34:06 +02:00
Cris cf5177e5e1 Added method getNext() to Studiensemester_model
getNext() returns the upcoming study semester.
2019-08-01 15:25:52 +02:00
hainberg 4f119c8d92 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
# Conflicts:
#	system/dbupdate_3.3.php
2019-07-18 12:11:07 +02:00
Paolo 6752dc649f Now is possible to have more than one FilterWidget in a single page 2019-07-17 11:38:47 +02:00
Paolo 2013c86ad3 Added jQuery wrapper to tabulator 2019-07-12 18:03:04 +02:00
Paolo 9cb1062275 Added new option hideMenu to FilterWidget 2019-07-11 12:59:30 +02:00
Paolo 31caf460ec Removed extra divs from views/widgets/filter/tableDataset.php 2019-07-11 12:14:35 +02:00
Paolo 73220d8dd6 More options to hide or show filter widget settings panel 2019-07-11 09:42:13 +02:00
Paolo 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
2019-07-10 14:39:59 +02:00
Paolo 7050def0bb public/js/FilterWidget.js: fixes 2019-07-10 13:35:34 +02:00
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
hainberg d0f40a1cf2 Added columns vertragsstunden/vertragsstunden_studiensemester_kurzbz in tbl_vertrag 2019-07-08 15:11:23 +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
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
raab 48c5713688 geteilte arbeitszeit konfigurierbar 2019-07-04 17:02:11 +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
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