Commit Graph

9269 Commits

Author SHA1 Message Date
Cris 73cf593a50 Merge remote-tracking branch 'origin/master' 2018-12-06 12:43:10 +01:00
Cris 38b195beeb Optimized Reihungstest-chronjob code
. Optimized code by retreiving data directly via model.
. Extended SQL query: study courses are now checked for active = true
2018-12-06 12:42:48 +01:00
Cris dd7e025220 Optimized Reihungstest-chronjob code
. Optimized code by retreiving data directly via model.
. Extended SQL query: study plans are now checked for active = true
2018-12-06 12:40:51 +01:00
Cris 1f6f56f71c Merge remote-tracking branch 'origin/master' 2018-12-06 08:28:48 +01:00
Paolo dee4a4a5a1 Removed ci_loader.php 2018-12-05 17:23:53 +01:00
Cris 41b55cf571 Added Reihungstest-chronjob -> sends info with Sancho mail
The job
-- checks if there are active studyplans which have no public placement tests assigned yet 
-- retrieves faculty and amount of free places for each public placement test date.

This information is then sent by email in Sancho design.
2018-12-05 16:58:38 +01:00
Cris 535275adb1 Changed Sancho default header picture 2018-12-05 16:45:06 +01:00
Andreas Österreicher ae38e867a9 Nachreichdatum für Dokumente kann im FAS editiert werden 2018-12-04 16:56:56 +01:00
Andreas Österreicher 141328bf87 Removed Mitarbeiter Include from functions.inc.php to get UDF in FAS
working again
2018-12-04 16:25:54 +01:00
Andreas Österreicher d5b1c9c643 Infocenter: Added Column ZGVNation to FilterPages 2018-12-04 15:45:51 +01:00
Andreas Österreicher 56a665fb9b Infocenter:
- Corrected Reihungstest angemeldet Column
- Changed Date Format and boolean Columns to German
2018-12-04 15:15:46 +01:00
Andreas Österreicher 8bbe26a365 Infocenter: Added Gender Column to Filter Pages 2018-12-04 14:41:40 +01:00
Andreas Österreicher 0352660194 Infocenter Back Link links now correctly to Reihungstest absolviert Page
if origin is set
2018-12-04 14:37:53 +01:00
alex 09e452cf74 bewerber is unparked after sending reply message 2018-12-04 09:42:33 +01:00
Paolo d178164130 - Removed private methods _setNavigationMenuIndex, _fillCustomFilters and _fillFilters from controller organisation/Reihungstest.php
- Removed public method setNavigationMenuArrayJson from controller organisation/Reihungstest.php
- Removed JS include public/js/reihungstest/reihungstest.js from views/organisation/reihungstest/reihungstest.php
- Removed JS public/js/reihungstest/reihungstest.js
2018-12-03 14:53:25 +01:00
alex f7f13d3941 added information about statusgrund to freigeben log 2018-12-03 14:43:07 +01:00
Paolo 3abc592c81 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-12-03 14:09:50 +01:00
Paolo 03f74c2299 - Added new page "Reihungstest absolviert" to InfoCenter
- New const REIHUNGSTESTABSOLVIERT_PAGE in InfoCenter controller
- New permission reihungstestAbsolviert => 'infocenter' in InfoCenter controller
- Remove private method _setNavigationMenuFreigegeben from InfoCenter controller
- Added new private method _setNavigationMenu to InfoCenter controller
- Added new public method reihungstestAbsolviert to InfoCenter controller
- Changed method setNavigationMenuArrayJson in InfoCenter controller to include new page "Reihungstest absolviert"
- Changed method _setNavigationMenuIndex in InfoCenter controller to include new page "Reihungstest absolviert"
- Added orgform to column StgAbgeschickt in infocenterFreigegebenData.php
- Added new columns Statusgrund, ReihungstestAngetreten and ReihungstestApplied in infocenterFreigegebenData.php
- Added new filters for reihungstestAbsolviert in system/filtersupdate.php
- Changed freigegeben filters in system/filtersupdate.php
2018-12-03 13:33:57 +01:00
alex 85cd0bade8 count of tablesorter-filtered datarows in infocenterübersicht also shown below the table 2018-11-30 16:49:26 +01:00
alex a28df53718 Infocenter changes
- new button for Freigabe zum Reihungstest, sending message to bewerber when freigabe
- button Freigabe for Studiengang with Statusgrund
- Ausbildungssemester can be saved
- Using Vorlagen for Freigabe Mail to assistance and message to bewerber
- Added Nation of address at details page
- Scroll to top button on details page
- moved messageList js to own file
2018-11-30 16:48:28 +01:00
Andreas Österreicher be03294685 Renamed Aufbaukurs to Qualifikationskurs
Extended Permission Check
2018-11-30 16:10:50 +01:00
Andreas Österreicher 672aacac56 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2018-11-30 15:57:55 +01:00
Andreas Österreicher 6c59fc93e3 Studiengang des Reihungstests zur Übersichtsliste hinzugefügt 2018-11-30 15:57:24 +01:00
Paolo 7523e275d5 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-11-30 15:08:27 +01:00
Paolo 7a9eda3912 - Added new public method setNavigationMenu to controller system/Filters.php
- Method _setNavigationMenuFreigegeben of system/infocenter/InfoCenter controller now generate only the menu entry "Home"
- Added new const CUSTOM_MENU to FiltersLib to represent new FilterWidget parameter to specify if the menu for this filter is custom
- Added new consts NAV_MENU_FILTER_KEY, NAV_MENU_FILTER_NAME, NAV_MENU_CUSTOM_FILTER_KEY and NAV_MENU_CUSTOM_FILTER_NAME to FiltersLib as name and array keys of the filters menu array
- Added new const NAVIGATION_PAGE to FiltersLib which represents the navigation page parameter name
- Added new public method generateFilterMenu to FiltersLib to generate the filters menu structure array and stores it into the session
- Fixed methods setElementSessionMenu and setElementSessionHeader in NavigationLib
- Added new public method getFiltersByAppDatasetName to Filters_model to load all filters by their app and dataset_name
- Added new private property _customMenu to FilterWidget
- If _customMenu is NOT true then the new private method _setFilterMenu is called
- View infocenter/infocenterData.php: arranged the code differently and set customMenu as true
- View infocenter/infocenterFreigegebenData.php: arranged the code differently
- Added new global function refreshSideMenuHook to FilterWidget.js
- Renamed private method _getNavigationWidgetCalled to getNavigationPage in NavigationWidget.js
- Method refreshSideMenuHook of NavigationWidget.js now can accept parameters to give them to the ajax call
- In infocenterPersonDataset.js the function refreshSideMenuHook is declared only if the page is the index page
2018-11-30 14:58:38 +01:00
Andreas Österreicher f40d29f774 Reihungstest Overview
- Changed Date-Format to German
- Schwund is taken from Config instead of hardcoded value
2018-11-30 10:15:48 +01:00
Andreas Österreicher b6b9001ff2 Added Option for Sorting German Date Styles 2018-11-30 10:15:15 +01:00
Andreas Österreicher 1e55ce5f0a Column Adress-Nation is now visible by default in FAS 2018-11-30 09:17:15 +01:00
Cris b7cdbcb593 Updated Diploma Supplement templates with newer content
. Updated text in Diploma Supplement templates for 
. master/bachelor (diplomaSupp_0.xsl) and
. Lehrgänge (diplomaSupp_Lehrgaenge.xsl)

