Commit Graph

797 Commits

Author SHA1 Message Date
alex ae052ec212 updated phrases for infocenter, layoutchanges phrasesupdate 2018-05-22 17:17:09 +02:00
alex cecda9e512 added alternative Text to Freigabemail (e.g. when not viewed as HTML) 2018-05-22 15:57:48 +02:00
alex 459f1a3be1 error is now not shown if no documents to accept during freigabe 2018-05-22 14:46:23 +02:00
Paolo 4b1eacff21 Added includes for ajaxlib and navigationwidget into home.php 2018-05-18 14:07:11 +02:00
Paolo a1b9e4e8b1 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-05-18 13:11:24 +02:00
Paolo 13beae23cc - Added public/css/FilterWidget.css and public/css/NavigationWidget.css to define CSS for Filter and Navigation widgets
- Added public/js/FilterWidget.js and public/js/NavigationWidget.js to collect all the JS for Filter and Navigation widgets
- Added filterwidget and navigationwidget paramaters to FHC-Header to include the new CSS and JS for Filter and Navigation widgets
- Removed all CSS and JS from the views used from Filter and Navigation widgets
- Added method _getFilterUniqueId to controller Filters to generate a unique id for a filter based on fhc_controller_id and the current page
- Adapted the code in controller Filters to use _getFilterUniqueId
- Added method _getFilterUniqueId to widget FilterWidget to generate a unique id for a filter based on fhc_controller_id and the current page
- Adapted the code in widget FilterWidget to use _getFilterUniqueId
- Removed fhc_controller_id from menu generation in InfoCenter controller
- InfoCenter controller now gives as parameter fhc_controller_id to view infocenterDetails
- InfoCenter controller now gives as parameter fhc_controller_id to various redirect
- Views infocenter, infocenterData, infocenterDetails and infocenterFreigegeben:
	- including new JS and CSS to work with Navigation and Filter widgets
	- including AjaxLib (required by FilterWidget.js and NavigationWidget.js)
	- using fhc_controller_id in Details and unlockPerson links
- fhc_controller_id in not anymore a parameter for FilterWidget, adapted the code where FilterWidget is called
- AjaxLib: renamed method _getUrlParameter to getUrlParameter
- Removed function getUrlParameter from public/js/infocenter/infocenterDetails.js, now uses the method from AjaxLib
- Added fhc_controller_id where needed into public/js/infocenter/infocenterDetails.js
- public/js/infocenter/infocenterPersonDataset.js now uses getUrlParameter from AjaxLib
- Added paramater filter_page in infocenterPersonDataset.js when calling Filters/rowNumber
2018-05-18 12:10:14 +02:00
alex 45c3aad94d Adapted query for infocenter parking, replaced null in parkdate with -, set min and max size for messages, increased msglist size, pager counts now only trs in tbody 2018-05-17 17:46:00 +02:00
alex 6a67183738 added Parking feauture to infocenter 2018-05-16 20:00:19 +02:00
Cris 24d4c316e4 Merge remote-tracking branch 'origin/master' 2018-05-16 15:44:24 +02:00
alex c6693bbc71 Merge remote-tracking branch 'origin/master' 2018-05-16 11:52:52 +02:00
alex 024bb06b0f improved currgeschaeftsjahrquery 2018-05-16 11:52:37 +02:00
Andreas Österreicher 087299cf84 Added Unoconv 0.6 switch because converting text documents to pdf fails 2018-05-16 08:48:37 +02:00
Paolo 748ab6fac3 Unique ID for each call to a controller
- Added constant FHC_CONTROLLER_ID to FHC_Controller
- Added private property _controllerId to FHC_Controller
- Added protected method setControllerId to FHC_Controller
- Added protected method getControllerId to FHC_Controller
2018-05-15 19:19:29 +02:00
Paolo a075cc26b3 - Removed place holders where not needed
- Added public/js/AjaxLib.js to perform Ajax calls via JS
- Added public/css/AjaxLib.css to configure the veil used in AjaxLib via CSS
- Added public/images/loader.gif to be used with the veil in AjaxLib
- Added to FHC-Header the possibility to include the AjaxLib (ajaxlib = true)
2018-05-15 18:33:01 +02:00
Andreas Österreicher 8b89131502 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2018-05-14 14:05:27 +02:00
Andreas Österreicher 4aa0f81278 Document Conversion Bugfix 2018-05-14 14:05:11 +02:00
Gerald Raab 257c833d45 'Interessent rejected' ignored in list 2018-05-11 15:43:39 +02:00
Andreas Österreicher 84ba892dc1 Added missing Permission to infocenter role 2018-05-11 15:01:40 +02:00
alex 26600dac05 added kurzbz to zgv info, optimized responsiveness of panel headers, whole notizenrow clickable 2018-05-11 14:14:16 +02:00
Cris 03b298f1f5 Added translation fallback
. fallback 1: 
  if no entry or empty entry in user's language --> fallback to default language
. fallback 2:
  if empty entry at all (even in default langage) --> fallback to phrasename
