Commit Graph

186 Commits

Author SHA1 Message Date
alex c2e9d27909 - Pruefungsprotokoll can be saved even when no grade provided
- removed console log
2020-06-09 13:09:35 +02:00
KarpAlex 466264befe Prüfungsprotokoll:
- changed phrases
- added notice  that grade cannot be set when Einverständniserklärung is not checked
2020-05-29 13:00:31 +02:00
KarpAlex f03ed2f666 Prüfungsprotokoll:
Verfassungscheck is not checked by default, if no grade filled out
2020-05-29 10:48:00 +02:00
KarpAlex bc32a643f1 Prüfungsprotokoll:
- phrases: multilingual database fields shown depending on language (e.g. beurteilung, studiengang,...
- added phrases
- added timepicker css
- if student not in condition, time can still be filled out
2020-05-28 20:53:21 +02:00
KarpAlex f1a346c545 Prüfungsprotokoll:
- new fields: beginnzeit, endezeit, Prüfungsantritt
- Einverständniserklärung: if not checked no save possible
- can be saved and freigegeben
- added phrases
2020-05-28 11:08:38 +02:00
Andreas Österreicher 772c4fa308 Prüfungsprotokoll Übersichtsliste für Vorsitz hinzugefügt 2020-05-28 09:44:52 +02:00
Cris 67a5fe82e7 Fixed: Now column-picker activates/deactivates correctly column buttons
Before the problem was using the pseudoclass 'active'. Now, by using
a css class instead, it works.
Also, before when clicking the button twice (activate/deactivate) - it
was always on focus (and therefore always grey). Also fixed.
2020-05-05 16:07:48 +02:00
Andreas Österreicher b7a9f139af Merge branch 'review/DigitaleLehrauftraege' 2020-05-05 08:03:13 +02:00
Andreas Österreicher ec884fe372 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-04-21 15:59:09 +02:00
Cris a0bb912f8d Fixed: typo error in accepted-tooltip
Now phrase is retrieved correctly
2020-04-21 13:36:32 +02:00
Cris 67a29b2ff7 Moved Tablesettings-Helptext to server (using phrases-system) 2020-04-20 14:58:24 +02:00
Cris 637dbefce0 Removed user_language property from FHC_JS_DATA_STORAGE_OBJECT
To persist on a consistent translation system, the translation should be
performed by phrases system on serversite.
Therefore the user_language property is removed from
FHC_JS_DATA_STORAGE_OBJECT.
2020-04-20 14:55:01 +02:00
Andreas Österreicher cee3d7bdd3 Merge branch 'feature-5883/DigitalerLehrauftrag_ColumnPicker' into review/DigitaleLehrauftraege 2020-04-17 09:33:32 +02:00
Andreas Österreicher b89ccf2595 Merge branch 'feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege' into review/DigitaleLehrauftraege 2020-04-17 08:54:21 +02:00
Cris aaaa5f52ae Added Multilingualism to all Lehrauftraege tooltips 2020-04-02 17:07:04 +02:00
Cris b960a5ec58 Added Multilingualism for Tablewidget: Help / GUI items
Shorter phrases are realised via FHC_PhrasesLib.
Longer text (including HTML tags) are realised by
. first retrieving language of FHC_JS_Storage_Object
. then switching to corresponding language text while rendering.
2020-04-02 15:53:06 +02:00
Paolo 299f16dd8c - View system/messages/ajaxWrite added new button backButton
- Added new function backToInOut to public/js/messaging/write.js
- Assigned function backToInOut to backButton click event
- Added new phrase backToReadWeiteMeassage to system/phrasesupdate.php
2020-04-01 18:27:10 +02:00
Paolo a2c9954a6d - FAS_UDF->index declared missing array data
- public/js/UDFWidget.js changed save button caption to "Speichern"
2020-03-31 20:40:41 +02:00
Paolo 91d78066a4 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-31 20:33:01 +02:00
Cris 76afc73c49 Fixed: Now Projektbetreuer are selectable again
Before Projektbetreuer, that should be selectable in ordering process,
were excluded from selection. This is fixed now.
2020-03-31 11:50:11 +02:00
Cris 9d4482767b Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren
# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
#	public/js/lehre/lehrauftrag/orderLehrauftrag.js
2020-03-31 09:57:24 +02:00
Cris e272975a17 Changed / Adapted Dropdown PDF Download for Lehrauftraege
Changed:
GUI. Now using Dropup button instead of 2 single buttons to give
clarity and ability to add more pdf download in a single point.

Adapted:
GUI and JS now adapted to newer GUI version (after merging column picker
branch into feature branch)
2020-03-30 19:10:59 +02:00
Cris f4747e431c Filtered out Lehrauftraege with non-employees and where stunden is 0 (or null)
Now the initial filter and the new/changed filter will filter out
Lehrauftraege, where no mitarbeiter exist or stunden are not assigned to.

The 'show-all'-filter still displays these Lehrauftraege, but will set
them to unselectable.

A tooltip on the status-icon will show an appropriate
information-
2020-03-24 17:48:59 +01:00
Andreas Österreicher 1f4722b7a0 - Config hinzugefügt um Lektorenzuordnungen im CIS nur anzuzeigen wenn der Vertrag erteilt wurde
- Verträge werden erst ab Status erteilt für Lektoren angezeigt
2020-03-12 19:24:47 +01:00
Paolo da621a2154 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-12 11:19:17 +01:00
Andreas Österreicher 5bd9ece44a Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker 2020-03-10 16:59:15 +01:00
Paolo edf7800120 - Controller system/messages/Messages parameters are now retrieved via HTTP POST
- public/js/messaging/messageWrite.js function parseMessageText now perform a HTTP POST ajax call
2020-03-02 16:45:04 +01:00
Paolo de62bc0f3d Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-03-02 16:13:04 +01:00
Andreas Österreicher 331c90b64b Merge branch 'feature-6079/Infocenter_Freigabe_nach_RT_Anmeldung' 2020-03-02 16:03:28 +01:00
Paolo caf57092e4 - Page to write a new message from FAS/Infocenter has a wider and higher variables drop down
- Tabulator fix CSS
2020-02-28 17:05:11 +01:00
Paolo b94aad14fb - Added new config entris for messaging: ou_receivers_no_notice and ou_receivers_private
- MessageLib:
	- Renamed method sendAllNotices to sendAllEmailNotices
	- Renamed method _sendOneNotice to _sendNoticeEmails
	- Renamed method _sendNotice to _sendNoticeEmail
	- If the recipient contact is empty is not anymore a blocking error
- Recipient_model->getMessageById renamed to getMessagesById, not it accepts an array of message ids, could return more results
- Fixed bug in public/js/messaging/writeReply.js to send subject value
2020-02-17 18:29:07 +01:00
alex ed332717ce Infocenter Details:
- added notice for entering the placement test points when Freigabe after RT participation
2020-02-14 18:23:14 +01:00
Paolo 6882199d0e Bugfixes to allow to write to a person or to a prestudent from different GUIs 2020-02-12 14:43:11 +01:00
Paolo 1b9693e316 Bugfix: Infocenter write page person id and prestudent id are swapped 2020-02-11 16:10:39 +01:00
Cris 3a8e7427a7 Enhanced active status behaviour of button group
Active status of button help / settings was not clear before. This is
corrected now.
2020-02-11 08:59:23 +01:00
Cris b2542b5fcc Added HELP button and collapsable help-info to TableWidget [ALPHA VERSION]
Now this is a standard behaviour of TableWidget.
Removed also table related help information from general
Hilfe-zu-dieser-Seite help.
[ALPHA VERSION]: minor issue to be fixed:
button color not toggling correctly when opening help then settings
(and way round)
2020-01-30 17:09:31 +01:00
Cris bce7f60df4 Moved layout options to TableWidget
Now this is a standard behaviour of TableWidget.
2020-01-30 13:22:49 +01:00
Cris 6897ccdd6b Moved empty table placeholder text to TableWidget
Now this is a standard behaviour of TableWidget.
2020-01-30 12:43:50 +01:00
Cris e1df2cbf23 Added tooltips on column headers (displaying title) in TableWidget
Now this is a standard behaviour of TableWidget.
2020-01-30 12:30:26 +01:00
alex 2e30841b0d - added UDF prestudent dropdown to infocenterDetails
- crm/Prestudent_model: improved code, e.g. replaced ->retval
2020-01-28 17:21:47 +01:00
Cris 198a3eb2d5 Adjusted tabulator size to window screen size 2020-01-28 12:29:18 +01:00
Cris b270e65d2e Extended FHC_TableWidget with column picker, header & footer
Added standard behaviour to FHC_TableWidget:
. Added column picker to new TableWidgetHeader div.
. Moved former footerElement (including Alle aus-/abwählen
buttons, CSV Downloads) from single specific files to new
TableWidgetFooter divs.
. Adapted other files to work with new FHC_TableWidget behaviour
2020-01-28 12:26:56 +01:00
Paolo 87aa482234 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-01-28 11:03:51 +01:00
Paolo 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
Paolo 47682f37df Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-16 16:36:57 +01:00
Cris 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
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