1b9693e316
Bugfix: Infocenter write page person id and prestudent id are swapped
2020-02-11 16:10:39 +01:00
8f908887be
- Method parseMessageText of controller system/messages/Messages could accept also the prestudent_id parameter
...
- If prestudent_id parameter then CLMessagesModel->parseMessageTextPrestudent is called
- Fixed show_error(getData error in model CLMessagesModel
- Added new method parseMessageTextPrestudent to model CLMessagesModel
- Method _prepareHtmlWriteTemplate of model CLMessagesModel now checks if data are from a prestudent and then uses MessageLib->getMessageVarsPrestudent
- Added new method getMessageVarsPrestudent to MessageLib
- Function parseMessageText in js/messaging/messageWrite.js could call system/messages/Messages/parseMessageText with prestudent_id parameter
2020-01-24 18:13:03 +01:00
47682f37df
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-16 16:36:57 +01:00
26228430aa
Customized error messages
...
Before the user got only a general error message ('Systemerror') when
an error occured. Now the error messages are more individual for better
debugging experience.
2020-01-08 15:46:17 +01:00
8f3aadd3e2
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-18 16:08:11 +01:00
df057faa8f
Added default text 'Keine Daten vorhanden' for empty tables
...
Before the tabulator sometimes looked kind of 'undone', when no data was
loaded. Now a nice message is displayed if the table is empty.
2019-12-18 15:45:34 +01:00
4b33f6c0bd
Minor code prettyfying (tabs instead whitespaces, line wraps)
2019-12-18 14:51:45 +01:00
34a55e2332
Added/Adapted JS functions for 'Stornierte Lehrauftraege'
...
- redrawed tabulator when opening the collapsed module. Must be done
to display stornierte lehrauftraege.
- generated storniert-tooltip
- generated storniert-status icon
- adapted selectableCheck to leave stornierte unselectable
2019-12-18 14:48:53 +01:00
5b27f29a92
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-12 13:54:20 +01:00
4da3062c00
Added LV-ID to group-header title
2019-11-25 08:38:01 +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
a093d470e4
Fixed merge mistakes in FilterWidget
2019-11-14 15:40:35 +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
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
d1f99ac667
Removed initial filter from Lehrauftrag akzeptieren
...
Now Lehrauftrag akzeptieren is showing initially all lehrauftraege.
2019-11-12 12:04:29 +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
551eeaa004
- infocenter: different color for onhold - applicants so they can be better distinguished in infocenter uebersicht from parked
2019-11-06 16:38:45 +01:00
ece06bc462
Notice email for all people allowed to receive messages for an organisation unit
2019-11-06 16:34:20 +01:00
5fa07f68c5
Minor changes: page title text; removed values not used by Tablewidget
2019-11-05 16:52:37 +01:00
9571e1ed7d
Changed: Check if HAS INKLUDIERTE LEHRE now done by AJAX within js file
...
After moving javascript code from the view to an external js file, the
usage of global variable has_inkludierteLehre was causing css issues.
Now the check if lector has inkludierte lehre is an extra method in the
controller which is called by AJAX in the tabulators render-callback
function.
2019-11-05 16:47:36 +01:00
3e5e65bfc4
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
2019-11-04 16:58:19 +01:00
f70fddbb27
Moved embedded js-script within view files --> to own javascript files
...
Moved out all js related code from views
lehrauftrag bestellen/erteilen/akzeptieren to own javascript files.
2019-11-04 15:35:34 +01:00
ed818c72d9
Merge branch 'master' into feature-4026/TabulatorWidget
2019-11-04 15:08:42 +01:00
2a4360862a
- Reply Button in Inbox/outbox Page
...
- Write new message Button with Layer/Popup
- Degree Programs drop down displays longer name (if prestudent bestätigt (alias interessent with bestaetigtam != null ) receiver-> dp, otherwise -> infocenter)
- SQL to get OU recipient doesn't use beginn / End of function
- Always set insertvon in tbl_msg_status
- Add Multilanguage Support for Message Page (not completed yet)
- If in sent mode do not set messages as read
- Error message when there are no Messages available shouldnt be displayed
2019-10-30 18:35:46 +01:00
36e5009d68
Fixed problems with DialogLib
2019-10-30 18:31:21 +01:00
6594a5288b
Better CSS for messaging system pages
2019-10-30 18:30:50 +01:00
bc05f32d5e
Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken'
2019-10-29 15:04:02 +01:00
9e9612d317
Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets'
2019-10-28 16:28:57 +01:00
2d68d2ffeb
Adapted Header and Background Style for CIS-CI Pages
2019-10-28 14:43:05 +01:00
89ad21b1ef
- Infocenter uebersicht bugfix: tablesorter filter storage is the same for homepage with and without "/index" (for keeping tablesorter filter when coming back from details page)
2019-10-25 10:26:54 +02:00
fbec49a663
- bugfix: parking & zurückstellen datepicker: current day cannot be selected, because default time is 00:00, and it would be immediately exceeded
2019-10-24 11:43:10 +02:00
4de5f1533f
- parking and zurückstellen date and buttons: adapted layout for correct line breaking
2019-10-24 11:29:38 +02:00
fd3f74807b
Added font-awsome 5.9.0. USER ICONS in PNG format 150x150
...
PNG icons are used in status- and filter buttons
Setting png icons is a workaround to use font-awsome 5.9.0 icons
until system can be updated to newer font awsome version.
2019-10-22 11:59:38 +02:00
509fdef03b
- Removed tabulator local pagination for messages list
...
- Removed error messages when the messages list is empty
2019-10-15 11:54:01 +02:00
120ffb0319
Merge remote-tracking branch 'origin/master'
2019-10-07 18:59:36 +02:00
2c23842fcb
BugFix Filterwidget DragAndDrop behaviour
2019-10-07 18:58:52 +02:00
72a3c2845f
tablesorter filters saved in local storage in infocenter Übersicht are not deleted when using zurück button or freigegeben on infocenter details page.
2019-10-07 18:30:06 +02:00
fce3659573
- Infocenter Übersicht: zurückgestellte BewerberInnen werden grün markiert
2019-10-03 15:22:54 +02:00
73e248534b
- infocenterDetails: added phrases rueckstelldatumUeberschritten and parkenZurueckstellenInfo
2019-10-03 10:15:10 +02:00
38ae98cc36
- Infocenter Details: possible to set persons on hold, i.e. person is out of workflow temporalily (e.g. when waiting for info), but this can only be undone manually
2019-10-02 17:19:31 +02:00
c0afb92ddc
Merge branch 'feature-4190/Cronjobs_log_in_database'
2019-10-02 14:29:53 +02:00
0dd82d42b3
Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets'
2019-10-02 10:57:58 +02:00
ac1f31f31f
Added possibility to have same TableWidget in more pages
2019-10-01 12:46:19 +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
0a4dffa704
FilterWidget is now back to only one filter per page, but others features were kept
2019-09-20 17:54:44 +02:00
Paolo