blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,369 Commits 211 Branches 6 Tags
89744f36f5fdfeffce746ca82586c086a4e523ea
Commit Graph

1229 Commits

Author SHA1 Message Date
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
Andreas Moik cac1aae235 implemented cascading deletion of persons/employees/students 2016-08-18 11:20:02 +02:00
kindlm e512a80335 Aufnahmeverfahren fhstp 
Zusammenlegung RT-Anmeldungen
 2016-08-11 09:57:00 +02:00
kindlm 35f8bab8b2 Aufnahmeverfahren fhstp 
- Funktion loadReihungstestPerson
- Anpassungen Excel-Export
 2016-08-11 09:56:23 +02:00
kindlm 6851e75c3f Several changes in reihungstestverwaltung 
- Add multiple studienplaene
 2016-08-09 14:58:33 +02:00
kindlm 98555f3dca Studiensemester GUI 2016-08-02 11:36:37 +02:00
kindlm 12e0f88b45 Reihungstestverwaltung Errormessage 2016-08-01 13:48:15 +02:00
kindlm b7fdc9cb5f Reihungstestverwaltung 
BugFix bei Auswahl aller studiensemester
 2016-07-28 11:19:30 +02:00
kindlm b998a42b87 Reihungstestverwaltung 
- Studiensemester
- Stufen
- Aufteilung der BewerberInnen
- Raumzuordnung
- Aufsichtspersonen
 2016-07-28 11:12:32 +02:00
kindlm 1a1d2de72c Reihungstestverwaltung Aufnahmestufen 2016-07-21 11:38:39 +02:00
kindlm 60e1e444e9 Link zum DMS-File in Bildprüfung 2016-07-18 12:05:28 +02:00
kindlm c57aa20058 Incoming-Plattform überarbeitet 
- Zählung Anmeldungen korrigiert
- Learning Agreement als statischer Link ins DMS
- StudiengangsDropDown auch englisch
- "Austausch" und "Freemover" in Austauschprogramm-DropDown
 2016-07-13 10:53:50 +02:00
kindlm 18729af639 Verbesserungen in Personensuche 2016-07-12 10:49:02 +02:00
kindlm 0950eebca6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-07-08 17:53:25 +02:00
kindlm a5c29fa2f7 Berechtigungsabfrage granularer; GUI-Verbesserungen 2016-07-08 17:53:20 +02:00
kindlm a9daf5bdc6 Fehler in Bildprüfung behoben 
Wenn Student oder Mitarbeiter gewählt wird und weniger als 100 Einträge
vorhanden sind, kann es vorkommen, dass wegen der Random-Funktion keine
Ergebnisse kommen
 2016-07-08 17:48:50 +02:00
Andreas Moik 81ca197020 bugfix 2016-06-30 16:15:05 +02:00
Andreas Moik a4a907a83f bugfix 2016-06-29 15:04:41 +02:00
oesi 3622052bd9 Berechnung der bereits aufgenommenen Personen korrigiert 2016-06-28 16:15:19 +02:00
Andreas Moik 974b5c0fe8 berits aufgenommene Studenten mit einer anderen Studienplan_id werden nun nicht mehr als aufgenommen angezeigt 2016-06-28 12:15:11 +02:00
Andreas Moik 0c28a6d6c4 bei dem aufnehmen der Bewerber wird nun der gewählte Studienplan und die Orgform bei dem Prestudentstatus eingetragen 2016-06-28 11:43:33 +02:00
kindlm 534a162809 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-27 11:33:25 +02:00
kindlm 4c21acc5f2 Firma DeleteOrganisationseinheit; Nur Eigene löschen 2016-06-27 11:33:17 +02:00
oesi fbf33e708e Fixed Typo 2016-06-27 09:31:01 +02:00
oesi 673e7a2a2f Berechnung korrigiert damit alle Bewerber einberechnet werden und nicht nur die noch nicht aufgenommenen 2016-06-24 17:15:13 +02:00
oesi ad335ad240 RTPunkte1, RTPunkte2 und Private EMail hinzugefügt. 
Funktion aus Klasse entfernt
 2016-06-24 17:04:56 +02:00
paolo 3397192298 Fix: check if data are present 2016-06-16 18:02:18 +02:00
oesi 7ba5026436 Personen ohne RTGesamtpunkte werden nicht berücksichtigt 
Wenn zu weniger Bewerber als APZ vorhanden sind wird die Anzahl der Personen aufgrund der Gesamtzahl der Bewerber berechnet anstatt anhand der APZ
 2016-06-14 17:09:49 +02:00
Andreas Moik c57b84d10c implemented the aliquote reduction 2016-06-14 10:11:16 +02:00
oesi 6089be78f7 Anmerkung/Prio wird bei Aliqoute Reduktion mit angezeigt 2016-06-09 09:53:00 +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
kindlm 73b69d8657 Reverted wrong commit 2016-06-01 17:45:39 +02:00
kindlm 8c8753b667 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 
# Conflicts:
#	include/studienplan.class.php
 2016-06-01 16:52:57 +02:00
kindlm d899ccad08 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-05-23 12:25:14 +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
oesi 7bee4b02b7 Aliqoute Reduktion zeigt nun an ob ein Interviewbogen vorhanden/akzeptiert ist 2016-04-25 16:00:48 +02:00
paolo 8ee7df5eba Fixed ob_flush() notice error 2016-04-11 09:59:58 +02:00
Paminger 3b39752ab7 Acceptance Tests 2016-04-10 18:11:09 +02:00
oesi 8a9ac4a8d6 Fehler behoben bei dem VertragsID bei der Lehreinheitenvorrückung mitkopiert wurde 2016-04-04 11:07:47 +02:00
oesi 7ed057b262 Tablesorter von Submodules entfernt und auf Meta Includes geändert 2016-03-22 12:12:37 +01:00
kindlm 9c67c9346b Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-22 11:21:14 +01:00
kindlm 7d78787b6c Reboot-Button bei Infoscreen 2016-03-18 17:38:49 +01:00
Andreas Moik ea2276b984 fixed typo 2016-03-17 17:23:17 +01:00
Andreas Moik ea66e0944a some comments added to the aliquote reduction 2016-03-17 16:48:08 +01:00
Andreas Moik 8f12102ce1 comment update 2016-03-17 10:46:08 +01:00
Andreas Moik aa249a044d bugfix 2016-03-17 10:30:30 +01:00
Andreas Moik be9e54b85f typo fix 2016-03-14 12:26:08 +01:00
Andreas Moik 0a38241d6b bugfix 2016-03-10 14:15:31 +01:00