Andreas Österreicher
8f3aadd3e2
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-18 16:08:11 +01:00
Cris
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
Cris
4b33f6c0bd
Minor code prettyfying (tabs instead whitespaces, line wraps)
2019-12-18 14:51:45 +01:00
Cris
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
Andreas Österreicher
5b27f29a92
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-12 13:54:20 +01:00
Cris
4da3062c00
Added LV-ID to group-header title
2019-11-25 08:38:01 +01:00
Andreas Österreicher
084056a1a0
Merge branch 'feature-4825/Infocenter_zurückstellen_Farbe_intensiver'
2019-11-15 11:44:45 +01:00
Andreas Österreicher
2f28d9aee9
Merge branch 'bug-3736/FilterWidget_apply_filter_before_saving'
2019-11-15 11:37:24 +01:00
Paolo
a093d470e4
Fixed merge mistakes in FilterWidget
2019-11-14 15:40:35 +01:00
Cris
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
Cris
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
Cris
e092a6c33e
Minor change: removed unused field
2019-11-12 16:08:10 +01:00
Cris
d1f99ac667
Removed initial filter from Lehrauftrag akzeptieren
...
Now Lehrauftrag akzeptieren is showing initially all lehrauftraege.
2019-11-12 12:04:29 +01:00
Paolo
ba0dfee18f
FilterWidget: apply filter changes before saving it
2019-11-07 16:06:09 +01:00
alex
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
Cris
5fa07f68c5
Minor changes: page title text; removed values not used by Tablewidget
2019-11-05 16:52:37 +01:00
Cris
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
Paolo
3e5e65bfc4
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
2019-11-04 16:58:19 +01:00
Cris
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
Paolo
ed818c72d9
Merge branch 'master' into feature-4026/TabulatorWidget
2019-11-04 15:08:42 +01:00
Andreas Österreicher
bc05f32d5e
Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken'
2019-10-29 15:04:02 +01:00
alex
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
alex
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
alex
4de5f1533f
- parking and zurückstellen date and buttons: adapted layout for correct line breaking
2019-10-24 11:29:38 +02:00
alex
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
alex
fce3659573
- Infocenter Übersicht: zurückgestellte BewerberInnen werden grün markiert
2019-10-03 15:22:54 +02:00
alex
73e248534b
- infocenterDetails: added phrases rueckstelldatumUeberschritten and parkenZurueckstellenInfo
2019-10-03 10:15:10 +02:00
alex
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
Andreas Österreicher
0dd82d42b3
Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets'
2019-10-02 10:57:58 +02:00
Paolo
ac1f31f31f
Added possibility to have same TableWidget in more pages
2019-10-01 12:46:19 +02:00
Paolo
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
Paolo
0a4dffa704
FilterWidget is now back to only one filter per page, but others features were kept
2019-09-20 17:54:44 +02:00
alex
123fef945f
- copied pivot.de.js pivottable language file from reporting addon to public folder
2019-09-12 18:10:36 +02:00
alex
67415a4707
- possible to read and write user Variables in Codeigniter
...
- added Variablenname_model, VariableLib, Variables controller
- Infocenter Übersicht - infocenterData, infocenterFreigegebenData, infocenterReihungstestAbsolviertData: added possibility of toggle of infocenter_studiensemester variable, only prestudents of selected Studiensemester are shown
2019-09-06 17:33:56 +02:00
alex
36ff38b0ee
- FilterWidget: added method reloadDataset() for reload of dataset only
2019-09-06 17:29:22 +02:00
Paolo
6752dc649f
Now is possible to have more than one FilterWidget in a single page
2019-07-17 11:38:47 +02:00
Paolo
9cb1062275
Added new option hideMenu to FilterWidget
2019-07-11 12:59:30 +02:00
Paolo
2daf745ad5
- Moved controller system/Filters to widgets/Filters
...
- Renamed FiltersLib to FilterWidgetLib
- Adapted code in widgets/FilterWidget, public/js/FilterWidget.js and public/js/infocenter/infocenterPersonDataset.js
2019-07-10 14:39:59 +02:00
Paolo
7050def0bb
public/js/FilterWidget.js: fixes
2019-07-10 13:35:34 +02:00
Paolo
9fd91c2888
FilterWidget + Tabulator final version
2019-07-09 16:21:08 +02:00
Paolo
f0ee8b0161
Added Tabulator to FilterWidget (alpha version)
2019-07-09 11:30:16 +02:00
alex
f664f1442f
- public/js/DialogLib.js: if dialog already present, it is removed before new one is attached (if dialogs are displayed on same page one afte another)
2019-07-04 11:25:32 +02:00
alex
d5f444e98c
public/tablesort.js: tablesorter is destroyed before new initialization if already applied to a table
2019-06-06 10:12:33 +02:00
alex
05a049edca
Infocenter message Quereinsteiger Freigabe
...
- Orgform bezeichnung shown in german and english
Infocenter Controller changes
- constants for Interessent and Abgewiesener names added
- removed unnecessary parameters in comments
crm/Prestudent_model
- fixed typo
2019-06-03 16:30:44 +02:00
alex
73328f0dea
Infocenter Message Sending
...
- Infocenter RT Freigabe not sent if Prestudent has ANY bestätigt Interessentenstatus for the Studiensemester (not only last Status)
- removed unnecessary interessentenCount array
- moved part of message send check logic to InfoCenter Controller
2019-05-21 18:28:28 +02:00
alex
3c2e02c3aa
orgform for RT Freigabe Message retrieved only from Studienplan, otherwise empty string
2019-05-07 14:55:43 +02:00
alex
25acc66b0b
- Infocenter: orgform is displayed in Messages Quereinstieg and Quereinstieg kurz
2019-05-03 11:47:00 +02:00
alex
c049090987
- Added jquery checkboxes to FHC-Header template
...
- select checkbox range with shift key is automatically possible in FilterWidget tables
2019-04-19 13:16:37 +02:00
Paolo
34791c96c4
Merge branch 'master' into ciauth
2019-04-17 15:46:27 +02:00
alex
d23357c331
InfoCenter Details AjaxLib calls update:
...
- using outputJson... methods instead of output type and json_encode
- added errorcallbacks for blocking errors
- called IC controller methods return success or error objects
- fitstudiengang is checked when sending freigabe stg message
2019-04-16 13:58:21 +02:00