blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-19 02:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 530ede77ad Merge branch 'master' into feature-14198/LVLeitungBeiLVInfoAnzeigen Andreas Österreicher 2021-10-27 17:06:14 +02:00
  • 671cf9e102 Merge branch 'feature-15103/Bismeldung_erweitern_Ectsrundung_Emailbe' Andreas Österreicher 2021-10-27 16:45:48 +02:00
  • 2b9d688ff7 Adaptierung ZE:Fix Bug Eingabe größer 24:00 ma0068 2021-10-27 13:07:21 +02:00
  • 6d4e5238fd merge feature-11468/ZeitsperrenBeruecksichtigen into featuresZeiterfassung/Sprint177 ma0068 2021-10-27 11:19:59 +02:00
  • c3771b9cd0 merge feature-11468/ZeitsperrenBeruecksichtigen into featuresZeiterfassung/Sprint177 ma0068 2021-10-27 10:47:21 +02:00
  • 63949faef6 Phrasenupdate Zeitsperre ma0068 2021-10-27 09:29:37 +02:00
  • 8cc5be2c40 Issues GUI: added phrases KarpAlex 2021-10-25 19:14:59 +02:00
  • b0b49f7a41 moved errormonitoring menu entry to person category KarpAlex 2021-10-25 16:48:47 +02:00
  • 9c193442ae archivieren von lv zeugnissen und zertifikaten ma0048 2021-10-25 14:54:45 +02:00
  • 40ea04364e Aktivität nicht mehr optional Andreas Österreicher 2021-10-25 14:45:45 +02:00
  • d269fd003d added new log to logdataname ma0048 2021-10-25 14:03:30 +02:00
  • 15ba3602f7 job fixed ma0048 2021-10-25 13:22:44 +02:00
  • 70781d966d Merge branch 'feature/infocenter_anpassungen' Andreas Österreicher 2021-10-25 10:50:09 +02:00
  • 54f6d88901 Merge branch 'feature-7423/infocenter_udf_schule_job' into feature/infocenter_anpassungen ma0048 2021-10-25 10:37:14 +02:00
  • a111503e04 Merge branch 'feature-15091/personen_zusammenlegen_fehlende_berechtigung' Andreas Österreicher 2021-10-25 10:36:17 +02:00
  • 29ae48bc48 udflib fixed fuer den infocenter udf schule uebernehmen job ma0048 2021-10-25 09:51:06 +02:00
  • 4e9eb12a71 Detailsicht: Parameteruebergabe uid für Projekt- und Projektübersichtexport ma0068 2021-10-23 10:40:05 +02:00
  • 875fc5c632 Maximale laufzeit für Auswertungen erhöht Andreas Österreicher 2021-10-22 16:07:41 +02:00
  • e6ba6f9bea dropdown im fas angepasst ma0048 2021-10-22 10:44:54 +02:00
  • 4fb4b72b26 Hinweis- und Warnsymbol für Pause fehlt ergänzt ma0068 2021-10-22 10:39:48 +02:00
  • 52272932ed another euvocid phrase Harald Bamberger 2021-10-22 10:31:02 +02:00
  • b74247a7f2 Merge remote-tracking branch 'origin/feature-15314/infocenter_abgewiesen_von_nicht_abgeschickten' into feature/infocenter_anpassungen ma0048 2021-10-22 07:13:22 +02:00
  • d7364d08dd Merge remote-tracking branch 'origin/feature-15389/infocenter_automatische_abfrage_ob_bewerberin_vorhanden' into feature/infocenter_anpassungen ma0048 2021-10-22 07:13:06 +02:00
  • 3f003f8fc3 Merge remote-tracking branch 'origin/feature-15572/infocenter_zurueckgestellt_nicht_immer_erste_stelle' into feature/infocenter_anpassungen ma0048 2021-10-22 07:12:53 +02:00
  • 1b1f6788ab Merge branch 'master' of github.com:FH-Complete/FHC-Core Harald Bamberger 2021-10-21 18:31:59 +02:00
  • 7de012c930 more phrases for eucovidqr Harald Bamberger 2021-10-21 18:31:48 +02:00
  • d73dd4769a Stipendien-Schnittstelle berücksichtigt auch Anzahlung und Restzahlung Andreas Österreicher 2021-10-21 17:44:45 +02:00
  • bc2ed35aa4 Merge remote-tracking branch 'origin/master' Manfred 2021-10-21 17:16:58 +02:00
  • a72f6597b3 BugFix 9. und 10. Semester bei Lehrauftragsverwaltung Manfred 2021-10-21 17:16:20 +02:00
  • 8033c12665 Added / Adapted tables for Zeitwunsch Gueltigkeit pro Studiensemester Cris 2021-10-21 13:03:16 +02:00
  • e754608a64 Merge branch 'feature-15763/ZeiterfassungPauseBeiAllIn' into features-Zeiterfassung/Sprint177 ma0068 2021-10-21 12:53:54 +02:00
  • b0571e0a26 additional phrases for eucovidqr Harald Bamberger 2021-10-21 08:18:04 +02:00
  • 2a8d91119a Öhbeitrag Management GUI: using phrases KarpAlex 2021-10-21 05:48:18 +02:00
  • 860ca5df53 Spalte Wunschlektor umbenannt Andreas Österreicher 2021-10-20 18:49:39 +02:00
  • 44c1e65011 getBetriebsmittel add parameter to only retrieve aktive users Harald Bamberger 2021-10-20 15:48:34 +02:00
  • 3aa251dc4b projektexport fixed, wenn es mit at startet ma0048 2021-10-20 15:11:00 +02:00
  • a87178a0e7 automatische pausen werden nun gerundet ma0048 2021-10-20 15:05:57 +02:00
  • c92aff5073 Removed console.log and added few comments Paolo 2021-10-20 12:57:43 +02:00
  • 6dfabf31fb - When the apply button is click it is checked that the conditions are not empty, in case the filter is not applied and the empty conditions are marked - Added new type bpchar to the conditions Paolo 2021-10-20 12:54:00 +02:00
  • 458cd6ae0c - Added new phrase for the filter widget and fixed GUI tranlations - Fixed error logs in public/js/FilterWidget.js - Changed the behavior of the Apply and Save buttons for the FilterWidget - Changed the GUI aesthetic of the FilterWidget settings - Added new option reloadPage to the AjaxLib, to reload the page after the complete callback - Added new classes to the public/css/FilterWidget.css - Changed FilterWidgetLib->loadDefinition: added a new fallback to find a filter in the database for the currend FilterWidget - Changed FilterWidgetLib->removeCustomFilter: when a custom filter is removed from the database then it is removed even from the session - Added new private method _dropFromSessionFilterWidgetById to application/libraries/FilterWidgetLib.php Paolo 2021-10-19 15:37:44 +02:00
  • 3f90efaed2 Hinweis: Pause fehlt bei AllIn eingetragen ma0068 2021-10-19 14:54:39 +02:00
  • 7dcddb9d49 Removed wrong comment Andreas Österreicher 2021-10-19 13:52:00 +02:00
  • 6025887bb6 Merge branch 'bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler' into feature-11952/ZeiterfassungDetailsichtFuerVorgesetzte ma0068 2021-10-18 11:50:14 +02:00
  • af89f444aa Merge branch 'master' into bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler ma0068 2021-10-18 11:45:52 +02:00
  • b6b347ff8b Merge Detailsicht Vorgesetzte ma0068 2021-10-18 11:10:13 +02:00
  • 55dcd730a5 merge master into 11952/DetailansichtVorgesetzte ma0068 2021-10-18 10:49:12 +02:00
  • 8801b84fd3 Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt Andreas Österreicher 2021-10-15 18:30:28 +02:00
  • 9dcf948e7e Merge branch 'FHBGLD-set_gemeinde_skript' Andreas Österreicher 2021-10-15 17:21:46 +02:00
  • 7c81f5a64c Gemeinde Update Infotext ergänzt Andreas Österreicher 2021-10-15 17:21:05 +02:00
  • 4c62b003df Merge branch 'master' into FHBGLD-set_gemeinde_skript Andreas Österreicher 2021-10-15 17:18:20 +02:00
  • 048d2764cf Merge branch 'FHBGLD-FHBGLD-studentDBML-generateMatrikelnummer' Andreas Österreicher 2021-10-15 17:11:10 +02:00
  • 2bcf422d7a Fixed Coding Guidelines Andreas Österreicher 2021-10-15 16:01:52 +02:00
  • 1c7bd4986a Fehler beim Anlegen von neuen Studiengängen behoben Andreas Österreicher 2021-10-15 15:12:23 +02:00
  • 38edfbac51 Merge branch 'FHBGLD-studentDBML-generateMatrikelnummer' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-studentDBML-generateMatrikelnummer Andreas Österreicher 2021-10-15 14:12:00 +02:00
  • ef14336b0b Zusätzliche Aktivitätenfilter für Zeitaufzeichnung hinzugefügt Andreas Österreicher 2021-10-15 14:04:20 +02:00
  • 7413e20888 Merge branch 'feature-15608/anpassung_excel_export_fas' Andreas Österreicher 2021-10-15 13:01:50 +02:00
  • 4101929cd5 stammkostenstelle anzeigen bei fixangestellten / fallback falls keine eingetragen ist ma0048 2021-10-15 12:57:18 +02:00
  • 7805784214 sap projektnummer im export hinzugefuegt ma0048 2021-10-15 12:54:24 +02:00
  • aa3a52f201 Aufnahme PhasenReset für neue Validierung Zeitabgrenzung 00:00:00 ma0068 2021-10-15 11:36:15 +02:00
  • 163caccc88 Merge branch 'bug-14102021/ZeiterfassungZeiteingabeMitternacht' into bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler ma0068 2021-10-15 11:25:00 +02:00
  • 269f3542d7 Zeiterfassung: keine Bis-Buchungen 00:00:00 bzw. 24:00:00 erlaubt ma0068 2021-10-14 15:39:17 +02:00
  • 9d08d00676 tbl_adresse typ von char auf varchar geaendert ma0048 2021-10-14 15:37:15 +02:00
  • 19548bf5f9 Update studentDBDML.php FHBGLDandGitHub 2021-10-14 14:36:58 +02:00
  • 0e5e686669 Änderungen bezüglich generateMatrikelnummer FHBGLDandGitHub 2021-10-14 14:33:55 +02:00
  • 6f14b5cec5 - Changed DocsboxLib->convert, not it accepts a new optional parameter called format - Integrated the DocsboxLib into the application/libraries/DocumentLib.php Paolo 2021-10-14 14:25:35 +02:00
  • 2fb4be0e55 - Added new config entry DOCSBOX_ENABLED to config/global.config-default.inc.php - Added new library application/libraries/DocsboxLib.php to manage document conversion using docsbox - Added new config file application/config/docsbox.php - Integrated DocsboxLib into include/dokument_export.class.php Paolo 2021-10-14 11:34:27 +02:00
  • 2bb357ccbd remove 3G from phrases Harald Bamberger 2021-10-13 15:14:13 +02:00
  • e5ecbd9488 Merge branch 'feature-10450/DVUH_requestMatrikelnummer' Andreas Österreicher 2021-10-13 14:18:06 +02:00
  • bd3ed4952b add phrases for eucovidqr errormsgs Harald Bamberger 2021-10-13 12:26:03 +02:00
  • f82315cfe7 ermoeglicht das einloggen wenn 2 Reihungstests am selben Tag sind ma0048 2021-10-13 10:46:05 +02:00
  • 4777c0414f dbupdate_3.3.php: fixed line break KarpAlex 2021-10-13 09:15:58 +02:00
  • 901f9ba7fa Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer KarpAlex 2021-10-13 09:05:05 +02:00
  • 45bb288127 error monitoring (issues): renamded variables, improved comments KarpAlex 2021-10-13 08:53:12 +02:00
  • ae2e425b7d Merge remote-tracking branch 'origin/master' Manfred Kindl 2021-10-12 17:01:18 +02:00
  • 6c98829e4e Mimetype editierbar Manfred Kindl 2021-10-12 17:00:57 +02:00
  • 7e0223b42a Tablesorter Filter-Widget aktiviert Manfred Kindl 2021-10-12 17:00:37 +02:00
  • 902ed7d22d Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes cris-technikum 2021-10-12 16:18:20 +02:00
  • e5f9b52c8e Stipendienanfragen angepasst wenn eine Person mehrere Studien besucht oder nach einem Abbruch das selbe Studium erneut besucht Andreas Österreicher 2021-10-12 14:02:00 +02:00
  • 3e00e4b3a1 infocenter warning falls bewerberIn bereits vorhanden ist ma0048 2021-10-12 13:08:17 +02:00
  • 8677cbf6dc Fixed requesting Anrechnungsantrag although grade is a blocking grade cris-technikum 2021-10-12 12:11:06 +02:00
  • 35cdac0438 Small Code Enhencement cris-technikum 2021-10-12 10:51:10 +02:00
  • 4f0b34137b replacement of hatschek letters added in hlp_common_helper.php to be the same as in function.inc.php KarpAlex 2021-10-11 18:48:25 +02:00
  • 7f00f506ea add viewport meta tag Harald Bamberger 2021-10-11 13:06:28 +02:00
  • 4c74176d64 Merge remote-tracking branch 'origin/feature-14635/UDF_move_permissions_to_JSON_definition' Harald Bamberger 2021-10-11 12:55:24 +02:00
  • 1ebae59292 - Adapted controllers/widgets/UDF->saveUDFs to call UDFLib->saveUDFs without the udfUniqueId parameter - UDFLib->saveUDFs changed, the udfUniqueId parameter is retrieved from the session - UDFLib->saveUDFs changed, the check of the permission is performed by the method prepare prepareUDFsWrite called by the DB_Model - Changed UDFLib->_validateUDFs and public/js/UDFWidget.js to have a better error handling and better message errors Paolo 2021-10-11 10:08:58 +02:00
  • c325046e8e - Renamed public method DB_Model->hasUDF to udfsExistAndDefined - Adapted controllers/system/FAS_UDF and models/crm/Prestudent_model - Added new private method _getUDFsNoPerms to DB_Model - Changed private method DB_model->_prepareUDFsWrite to use _getUDFsNoPerms Paolo 2021-10-08 17:30:28 +02:00
  • 4ef7f49bdb add missing phrase Harald Bamberger 2021-10-08 15:12:06 +02:00
  • 066e2fe936 Merge branch 'feature-15049/COVID-19_Zertifikate_automatisiert_ueberpruefen' Harald Bamberger 2021-10-08 14:28:38 +02:00
  • 11952fe063 Merge branch 'feature-14635/UDF_move_permissions_to_JSON_definition' Harald Bamberger 2021-10-08 14:02:17 +02:00
  • 524a3dfd95 phrases for eucovidqr Harald Bamberger 2021-10-08 11:25:55 +02:00
  • 5954237851 update rechte tbl_person_lock fuer benutzer vilesci ma0048 2021-10-08 10:51:13 +02:00
  • 20f583f7e2 excel report angepasst ma0048 2021-10-08 10:44:27 +02:00
  • a8327a20ab excel report angepasst ma0048 2021-10-08 10:40:10 +02:00
  • 3ff3353aae Aufnahme von hacek-Sonderzeichen in Funktion covertProblemChars ma0068 2021-10-08 10:24:46 +02:00
  • 45fab928ad - Renamed private method _manageUDFs to _prepareUDFsWrite in application/core/DB_Model.php - Changed private method _toPhp in application/core/DB_Model.php to check permissions on UDFs - Adapted code to fit the changes in application/libraries/UDFLib.php - Renamed public method manageUDFs to prepareUDFsWrite in application/libraries/UDFLib.php - Added new public method prepareUDFsRead to application/libraries/UDFLib.php - Fixed bugs, comments & code style Paolo 2021-10-07 17:32:49 +02:00
  • d7a33df898 When exporting in MS Excel format from FAS it is checked that the logged user has the permissions to export UDFs. If the logged user has no permissions on a UDF then the UDF is discarted and it will not present into the MS Excel file Paolo 2021-10-06 10:58:58 +02:00
  • ab59c265d4 First commit Paolo 2021-10-04 14:05:10 +02:00
  • 9c4f8eb0eb bei logdata 'new application' entfernt org_name hinzugefuegt order by log_id statt zeitpunkt ma0048 2021-10-04 13:26:40 +02:00
  • 175d75c70d FAS studentdetailoverlay.xul.php bisstandort and foerderrelevant fields: - added label tags (for hiding also the labels) - changed column width for better look KarpAlex 2021-10-04 12:57:18 +02:00
  • 4a4c95aa08 auswahl fuer bewerbung abgeschickt ja/nein hinzugefuegt ma0048 2021-10-04 12:37:50 +02:00