Commit Graph
657 Commits
Author SHA1 Message Date
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
Paolo 48bcc77c97 - Added CSS public/css/Tabulator.css and public/css/TinyMCE.css
- Added these new CSS to views/templates/FHC-Header.php
- Unified messages CSS in public/css/messaging/message.css
- Messages Inbox/Outbox GUI beautified
2019-07-04 17:18:01 +02:00
Paolo 18ea98416f From/To toggle tabulator columns 2019-07-04 15:11:58 +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
Paolo c62b4dc018 - Added new public method setMessageRead to system/messages/MessageClient
- system/Recipient_model methods getReceivedMessages and getSentMessages now retrieve person_id from tbl_msg_status
- Added new public method setMessageRead to CL/Messages_model
- Improved code in public/js/messaging/read.js
2019-07-04 11:15:07 +02:00
Paolo 99e541d506 Fixed receiver/sender retrieved from database 2019-06-28 19:18:18 +02:00
Paolo 34dc82766a - Renamed public/js/messaging/messageClient.js to public/js/messaging/read.js
- Added new JS public/js/messaging/write.js used in view application/views/system/messages/ajaxWrite.php
- Added new public method write, listReceivedMessages, listSentMessages and sendMessageToOU to controller system/messages/MessageClient.php
- Removed private method _getReceiversByOekurzbz from MessageLib
- Fixed method sendMessageOU of MessageLib
- Added new public method prepareAjaxWrite to model CL/Messages_model
- Fixed method prepareAjaxReadReceived of model CL/Messages_model
- Added new public method prepareAjaxReadSent to model CL/Messages_model
- Changed method CL/Messages_model->_personLog interface
- Added new public method getOrganisationunitsByPersonId to crm/Prestudent_model
- Added new public method getReceivedMessages to model system/Recipient_model
- Changed getReceivedMessages method of model system/Recipient_model
- Changed view system/messages/ajaxRead.php
- Added new view system/messages/ajaxWrite.php
2019-06-28 19:01:25 +02:00
Paolo 27ccd086ac - Added new functions getAuthFirstname and getAuthSurname to helper hlp_authentication_helper
- Added methods getReceivedMessages and getSentMessages to model system/Recipient_model.php
- Added jqueryui and dialoglib to view system/messages/ajaxRead
- Added method prepareAjaxRead to model CL/Messages_model
- Removed private method _getAuthUser from model CL/Messages_model
- Adapted code in model CL/Messages_model to use functions isLogged and getAuthPersonId
2019-06-24 17:32:31 +02:00
Paolo b364cfae06 - Moved controllers FASMessages and Messages to system/messages/
- Adapted code to use the new path
2019-06-19 15:29:17 +02:00
Paolo f6e0f58b3d - Renamed view system/messages/messageSent.php to system/messages/htmlSuccess.php
- Added new view system/messages/htmlError.php
- Renamed view system/messages/messageWrite.php to system/messages/htmlWriteTemplate.php
- Added new widget views: widgets/Dropdown_widget.php and widgets/MultipleDropdown_widget.php
- Added new CSS public/css/Widgets.css
- Controller system/FASMessages:
	- Renamed method write to writeTemplate and method writeReply to writeReplyTemplate
	- Removed all the private methods and moved all the logic to model CL/Messages_model
	- Methods writeTemplate and writeReplyTemplate do not need anymore the sender id as parameter
- Controller system/Messages:
	- Renamed method write to writeTemplate
	- Renamed method send to sendImplicitTemplate
	- Renamed method sendJson to sendExplicitTemplateJson
	- Moved all the logic to model CL/Messages_model
- Adapted php and JS code to use these new methods names and interfaces
- Removed public method getIsAdmin from MessageLib
- Method _sendMessage of MessageLib now returns the saved message ids
- Added new package olifolkerd/tabulator to composer
- Added new parameter widgets to view templates/FHC-Header.php
- Added new HTML widget widgets/Dropdown_widget and widgets/MultipleDropdown_widget
- Added constants REPLY_SUBJECT_PREFIX and REPLY_BODY_PREFIX to model CL/Messages_model
- Added new public methods prepareHtmlWriteTemplatePersons, prepareHtmlWriteTemplatePrestudents, sendImplicitTemplate, sendExplicitTemplate, getVorlage, parseMessageText and getMessageFromIds to model CL/Messages_model
- Added new private methods _getAuthUser, _lowerReplaceSpaceArrayKeys, _addOeToPrestudents, _personLog and _prepareHtmlWriteTemplate to model CL/Messages_model
2019-06-18 18:25:26 +02:00
Paolo 5bda5eb966 - Moved view system/messages/messageList.php -> system/infocenter/messageList.php
- Moved js public/js/messaging/messageList.js -> public/js/infocenter/messageList.js
- Updated includes in controller system/infocenter/InfoCenter.php and view system/infocenter/infocenterDetails.php
2019-06-14 15:40:15 +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
alex 95af36fc59 public/DialogLib update:
- added alertWarning method
- outsourced code to _displayDialog method
2019-04-16 13:29:51 +02:00
alex b8a504b424 Budget FilterWidget Übersicht Updates:
- public/FilterWidget.js : ignore empty objects when rendering tablesorter table
- Insert Budget filter
- Insert app "budget"
2019-04-15 16:59:24 +02:00
Paolo 3abc2e2948 Merge branch 'master' into ciauth 2019-03-21 17:04:51 +01:00
Paolo f92e32d8f0 - Added new public method getLandingPage to AuthLib.php
- AuthLib->redirectToLandingPage now calls getLandingPage
- Added new controller system/Login.php to perform login operations
- Added new view system/login/usernamePassword.php to login with username and password
- Added css/Login.css, images/logo-300x160.png and js/Login.js to be used by usernamePassword.php
2019-03-21 17:00:08 +01:00
alex 8449e1f69c - modified public/tablesort.js to accept additional tablesorter parameters
- filter cell not displayed if disabled in tablesorter (public/tablesort_bootstrap.css)
2019-03-21 16:09:30 +01:00
alex 0cb86f84ed Infocenter:
- No Message sent when FIT program Freigabe
2019-02-21 17:18:12 +01:00
alex a2d0ae6da8 Infocenter:
- FIT Programme Studiengänge 10021,10027 can be freigegeben an Studiengang
 - earlier check for existing prestudentid in prestudentmodel in getPrestudentWithZgv method
 - reduced Sprache attributed to sprache, locale, bezeichnung in prestudentmodel in getPrestudentWithZgv method