2018-05-09 12:39:19 +02:00
Cris 1254e8d618 Added translation using phrases
. added translation functionality by
-- adding loadPhrases-method in Controllers
-- replacing hardcoded html-text with $this->p->t(...)
2018-05-09 12:36:35 +02:00
Paolo 8c00fb7be5 Improved the code in fhcauth_helper 2018-05-09 12:02:31 +02:00
alex aa278e89f0 Infocenter details changes: popup for ZGV info, show Bewerbungsfriste(n), optimized mobile responsiveness, set dokumente to "akzeptiert" when freigegeben 2018-05-08 14:13:47 +02:00
alex e4cdac1acb moved infocenter and sb admin js and css from include to public, get inactive parents/children oe is possible 2018-05-03 13:33:08 +02:00
Andreas Österreicher a2e109a1eb Reactivated Freigegeben Page 2018-05-03 13:04:56 +02:00
Paolo dba08d4d9e - Added the feature to the Infocenter controller to generate a unique identifier for each call of itself, and to keep using the identifier for the next calls in the same browser/tab
- Added the feature to the FilterWidget to use this identifier to create a different session for each FilterWidget
2018-05-03 12:33:01 +02:00
Paolo 4e90523ccc Removed var_dumps and error_logs where not needed or placed a comment where they are needed 2018-05-03 12:31:56 +02:00
Paolo c4baa454aa Added comment to application/helpers/fhc_helper.php 2018-05-03 12:26:50 +02:00
alex 89e724de0e added Kostenstellen retrievers by geschaeftsjahr 2018-04-30 17:57:48 +02:00
alex 0f8847593a renamed budget tables (permissions) 2018-04-30 17:56:00 +02:00
alex 18ef284aca Merge remote-tracking branch 'origin/master' 2018-04-30 17:32:22 +02:00
alex 3b33e52df4 added getChild and getParents methods to CI model 2018-04-30 17:32:08 +02:00
Andreas Österreicher ecaaa3cd19 Cronjob für Korrektur des Studienplanes korrigiert nun auch den
Studienplan der Reihungstestanmeldung
2018-04-30 09:44:40 +02:00
Paolo 999b4040a4 Moved JS function refreshSideMenu from views/widgets/filter/filter.php to include/js/infocenter/infocenterPersonDataset.js and adapted the code 2018-04-24 18:34:07 +02:00
Cris b7160b00fb Adapted curser pointer for notices
cursor changes now to pointer-symbol when hovering a notice
2018-04-23 14:58:29 +02:00
alex ce3307bcf0 Merge remote-tracking branch 'origin/master' 2018-04-19 13:23:46 +02:00
alex 0acf6b84d7 moved permission checks for budget to extension 2018-04-19 13:23:33 +02:00
Paolo 5b68f54328 ExtensionsLib:
- Private property SOFTLINK_TARGET_DIRECTORIES is now a two dimentional associative array
- The first index of this array is used to select the destination partial path where to link the given directory from the second index
- The second index is used to select all the target directories to be linked
- Adapted methods _delSoftLinks and _addSoftLinks to work with this new structure of SOFTLINK_TARGET_DIRECTORIES
- Added to SOFTLINK_TARGET_DIRECTORIES the entry DOC_ROOT => array('public')
2018-04-18 16:32:29 +02:00
alex fcaa447877 Merge remote-tracking branch 'origin/master' 2018-04-18 14:49:46 +02:00
alex 17bacc48c6 kostenstellen are retrieved only for permitted users, easier SQL statement, Geschaeftsjahr nex and current retrievement 2018-04-18 14:49:28 +02:00
Cris daab764a14 Added Notice-Update functionality
. added notice updates functionality by clicking on a row in the notice-table
. log "Notice updated" is set into log-table when note was updated successfully
2018-04-18 14:34:36 +02:00
Paolo db759fc72e PhrasesLib:
- Better code
- Added private method _extend_construct to extend the constructor
- Now is possible to instantiate the object PhrasesLib giving other parameters (like a second constructor)
- The new parameters are categories and language, used to retrive phrases from the DB
- Added new method 't' used to print out a phrase using the following parameters: category, phrase, replacement parameters, orgeinheit_kurzbz, orgform_kurzbz
- This method uses the CodeIgniter parser to replace parameters inside the phrase
2018-04-17 16:06:18 +02:00
Paolo 08c5733298 - Added method loadPhrases to FHC_Conroller as a wrapper to load phrases
- Added method getLanguage to Person_model to load the language for a user by the given UID
- Added comments to method getPhrasesByCategoryAndLanguage of system/Phrase_model, ORDER BY and more fields to SQL statement
2018-04-17 16:00:19 +02:00
Paolo 794fb7f6ac Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-04-17 13:13:11 +02:00
Paolo 874cbc9b92 Added method getPhrasesByCategoryAndLanguage to system/Phrase_model
It's used to retrived Phrases from DB using category and sprache as keys
2018-04-17 13:12:15 +02:00
Cris 898b15a6b6 Added view for "Freigegebene Bewerber" - not active yet
added 
. view for freigegebene bewerber
. controller calling the view
. navigation icons / text 

-- navigation item "Freigegeben" DEACTIVATED UNTIL FILTER is revised (filter should return ALL freigegebene Bewerber)
2018-04-17 11:35:16 +02:00
Cris 63a56932e8 Adapted Freigabe-Button at ZGV Prüfung
Freigabe-button is now disabled:
. as long the application was not sent by the bewerber
. for all study programs that are not bachelor
2018-04-16 16:35:50 +02:00
Andreas Österreicher 0ea5d53b0a Replaced base_url with site_url 2018-04-13 14:10:09 +02:00
Andreas Österreicher 1b11ed75db - Moved Menu collapse Item to the bottom of the Menu
- Added Tooltip to collapse Icons
2018-04-13 14:09:21 +02:00
Paolo 280fb62b01 Changed the global JS object FHC_JS_DATA_STORAGE_OBJECT, called path and called method have been separeted into two different properties 2018-04-13 13:41:25 +02:00