3abfaebb1a
Created filter to accept Lehraufträge
2019-09-24 10:11:07 +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
a2ecd9bdbc
- zeitaufzeichnung_projektliste.php: separate sheet for each projekt
...
- fixed rounding sum issues for Projektphasen
- subtraction of pausen from Projektphase duration
- errorfree display if no projekt entered
- added projektphase_id to zeitaufzeichnung.class.php in getListe methods
2019-09-23 17:47:11 +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
cad203496f
Created filter to approve Lehraufträge
2019-09-19 13:18:03 +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
6669014ac4
Neue Felder für UHSTAT2 Meldung zu IO Karteireiter hinzugefügt
...
Mehrfachangabe von Zweck des Auslandsaufenthalts
Mehrfachangabe von Förderung des Auslandsaufenthalts
Neue Felder für erworbene und angerechnete ECTS hinzugefügt
BIS Schnittstelle um die neuen Felder erweitert
2019-09-19 09:19:09 +02:00
1da2a19d57
Ansprechpartner bei Account Deaktivierung korrigiert
2019-09-18 13:39: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
14c279a03d
Problem behoben wodurch Matrikelnummern für das falsche Semester
...
angefordert wurden
2019-09-17 15:45:48 +02:00
c30135f197
Now MessageClient extends FHC_Controller and then starts the authentication
2019-09-17 10:38:25 +02:00
31cb13ec14
- Zeitaufzeichnung: Projektphase can be selected and saved for a project
2019-09-17 10:36:53 +02:00
131d031cae
- added column projektphase_id to tbl_zeitaufzeichnung
2019-09-17 10:29:24 +02:00
bf8b7e0ccd
Added JobsViewer
2019-09-16 14:00:51 +02:00
77f822cfc2
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2019-09-12 19:21:25 +02:00
4181893fdd
Hinweistext hinzugefügt wenn bei der Kartenverwaltung
...
zu viele Einträge gewählt werden da es vorkommen kann dass dadurch die maximale
Anzahl an POST Parametern überschritten wird und das Speichern der Daten
nicht korrekt funktioniert.
2019-09-12 19:19:50 +02:00
123fef945f
- copied pivot.de.js pivottable language file from reporting addon to public folder
2019-09-12 18:10:36 +02:00
8efb6035c9
Mitarbeiter Defaultwert für Fixangestellt und Aliasgenerierung ist
...
konfiguriertbar
2019-09-12 17:36:40 +02:00
66cdfa5772
Merge branch 'bug-4218/LVPlan_Direkte_Gruppen_im_Verband'
2019-09-12 15:42:52 +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
90c257f7bb
Fotoliste zeigt nun korrekte Studiengangsbezeichnung wenn Gruppen aus
...
anderen Studiengängen zugeteilt sind
2019-09-12 14:09:18 +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
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
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
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
0703984fa6
Added Controller method orderLehrauftrag
2019-09-12 13:26:29 +02:00
5150c1fc44
Removed DBSkel changes from master branch
2019-09-12 10:41:40 +02:00
418be38a52
Merge branch 'feature-3778/PunkteübertragReihungstestpunkteFAS'
2019-09-11 16:08:41 +02:00
d7fd969ac6
Anzeige und speichern für aktuelles Semester und nächstes Semester möglich
2019-09-11 14:53:00 +02:00
2b0ca26db1
Merge branch 'feature-3866-2/Ueberarbeitung_Testtoolsprache_fix'
2019-09-11 14:46:40 +02:00
Cris