. Deleted diploma supplement template for App Development (diplomaSupp_-7.xsl) as it is not active anymore.
2018-11-29 14:23:16 +01:00
Andreas Österreicher a9f97cc755 Muted USort Warning-Output as Workaround for PHP 5.6 Bug 2018-11-29 07:23:35 +01:00
Paolo 513815bbd2 Fixed wrong order of columns aliases in infocenterData and infocenterFreigegebenData 2018-11-28 14:57:54 +01:00
Andreas Österreicher 6ac176b412 Addonspezifische Tabellen aus Mergescript für Personen entfernt 2018-11-27 17:37:02 +01:00
Paolo 874716921b - Removed static menu entries InfoCenter/index and InfoCenter/freigegeben from config/navigation.php
- Added new constant FILTER_ID to controllers/system/infocenter/InfoCenter.php
- Added new constant PREV_FILTER_ID to controllers/system/infocenter/InfoCenter.php
- Changed InfoCenter controller methods _setNavigationMenuIndex, _setNavigationMenuShowDetails and _setNavigationMenuFreigegeben to generate links with possibly parameter prev_filter_id
- Changed views system/infocenter/infocenterData.php and system/infocenter/infocenterFreigegebenData.php to generate links with possibly parameter prev_filter_id
2018-11-27 17:02:34 +01:00
Paolo 4be03a4657 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-11-27 17:00:41 +01:00
Cris 1671badf58 Moved permission check-functions to mitarbeiter.class.php
In order to avoid cross scripting problems:
MOVED functions
. check_isVorgesetzter
. check isVorgesetzter_indirekt
FROM functions.inc.php TO mitarbeiter.class.php
2018-11-27 16:20:34 +01:00
Paolo d9847a9ce6 - Added new private method _generateLink to NavigationWidget.js
- Now _buildLeftMenuStructure uses _generateLink to generate the menu entry href
2018-11-27 12:06:04 +01:00
Andreas Österreicher 2a05b46dd2 Increased Execution Time for DMS Faker 2018-11-27 11:05:53 +01:00
Andreas Österreicher 608a86e049 Neue Übersichtsseite für Reihungstests hinzugefügt 2018-11-27 11:04:08 +01:00
Andreas Österreicher 3fcfcd49b1 Fixed loading of the Vilesci Menü 2018-11-27 08:14:39 +01:00
Manfred Kindl d71e9a736f Merge remote-tracking branch 'origin/master' 2018-11-26 18:14:01 +01:00
Manfred Kindl 50c1b1b89a New function getVerfuegbarePlaetzeReihungstest
Laedt die Anzahl an verfügbaren Plätzen bei einem Reihungstest.

