blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,964 Commits 225 Branches 6 Tags
2ef2a906c361470336935ca97fd8a130a76fd722
Commit Graph

123 Commits

Author SHA1 Message Date
Andreas Österreicher ec849c7daf Längenprüfung für ZGV Ort hinzugefügt 2020-04-28 08:16:52 +02:00
Manfred Kindl 6874408200 Bugfix Fallback Bild 
Bugfix Loginliste
 2020-02-26 17:11:11 +01:00
Manfred Kindl 9586a3e551 Updated function getFirstPrioPrestudentRT 2020-02-24 21:01:41 +01:00
Manfred Kindl 8c30666043 Testtool Login shows applicants only once (Only application of first priority) -> Only for FHTW! 
New function getFirstPrioPrestudentRT in prestudent.class.php
Link to pivot-table in mail to assistants
auswertung_fhtw berücksichtigt nun orgformen (studienpläne) aus tbl_ablauf
 2020-02-24 18:43:38 +01:00
Cris 94b19d8bd1 Fixed to get question in language of the actual logged-in Master study 
When logging in with a Master study, the system was retrieving the
studyplan/study of the highest priored applied Master study. This
behaviour should only occure for Bachelor studies and was leading to
incorrect language setting.

Now if user logs in with a Master study, the actual studyplan/study and
the correct language setting are retrieved.
 2019-05-14 16:34:37 +02:00
Cris 0b5f9f51f7 Extended function getActualInteressenten to differ only by STG-type/-kz 
Now the function accepts the optional arguments:
. typ (= studiengangstyp)
. studiengang_kz
to retrieve more specific data.
 2019-03-12 17:53:44 +01:00
Cris af79da67cb Added function to retrieve actual Interessenten (optionally only for prio) 
The query retrieves all actual prestudenten with the status 'Interessent' of the users person_id.  (+ prio, stg, stpl and ausbildungssemester) 
Optionally the function limits the result to the one stg with the highest priority.
 2019-03-06 12:09:14 +01:00
Manfred Kindl 60d45a0239 Relative Priorisierung in FAS 2019-01-31 16:18:22 +01:00
Manfred Kindl 955102b822 Changes in functions 
- Optional studienplan_id in existsPrestudentstatus
- Optional order by in getPriorisierungPersonStudiensemester
- Function getPriorisierungPersonStudiensemester returns now object with priorisierung and studiengang_kz
 2018-12-10 10:24:58 +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 c8b0b416bb Spalte "Priorisierung" in DB und Prestudent.class 2018-10-08 14:25:50 +02:00
