Commit Graph

35 Commits

Author SHA1 Message Date
bison cf999b6d82 - Added constant DOC_ROOT in system.config-default.inc.php
- Using DOC_ROOT in dbupdate_3.2.php to be compatible with checksystem.php and DBTools.php
- Rolled back all classes in the include directory from CI to basis_db
2016-08-17 11:14:52 +02:00
kindlm 89d920427a Changes in studienplan.class
- New function searchStudienplaene
- Changes in function getStudienplaeneFromSem
2016-08-09 14:01:36 +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 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 4cc83999ed - Moved class APIv1_Controller from FHC_Controller.php to APIv1_Controller.php
- Moved class DB_Model from FHC_Model.php to DB_Model.php
- load method of class person (person.class.php) now is calling getPerson
  method of the class Person_model
- getAllForBewerbung method of class studiengang (studiengang.class.php) now is calling getAllForBewerbung
  method of the class Studiengang_model
- getStudienplaene method of class studienplan (studienplan.class.php) now is calling getStudienplaene
  method of the class Studienplan_model
2016-04-25 18:25:03 +02:00
paolo a3a9c42e99 - Renamed classes, methods and properties names in german
- All the controllers exends APIv1_Controller rather than REST_Controller
 - Codeceptions modified to be compliant to changes
2016-04-25 15:57:52 +02:00
paolo f6f533a23b API Calls codeception
Fixed translations
2016-04-22 14:44:40 +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
oesi 87c021b693 Fehler behoben in der Anzeige der Lehrveranstaltungen im FAS wenn mehrere verschiedene Studienordnungen aktiv sind 2016-04-15 09:35:30 +02:00
oesi 9a6cf6ee7b Fehler behoben wodurch das Kopieren von Studienordnungen zu Fehlermeldungen führte 2016-04-01 08:08:07 +02:00
Stefan Puraner 093c70eeb4 fixed bugs 2016-03-31 11:57:50 +02:00
Stefan Puraner 0c2ecb44a8 added column genehmigung 2016-03-23 16:33:14 +01:00
Stefan Puraner 21272960c9 added column genehmigung 2016-03-23 16:22:07 +01:00
oesi 834e63ca21 Fehler beim Speichern der Studienplan Lehrveranstaltung Zuordnung behoben 2016-03-16 16:45:36 +01:00
Andreas Moik deab8fb0d8 fas changed from lehre.tbl_studienordnung_semester to lehre.tbl_studienplan_semester 2016-03-10 16:26:55 +01:00
Andreas Moik f8f672052e cleanups in studienplan-class 2016-03-09 14:34:04 +01:00
Andreas Moik 0a200e1668 cleanups in studienplan-class 2016-03-03 11:49:07 +01:00
Stefan Puraner c85a8e9455 bugfixes 2016-03-03 11:10:39 +01:00
Stefan Puraner 3b042657fd moved studienplanmatrix and bewerbtungstermine to core 2016-02-29 12:28:39 +01:00
Stefan Puraner 1f3fba3d19 fixes for addon studiengangsverwaltung 2015-12-03 08:27:59 +01:00
oesi 89dc6d23d5 Mailversand bei Notenfreigabe angepasst:
- Wenn Punkteeingabe aktiv ist werden die Punkte im Mail mit angezeigt
- Studienplan wird im Betreff des Mails angezeigt um Filterregeln im Client erstellen zu können
- Bei der Lehrveranstaltung wird zusätzlich die Organisationsform angezeigt
- Es wird die volle Bezeichnung der Note angezeigt anstatt der ID
2015-10-14 17:44:03 +02:00
Stefan Puraner 03f03587b7 Sortierungsmöglichkeit der Lehrveranstaltungen im Studienplan 2014-10-23 07:49:32 +00:00
Stefan Puraner 5b747dac2e Überprüfung bei Löschen einer LV aus Studienplan ob LV-Regeln vorhanden sind 2014-07-15 13:04:54 +00:00
Andreas Österreicher f55fcaad05 Kopieren von Studienordnungen hinzugefügt 2014-05-21 13:57:42 +00:00
Andreas Österreicher 30b33164e2 Lehrfach auf Lehrveranstaltung geaendert; Studienordnung Tree wird nun im JS erstellt; Veraltete Ordner entfernt 2014-02-04 08:01:07 +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
Martin Tatzber 1b6fe65e16 Studienplan: Regelstudiendauer not null 2013-12-09 13:26:37 +00:00
Andreas Österreicher f75645b6c3 Erstversion Studienplan ansicht für Studierende 2013-12-09 09:14:41 +00:00
Andreas Österreicher c4602d46a2 Zuteilung von Lehrveranstaltungen zu Studienordnungen, Tab mit Details hinzugefuegt 2013-11-28 08:32:04 +00:00
Stefan Puraner af021019de Studienordnung: LVs mit Studienplan verknüpfen; speichern der verknüpften LVs in DB 2013-11-26 15:26:09 +00:00
Stefan Puraner 506878c59f Studienordnung: LVs mit Studienplan verknüpfen; speichern der verknüpften LVs in DB und löschen aus DB 2013-11-26 12:12:22 +00:00
Andreas Österreicher 0b4124c833 LVRegeln 2013-11-19 14:05:40 +00:00
Stefan Puraner dc2e2c45d2 Verknüpfen von LVs mit einem Studienplan 2013-11-12 13:55:26 +00:00
Andreas Österreicher 8bba44a7bb Fehler beim Escapen von Integern behoben, Anpassung der Studienordnung-Klassen 2013-10-21 09:36:46 +00:00