New param "$studiensemester_kurzbz" for function getReihungstestPerson:  Studiensemester, in welchem der Reihungstest liegen soll
2018-11-26 18:12:05 +01:00
Manfred Kindl 7e6d9bb8cf New right "reihungstestOeffentlich"
Erlaubt das Veröffentlichen von Reihungstests (Sichtbarkeit für BewerberInnen)
2018-11-26 18:09:37 +01:00
Manfred Kindl 2be8045642 New Script studienplan_vorrueckung
Lädt alle Studienpläne, die für das Zielsemester noch keinen Eintrag im 1. Ausbildungssemester haben und kopiert diese ins Folge- Studiensemester
2018-11-26 18:09:14 +01:00
Manfred Kindl 90209ec35d Reihungstestverwaltung new features
- Auto set Anmeldefrist on datum-change
- Added Fakultäten/All Bachelor/ All Master/ All degree-Programs to autocomplete
- New right reihungstestOeffentlich to save boolean "oeffentlich"
- Copy of date also copies rooms an studienplans
- Beautify error-/success messages
2018-11-26 18:05:53 +01:00
Manfred Kindl 137c8ca946 Added tablesorter, New Columns for prestudent-table
Studiensemester
Priorität
Studiengang
Organisationsform
Studienplan
2018-11-26 17:59:18 +01:00
Manfred Kindl f7d37d59eb Korrektur Adresse FHTW 2018-11-26 17:56:17 +01:00
Manfred Kindl c362ae12ab New param $aktiv and $gueltigInStudiensemester to searchStudienplaene
- $aktiv Optional. Wenn true werden nur aktive Studienpläne geliefert, wenn false nur inaktive, wenn null (default) alle
- $gueltigInStudiensemester Optional. Studiensemester_kurzbz in welchem der Studienplan gueltig ist
2018-11-26 17:55:45 +01:00
Manfred Kindl b2d664accf New function loadStudiengaengeFromTyp
Laedt die Studiengänge die vom übergeben Typ sind
2018-11-26 17:54:06 +01:00
Manfred Kindl fad7705b65 New function getHoechstePriorisierungPersonStudiensemester
Liefert die höchste Priorität des PreStudenten einer Person in einem Studiensemester
2018-11-26 17:53:23 +01:00
Manfred Kindl 95fdc69541 Add param $organisationseinheittyp_kurzbz in function getChilds 2018-11-26 17:52:44 +01:00