a93ddfbe3d
Added cronjob mailLehrauftraegeToAccept()
...
This daily job sends information about all lehr-/projektauftraege
approved (and not accepted/cancelled) the day bofore.
Receivers: lectors
2019-11-26 14:44:24 +01:00
45e381e043
Added function getApproved_fromDate() to Vertragvertragsstatus_model
...
This method returns all contracts, where the status had been set to
'erteilt' on given date.
2019-11-26 14:41:27 +01:00
a33d64427e
vilesci/personen/import/mitarbeiterimport.php:
...
- uid validity is checked with php as well
- fixed tablesorter error when no mitarbeiter found when "Vorschlag laden" is clicked
- changed width of "Vorschlag laden" table for better layout
- adding mitarbeiter to existing person: adress fields are now disabled when 'Adresse nicht anlegen' is selected, enabled when "Bestehende Adresse überschreiben" or "Adresse hinzufügen" are selected
2019-11-25 17:58:44 +01:00
94bafe4d6d
Fixed cancel-error-msg & wrong status 'geändert' by adding permission
...
Before the assistance was receiving error msg when cancelling a contract.
Also study program leader and assistance got wrong status displayed.
This was due to missing permission check in vertrag.rdf.php and is
fixed now.
2019-11-25 17:11:41 +01:00
0f9b29c52e
- Added private method _checkHTTPS to core/FHC_Controller
...
- Method _checkHTTPS is called in core/FHC_Controller constructor immediately after the parent constructor call
- Method _checkHTTPS checks if the HTTPS protocol is enabled and used, if NOT then an error is raised and the execution is terminated
2019-11-25 16:25:10 +01:00
586c626ff0
Fixed: Corrected incorrect SQL query in Benutzerfunktion_model
...
Incorrect bracket was causing error message. This is fixed now.
2019-11-25 09:35:42 +01:00
24db32f658
Added function getOrdered_fromDate() to Vertragvertragsstatus_model
...
This method returns all contracts, where the status had been set to
'bestellt' on given date.
2019-11-25 08:55:30 +01:00
0a335b7627
Added cronjob mailLehrauftraegeToApprove()
...
This daily job sends information about all lehr-/projektauftraege
ordered (and not approved) the day bofore.
Receivers: Department-/Kompetenzfeldleiter
2019-11-25 08:46:31 +01:00
ea09dfda58
Optimized text of 'Hilfe für diese Seite'
...
Added information for lectors page. Some minor text enhancements to
avoid misunderstanding.
2019-11-25 08:43:46 +01:00
df555426a0
Changed: column STG-type is visible now
2019-11-25 08:39:53 +01:00
4da3062c00
Added LV-ID to group-header title
2019-11-25 08:38:01 +01:00
819face9f9
Funktionen für BIS-Meldung angepasst/ergänzt
2019-11-25 08:36:35 +01:00
107a8ea9a9
vilesci/personen/import/mitarbeiterimport.php:
...
- uid special characters check performed, form submitted if passed, submisson prevented otherwise
- uid length check >= 4 >= 32
- correct line breaking of left block when "Vorschlag laden" table is displayed
2019-11-22 18:06:20 +01:00
ceb3f212c9
- Added support for language in session in function getUserLanguage from helper hlp_language_helper
...
- If the language is loaded from database then it is checked that the language is enabled
2019-11-22 12:05:07 +01:00
9e6af6579f
Aktueller Vertragsstatus wird im Tempus angezeigt
2019-11-20 14:01:27 +01:00
e4f1215d50
- added database table fue.tbl_projekttyp
...
- foreign key projekttyp_kurzbz in fue.tbl_projekt table
2019-11-19 14:27:29 +01:00
996e9147bc
views/system/infocenter/infocenterFreigegebenData.php: Interessenten with reihungstestangetreten = TRUE from prestudent table are removed from resultset
2019-11-18 18:47:54 +01:00
6bf7d46ace
- Added securimage via composer
...
- Added securimage in application/views/templates/FHC-Header.php
2019-11-18 15:04:52 +01:00
78dcf5ca26
Räume können optional auch bei Terminkollision gebucht werden
2019-11-18 07:31:53 +01:00
2657c64b81
Merge branch 'feature-4590/Freifächer_am_Notenspiegel'
2019-11-15 14:13:11 +01:00
cbb82ade3c
Merge branch 'feature-4837/CIS_insertvon_bei_Reservierungen_anzeigen'
2019-11-15 14:06:45 +01:00
4e83a4863a
Merge branch 'feature-4835/Zeitaufzeichnung_Admin_exportiert_Projektliste_eines_Users'
2019-11-15 12:13:40 +01:00
10b351f4da
Merge branch 'feature-4834/Zeitaufzeichnung_OhneUeberlappung'
2019-11-15 12:12:14 +01:00
084056a1a0
Merge branch 'feature-4825/Infocenter_zurückstellen_Farbe_intensiver'
2019-11-15 11:44:45 +01:00
2f28d9aee9
Merge branch 'bug-3736/FilterWidget_apply_filter_before_saving'
2019-11-15 11:37:24 +01:00
453589b54e
Merge branch 'feature-4022/Fotoliste_PHP_Notice_wenn_keine_Studierenden_zugeteilt_sind'
2019-11-15 11:23:15 +01:00
0d3e94af32
Merge branch 'feature-4463/Untergebene_ohne_Assistenz'
2019-11-15 11:16:07 +01:00
617f435a7c
Merge branch 'feature-4825/Studiensemester_Studienjahr_anlegen_bessere_Fehlermeldung_wenn_existiert'
2019-11-15 11:08:53 +01:00
c17bbfff5d
Added missing tables and columns to DB-Reverse-Check
2019-11-15 08:26:47 +01:00
a093d470e4
Fixed merge mistakes in FilterWidget
2019-11-14 15:40:35 +01:00
2a73f440ee
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-11-14 14:41:47 +01:00
415b37a8f4
- Write message page is opened in same window
...
- After message is sent then read page is loaded
2019-11-14 14:21:36 +01:00
565cf93f5d
- Messages GUI multilingual
...
- Tabulator refresh fixed
2019-11-14 13:49:31 +01:00
7bc8255787
Added fixed column width to all betrag- and all status-columns
2019-11-12 17:51:18 +01:00
5488bfbc28
Amended 'Hilfe zu dieser Seite' information for Lehrauftrag akzeptieren
...
Added information about filter and selection.
2019-11-12 17:42:51 +01:00
cc4baa9dfb
Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag
2019-11-12 16:21:38 +01:00
b0d9010aec
Fixed: now status 'geändert' renders correctly when Stunden are NULL
...
When FAS Stunden were left empty, the vertrag_stunden were compared with
null stunden. So: comparing 0 with null was setting status to 'geaendert',
although practically there was no change to the contract.
This is fixed now.
2019-11-12 16:17:45 +01:00
7aea534778
Added formatter to column Stunden: null values -> format to '0.0'
...
Before the field was left empty. Now 0.0 will be displayed, even if
FAS Stunden are left empty.
2019-11-12 16:11:40 +01:00
e092a6c33e
Minor change: removed unused field
2019-11-12 16:08:10 +01:00
609adcc431
Dashboard für Lehraufträge hinzugefügt
2019-11-12 16:02:13 +01:00
80ed75a6ad
Im Statistik SQL wird die Variable $user automatisch durch den eingeloggten User ersetzt.
2019-11-12 15:59:19 +01:00
26cd749f01
Added 'Hilfe zu dieser Seite' link & collapsable module
...
Now a 'how to use this site' - help information is provided to the user
for Lehrauftrag bestellen / erteilen / annehmen.
2019-11-12 12:08:54 +01:00
3f1f509dfa
Renamed column 'LE-ID' -> to 'LV-Teil'
2019-11-12 12:05:31 +01:00
d1f99ac667
Removed initial filter from Lehrauftrag akzeptieren
...
Now Lehrauftrag akzeptieren is showing initially all lehrauftraege.
2019-11-12 12:04:29 +01:00
321da96728
Fixed: Vertragsstatus in Projektbetreuung now showing correct status
...
Before it was showing incorrectly status 'Geändert', it means even if
contract and lehrauftrag had same stunden or betrag.
Now this is fixed.
2019-11-12 11:59:51 +01:00
bd723e234e
Changed order of Studiensemester_widget
...
Now it is ordered chronologically (WS2020-SS2020-WS201-SS2019...), which
fits better to daily usage.
Before it was ordered alphabetically.
2019-11-12 11:56:11 +01:00
9f3c9d5481
Unified default text displayed in Dropdown-Widgets
...
Now the dropdown widgets used in lehrauftrags-process have all same
look & feel when nothing is (pre-)selected. It will display
'Ausbildungssemester' or 'Studiengang'.
2019-11-12 11:53:57 +01:00
3b697df851
Changed side menu window target from _blank -> to _self
...
Now side menu links Lehrauftrag bestellen and Lehrauftrag erteilen
are opening within tab itself.
2019-11-12 11:46:01 +01:00
f5a7c77707
infocenter Übersicht: changed color of onhold students to dark yellow, #CDAD00
2019-11-12 10:51:17 +01:00
ba0dfee18f
FilterWidget: apply filter changes before saving it
2019-11-07 16:06:09 +01:00
Cris