2019-02-20 16:50:20 +01:00
Paolo d82c35f964 Merge branch 'master' into messages 2019-02-15 15:31:55 +01:00
Andreas Österreicher 7662edd061 Neue Notenübersicht für Studenten
- Ansicht aller LVs die der Studierende lt Studienplan besuchen muss
- Lehrveranstaltungen die ausserhalb des Studienplanes besucht wurden
- Notendurchschnitt pro Semester und über alle Semester nur für
Studienplanrelevante LVs
- Neuer Menüpunkt im FAS für Zugriff auf die Notenliste
2019-02-13 15:52:51 +01:00
alex c33e9ba501 extended infocenter message sending flow with special cases:
- Stgfreigabe not sent when already stg freigegeben
- statusgrund checked for rtfreigabe (null)
2019-02-12 17:56:36 +01:00
Paolo 085d612d94 - Added new view system/messages/messageReplySent.php to show the message reply delivery status
- system/messages/messageSent.php is now used to thow message delivery status
- Moved JS from view system/messages/messageWriteReply.php to public/js/messaging/messageWriteReply.js
2019-02-07 14:18:32 +01:00
Paolo 91fbabde6f - Added new directory application/views/system/messages/
- Moved application/views/system/message* to application/views/system/messages/
- Adapted code to use those views with the new path
- Fixed function getCode in public/js/AjaxLib.js
- In public/js/messaging/messageWrite.js is now used AjaxLib.js
- Changed method parseMessageText in MessageLib.php to replace the keys of the data parameter
- Removed function write from application/controllers/system/Phrases.php
- Adapted code in application/controllers/system/Messages.php to use the changed method parseMessageText in MessageLib.php and path of the moved views
2019-02-06 18:18:57 +01:00
Paolo e25034560f Merge branch 'master' into messages 2019-02-05 18:13:06 +01:00
Paolo 8ccb94af38 Last things missing from the missing commits 2019-02-05 12:23:34 +01:00
Paolo 49b224c10b Infocenter:
- even if a prestudent is already freigegeben for a studiengang, and if Quereinstieg, "shorter" Quereinstiegsinfomessage is sent when zum RT freigegeben
- message sending: replaced ugly html parsing for check if already freigegeben with AJAX call
2019-02-05 10:52:19 +01:00
Paolo b58475d6c5 - FilterWidget can represents the retrieved data with tablesorter or pivotUI
- Added new constants to FiltersLib
- Added new parameter pivotui to FHC-Header to load JS and CSS for pivotUI
- Renamed constat WIDGET_URL_TABLE_DATASET to WIDGET_URL_DATASET_TABLESORTER in FilterWidget
- Added new constat WIDGET_URL_DATASET_PIVOTUI to FilterWidget
- Added new private properties _datasetRepresentation and _datasetRepresentationOptions to FilterWidget
- Renamed FilterWidget->loadViewTableDataset to loadViewDataset
- FilterWidget->loadViewDataset loads tablesorter or pivotUI view depending on the value of property _datasetRepresentation
- FilterWidget accepts two new parameter: datasetRepresentation and datasetRepOptions
- datasetRepresentation is required
- FilterWidget stores in session the _datasetRepresentation and _datasetRepresentationOptions properties
- Adapted view views/widgets/filter/filter to use loadViewDataset
- All views using FilterWidget have been adapted to use the required parameter datasetRepresentation
- Added new constats DATASET_REP_TABLESORTER and DATASET_REP_PIVOTUI to public/js/FilterWidget.js
- Added new private property _datasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
- Based on property _datasetRepresentation FilterWidget.js will represent the FilterWidget data with tablesorter or pivotUI
- Added new private method _renderDataset to FHC_FilterWidget in public/js/FilterWidget.js
- Renamed method _renderTableDataset to _renderDatasetTablesorter in FHC_FilterWidget in public/js/FilterWidget.js
- Added new method _renderDatasetPivotUI to FHC_FilterWidget in public/js/FilterWidget.js
- Added bew method _setDatasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
2019-02-05 10:38:22 +01:00
Paolo 6a512d7b25 Infocenter notizen update
- removed html specialchars in quickinfo
- notizen are retrieved by ajax when click on tablerow
2019-02-05 10:33:11 +01:00