Manfred Kindl 07f99b81ff Personen Zusammenlegen ueberarbeitet 
- Personen können aus FAS heraus zusammengelegt werden (bis zu 2 Personen markieren -> Rechte Maustaste -> Personen zusammenlegen"
- Fotos und die existierenden Rollen werden in der Übersicht angezeigt
- Recht muss "basis/person" mit SUID sein
- Alle derzeit vorhandenen DB-Tabellen werden berücksichtigt
- Aktuelleres Foto wird übernommen, Fotosperren werden übernommen, Fotohistorie wird übernommen
- Ersatzkennzeichen bzw Sozialversicherungsnummer wird übernommen
- Letztbenutzter Zugangscode wird übernommen
- Adressen der verbliebenen Person werden zusammengeräumt (Doppelte löschen, Unvollständige zusammenführen)
- Kontakte der verbliebenen Person werden zusammengeräumt (Doppelte löschen, Unvollständige zusammenführen)
- Doppelte PreStudenten (im selben Studiensemester) werden gelöscht
- Neue Funktion getLog in personlog.class laedt die Log-Einträge einer Person
 2018-07-17 11:22:06 +02:00
Manfred Kindl 6f6929e55f CIS-Suche optimiert 
Redirects auf interne Seiten werden nicht im Suchergebnis angezeigt. Solche auf externe Seiten werden in einem neuen Fenster geöffnet.
OE-Suche optimiert
 2018-04-03 11:11:08 +02:00
Manfred Kindl e7eac3e4fc New Function existsPrestudentstatus 2018-02-05 12:13:08 +01:00
Paolo 0bc0a09bf4 - Removed file system execute permission for all files (no directories) 
- application/extensions file system permission now is 775
- application/logs file system permission now is 775
- Added extensions directory in application/: config, controllers, helpers, hooks, libraries, models, views and widgets
- Added view views/extensions/manage.php
- Added controller controllers/system/extensions/Manager.php
- Added library ExtensionsLib to manage extensions
- Added model models/system/Extensions_model.php
- Moved code related to print out info from MigrationLib to EPrintfLib
 2017-11-13 10:45:49 +01:00
Andreas Oesterreicher 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
 2017-08-31 10:28:22 +02:00
oesi c826e76e8f Beim bestätigen des Status im FAS wird das Updateamum/Updatevon und Bestaetigtvon gesetzt 2017-08-28 16:56:50 +02:00
oesi 4a82d2f36f Personen scheinen jetzt nicht mehr doppelt im DropDown des Reihungstest Login auf wenn Onlinetest und Interview am selben Tag stattfinden 2017-05-12 17:25:43 +02:00
kindlm 8d50b16413 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-03-21 17:36:27 +01:00
kindlm 8e0009573f FAS Prestudenten löschen 
Wenn der letzte PreStudentStatus-Eintrag gelöscht wird, wird der ganze
Prestudent-Datensatz geloescht (nach vorherigen Hinweis) und ins Log
geschrieben (Außer, es hängen noch Verknüpfungen in der DB dran)
 2017-03-21 17:29:22 +01:00
oesi 261df66d7b Reihungstestlogin zeigt nur noch Personen an die Statuseinträge mit Studiensemesterbeginn nach dem Reihungstestdatum haben damit keine doppelten Personen mit unterschiedlichen PrestudentIDs angzeigt werden wenn diese bereits einen Reihungstest in vorherigen Semestern besucht haben. 2017-03-10 16:35:58 +01:00
oesi 0169ad91b3 Filter "Interessenten"->"Reihungstest angemeldet" prüft ob jetzt zusätzlich das Studiensemester 2017-03-01 18:12:13 +01:00
oesi 586acf790e - Tippfehler in Funktionsnamen behoben 
- Nicht mehr verwendetes RDF entfernt
 2017-03-01 18:07:53 +01:00
oesi 57520c1ae4 - Versionsnummer korrigert 
- Neues DB Update File erstellt
- Statusgrund bei Prestudentstatus hinzugefügt
- Editieren des Statusgrund im FAS hinzugefügt
 2017-02-14 18:58:47 +01:00
oesi 75626b620b Reihungstest Login zeigt Personen jetzt nicht mehr doppelt an wenn diese mehrere Prestudenten Einträge haben. 
Personen werden jetzt korrekt mit dem Studiengang des Prestudenten anstatt mit dem Studiengang des Reihungstests angezeigt
 2017-01-27 08:31:55 +01:00
oesi 51b8a15f27 Added Aufnahmegruppe DropDown in FAS 2017-01-17 14:47:16 +01:00
oesi d4498c20d1 Filter im Verbandstree für Reihungstest angemeldet/nicht angemeldet greift nun auf die neun Aufnahme-Tabellen zu. 2017-01-10 12:02:13 +01:00
oesi 8ea63d04a6 Testtool, Auswertung und Reihungstestadministration benutzen nun die neuen Reihungstestanmeldetabelle 2016-12-20 12:38:36 +01:00
oesi 68a696cdc8 Merge branch 'master' into ci 
Conflicts:
	cis/testtool/admin/add_gebiet.php
	cis/testtool/admin/edit_gebiet.php
	cis/testtool/admin/index.php
	config/global.config-default.inc.php
	content/student/studentDBDML.php
	content/student/studentdetailoverlay.xul.php
	include/ablauf.class.php
	include/frage.class.php
	include/organisationseinheit.class.php
	include/studiengang.class.php
	include/vorschlag.class.php
	phpci.yml
	rdf/student.rdf.php
	system/dbupdate_3.2.php
	tests/codeception/_support/AcceptanceTester.php
	tests/codeception/_support/BasisKlasseTest.php
	tests/codeception/_support/FunctionalTester.php
	tests/codeception/_support/UnitTester.php
	tests/codeception/_support/_generated/AcceptanceTesterActions.php
	tests/codeception/acceptance/AcceptanceTester.php
	tests/codeception/acceptance/CISLoginPageCept.php
	tests/codeception/acceptance/_bootstrap.php
	tests/codeception/codeception.dist.yml
	tests/codeception/functional/FunctionalTester.php
	tests/codeception/functional/_bootstrap.php
	tests/codeception/tests/acceptance.suite.dist.yml
	tests/codeception/tests/acceptance/CISLoginPage.php
	tests/codeception/tests/acceptance/CISLoginPageCept.php
	tests/codeception/tests/api/_bootstrap.php
	tests/codeception/tests/functional/FunctionalTester.php
	tests/codeception/tests/functional/_bootstrap.php
	tests/codeception/tests/unit/BasisKlasseTest.php
	tests/codeception/tests/unit/UnitTester.php
	tests/codeception/unit/BasisKlasseTest.php
	tests/codeception/unit/UnitTester.php
 2016-11-22 13:58:29 +01:00
oesi 562a183098 Neuen Karteireiter im FAS zur Erfassung von Gemeinsamen Studien hinzugefügt 2016-10-18 14:35:37 +02:00
oesi 65765bceb1 - Removed CI Inheritance from Prestudent because it breaks the person inheritance 
- Added function to parse Language Arrays to db_extras
 2016-07-05 16:28:35 +02:00
oesi 6544a656f8 - Studienplan removed Getter to get CI-Language working 
- Prestudent added missing Person Class
 2016-07-05 10:00:49 +02:00
oesi ad335ad240 RTPunkte1, RTPunkte2 und Private EMail hinzugefügt. 
Funktion aus Klasse entfernt
 2016-06-24 17:04:56 +02:00
paolo 58a6da42ae The method loadWhole has been removed from model DB_Model. 
The same functionality has given by calling the load method without parameters
 2016-06-24 10:39:52 +02:00
oesi 6089be78f7 Anmerkung/Prio wird bei Aliqoute Reduktion mit angezeigt 2016-06-09 09:53:00 +02:00
paolo 3955d4b395 - Moved old libraries to CI 
- Extended Controllers functionalities
- Added controls to ueberbuchung.php, zeitwuensche.php and funktion_det.php
pages to avoid warnings and notices, especially when no data are in DB
- Removed fhcdb_helper.php because it's no more needed
 2016-06-07 17:55:31 +02:00
paolo 0dc605df3c - Modified FHC_Model, now it is saving uid in CI session 
- Added codeception tests
- Added statistik to dump.sql
- Moved old libraries to CI
 2016-06-06 16:36:23 +02:00
oesi b0b3fe845a Aliqoute Reduktion verwendet die MasterZGV bei Masterstudiengängen zur Reihung 2016-06-01 13:55:42 +02:00
paolo 00211ee647 - Added codeception test cases 
- Moved old libraries to CI
 2016-05-25 18:36:18 +02:00
Gerald Raab f0bee0d531 Ital Phrases, Error in Classfile localised 2016-05-04 14:42:09 +02:00
Paminger 2dada5200c Merge branch 'master' into ci 
Conflicts:
	.gitignore
	composer.json
	include/prestudent.class.php
	include/securimage/securimage.php
	include/studienplan.class.php
	system/dbupdate_3.2.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/DocBlockAlignmentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentSniff.php
	tests/codesniffer/FHComplete/Sniffs/Commenting/FunctionCommentTypeSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ControlSignatureSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/ControlStructures/WhileStructuresSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/OneClassPerUseSniff.php
	tests/codesniffer/FHComplete/Sniffs/Formatting/UseInAlphabeticalOrderSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/ClosureDeclarationSniff.php
	tests/codesniffer/FHComplete/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/CamelCapsMethodNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidClassBracketsSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidTraitNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidVariableNameSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/DisallowShortOpenTagSniff.php
	tests/codesniffer/FHComplete/Sniffs/PHP/TypeCastingSniff.php
	tests/codesniffer/FHComplete/Sniffs/Strings/ConcatenationSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/CommaSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/FunctionSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/OperatorSpacingSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/ScopeIndentSniff.php
	tests/codesniffer/FHComplete/Sniffs/WhiteSpace/TabAndSpaceSniff.php
	tests/codesniffer/FHComplete/ruleset.xml
	tests/codesniffer/FHComplete/tests/FHCompletePHPStandardTest.php
	tests/codesniffer/FHComplete/tests/TestHelper.php
	tests/codesniffer/FHComplete/tests/bootstrap.php
	tests/codesniffer/FHComplete/tests/files/FHComplete/throws_pass.php
	tests/codesniffer/FHComplete/tests/files/bad_trait_name.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail1.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail2.php
	tests/codesniffer/FHComplete/tests/files/class_brackets_fail3.php
	tests/codesniffer/FHComplete/tests/files/class_underscore_prefix_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_brackets_pass.php
	tests/codesniffer/FHComplete/tests/files/control_structure_dowhile.php
	tests/codesniffer/FHComplete/tests/files/control_structure_elseif.php
	tests/codesniffer/FHComplete/tests/files/control_structure_indentation.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nobrackets.php
	tests/codesniffer/FHComplete/tests/files/control_structure_nospace.php
	tests/codesniffer/FHComplete/tests/files/control_structure_while.php
	tests/codesniffer/FHComplete/tests/files/control_structures_no_newline.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_fail.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_flat_pass.php
	tests/codesniffer/FHComplete/tests/files/docblock_align_pass.php
	tests/codesniffer/FHComplete/tests/files/double_space.php
	tests/codesniffer/FHComplete/tests/files/for_function_comment_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_opening_line_pass.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_fail.php
	tests/codesniffer/FHComplete/tests/files/function_comment_type_pass.php
	tests/codesniffer/FHComplete/tests/files/function_spacing.php
	tests/codesniffer/FHComplete/tests/files/mixing_indent.php
	tests/codesniffer/FHComplete/tests/files/multiple_use.php
	tests/codesniffer/FHComplete/tests/files/multiple_use_pass.php
	tests/codesniffer/FHComplete/tests/files/operator_spacing_pass.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_fail.php
	tests/codesniffer/FHComplete/tests/files/short_open_tags_pass.php
	tests/codesniffer/FHComplete/tests/files/space_tab.php
	tests/codesniffer/FHComplete/tests/files/tab_space.php
	tests/codesniffer/FHComplete/tests/files/traits_no_order.php
	tests/codesniffer/FHComplete/tests/files/traits_pass.php
	tests/codesniffer/FHComplete/tests/files/type_casting_fail.php
	tests/codesniffer/FHComplete/tests/files/type_casting_pass.php
	tests/codesniffer/FHComplete/tests/files/use_class_and_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_closure_pass.php
	tests/codesniffer/FHComplete/tests/files/use_no_order.php
	tests/codesniffer/FHComplete/tests/files/use_ok_pass.php
	tests/codesniffer/FHComplete/tests/files/use_with_commas.php
	tests/codesniffer/FHComplete/tests/files/variable_name_pass.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_before.php
	tests/codesniffer/FHComplete/tests/files/whitespace_comma_pass.php
	tests/codesniffer/FHComplete/tests/ruleset.xml
 2016-04-28 18:14:40 +02:00
paolo 75e3590a09 This is not the best code in the world, it's only a beta version 2016-04-21 17:17:30 +02:00
paolo 78e4c2900b Merge origin/ci into ci 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
 2016-04-20 17:57:55 +02:00
Gerald Raab ae2f6c21d8 statusbezeichnung mehrsprachig, prüfungsverwaltung mehrsprachig 2016-04-20 17:19:14 +02:00
Nikolaus Krondraf 0292f69d2b Mehrsprachigkeit der Statuswerte 2016-04-18 12:12:04 +02:00
Andreas Moik ecf882e748 better automatic selection in the aliquote reduction 2016-03-07 14:04:14 +01:00
Andreas Moik 2a24f20cce first preselection for the aliquote reduction 2016-03-07 12:18:38 +01:00
Andreas Moik 5501cdbecd First draft for aliquote reduction 2016-03-03 17:00:32 +01:00
kindlm de1308f280 Neue Filter bei PreInteressenten 
- Bewerbung nicht abgeschickt
- Bewerbung abgeschickt, Status unbestätigt
- Status bestätigt
 2016-01-25 17:08:32 +01:00
kindlm 367657a9f4 Attribut bewerbung_abgeschicktamum 
Neues Attribut bewerbung_abgeschicktamum in Klasse eingefügt
 2015-12-14 23:56:52 +01:00