fd0eaaa366
Fixed: SQL subquery to only return one row
...
The subquery was sometimes returning more rows causing error message.
This is fixed now.
2019-09-30 14:11:04 +02:00
3938000cfc
Changed Kürzel for Studiengang-Dropdown-Widget to upper(typ||kurzbz)
2019-09-30 14:05:22 +02:00
10e1539b22
infocenterData.php, infocenterFreigegebenData.php, infocenterReihungstestAbsolviertData.php: column data is retrieved from selected Studiensemester variable, and not from future Semesters
2019-09-27 14:36:18 +02:00
1273c32419
- Renamed controller system/JobsViewer.php to system/LogsViewer.php
...
- Renamed directory views/system/jobs to views/system/logs
- Changed FilterWidget query in view system/logs/logsViewerData.php to load all logs
- Added more filters in database to load different log types
2019-09-26 17:40:51 +02:00
bdb0cb7772
- added codex/Bisiozweck_model.php
2019-09-26 16:17:35 +02:00
0c82d4fffc
Added new views for TableWidget
2019-09-25 17:19:08 +02:00
8210c3fdc7
Derived TableWidget from FilterWidget, added:
...
- libraries/TableWidgetLib
- widgets/TableWidget
- controllers/widgets/Tables
- public/js/TableWidget.js
2019-09-25 17:15:46 +02:00
a70507a079
Adapted tabulator to display columns in correct order after query change
2019-09-25 16:58:33 +02:00
61a6bc7bfc
Fixed SQL query: corrected column order in subquery for Projektbetreuung
2019-09-25 16:25:04 +02:00
6f5de6a786
Adapted SQL query: gruppen aggregated in one cell, not in seperated rows
...
Before same lehreinheiten of same lector were shown in different rows,
when they were taught in different groups. This caused incorrect contract
inserts.
One contract is for per lector and per lehreinheit. Gruppen are only
displayed in one cell (aggregated if more)
2019-09-25 15:39:42 +02:00
83dd828be7
Minor adaptation to changed method isMitarbeiter()
2019-09-25 14:13:16 +02:00
169ffbb568
Changed method isLektor() to isMitarbeiter()
...
Because boolean field lektor is not necessary maintained, check is now
for overall mitarbeiter.
2019-09-25 14:11:38 +02:00
d7cbc89d8b
Added password validation to accept Lehraufträge in view & controller
...
. added password input field in view
. added password check in controller
. adapted ajax data object and logic to handle password check
2019-09-25 12:15:19 +02:00
8685f5ed1b
Minor fix: Corrected wrong hover color behaviour
...
Now the row stays green when accepted. Before it was still changing
color when hovering.
2019-09-25 12:11:28 +02:00
30c60881a7
Changed check for inkludierte Lehre
...
Now inkludierte Lehre returns false when value is null (= freelancer
lector), else true (= fix employed lector)
This impacts the visibility of the column 'Betrag': hidden for fix
employed lectors, shown for freelancer lectors.
2019-09-25 09:53:52 +02:00
dc64cadc4a
Changed: now rows are marked green only for accepted Lehraufträge
...
This is to achieve same behaviour for whole process Lehraufträge
bestellen/erteilen/akzeptieren.
2019-09-25 08:50:21 +02:00
43452a2127
Hided column 'Betrag' if lector has inkludierte Lehre
...
If the lectors actual Verwendung has inkludierte Lehre, the tabulators
column betrag is hided.
2019-09-24 16:10:23 +02:00
223f3110bd
Added method getLast()
...
This method gets latest (active) Verwendung of the user.
2019-09-24 16:06:50 +02:00
3340922a35
Extended/Adapted method setStatus()
...
Extended check: if new status is 'akzeptiert', the latest status has
to be 'erteilt'.
Adapted code as check for having certain status was outsourced to method
hasStatus.
2019-09-24 10:21:05 +02:00
1a58c977fe
Added method getLastStatus()
...
This method gets the latest Vertragsstatus for the given Vertrag and
Mitarbeiter.
2019-09-24 10:15:21 +02:00
812899e885
Added method hasStatus()
...
This method checks if Vertrag has the given Vertragsstatus.
2019-09-24 10:14:22 +02:00
a910527109
Added method isLektor()
...
This method checks if a given user is a lector (and eventually if is
fix employed)
2019-09-24 10:13:08 +02:00
6caec74df5
Created SQL-query and tabulator to accept Lehraufträge
2019-09-24 10:10:42 +02:00
9829532e4f
Created View to accept Lehraufträge
...
Created view and jQuery functions to manipulate the tabulator.
2019-09-24 10:08:20 +02:00
9325edd326
Created Controller to accept Lehraufträge
...
Created index- and acceptLehrauftrag methods.
2019-09-24 10:06:03 +02:00
0a4dffa704
FilterWidget is now back to only one filter per page, but others features were kept
2019-09-20 17:54:44 +02:00
b1815039fd
Merge branch 'feature-2147/CallerLibrary_and_CallerModel_controllers'
2019-09-19 17:00:19 +02:00
73904dd007
Added contract description when saving new contract
...
Description was missing, now generated when inserting new contract.
2019-09-19 15:56:30 +02:00
18a36ea497
Fixed controller api/v1/person/Benutzer
2019-09-19 14:33:02 +02:00
aa5ad40d5c
Minor code enhancement
...
changed clearFilter method; deleted comment
2019-09-19 14:19:45 +02:00
dd22ae71e3
Added alert/exit when no lehrauftrag was selected
2019-09-19 14:17:03 +02:00
2d8618b746
Added button to show only new Lehraufträge
2019-09-19 14:16:26 +02:00
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
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
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
62cd1b6317
Adapted widget to receive and display only passed OrgUnits in Dropdown
2019-09-19 13:20:35 +02:00
9de4faf25d
Created View data to approve Lehraufträge (query & tabulator)
2019-09-19 13:16:30 +02:00
1cbbf2652d
Created View to approve Lehraufträge
2019-09-19 13:15:17 +02:00
efd5ae6411
Created Controller to approve Lehraufträge
2019-09-19 13:13:03 +02:00
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
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
c30135f197
Now MessageClient extends FHC_Controller and then starts the authentication
2019-09-17 10:38:25 +02:00
bf8b7e0ccd
Added JobsViewer
2019-09-16 14:00:51 +02:00
c91cfcb679
Added tabulator options and behaviour
2019-09-12 14:18:14 +02:00
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
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
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
edd7f56481
Corrected query: load uids only from *active* benutzer
2019-09-12 13:57:02 +02:00
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
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
Cris