Commit Graph

561 Commits

Author SHA1 Message Date
Andreas Österreicher 971e239d8e Merge branch 'feature-5961/DigitalerLehrauftrag_Auszahlungsinfoblatt_externe_Lehrende' into review/DigitaleLehrauftraege 2020-04-17 11:04:37 +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
Andreas Österreicher d5c8077d80 Merge branch 'feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren' into review/DigitaleLehrauftraege 2020-04-17 08:47:16 +02:00
Cris e25bf60bf1 Added GUI and phrase for info sheet for external lecturers
A new link was set.
. only shown to external lecturers
. links to dms document infoblatt for external lecturers
2020-04-15 09:51:25 +02:00
Cris 2a99f37508 Added Help-Text (Guide to this page) to orderLehrauftrag & approveLehrauftrag
Moved text to function_getHelptext, which will switch language depending
on the given user language.
2020-04-14 13:58:40 +02:00
Cris 262fdc277e Added Help-Text (Guide to this page) to acceptLehrauftrag
Moved text to function_getHelptext, which will switch language depending
on the given user language.
2020-04-14 12:52:03 +02:00
Cris db78fa20f3 Added Multilingualism to all Lehrauftraege View GUI-items
Attention: part of phrases-array is used by javascripts.
(acceptLehrauftrag.js, approveLehrauftrag.js, orderLehrauftrag.js)
2020-04-02 17:12:36 +02:00
Cris b6f509c057 Added Multilingualism to all Lehrauftraege Tablewidgets' columns fields 2020-04-02 16:33:26 +02:00
Paolo 2a59165332 Added new date format column ReihungstestDate to system/infocenter/infocenterFreigegebenData.php 2020-04-01 18:53:13 +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 2938e0bdb0 Bugfixed: Removed undefined functions
After moving functions to Tablewidget.js, these function calls doesnt
exist anymore in the earlier corresponding javascripts. Therefore they
must be removed.
2020-03-30 19:27:12 +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 eac386496a Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege
# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
2020-03-30 12:32:39 +02:00
Cris 0b1d847882 Added Download PDF of accepted Lehrauftraege (seperated by FH /Lehrgaenge)
Lectors can now download as pfd all their accepted Lehrauftraege.
Therefore two buttons are available for seperate download of
Lehrauftraege on FH or Lehrgaenge.
The queries are proofing now if a contract exists and if the status is
'akzeptiert'.
2020-03-26 14:16:37 +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
Andreas Österreicher 5bd9ece44a Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker 2020-03-10 16:59:15 +01:00
Paolo de62bc0f3d Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-03-02 16:13:04 +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
Andreas Österreicher 88693f2dea Merge branch 'bugfix-6005/Digitaler_Lehrauftrag_Hidden_Field_4Chrome' 2020-02-28 13:44:37 +01:00
Paolo 34b6581849 - Renamed BenutzerfunktionModel->getByPersonId to getActiveFunctionsByPersonId
- BenutzerfunktionModel->getActiveFunctionsByPersonId changed query to get only active functions
- Removed commented code
2020-02-26 17:22:59 +01:00
Manfred Kindl 8507f63936 GUI-changes in writeTemplate
- Show only "bezeichnung" of template in select for regular users
- New styled "Preview"-Button.
- Click on "Preview" automatically scrolls to Preview-Div
2020-02-23 20:51:16 +01:00
Paolo 9a9b847138 Fixed Tabulator include in FHC-Header 2020-02-20 16:21:31 +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
Paolo a4bfdfb4a0 Fixed merge with stashed files in system/messages/htmlWriteTemplate.php 2020-02-13 12:49:57 +01:00
Paolo 937db42e11 - Allow to change the subject in all reply pages
- Remove tabs and/or blanks from subject when replying
2020-02-12 16:14:50 +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
Manfred Kindl 98b2abeb51 BugFix show PreStudent Variables instead of Person Variables in Msg 2020-02-12 09:40:19 +01:00
Paolo 98918bc336 - Bugfix: fixed phrases in views/system/messages/*
- Added new phrases where missing or hard coded
- Fixed windowz new lines in /application/*
2020-02-11 18:05:26 +01:00
Paolo 16cb4a0d4c - Replace "This is a notice to notice you that you have been noticed..." with:
EN: "This message will be delivered to the Infocenter of UAS Technikum Wien"
	DE: "Diese Nachricht wird an das Infocenter der FHTW zugestellt "
- Bugfix: fixed phrases in system/messages/MessageClient/write
2020-02-11 16:49:25 +01:00
Cris 5953b6932f Bufixed Chromes autofilling username in random input field
If no username input field is required, Chorme is autofilling a random
inputfield with username. This is a Chrome bug.
Workaround by adding a hidden username field. Also setting autocomplete=
new-password should help stopping random autofill in some browsers.
2020-02-10 15:42:34 +01:00
Paolo 15b3532359 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-04 17:16:17 +01:00
Paolo d496bf5993 When the recipient is infocenter then place a * close to the drop down description and a note under the tinymce box. 2020-02-03 16:44:29 +01:00
Andreas Österreicher 16f6bdbf70 Merge branch 'feature-5128/FHC-IDAM_account_activation' 2020-02-03 14:53:24 +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 8c36b0b67a Reduced default minimum size of columns in Stornierte Lehraufträge 2020-01-30 12:28:51 +01:00
Cris 3b2b279bf9 Changed default visibility / order of columns
Now fitted to the users primary needs. Columns can be displayed/hidden
via Columnpicker by user afterwards.
2020-01-30 12:27:13 +01:00
Cris 9bdee6d0f8 Corrected SQL query: now retrieving employees UID via tbl_mitarbeiter
Some Lectors, who were assigned as Projektbetreuer, received an email on
their (past) student-email-account. Now this is corrected.
2020-01-28 17:33:04 +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 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 15fa4a6c90 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-23 09:55:00 +01:00
Paolo 0244caaa70 - Moved core from Redirect controller to ViewMessage controller
- Dropped Redirect controller
- Adapted configs and paths because of these changes
2020-01-17 15:39:34 +01:00
Paolo 47682f37df Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-16 16:36:57 +01:00
Paolo 4e43d37780 - Droped not used packages from composer.json
- Fixed packages version in composer.json
- Renewed file composer.lock
- Checked & Fixed imports paths
- Moved /vendor/FHC-Vendor to /FHC-Vendor
2020-01-15 18:08:29 +01:00
Paolo 1832f9a78a - Set reloadDataset = true when widget is loaded
- Remove reloadDataset = true where these widgets are called
2019-12-20 14:43:09 +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 ff9aa5c48a Expanded 'lector'-column width 2019-12-18 15:40:16 +01:00