Commit Graph

2783 Commits

Author SHA1 Message Date
kindlm c773cd3ddc Korrektur Query DeleteFirmaOrganisationseinheit 2016-06-27 11:30:29 +02:00
oesi ad335ad240 RTPunkte1, RTPunkte2 und Private EMail hinzugefügt.
Funktion aus Klasse entfernt
2016-06-24 17:04:56 +02:00
Paminger 74186cc5c6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/DB_Model.php
2016-06-24 13:09:44 +02:00
Paminger 925d210bff Permission Problem workaround 2016-06-24 13:08:18 +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
Paminger 4f14e7fa92 Messages Inbox Outbox 2016-06-23 10:28:26 +02:00
Gerry Raab 642f700cae phrases textile prev 2016-06-22 10:42:32 +02:00
root 25e0ba9407 basic phrases editing 2016-06-22 01:24:59 +02:00
oesi fab06f9ddb Neue Funktionen für Zugriff auf Studienplaene hinzguefügt 2016-06-21 14:30:11 +02:00
Andreas Moik 7758fa3807 fixed timestamp bug in eventkalender 2016-06-20 14:46:55 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +02:00
paolo ffa0bdc947 - Moved old libraries to CI
- Bugfixes
2016-06-10 18:09:54 +02:00
oesi 6089be78f7 Anmerkung/Prio wird bei Aliqoute Reduktion mit angezeigt 2016-06-09 09:53:00 +02:00
oesi 8d10a9a654 Fehlerbehandlung bei Dokumentenexport hinzugefügt 2016-06-08 18:14:30 +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 dabcf8188b - Modified FHC_Model contructor to get UID from vilesci authentication
- Copied functionalities from old libraries to controllers
- Ported old libraries to CI
- Modified codeception
2016-06-03 16:19:06 +02:00
oesi b0b3fe845a Aliqoute Reduktion verwendet die MasterZGV bei Masterstudiengängen zur Reihung 2016-06-01 13:55:42 +02:00
oesi f1098055fe Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-05-30 16:00:58 +02:00
oesi ba9d398b55 Engliche Fehlermeldung bei Fehlerhaftem Login 2016-05-30 16:00:26 +02:00
paolo 00211ee647 - Added codeception test cases
- Moved old libraries to CI
2016-05-25 18:36:18 +02:00
Gerald Raab d47e506976 Ital. LV Bezeichnung 2016-05-24 17:05:48 +02:00
kindlm abae24b0aa Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 12:07:34 +02:00
kindlm fc932b464d SQL in function getStudienplaeneFromSem adaptiert 2016-05-23 11:49:57 +02:00
kindlm 029395372b Add Param $studiensemester_kurzbz in function getAllForBewerbung 2016-05-23 11:49:21 +02:00
oesi 0e3cd3a54d Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-05-20 14:59:47 +02:00
oesi 3997dd55ce Fehler behoben bei der Anzeige der Dokumente im Bewerbertool 2016-05-20 14:54:29 +02:00
paolo cd10d96c91 - Added permissions and linked them to user admin in dump.sql
- Modified validate methods to public for classes benutzer, student and mitarbeiter
2016-05-20 12:09:18 +02:00
Gerald Raab da7036d33a Bugfix ExamReg, Geburtsort instudent xml, Hide Moodle-Icon if not used 2016-05-20 10:25:32 +02:00
Paminger 42e911b4fe CodeSniffer 2016-05-20 07:44:08 +02:00
paolo de9e92e3b0 - Added permissions for every DB tables that has a model
- Added all controllers for every model
- All controller has a load and a insert/update method
2016-05-13 19:00:40 +02:00
oesi 951986bd51 Übersichtsseite über die Gültigkeit von Studienordnungen/Studienplänen 2016-05-11 06:45:21 +02:00
Paminger e624540c16 Message 2016-05-10 14:12:33 +02:00
oesi 8ef0f07336 Beim Laden von Adressen werden Zustelladressen zuerst geliefert 2016-05-06 13:53:23 +02:00
Gerald Raab f0bee0d531 Ital Phrases, Error in Classfile localised 2016-05-04 14:42:09 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53:15 +02:00
kindlm 9d4133a6ff Multilanguage-Atrributes for function "getAllDokumente" 2016-04-29 17:35:15 +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
oesi 7939d1db9e Lehrveranstaltungsverwaltung im Vilesci enthaelt nun auch die neuen Attribute Lehrauftrag/LVInfo und Benotung 2016-04-27 15:19:54 +02:00
oesi ccbff2b349 Status, Standort, ECTS, PflichSWS und PflichtLVS können jetzt auch über Vilesci GUI editiert werden 2016-04-27 14:49:05 +02:00
paolo d93dd1fb94 FIXed AddonAuthentication file inclusion 2016-04-26 11:14:38 +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
kindlm 197064d44d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-04-25 12:23:14 +02:00
kindlm f58ee305dc Added span for Addon lehrmittel/software 2016-04-25 11:38:39 +02:00
paolo f6f533a23b API Calls codeception
Fixed translations
2016-04-22 14:44:40 +02:00
paolo 4e02a1105b Fixed wrong path in require statement 2016-04-22 10:00:24 +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