Commit Graph

  • f7efce273c XML compliant Paolo 2017-09-13 15:34:52 +02:00
  • feada15766 XUL files still using old jQuery because of an incompatibility Paolo 2017-09-13 15:28:27 +02:00
  • 46142f80cd Merge branch 'master' of https://github.com/FH-Complete/FHC-Core kindlm 2017-09-13 14:22:07 +02:00
  • 84eba8f06e Wochenplan: Anzeige der Gruppen wenn lva kindlm 2017-09-13 14:22:01 +02:00
  • 6cbd48003e FAS Pruefungszeugnis entfernt kindlm 2017-09-13 14:20:09 +02:00
  • 6c920c9e3e FAS BCC-Mailversand mit ctrlKey kindlm 2017-09-13 14:04:04 +02:00
  • 1685836b0a Changed to the new tabs jQueryUI plugin syntax Paolo 2017-09-13 14:03:22 +02:00
  • a294a44b2c Mlists_generate Optimierung kindlm 2017-09-13 13:50:17 +02:00
  • b39a6ca85e JS bugfix Paolo 2017-09-13 13:50:07 +02:00
  • 1ae2816608 JS bugfix Paolo 2017-09-13 13:11:26 +02:00
  • 01c1356c32 Closed echo quotes Paolo 2017-09-13 12:53:31 +02:00
  • 6ef17867e1 Closed echo quotes Paolo 2017-09-13 12:52:12 +02:00
  • e3d94a1202 Removed console.log Paolo 2017-09-13 12:17:02 +02:00
  • 2a183ce3f5 Bei Anzeige des LVPlans auf Lehrveranstaltungsebene werden jetzt keine Reservierungen mehr angezeigt Andreas Oesterreicher 2017-09-12 17:09:20 +02:00
  • 1e28e681cb Neue Seite hinzugefügt um Zutrittskarten zurückzunehmen (auszutragen) Andreas Oesterreicher 2017-09-12 11:48:19 +02:00
  • 9b1df1e4af Fehler behoben wodurch das Löschen von Incominggruppen nicht funktioniert oesi 2017-09-12 11:22:16 +02:00
  • bcd84512f5 Second commit Paolo 2017-09-11 16:06:56 +02:00
  • b0806f263b First commit Paolo 2017-09-08 19:15:21 +02:00
  • 25d8656c7c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core Gerry Raab 2017-09-07 22:16:03 +02:00
  • 51d065b4fb Studienplan LV-Planlink anzeigen konfigurierbar Gerry Raab 2017-09-07 22:15:27 +02:00
  • f72a484a1e Merge branch 'master' of github.com:FH-Complete/FHC-Core Andreas Oesterreicher 2017-09-07 19:10:43 +02:00
  • df34c6c202 Einfachere GUI zur Aktivierung von FH-Ausweisen hinzugefügt Andreas Oesterreicher 2017-09-07 19:09:50 +02:00
  • cd81bac7eb Added foreign keys for columns sprache, orgeinheit_kurzbz and orgform_kurzbz to table system.tbl_phrasentext Paolo 2017-09-07 14:05:45 +02:00
  • 3e74029552 If the recipient is an employee and has a UID then send the email to UID@Domain Paolo 2017-09-07 13:43:56 +02:00
  • 3a3656139b Added UserDefinedFields to Changelog Andreas Oesterreicher 2017-09-06 08:00:51 +02:00
  • 5436b44fea Fixed broken Schedule Export Andreas Oesterreicher 2017-09-05 07:56:16 +02:00
  • a72022950a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core Gerald Raab 2017-09-01 14:55:35 +02:00
  • eb4f4a0efb anmerkungen von stp_dev nach stp syncen wenn config eintrag aktiviert Gerald Raab 2017-09-01 14:53:16 +02:00
  • e45e7b02fa Codeception test updated Paolo 2017-09-01 14:11:39 +02:00
  • 16f1a3365f Merge branch 'master' of github.com:FH-Complete/FHC-Core Andreas Oesterreicher 2017-08-31 10:29:32 +02:00
  • 247418cbf7 Problem behoben wodurch der Login zum Reihungstest nicht möglich ist wenn das Semester bereits gestartet hat für das sich der Bewerber beworben hat Andreas Oesterreicher 2017-08-31 10:28:22 +02:00
  • fc3864f713 Zustelladresse zu Studierendenexport wieder hinzugefügt oesi 2017-08-30 15:27:01 +02:00
  • fceb9a8b09 Forgot an error_log in dbupdate_3.3.php :P Paolo 2017-08-29 15:07:26 +02:00
  • e908be8021 dbupdate_3.3.php: added foreign key tbl_phrasentext_sprache_fkey on system.tbl_phrasentext.sprache that references to public.tbl_sprache.sprache Paolo 2017-08-29 15:05:00 +02:00
  • c826e76e8f Beim bestätigen des Status im FAS wird das Updateamum/Updatevon und Bestaetigtvon gesetzt oesi 2017-08-28 16:56:50 +02:00
  • e46c090bc2 - Added method encodeToString to udf.class.php - Using method encodeToString in mitarbeiterexport.xls.php and studentenexportextended.xls.php - Method encodeToString now takes care also about booleans and null values Paolo 2017-08-28 15:23:57 +02:00
  • d2acf19b70 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core Paolo 2017-08-28 12:45:09 +02:00
  • 72b3e9adc1 - Replaced DEFAULT_LEHREINHEIT_SPRACHE with DEFAULT_LANGUAGE in UDFLib - Method _setAttributesWithPhrases now sets by default all the attributes to null - Method _setValidationAttributes now sets also MIN_LENGTH and MAX_LENGTH attributes Paolo 2017-08-28 12:42:19 +02:00
  • 9853af4e1f Tippfehler bei Semesterplan behoben oesi 2017-08-28 11:17:13 +02:00
  • 0895c171a5 Default Status when creating new Studienordnung set to "in Bearbeitung" in drop down alex 2017-08-28 10:58:56 +02:00
  • 672c452860 Fehlermeldung behoben beim Anzeigen der Gesamtnote wenn noch keine Personen zu der Lehrveranstaltung zugeordnet sind oesi 2017-08-28 09:34:34 +02:00
  • add7ebb15d Removed unused files from include directory Paolo 2017-08-25 14:46:25 +02:00
  • 10f263aaa5 Renamed widget vorlage_widget.php into Vorlage_widget.php Paolo 2017-08-25 14:17:35 +02:00
  • 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 Paolo 2017-08-25 14:13:46 +02:00
  • fbb4a492b5 Added jquery/jquery1.9 to composer requirements (composer.json) Paolo 2017-08-25 12:58:07 +02:00
  • 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 Paolo 2017-08-25 12:24:04 +02:00
  • 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 Paolo 2017-08-25 11:27:41 +02:00
  • 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 Paolo 2017-08-23 10:47:12 +02:00
  • 3181d3741e fixed Typo Andreas Oesterreicher 2017-08-22 23:25:56 +02:00
  • 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 Andreas Oesterreicher 2017-08-22 23:23:58 +02:00
  • 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) Paolo 2017-08-22 16:24:51 +02:00
  • 36ab348951 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core kindlm 2017-08-22 10:56:44 +02:00
  • 36b881b0c8 Lehrveranstaltungsverwaltung: Suche Bezeichnung kindlm 2017-08-22 10:56:34 +02:00
  • 1afe6c00a1 Removed check of size functions in loop statements in CS Paolo 2017-08-22 10:32:11 +02:00
  • 17acfa3945 Codesniffer FHComplete rules: underscores before protected and private methods are not checked anymore Paolo 2017-08-21 12:22:56 +02:00
  • 0317c5314a Removed ruleset.xml from tests directory Paolo 2017-08-21 12:11:54 +02:00
  • 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 Paolo 2017-08-18 15:50:59 +02:00
  • 44c52abd21 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core Werner Masik 2017-08-18 12:55:02 +02:00
  • 1a2c663e72 Funktion für Änderungen bei Firmen innerhalb KW Werner Masik 2017-08-18 10:48:48 +02:00
  • b47776ac24 Modified function check_infrastruktur kindlm 2017-08-18 10:38:58 +02:00
  • cf19284132 updated function to get infrastructure-ma Gerald Raab 2017-08-18 09:38:31 +02:00
  • 1a2fce8d1c - Moved property $htmlParameters from HTMLWidget to DropdownWidget - Moved all the UDF related code from UDFWidget to UDFLib - UDFWidget is now using UDFLib Paolo 2017-08-17 16:33:45 +02:00
  • 35a4861abf Bugfix in system/aufnahme/PrestudentMultiAssign: - Converting strings 'null' to null values - Better error messages in case of invalid parameters Paolo 2017-08-17 12:49:41 +02:00
  • 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 Paolo 2017-08-17 11:51:40 +02:00
  • 31e21acd67 New columns in tbl_service kindlm 2017-08-17 11:38:16 +02:00
  • a18c6816a6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core kindlm 2017-08-16 15:00:13 +02:00
  • d9207e5364 Added static Verbaende to Select kindlm 2017-08-16 15:00:00 +02:00
  • 74d3a89688 Add column "bewerbung_abgeschicktamum" to FAS GUI kindlm 2017-08-16 14:59:28 +02:00
  • 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 Paolo 2017-08-11 18:41:21 +02:00
  • d7bed89869 - Added class label[udf-required=true]::after to skin/widgets.class - Added attribute udf-required to tag label in the HTML components widges Paolo 2017-08-09 17:10:10 +02:00
  • 226eda73e5 - Added comments to DB_Model - Method _manageUDFs using a temp variable to store result from _validateUDFs Paolo 2017-08-09 16:20:10 +02:00
  • 973b74ce7e $validate variable reset on every loop Paolo 2017-08-09 15:55:32 +02:00
  • 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 Paolo 2017-08-09 15:18:55 +02:00
  • c351ef781a Changed method getAppliedStudiengangFromNow in Studiengang_model. Now also takes into consideration the current semester Paolo 2017-08-08 11:17:33 +02:00
  • a56412d687 Merge branch 'udf' Paolo 2017-08-07 16:44:03 +02:00
  • 35e8df3b22 Added method getAppliedStudiengangFromNow to controller Studiengang. This method can retrive all the applied studiengang for a person from the current studiensemester Paolo 2017-08-07 15:15:08 +02:00
  • a3e63a99b8 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core kindlm 2017-08-07 11:34:16 +02:00
  • ed1d7ae0b0 lehrauftrag.xml.php $fb_arr wird nun auch mit oe_kurzbz befüllt kindlm 2017-08-07 11:32:04 +02:00
  • 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 Paolo 2017-08-07 11:18:41 +02:00
  • 2edcfae0af - Added method existsUDF - Added comments Paolo 2017-08-04 15:12:36 +02:00
  • f5d3f20ec7 Merge branch 'master' into udf Paolo 2017-08-03 15:37:37 +02:00
  • d7d550d53f - Multipledropdown: fixed problem to see and to save more selected elements - Dropdown: reset selected element to null Paolo 2017-08-03 15:20:32 +02:00
  • 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 alex 2017-08-03 13:48:10 +02:00
  • 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 Paolo 2017-08-02 17:02:39 +02:00
  • dda920dd58 Fixed URL without double slashes Paolo 2017-08-02 16:56:51 +02:00
  • 42960ffe20 Moodle-Integration aus FHComplete Core entfernt und in eigenes Addon ausgelagert. Support für Moodle 1.9 entfernt Andreas Oesterreicher 2017-08-02 14:05:31 +02:00
  • 65be806e91 Merge branch 'master' into udf Paolo 2017-08-01 18:31:30 +02:00
  • 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 Paolo 2017-08-01 18:25:23 +02:00
  • 5d0dcb6e4a Kommentar ergänzt Andreas Oesterreicher 2017-08-01 16:54:43 +02:00
  • afd1667645 GUI für Studiensemester und Studienjahr hinzugefügt alex 2017-08-01 14:50:19 +02:00
  • b7da7b86f9 PHP7 compatibility fix Andreas Oesterreicher 2017-08-01 10:45:00 +02:00
  • bba27f75e0 Merge branch 'master' into udf Paolo 2017-07-28 18:41:35 +02:00
  • 59045e1136 Added private method _fillMissingChkboxUDF to UDF_model. It checks if UDF checkboxes are NOT posted and sets theirs values to false Paolo 2017-07-28 18:36:08 +02:00
  • 0ff635f5ea - Added Zusatzfelder tab for UDF in FAS, students and employees - UDF for person and prestudent only - Added CSS for widgets - Fixed checkbox - Improved aesthetics of widgets Paolo 2017-07-28 17:25:27 +02:00
  • 994c4e1d36 If a UDF is of type checkbox, convert the string value to a boolean Paolo 2017-07-28 17:21:01 +02:00
  • 0d9e5cc7a0 It checks in the index if $person_id and $prestudent_id parameters are given. If they are given it loads the respective data. Paolo 2017-07-28 17:07:01 +02:00
  • 28be99c952 In case a table is updated and UDF are present in that table, the method _manageUDFs will preserve the UDF values that are NOT given as parameters. Updates only the wanted UDF, without overwriting the others. Paolo 2017-07-28 17:00:42 +02:00
  • 6afd71876f Added UDF to FAS -> export Paolo 2017-07-28 16:08:36 +02:00
  • 0bd66c37b4 Problem beim Erstellen von Dokumenten mit alten unoconv Versionen behoben bei denen es zu Berechtigungsproblemen bei der Erstellung der Dokumente kommt Andreas Oesterreicher 2017-07-28 09:33:27 +02:00
  • dfe476799b Berechtigungspruefung korrigiert Andreas Oesterreicher 2017-07-28 09:30:22 +02:00