blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-04 21:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,124 Commits 225 Branches 6 Tags
e50f644cb671bba14e7696fb949b3d9fded2f8fa
Commit Graph

89 Commits

Author SHA1 Message Date
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
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
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
paolo 00211ee647 - Added codeception test cases 
- Moved old libraries to CI
 2016-05-25 18:36:18 +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
oesi c9e35a60c6 Beim Laden des Status wird die Anmerkung mitgeladen 2015-10-29 16:22:28 +01:00
oesi 2ec1996b0f ext_id aus Save Funktionen entfernt damit diese beim Speichern von Datensätzen nicht verloren geht 2015-08-18 11:26:01 +02:00
oesi 800eeb4dfd Dateien in Addon Bewerbung verschoben 
Warning behoben wenn Zahlungen auf nicht aktiven Studiengang vorhanden sind
 2015-04-21 12:28:21 +02:00
oesi b50d4c27d1 Fehler behoben bei dem ErrorMsgs beim Reihungstest angezeigt wurden 2015-04-17 08:32:08 +02:00
Robert Hofer 29f2b98877 ausstellungsstaat, zgv nation 2015-03-25 18:41:06 +01:00
Robert Hofer 95d8967855 nation attribute for ZGV 2015-03-24 18:07:43 +01:00
Robert Hofer 8b4c82c0e3 get types of a list of studiengaenge 
get zgv for all prestudents of one student
 2015-03-20 13:37:27 +01:00
oesi 2d1e5c2376 Anmerkung bei Prestudentstatus im FAS sichtbar und editierbar 2015-03-16 18:05:11 +01:00
Robert Hofer 6c3b5403ae column tbl_prestudent.anmerkung 
is called "anmerkung_status" in php object
 2015-03-13 14:44:20 +01:00
Robert Hofer 6066462044 load prestudent 2015-03-12 11:36:24 +01:00
Robert Hofer 2dc8e8a7a6 new column "anmerkung" in tbl_prestudentstatus 2015-02-26 16:57:18 +01:00
Robert Hofer 6e09afb9af attendance view for lectors and students 2015-02-03 14:08:43 +01:00
Christian Paminger 5cda898433 Studienplan in FAS-Liste 2014-10-24 15:24:00 +00:00
Nikolaus Krondraf 13230aa781 Textfeld "Mentor" bei PreStudent im FAS hinzugefügt 2014-10-23 11:37:20 +00:00
Werner Masik dd10775c52 Bug Fix und Performanceverbesserungen 2014-04-03 20:14:38 +00:00
Andreas Österreicher a98e9aa584 Anpassungen Berechnung Studierendenzahlen 2014-03-20 15:52:58 +00:00
Werner Masik bf1031e395 Studienplatzverwaltung benutzt nun Datenbank anstatt Testdaten. 2014-03-17 12:20:14 +00:00
Andreas Österreicher a50854343c Prestudent Funktionen für Studienplatzverwaltung hinzugefuegt 2014-02-05 08:24:30 +00:00
Martin Tatzber ace01397b0 Studentenverlängerung im CIS und FAS 2014-02-04 12:01:05 +00:00
Andreas Österreicher efff63fa6d Beim Status des Prestudenten kann nun zusaetzlich der Studienplan gespeichert werden; Erweiterung der Studienplan ansicht für Studierende inklusive Anmeldung zu Lehrveranstaltungen 2013-12-17 15:30:26 +00:00
Karl Burkhart 5ec694ae3d -zgvdoktor in akte und zgv klasse hinzugefügt 
-nachgereicht, anmerkung in prestudent hinzugefügt
 2013-10-09 13:15:47 +00:00
Andreas Österreicher 6dae98a29a 3. Feld fuer Reihungstestpunkte hinzugefuegt; ueber Config aktivierbar 2013-06-28 09:47:49 +00:00
Manfred Kindl 13dd931238 freifaecher/anmeldung.php: Infotext auskommentiert. 
testtool/login.php: benutzerberechtigung eingefügt.
mitarbeiter.class.php: Suchfeld im FAS sucht nun nach Vorname UND Nachname sowie nach svnr.
student.rdf.php: Suchfeld im FAS sucht nun nach Vorname UND Nachname sowie nach svnr.
prestudent.class.php: Dropdown im Reihungstest-Login zeigt nur mehr heutige (und nicht mehr auch zukünftige) Prestudenten an.
 2012-03-30 11:53:40 +00:00
Karl Burkhart 42b33dcf87 ausstellungstaat in save() hinzugefügt 2011-10-04 12:24:53 +00:00
Andreas Österreicher 1c31234ca1 Neues Feld Ausstellungsstaat für BIS hinzugefügt 2011-09-23 07:53:54 +00:00
Karl Burkhart bc6a7af1b6 -parameter status_kurzbz für getLastStatus hinzugefügt. 2011-03-29 08:06:27 +00:00
Karl Burkhart 8549a48520 getPrestudentRolle order by hinzugefügt 2011-03-22 10:33:03 +00:00
Karl Burkhart 9a0389a70d - getFirstStatus() hinzugefügt 2011-03-16 14:51:17 +00:00
Markus Pospischil 7443c47bb0 Typos, comments, finale(einstweilen..) Version der Zeugnisse, UML doku 2010-06-18 13:56:48 +00:00
Andreas Österreicher d0d0f3cc42 - ZGV-Master wird bei ZGV Filtern bei Masterstudiengängen jetzt richtig berücksichtigt 
- Bugfix beim Löschen von Vorschlägen
 2010-05-07 11:32:20 +00:00
Andreas Österreicher b2cca19190 Updateamum und Updatevon wird beim Speichern der Rolle jetzt richtig gesetzt 2010-04-15 11:43:16 +00:00
Andreas Österreicher 09c8cd1f7f - Diverse kleinere Bugfixes Aufgrund der Errorlog Auswertung 
- OE-Beitragsliste zeigt nun nur noch die Studenten an die aktuell den Status Student/Diplomand/Praktikant haben und das BIS-Melden Hackerl gesetzt haben
 2009-11-23 10:31:16 +00:00
Andreas Österreicher 424d6c1b7d 2009-10-15 15:55:15 +00:00
Andreas Österreicher 12b5b26f98 - Prestudent-Filter korrigiert 
- Organisationseinheiten Übersicht zeigt nur noch aktive OEs an
 2009-10-06 09:15:00 +00:00