Commit Graph

1148 Commits

Author SHA1 Message Date
Cris 2d8618b746 Added button to show only new Lehraufträge 2019-09-19 14:16:26 +02:00
Cris 6d2f911d58 Extended tabulator functionalities
Added some adaptations like
. group by lektor
. deselection on rowUpdate
. row formatting
. Text "Anzahl" to bottom line
2019-09-19 14:07:59 +02:00
Cris 615ed03fbe Added method getOE_isEntitledFor()
The method checks permission of the logged in user and retrieves all
organisational units this user is entitled for.
2019-09-19 13:28:15 +02:00
Cris 8566039cc4 Fixed: Added check before DB insert
A check was missing if the contract already had that status. Error
was given. This is fixed now.
2019-09-19 13:23:12 +02:00
Cris 62cd1b6317 Adapted widget to receive and display only passed OrgUnits in Dropdown 2019-09-19 13:20:35 +02:00
Cris 9de4faf25d Created View data to approve Lehraufträge (query & tabulator) 2019-09-19 13:16:30 +02:00
Cris 1cbbf2652d Created View to approve Lehraufträge 2019-09-19 13:15:17 +02:00
Cris efd5ae6411 Created Controller to approve Lehraufträge 2019-09-19 13:13:03 +02:00
Cris e39a4252eb Added param mitarbeiter_uid to method save()
For performance reasons.
(Before the uid was retrieved by loading BenutzerModel each time when
saving lots of contracts)
2019-09-17 15:58:40 +02:00
Cris ad5309e273 Corrected SQL: bestellt/erteilt/akzeptiert in same row; added mitarbeiter_uid
. Corrected SQL to get bestellt/erteilt/akzeptiert in same row
  Before it was creating new row for each stati, which was wrong.

. Added mitarbeiter_uid column.

. Changed column names for better maintainance and understanding.
  (e.g. row_index instead of id)
2019-09-17 15:54:41 +02:00
Cris c91cfcb679 Added tabulator options and behaviour 2019-09-12 14:18:14 +02:00
Cris b92f3a1ee5 Adapted tabulator data-query (row index; some extra columns)
. Added incrementing id column which provides unique number to enable
tabulator to use it as row index.

. Added extra colums studiengang_kz, lv_oe_kurzbz
2019-09-12 14:16:08 +02:00
hainberg 35b37179e9 Added Javascript button functionalities and functions for Tabulator
Added buttons and functionalities for
. showing all
. showing new
. select all
. deselect all
...Lehraufträge in tabulator-table

Added methods to manipulate date-data and filtering in tabulator.
2019-09-12 14:09:57 +02:00
hainberg 94d13fd77a Added method getBenutzerByBerechtigung
This method returns user who are authorized with berechtigung and,
if given, authorized for the specific organisational unit.
2019-09-12 14:04:48 +02:00
Cris edd7f56481 Corrected query: load uids only from *active* benutzer 2019-09-12 13:57:02 +02:00
hainberg b8ed622f96 Added method getParent()
This method gets only one parent of given organisational unit.
This ist to easily retrieve department of a studiengang or
fakultät of department etc.
2019-09-12 13:53:39 +02:00
hainberg 3c98988c1c Added new method hasVertrag()
This method checks if a Projektbetreuer has a corresponding contract.
If vertrag_id is null => is still a new Projektauftrag
If vertrag_id is present => Projektauftrag has been ordered and a
contract has been created.
2019-09-12 13:51:54 +02:00
hainberg 237a906ecf Added new method hasVertrag()
This method checks if a Lehrauftrag has a corresponding contract.
If vertrag_id is null => is still a new Lehrauftrag
If vertrag_id is presendt => Lehrauftrag has been ordered and a contract
has been created.
2019-09-12 13:50:31 +02:00
hainberg 10b476c27e Added methods save() and setStatus()
. save method inserts a new Vertrag, sets Vertragsstatus to 'bestellt'
  and assigns vertrags_id to either corresponding Lehreinheitmitarbeiter
  or corresponding Projektbetreuuer
. setStatus inserts a new Status to a given Vertrag
2019-09-12 13:45:50 +02:00
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
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
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 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
Andreas Österreicher 93a6652c5f Gradelist - Max-ECTS-Sum includes ECTS of assigned Courses without Grades 2019-07-05 17:07:06 +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
Andreas Oesterreicher 7886cfc9e3 Tooltiptext für Notendurchschnitt auf Gradeliste hinzugefügt.
Menüpunkt im FAS gegendert
2019-07-01 14:37:14 +02:00
Andreas Österreicher 7ff6427d55 Notenspiegel Student umbenannt in Studienverlauf und Menüpunkt nach Berichte->Student verschoben 2019-06-25 08:48:20 +02:00
Paolo 477ebe7cc7 - core/Auth_Controller does NOT load anymore hlp_authentication helper
- Added function getAuthPersonId to hlp_authentication helper
- Added function isLogged to hlp_common helper
- hlp_authentication helper functions getAuthPersonId and getAuthUID make use of isLogged function
- AuthLib loads hlp_authentication helper after a successful login or if a user is already logged
- FilterLib does NOT load anymore hlp_authentication helper
- FilterLib does NOT use anymore BenutzerModel and getAuthUID, but retrieves user data directly using the person_id from getAuthPersonId
2019-06-21 13:16:14 +02:00
Manfred Kindl be09e3bf5e Refactor Reihungstest-Jobs
- Link to Auswertung instead of Student-Table in E-Mail (Data security)
- Params in function for degraee-program, bcc and from
2019-06-12 14:51:57 +02:00
raab 1b87073060 Formatierung Datum der Anmeldefrist 2019-06-07 11:19:45 +02:00
alex 05a049edca Infocenter message Quereinsteiger Freigabe
- Orgform bezeichnung shown in german and english
Infocenter Controller changes
- constants for Interessent and Abgewiesener names added
- removed unnecessary parameters in comments
crm/Prestudent_model
- fixed typo
2019-06-03 16:30:44 +02:00
Andreas Österreicher 8d5742136c Gradelist
- added additional Informations for courses
   - only display courses where the person is assigned to
   - added SWS Sum
   - Improved Multilanguage support
2019-05-28 18:37:21 +02:00