blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-02 20:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,055 Commits 225 Branches 6 Tags
df51fb29886dec58fecb28d763ceef9dfd724c2d
Commit Graph

76 Commits

Author SHA1 Message Date
oesi 33585586ec Removed useless getter 2017-02-07 16:42:02 +01:00
oesi b8177b58e8 Merge branch 'master' into ci 
Conflicts:
	composer.json
	composer.lock
	phpci.yml
	system/checksystem.php
	system/dbupdate_3.2.php
	tests/codeception/_data/dump.sql
	tests/codeception/tests/acceptance/CISLoginPage.php
 2017-01-20 11:05:08 +01:00
kindlm db9de19978 Alte Funktion "getAllForBewerbung" Deprecated 
Funktion "getAllForBewerbung" überarbeitet aber vorerst auskommentiert
 2016-12-23 17:01:06 +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
kindlm e29202eaa0 Lehrgangstyp in Ausbildungsvertrag 
- Neue Funktion loadLehrgangstyp in studiengang.class
- lgartcode und lgartBezeichnung in ausbildungsvertrag.xml
- Neue Templates für Ausbildungsvertrag Lehrgänge
 2016-11-14 17:52:39 +01:00
kindlm b237eb59c6 Param $order added for function getAllForBewerbung 2016-10-07 16:07:38 +02:00
Paolo 40a2b53858 Merge master into HEAD 
Conflicts:
	include/dokument_export.class.php
	include/studiengang.class.php
	vilesci/stammdaten/reihungstestverwaltung.php
 2016-08-18 16:23:11 +02:00
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
Paminger 4f14e7fa92 Messages Inbox Outbox 2016-06-23 10:28:26 +02:00
oesi fab06f9ddb Neue Funktionen für Zugriff auf Studienplaene hinzguefügt 2016-06-21 14:30:11 +02:00
kindlm 029395372b Add Param $studiensemester_kurzbz in function getAllForBewerbung 2016-05-23 11:49:21 +02:00
Paminger e624540c16 Message 2016-05-10 14:12:33 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53: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
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 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 04aec20a45 set italian course name 2016-03-24 11:59:22 +01:00
kindlm 12b9c7a8e1 getAllForBewerbung holt nur aktive Studienpläne 2016-01-25 17:04:19 +01:00
kindlm a320ce23bc Berechtigungen kopieren 2016-01-08 14:55:19 +01:00
kindlm 3ad06bed01 Lehrgänge werden auch nach Lehrgangsart sortiert 2015-11-06 18:21:30 +01:00
oesi 34e0c62e75 Funktion hinzugefügt zum Laden der Lehrgangsarten 
Fehler behoben bei dem Studiengänge nicht immer gespeichert werden konnten
 2015-09-25 12:57:42 +02: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 a923efdbd5 Stundengrenze für Fixe und Externe Lektoren wird jetzt ueber den OE-Baum verwaltet. 
Es können unterschiedliche Grenzen für Abteilungen festgelegt werden.
Die Lehrauftragsliste kann jetzt getrennt für einzelen Organisationseinheiten-Bäume erstellt werden
 2015-06-09 08:12:17 +02:00
oesi f455b28bba Englische Bezeichnung hinzugefügt 2015-05-28 10:39:23 +02:00
Nikolaus Krondraf 059a37fb5f Erweiterungen zum Abruf der Standorte für Bewerbertool 2015-05-13 12:07:58 +02:00
Nikolaus Krondraf 03aa653ef4 add function 2015-05-05 15:07:12 +02:00
kindlm f373ec7a67 CIS-Suche nach Organisationseinheiten 2015-04-27 18:56:24 +02:00
oesi 47802e2b03 AktenUpload in Bewerbungstool Addon verschoben 
Warnungen behoben
 2015-04-09 17:10:23 +02: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
Robert Hofer 570bbf7527 studiengang infos 2015-03-10 20:21:36 +01:00
Robert Hofer 2238af4b39 new flag onlinebewerbung 
new column onlinebewerbung
view studiengang_details refactored
change flag onlinebewerbung in vilesci
 2015-03-10 14:26:31 +01:00
Andreas Österreicher 6c932c8d30 Fehler beim ermitteln der Studiengangstypen behoben 2014-06-04 12:55:39 +00:00
Andreas Österreicher 8a87e28aff Performanceproblem beim Infoterminal behoben; Unnötige Datenbankzugriffe in Klasse Studiengang minimiert; 2014-04-25 15:26:26 +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
Stefan Puraner dc2e2c45d2 Verknüpfen von LVs mit einem Studienplan 2013-11-12 13:55:26 +00:00
Karl Burkhart 03510f423c Inskriptionsbestätigung 
- Studiengangtyp wird aus studiengangtyp tabelle geholt
 2013-11-06 15:06:21 +00:00
Martin Tatzber fa851462b6 Studiengangsverwaltung 2013-10-14 07:15:30 +00:00
Manfred Kindl 3b9d40b950 Fehler bei Mischform. War nicht BOOLEAN sondern INTEGER 2013-08-01 14:35:57 +00:00
Andreas Österreicher 4e1966f9c0 Klassenanpassungen an Datenbankklasse 2012-10-03 13:18:35 +00:00
Andreas Österreicher 8ebbb6eb71 - Menü optimierungen 
- Mehrsprachige Arrays für Studiengang und LVs hinzugefügt
- Menü-Addons für mehrsprachige LV-Namen angepasst
 2011-08-05 07:28:41 +00:00
Andreas Österreicher 8009334f50 Projektarbeitsnote am Zeugnis kann nun pro Studiengang ein und ausgeblendet werden 2011-03-17 14:45:49 +00:00
Karl Burkhart 24635bc3f4 2011-02-24 15:04:38 +00:00
Karl Burkhart 814be484f5 added getStudiengangFromOe -> lädt Studiengang anhand oe kürzel 2011-02-24 13:49:16 +00:00
Andreas Österreicher 28780620d9 Bugfix beim Speichern von Studiengängen 2010-08-16 12:48:37 +00:00
Andreas Österreicher 23278ca329 Studiengäng können nun intern als Mischform geführt werden. (unabhängig von der BIS Meldung) 2010-06-25 07:15:48 +00:00
Andreas Österreicher e87bc58fc6 - Reservierung auf neues Berechtigungskonzept umgestellt 
- Reservierungen haben insertamum und insertvon Feld
- Erweiterte Reservierung mit Auswahl des Lektors, Studienganges, Semester und Gruppe
 2010-01-27 16:52:04 +00:00
Andreas Österreicher a47b732fb3 - Semesterweise Lehreinheitenvorrückung 
- Anpassungen neue Berechtigungen
 2009-12-07 12:37:44 +00:00
Andreas Österreicher adcd03f4c0 - Funktionen Stgl und FBL zu Leitung zusammengelegt 
- Bezeichnung bei Funktionen
- Accountinfoblatt auf Englisch
 2009-10-01 06:50:10 +00:00
Andreas Österreicher 830f2f7920 - Bugfix beim Speichern von Studiengängen 2009-09-09 13:23:09 +00:00