Commit Graph

41 Commits

Author SHA1 Message Date
Paminger e21b2f6233 Seeds 2016-06-28 12:34:12 +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
kindlm bfe3e3e900 Removed NOT NULL constraint on verfasser_uid from public.tbl_notiz 2016-04-27 16:08:22 +02:00
Paminger 9d2c05bd3d PHPCI-Install 2016-04-27 10:34:49 +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
Stefan Puraner 325243f165 pruefungstyp is now calculated by countinig past attempts 2016-04-11 13:27:37 +02:00
Stefan Puraner e286e70b0b changed default values of column lvinfo and benotung 2016-03-31 10:05:20 +02:00
Stefan Puraner 21272960c9 added column genehmigung 2016-03-23 16:22:07 +01:00
oesi 5c04347cbe Fehler behoben wodruch das Update nicht funktioniert wenn Studienjahr NULL ist 2016-03-17 09:58:20 +01:00
Andreas Moik 4ca4f347c5 cleanups 2016-03-16 16:17:20 +01:00
Stefan Puraner 527fb7fa4e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-16 12:39:17 +01:00
Stefan Puraner f42665f01f fixed table columns studienjahr 2016-03-16 12:34:57 +01:00
Andreas Moik 005be3df3c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-10 11:23:14 +01:00
Andreas Moik 48ecbaacfb automatic conversion from studienordnung_semester to studienplan_semester 2016-03-10 11:22:31 +01:00
Stefan Puraner 8f9fbee0e5 fixed foreign key name 2016-03-10 11:10:48 +01:00
Stefan Puraner 48e3a59b19 tabelle studienjahr inkl klasse hinzugefuegt 2016-03-09 08:18:17 +01:00
Gerald Raab 012ce5fd51 added Projektwuerdigkeitsanalyse 2016-03-07 11:58:17 +01:00
Andreas Moik 2c2ad752a7 bugfix 2016-03-03 14:40:33 +01:00
Andreas Moik 5acbf1e199 added zgv_code foreign keys 2016-03-03 14:32:40 +01:00
Andreas Moik ec79066211 bugfix for datatypes in bis.tbl_zgvgruppe_zuordnung 2016-03-03 14:29:05 +01:00
Andreas Moik 172fca2018 tables bis.tbl_zgvgruppe_zuordung and bis.tbl_zgvgruppe added 2016-03-03 13:33:19 +01:00
Stefan Puraner 552448c71f Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-03 11:19:00 +01:00
Stefan Puraner c85a8e9455 bugfixes 2016-03-03 11:10:39 +01:00
Andreas Moik 8cb06f5587 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-02 15:06:28 +01:00
Stefan Puraner 147a90847a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-02 15:05:25 +01:00
Andreas Moik 72aac077f8 Automatic insert of studienplan_id in lehre.tbl_studienplan 2016-03-02 15:05:25 +01:00
Stefan Puraner f647ad4ae1 bugfixes 2016-03-02 15:04:12 +01:00
Andreas Moik 11985e8066 new columns APZ and studienplan_id in table lehre.tbl_studienplatz 2016-03-01 14:54:41 +01:00
Stefan Puraner 3b042657fd moved studienplanmatrix and bewerbtungstermine to core 2016-02-29 12:28:39 +01:00
oesi 9af103272b Syntaxfehler behoben 2016-02-19 16:05:50 +01:00
Andreas Moik cdf2c0fa80 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-02-18 12:40:43 +01:00
Andreas Moik d0eeba5afd TEIL 2: FAS-UI an 16 stellige SVNR angepasst + Uhrzeitfeld für Abschlusspruefung eingefügt 2016-02-18 12:36:42 +01:00
Andreas Moik ae4599f76d changed svnr in tbl_person from char(10) to varchar(16) and added a check for char_len(10) || char_len(16) 2016-02-17 10:00:42 +01:00
Stefan Puraner e63d99b63e new column curriculum 2016-02-10 13:49:53 +01:00
Andreas Moik 0b1b7dd346 checksystem
-benötigt nun die Berechtigung "admin"
	-bugfixes in dbupdate
	-bisorgfom ausgebessert auf bisorgfoRm
2016-02-04 11:50:55 +01:00
Stefan Puraner dab52ae093 neue Spalten benotung und lvinfo fuer tbl_lehrveranstaltung 2016-01-18 14:16:50 +01:00
kindlm bc13543166 Bewerbung_abgeschicktamum bei tbl_prestudentstatus 2015-12-14 20:08:38 +01:00
oesi dca82ad1bd Gewichtung für Lehreinheiten hinzugefügt 2015-12-11 08:21:22 +01:00
oesi e8d2e8c48d DB Update Files korrigiert
Berechtigungen für Web User hinzugefügt
2015-11-24 11:27:18 +01:00
Andreas Moik fb61636a05 dbupdate_3.2 2015-11-12 15:33:07 +01:00