Commit Graph

13768 Commits

Author SHA1 Message Date
Werner Masik 19273003ee * changed composer.json
* primvue is now included with help of https://asset-packagist.org/
* https://asset-packagist.org/ makes including npm packages with composer easy
2022-07-06 17:52:13 +02:00
Werner Masik 6c618c9a20 * changed some { to [ for PHP 7.4 compatibility
* added some PrimeVUE 3 components to composer (currently used in organization chart of PV21 extension)
2022-07-06 17:52:13 +02:00
Paolo 74b0fc5662 - Added new directory public/js/components/filter/
- Moved component public/js/components/Filter.js to public/js/components/filter/
- Moved API calls from public/js/components/filter/Filter.js to public/js/components/filter/API.js
- public/js/components/filter/Filter.js now imports public/js/components/filter/API.js
2022-07-06 16:59:33 +02:00
ma0068 fe6a6c5da3 neue Funktion getVorgesetzteMonatTimesheet() 2022-07-06 15:24:28 +02:00
Cris 44a3231d55 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
2022-07-06 12:00:09 +02:00
Cris 72428d0587 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-07-06 11:54:48 +02:00
ma0048 acffebf515 check doppelte benutzer auch mit unterschiedlicher groß und kleinschreibung 2022-07-06 10:56:24 +02:00
Paolo ce9aa4c388 - Removed inlcudes of RESTClient from PHP (FHC-Common, FHC-Footer and views/system/logs/logsViewer)
- Changed RESTClient to be a JS module
- Now RESTClient is included via JS in the app LogsViewer and in component Navigation
- Added new directory public/js/components/navigation
- Moved component Navigation to public/js/components/navigation
- Moved API calls of the Navigation component to public/js/components/navigation/API.js
- Navigation component now imports public/js/components/navigation/API.js
2022-07-06 09:48:15 +02:00
Manfred 759a2b4c8a Merge remote-tracking branch 'origin/master' 2022-07-05 15:33:22 +02:00
Manfred e7587a9f00 Rechtecheck im Skript studienplan_vorrueckung auf lehre/studienplan 2022-07-05 15:33:17 +02:00
Manfred afb9bec9ba Zugangscode ausblenden, wenn Bewerbungstool-Addon nicht aktiv 2022-07-05 15:32:29 +02:00
Paolo 2927682dae Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets 2022-07-04 19:30:18 +02:00
Paolo 60b3be3d64 - Added new JS public/js/RESTClient.js as axios wrapper
- composer.json: added axios from github
- Added new directory application/components/extensions/
- Added new utility function findResource to application/helpers/hlp_common_helper.php
- Now the library libraries/FilterCmptLib loads the component definition php files from the extensions
- views/system/logs/logsViewer now includes axios and restclient, removed the includes for ajaxlib and jQueryUI
- Added includes for the RESTClient and axios to views/templates/FHC-Common and views/templates/FHC-Footer
- Improved component js/components/Fetch
- Components public/js/components/Filter.js and public/js/components/Navigation.js now they are making use of the Fetch component or/and the RESTClient
2022-07-04 19:25:16 +02:00
Andreas Österreicher 1d980274fe Merge branch 'feature-19651/OEH_Beitragsliste' 2022-07-04 16:27:26 +02:00
Harald Bamberger 5c94e33f24 render array properties correct, resize result on window resize, hide result on loosing focus 2022-07-02 13:26:18 +02:00
Andreas Österreicher ac231722f1 Problem behoben wodruch Fehlermeldungen nicht korrekt angezeigt wurden
in der Zeitaufzeichnung
2022-07-01 14:31:39 +02:00
Andreas Österreicher 1641a879af PHP Version Compatibility fixed 2022-07-01 09:04:52 +02:00
KarpAlex 6341246550 Gruppenmanagement vilesci:
- changed description of manager input field
- error messsages are displayed in red color
2022-06-30 15:48:32 +02:00
ma0068 2e4085c8de Validierung bei Löschen zeitaufzeichnungsrelevanter Zeitsperren und bereits abgeschickter Monatsliste 2022-06-30 14:22:29 +02:00
KarpAlex 9262dc6197 added Gruppenmanagement navigation menu entry to Persons category 2022-06-30 14:22:12 +02:00
Andreas Österreicher dd66e9d119 Merge branch 'feature-19766/Issues_Studiengang_der_Person_anzeigen' 2022-06-30 12:35:22 +02:00
ma0068 35426251cb Delete Testausgabe 2022-06-30 11:42:14 +02:00
KarpAlex f74e036ec8 moved Berechtigung "extension/dvuh_gui_ekz_anfordern" to DVUH extension SQL 2022-06-30 11:27:24 +02:00
ma0068 cf7ad022a7 Sancho Mail im Urlaubstool, neue Funktion checkActiveAddon 2022-06-30 10:51:02 +02:00
KarpAlex 1c3acc6366 issue overview: added column "Zugehörigkeit"(Belonging) to show study programs of concerning person and wether it is an employee 2022-06-29 17:59:57 +02:00
ma0068 60cbb8bd8c Einfügen Spalte Status Monatsliste, Verhindern bei Löschen von ZA wenn Monatsliste abgeschickt 2022-06-29 15:01:16 +02:00
Harald Bamberger 32daed2ad2 first draft data fetch component 2022-06-29 13:17:57 +02:00
Paolo f85225cc4e Addex axios to the views/templates/ includes 2022-06-29 10:58:33 +02:00
Paolo 091307680b - Sorted composer packages in composer.json
- New composer.lock generated
- Added new package axios
2022-06-29 10:57:08 +02:00
Paolo 796c09999f Changed FilterCmptLib public methods to private where they were not used outside the library itself 2022-06-29 10:55:30 +02:00
ma0068 ad30cc862e Neue Spalte Status Monatsliste 2022-06-29 10:53:45 +02:00
ma0068 797cabccb9 neue Mailvorlagen Sancho fuer Zeitausgleich und Urlaub 2022-06-29 08:46:01 +02:00
KarpAlex 500bbec2c1 added "hasSequence" = false to crm/Dokumentprestudent_model to avoid "lastval not found" error 2022-06-28 19:07:09 +02:00
Andreas Österreicher eeba5c7bd5 Merge branch 'feature-18887/Datenverbund_Clearing_und_Community_Changes' 2022-06-28 14:28:04 +02:00
Paolo bcaa560a46 Bugfix: query executed before changes are applied 2022-06-28 10:29:44 +02:00
Paolo 2a298dc6d1 - Added JSON post parameter check in controllers/components/SearchBar->search
- Expanded search capabilities for organization units and employees
2022-06-27 16:22:40 +02:00
Andreas Österreicher 2692accbdf Merge branch 'master' into feature-18887/Datenverbund_Clearing_und_Community_Changes 2022-06-27 14:48:11 +02:00
Harald Bamberger 47f7c03075 virtualsplit and searchbar vue component, TestSearch Controller and View for Demonstration, minor change to SearchBar Controller to work with posted json 2022-06-24 19:26:37 +02:00
Paolo 147ab92bae - Added new library libraries/SearchBarLib
- Added new controller components/SearchBar
- Removed not anymore used view application/views/system/logs/logsViewerData.php
2022-06-24 17:59:01 +02:00
Paolo 24b78454d3 - Added new function generateJSModulesInclude to application/helpers/hlp_header_helper.php
- Added entry "customJSModules" to the application/views/templates/FHC-Footer.php to be passed to the generateJSModulesInclude function to generate JS modules tags
- The new VUE components are making use of the JS import and export functionalities
2022-06-24 15:07:50 +02:00
Paolo 9e48ba09d8 - Moved GUI options from application/components/filters/LogsViewer.php to application/views/system/logs/logsViewer.php
- Changed controller components/Filter to work with the new FilterComponent
- Removed unused code from library libraries/FilterCmptLib
- Changed library libraries/FilterCmptLib to work with the new changes in the controller components/Filter
- Added new CSSs for the new FilterComponent and NavigationComponent
2022-06-24 14:55:04 +02:00
Manfred f0df99c46a Merge remote-tracking branch 'origin/master' 2022-06-24 14:29:35 +02:00
Manfred fcf829d03b Button "Liste ausräumen" ergänzt
Löscht leere (unbenutzte) Prüflinge
2022-06-24 14:29:08 +02:00
ma0068 c87aee0ddf Zeitsperre Umbau Mail auf Sanchomail, Anzeige Zeitsaldo in Sanchomail, Adpatierungen Urlaub 2022-06-24 08:10:51 +02:00
Cris 5f5031e8d1 Added ECTS Summe to Anrechnung Detail View. 2022-06-22 10:54:17 +02:00
Cris 7bba155bb5 Adapted function getPreviousFrom to return more than 1 previous semester if needed 2022-06-22 10:52:51 +02:00
Cris b52a3c9397 Added DB queries to calculate ECTS Summe in Lehrveranstaltung_model.php 2022-06-22 10:51:39 +02:00
Cris 12c9afbd3d Added function getFirstStatus to Prestudentstatus_model.php
Funktion liefert den Ersten Status eines Prestudenten mit der übergebenen Statuskurzbezeichnung.
2022-06-22 10:48:48 +02:00
Cris 42fb7a4fc8 Added ECTS Summe functions to AnrechnungLib
Added functions to calculate total ECTS Summe of
. angerechnete Studiensemester of Quereinsteiger
. bisher angerechnete schulische Kenntnisse
. bisher angerechente berufliche Kenntisse
2022-06-22 10:47:29 +02:00
cgfhtw 65ba946321 Rework Studienplan->getStudienplanLehrveranstaltung for Templates & use it in Vilesci "Lehrveranstaltung" 2022-06-22 09:39:53 +02:00