Commit Graph

8148 Commits

Author SHA1 Message Date
Paolo 2beba613e6 - Renamed parameter jquery into jquery19 in file application/views/templates/header.php
- Fixed includes in prestudentMultiAssign.php and messageWrite.php
- Fixed new lines in prestudentMultiAssign.php and messageWrite.php
2017-08-25 14:13:46 +02:00
Paolo fbb4a492b5 Added jquery/jquery1.9 to composer requirements (composer.json) 2017-08-25 12:58:07 +02:00
Paolo f4cd573395 - added rmariuzzo/jquery-checkboxes to composer requirements
(composer.json)
- removed js include/js/jquery.checkboxes-1.0.7.min.js
- replaced jquery.checkboxes-1.0.7.min.js path with the new path
2017-08-25 12:24:04 +02:00
Paolo 921bdd1242 - beautified composer.json
- added borgar/textile-js to composer requirements (composer.json)
- removed textile.min.js from include directory
- replaced old textile js path with the new one in header.php
- changed the call of js textile in application/views/system/phraseinhaltEdit.php
2017-08-25 11:27:41 +02:00
Paolo d1fa93a2b6 DB_model bugfix:
- update method now is using _manageUDFs instead of directly UDFLib->manageUDFs
- _manageUDFs method now accept the id as third parameter
- if the third parameter of _manageUDFs is null the getUDFs is not
called
- If id parameter of method load is null now a correct parameter is given to
get_where
2017-08-23 10:47:12 +02:00
Andreas Oesterreicher 3181d3741e fixed Typo 2017-08-22 23:25:56 +02:00
Andreas Oesterreicher 809d65a62e Der Mitarbeiterexport im FAS exportiert nun nicht mehr die Mitarbeiter
des Ausgewählten Filters sondern die markierten Mitarbeiter. Wenn keine
Mitarbeiter markiert wurden werden alle angezeigten Mitarbeiter
exportiert
2017-08-22 23:23:58 +02:00
Paolo d8cd786079 - application/core/* -> CS compliant
- application/libraries/* -> CS compliant
- FHC_Model isEntitled method now return error() or success()
- Updated all code that uses isEntitled method from FHC_Model
- Removed Squiz.PHP.DisallowSizeFunctionsInLoops from CS ruleset
- Removed depracated method replace from DB_Model
- Removed unused method pgArrayPhp from DB_Model
- Renamed method arrayMergeIndex to _arrayCombine in DB_Model and set as private
- Added method _manageUDFs to DB_Model (a wrapper for UDFLib->manageUDFs)
2017-08-22 16:24:51 +02:00
kindlm 36ab348951 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-08-22 10:56:44 +02:00
kindlm 36b881b0c8 Lehrveranstaltungsverwaltung: Suche Bezeichnung
- In der Lehrveranstaltungsverwaltung kann nun auch nach Bezeichnung der
LV (Deutsch/Englisch) gesucht werden. % und _ als Platzhalter sind
möglich
2017-08-22 10:56:34 +02:00
Paolo 1afe6c00a1 Removed check of size functions in loop statements in CS 2017-08-22 10:32:11 +02:00
Paolo 17acfa3945 Codesniffer FHComplete rules: underscores before protected and private methods are not checked anymore 2017-08-21 12:22:56 +02:00
Paolo 0317c5314a Removed ruleset.xml from tests directory 2017-08-21 12:11:54 +02:00
Paolo b50aab2d33 - Moved all code related to UDF from DB_Model to UDFLib
- Changed method getUDFs in DB_Model
- Removed method getUDF
- Moved method _getUDFsDefinitions to UDF_model and renamed to getUDFsDefinitions
- Updated model UDF_model
- Updated controller system/UDF
- Updated DB_Model to be more CS compliant
2017-08-18 15:50:59 +02:00
Werner Masik 44c52abd21 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-08-18 12:55:02 +02:00
Werner Masik 1a2c663e72 Funktion für Änderungen bei Firmen innerhalb KW 2017-08-18 10:48:48 +02:00
kindlm b47776ac24 Modified function check_infrastruktur 2017-08-18 10:38:58 +02:00
Gerald Raab cf19284132 updated function to get infrastructure-ma 2017-08-18 09:38:31 +02:00
Paolo 1a2fce8d1c - Moved property $htmlParameters from HTMLWidget to DropdownWidget
- Moved all the UDF related code from UDFWidget to UDFLib
- UDFWidget is now using UDFLib
2017-08-17 16:33:45 +02:00
Paolo 35a4861abf Bugfix in system/aufnahme/PrestudentMultiAssign:
- Converting strings 'null' to null values
- Better error messages in case of invalid parameters
2017-08-17 12:49:41 +02:00
Paolo e4160088e8 - Added headers where they were missing
- Added comments where needed
- Beautified the code where needed, more readable and more compliant to CS
- loadResource function in helper fhc_helper.php is not using anymore CI
- Moved all constants from UDFWidget to UDFLib
- Added constant SORT to UDFLib
- Renamed constant REGEX_LANGUAGE to FE_REGEX_LANGUAGE in UDFLib
- Better formatting and indentation of the code of WidgetLib (more compliant to CS)
- Added missing validation attributes to HTML widgets
- Added constant HTML_DEFAULT_VALUE to CheckboxWidget
- Unset parameter multiple in DropdownWidget constructor
- Changed value of constant REQUIRED in widget HTMLWidget
- Added protected property $htmlParameters to widget HTMLWidget
  (it works as alias to $this->_args[HTMLWidget::HTML_ARG_NAME] -> better code)
- Replaced $this->_args[HTMLWidget::HTML_ARG_NAME] with $this->htmlParameters in the widgets
- Changed the CSS class label[udf-required=true]::after to label[required-field=true]::after in widgets.css
- Better use of constants in UDFWidget: constants from HTMLWidget are used only for the HTML parameters,
  while constants from UDFLib are used only for UDF parameters
2017-08-17 11:51:40 +02:00
kindlm 31e21acd67 New columns in tbl_service
- Added columns design_uid, betrieb_uid and operativ_uid to tbl_service
2017-08-17 11:38:16 +02:00
kindlm a18c6816a6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-08-16 15:00:13 +02:00
kindlm d9207e5364 Added static Verbaende to Select 2017-08-16 15:00:00 +02:00
kindlm 74d3a89688 Add column "bewerbung_abgeschicktamum" to FAS GUI
- Added to Tab Prestudentstatus. Optional culumn. Default invisible
2017-08-16 14:59:28 +02:00
Paolo f126bca708 - New directory application/widgets/html/ for widgets to render HTML
elements
- All the widgets classes to render HTML elements moved from WidgetLib
to application/widgets/html/
- New directory application/widgets/udf/ for widgets to render UDF
- All the UDF widgets classes moved from WidgetLib to
application/widgets/udf/
- HTMLWidget is now the main class to render HTML widget
- UDFWidget is now the mail class to render UDF
- Removed UDFWidgetTpl
- Added function loadResource to fhc helper
- Changed method widget of WidgetLib (using loadResource)
- Moved UDFWidget method from WidgetLib to UDFLib
- Slimmed down class Widget present in WidgetLib
- Controller system/UDf now uses UDFLib
- View application/views/system/udf.php now uses UDFLib
- Updated udf and html widgets to adapt them to the new libs
2017-08-11 18:41:21 +02:00
Paolo d7bed89869 - Added class label[udf-required=true]::after to skin/widgets.class
- Added attribute udf-required to tag label in the HTML components widges
2017-08-09 17:10:10 +02:00
Paolo 226eda73e5 - Added comments to DB_Model
- Method _manageUDFs using a temp variable to store result from _validateUDFs
2017-08-09 16:20:10 +02:00
Paolo 973b74ce7e $validate variable reset on every loop 2017-08-09 15:55:32 +02:00
Paolo 9ee1820ac3 - Not to check the required attribute for them all together, but only if the UDF is present in the given parameters.
Update of UDF should work in the same way as the update of regular columns.
- Required rules:
    - If required === false && value to be saved == (null || false) => validation avoided
    - If required == false && value to be saved != null => validation performed
    - If required == true => validation performed && value cannot be null
    - If required == true && value to be saved == (null || false) => raise error: required field
    - If raised error required field => validation is not performed
2017-08-09 15:21:19 +02:00
Paolo c351ef781a Changed method getAppliedStudiengangFromNow in Studiengang_model.
Now also takes into consideration the current semester
2017-08-08 11:17:33 +02:00
Paolo a56412d687 Merge branch 'udf' 2017-08-07 16:44:03 +02:00
Paolo 35e8df3b22 Added method getAppliedStudiengangFromNow to controller Studiengang.
This method can retrive all the applied studiengang for a person from
the current studiensemester
2017-08-07 15:15:08 +02:00
kindlm a3e63a99b8 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-08-07 11:34:16 +02:00
kindlm ed1d7ae0b0 lehrauftrag.xml.php $fb_arr wird nun auch mit oe_kurzbz befüllt 2017-08-07 11:32:04 +02:00
Paolo db63dd1dd0 - Added method dropdownListValuesToString to udf.class.php
- Added enum element to UDF definition in method _getUDFDefinition
- Exports now show the values of dropdowns and not the id
2017-08-07 11:18:41 +02:00
Paolo 2edcfae0af - Added method existsUDF
- Added comments
2017-08-04 15:12:36 +02:00
Paolo f5d3f20ec7 Merge branch 'master' into udf 2017-08-03 15:37:37 +02:00
Paolo d7d550d53f - Multipledropdown: fixed problem to see and to save more selected
elements
- Dropdown: reset selected element to null
2017-08-03 15:20:32 +02:00
alex 9e14e39b66 Added Comments in Controllers
called html_escape function for all textfields before saving (against html injection)
Reformatted
Fixed Studienjahr Dropdown prefill in Studiensemester view
2017-08-03 13:48:10 +02:00
Paolo 68189bb7a5 - If required == false and a null value is given for a UDF, then no
validation is performed
- No validation is performed for checkboxes
- Better workaround in UDF_Model
2017-08-02 17:02:39 +02:00
Paolo dda920dd58 Fixed URL without double slashes 2017-08-02 16:56:51 +02:00
Andreas Oesterreicher 42960ffe20 Moodle-Integration aus FHComplete Core entfernt und in eigenes Addon
ausgelagert.
Support für Moodle 1.9 entfernt
2017-08-02 14:05:31 +02:00
Paolo 65be806e91 Merge branch 'master' into udf 2017-08-01 18:31:30 +02:00
Paolo 66de1e18f8 - Removed /core from URL
- If UDf are not set in DB UDF view will not display them
- Removed placeholder from multiple dropdown widget
- Dropdown widget has null value as placeholder
- Added permission system/udf to checksystem
2017-08-01 18:25:23 +02:00
Andreas Oesterreicher 5d0dcb6e4a Kommentar ergänzt 2017-08-01 16:54:43 +02:00
alex afd1667645 GUI für Studiensemester und Studienjahr hinzugefügt 2017-08-01 14:50:19 +02:00
Andreas Oesterreicher b7da7b86f9 PHP7 compatibility fix 2017-08-01 10:45:00 +02:00
Paolo bba27f75e0 Merge branch 'master' into udf 2017-07-28 18:41:35 +02:00
Paolo 59045e1136 Added private method _fillMissingChkboxUDF to UDF_model.
It checks if UDF checkboxes are NOT posted and sets theirs values to
false
2017-07-28 18:36:08 +02:00