4e0264e2d4
Added method cancel() to vertrag.class to cancel contracts
2019-10-07 08:57:52 +02:00
d9df0196a4
Adapted getLehreinheitmitarbeiter() to return also vertrag_id
2019-10-02 17:26:30 +02:00
605b88e8d7
Adapted queries to new vertragstunden, -studiensemester in vertrag.class
...
Adapted methods:
load, loadVertrag, loadZugeordnet, loadNichtZugeordnet
2019-10-02 09:39:38 +02:00
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
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
02693ed790
Infotext im Tempus angepasst bei Lektoren mit Selbstverwalteter Pause (SVP)
2019-07-05 16:28:58 +02:00
96783da013
Bugfix to get old Sabredav working with php7
2019-07-05 16:12:27 +02:00
b5c1512d68
Merge branch 'master' into fb-3922/ZeitwunschZustimmung
2019-07-05 09:11:46 +02:00
a8f7199ee8
nur für fixangestellte, neuer text
2019-07-01 15:53:57 +02:00
c4c361e94c
Merge branch 'master' into fb-3922/ZeitwunschZustimmung
2019-07-01 15:52:49 +02:00
b27ed8abd0
Uncomment check for Levelgleichverteilung
2019-06-28 15:55:01 +02:00
162b935b8c
Bugfix RT-Auswertung
2019-06-28 15:49:45 +02:00
fff467536f
- correct mitarbeiter uid when deleting reservierung
...
- reservierung data saved correctly
2019-06-28 13:38:10 +02:00
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
dc35b285c9
Errormessage angepasst, wenn Dokumentkonvertierung fehlschlägt
2019-06-25 11:19:22 +02:00
6ad63faa86
geteilte dienste
2019-06-24 14:43:08 +02:00
e4ad90781e
Spalten $bisorgform_kurzbz und $bezeichnung_mehrsprachig in orgformclass
2019-06-17 15:12:40 +02:00
8843462c7d
load entry and display if exists
2019-06-14 11:49:50 +02:00
c887c61d96
Created class zeitaufzeichnung_gd & method save()
...
The save method saves the lectors decision about self-managing breaks
during parted working times.
2019-06-13 16:19:23 +02:00
d3a1140c01
Stufe in function getAllDokumenteForPerson
2019-06-12 14:56:39 +02:00
c04e7b4057
Syntax-Fix
2019-06-12 14:56:10 +02:00
d341e5e1b1
Merge branch 'master' into stplreservierung
2019-05-21 18:32:33 +02:00
d449431469
SQL formatted
2019-05-17 14:49:10 +02:00
c0b448125d
CIS Wochenplan Reservierung update
...
- Mitarbeiter autocomplete for reserving one hour for multiple Mitarbeiter at same time
- possible to delete Reservations directly in Wochenplan
2019-05-16 17:32:34 +02:00
94b19d8bd1
Fixed to get question in language of the actual logged-in Master study
...
When logging in with a Master study, the system was retrieving the
studyplan/study of the highest priored applied Master study. This
behaviour should only occure for Bachelor studies and was leading to
incorrect language setting.
Now if user logs in with a Master study, the actual studyplan/study and
the correct language setting are retrieved.
2019-05-14 16:34:37 +02:00
3f423898f9
Added alert when test includes MathML format and browser is not Firefox
...
By the moment applicants should absolve the tests using Firefox Browser
to ensure the correct display MathML. If they use another browser, they
will now get an alert.
2019-05-09 12:49:20 +02:00
c2a4c3413e
Removed dependencies from mcrypt Library to work with PHP7.2
2019-05-07 11:05:43 +02:00
a2b6d1e8dd
Fixed FreeBusy Import of Google Calender
...
Google Calender now exports FreeBusy Information without BEGIN:VFREEBUSY/END:VFREEBUSY Tags
2019-04-24 18:04:10 +02:00
307f279e08
New optional param prestudent_id in function getBewerbungstoolNotizen
2019-04-16 16:43:25 +02:00
e9521d056d
Implemented Nationengruppe
...
- New class
- Attributes in nation.class
- Attributes in bewerbungtermin.class
2019-04-16 16:40:31 +02:00
aad0292d5a
Added function to get all Organisationsunits that are attachted to a course
2019-04-15 17:30:55 +02:00
a5bd9502d8
Tempus zeigt das Datum der letzten Änderung von Zeitsperren im Tooltip an
2019-04-10 13:42:42 +02:00
39177fb97f
Removed check for Reihungsteststufe 1/NULL in getReihungstestErgebnisPerson
...
Removed check for Reihungsteststufe 1 in function
getReihungstestErgebnisPerson.
2019-04-10 10:53:43 +02:00
c7e757c76f
Added document Lehrtätigkeit Bestätigung in FAS (only FHTW)
...
Now a new document exists to confirm the lecture activities which
include all the
. lehreinheiten of the mitarbeiter
AND
. projektarbeiten of the mitarbeiter (betreuer,...)
clustered by studiensemester.
2019-04-09 14:57:48 +02:00
d5dfcae134
Added function getAllProjects to projectbetreuer class
...
This function retrieves all projektarbeiten by person.
(Only with stundensatz > 0)
2019-04-09 14:27:28 +02:00
9dc44c5908
- only positive grades are displayed on Studienerfolgsbestätigung, Diplomasupplement and Zeugnis, no Studiensemester on Diplomasupplement
2019-04-01 09:48:20 +02:00
df8ccbdd69
Serialized array of config const FAS_REIHUNGSTEST_EXCLUDE_GEBIETE
...
Serialized and unserialized const array to make it work properly.
2019-03-28 16:53:59 +01:00
4c0d8e7f20
Fixed 0 values in Reihungstest end results
...
Fixed query to retrieve correct Reihungstest end results for basic question areas.
2019-03-28 16:38:32 +01:00
00df53b3e5
Code formatted
2019-03-28 15:50:34 +01:00
fd1f87e80b
Umbenennung LehreIntern zu Lehre
2019-03-27 17:46:10 +01:00
9ef8adae39
Added return false to function akzeptiert in document.class
...
Method is expected to return boolean true or false. False was missing.
2019-03-27 11:49:29 +01:00
72a9d9dc01
Modified function getReihungstestErgebnisPerson in pruefling class
...
. Function now provides end resulting points only of the general basic question areas. (without quereinsteiger-gebiete)
. Function now accepts question areas to be excluded.
2019-03-20 17:32:52 +01:00
09097c6205
Corrected function getReihungstestErgebnisPerson
...
Now the prestudent_id is retrieved by joining on study semester (instead of studienplan, which was inconsistent).
Added also restricion on stufe = 1 to retrieve only Reihungstest absolved on desktop.
2019-03-13 15:14:56 +01:00
0b5f9f51f7
Extended function getActualInteressenten to differ only by STG-type/-kz
...
Now the function accepts the optional arguments:
. typ (= studiengangstyp)
. studiengang_kz
to retrieve more specific data.
2019-03-12 17:53:44 +01:00
7f364835bf
Extended function getReihungstestErgebnisPerson: excluding gebiete opt.
...
Now questioning areas (gebiete) can be excluded when calculating the total Reihungstestpunkte.
excluding gebiete should be defined in the config array FAS_REIHUNGSTEST_EXCLUDE_GEBIETE.
2019-03-11 17:11:33 +01:00
ddf9153b7f
Function load_person: studiengang_kz is now optional
2019-03-08 15:03:25 +01:00
d13872428b
Bug Fix: Beim Anlegen einer Firma im WAWI kam Fehlermeldung wegen falschem Typs des Lieferant-Feldes
2019-03-07 16:52:38 +01:00
af79da67cb
Added function to retrieve actual Interessenten (optionally only for prio)
...
The query retrieves all actual prestudenten with the status 'Interessent' of the users person_id. (+ prio, stg, stpl and ausbildungssemester)
Optionally the function limits the result to the one stg with the highest priority.
2019-03-06 12:09:14 +01:00
c23cefa77f
Added db_parse_bool to sprachwahl (testtool)
...
Now sprachwahl is returning a boolean
- function concerned: getAblaufVorgabeStudiengang
- files using this function are approved
2019-03-06 11:58:43 +01:00
92d5c8a9d2
Kategorien für Services hinzugefügt
2019-03-05 16:06:42 +01:00
Cris