b1a8c71ea4
Removed a wrong Js include, ordered JS and CSS includes
2017-09-14 11:29:20 +02:00
bcd84512f5
Second commit
2017-09-11 16:06:56 +02:00
b0806f263b
First commit
2017-09-08 19:15:21 +02:00
f4cd573395
- added rmariuzzo/jquery-checkboxes to composer requirements
...
(composer.json)
- removed js include/js/jquery.checkboxes-1.0.7.min.js
- replaced jquery.checkboxes-1.0.7.min.js path with the new path
2017-08-25 12:24:04 +02:00
42960ffe20
Moodle-Integration aus FHComplete Core entfernt und in eigenes Addon
...
ausgelagert.
Support für Moodle 1.9 entfernt
2017-08-02 14:05:31 +02:00
75f21145ce
- Vorrückung der Studierenden prüft die Gültigkeit des Studienplans. Wenn dieser nicht gültig ist wird versucht den neueren Studienplan zu finden. Wird kein eindeutiger Studienplan gefunden bleibt der alte Studienplan.
...
- CheckStudenten prüft die Studienpläne und zeigt Warnungen an wenn Studierende einen ungültigen Studienplan zugeordnet haben
2017-03-27 10:32:46 +02:00
75b8ae7288
Aliqoute Reduktion an neue Reihungstestpunkte angepasst
2017-03-01 18:00:50 +01:00
ef146682e3
Merge branch 'master' into ci
2017-02-03 08:41:15 +01:00
59fb5d9910
Admins können direkt vom FAS aus archivierte Dokumente mit rechter Maustaste überschreiben
2017-02-03 08:39:51 +01:00
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
b3476f93c1
Beim Anlegen von neuen Interessenten werden nur noch Studienpläne vorgeschlagen die für die Ausgewählte kombination gültig sind
2016-12-19 14:35:28 +01:00
afe0334e05
Incoming-Adminseite Übersicht LVs
...
- An neue Berechnung des Tools angepasst
- Anzeige der Anmeldungen
- Es werden auch LVs mit Anmeldungen gezeigt, deren Incomingplätze 0
sind oder die nicht in der Studienordnung sind
2016-12-05 12:16:00 +01:00
c4ed2d05f1
- removed forgotten break
...
- restored feature 'delete person'
2016-11-23 16:26:58 +01:00
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
48a81153bc
voriges studienjahr in kontobuchungsbezeichnung
2016-11-08 15:52:56 +01:00
57fe1f9664
vilesci/personen/leistungsstipendium.php:
...
- Selects the current studiensemester in the studiensemester drop-down
list
- Checks if the student is also present in the previous studiensemester
to the posted one
2016-11-02 15:42:05 +01:00
c5c728d495
import leistungsstipendien:
...
* abbruch, wenn bereits vorhanden fuer stsem
* insertamum, insertvon, beschreibungstext
2016-10-28 14:58:00 +02:00
467ecfbff6
Import CSV file for updating leistungsstipendien
2016-10-25 18:22:34 +02:00
d2b5c6e609
Seite zum Überschreiben von bestehenden Akten hinzugefügt
2016-10-13 10:33:45 +02:00
6c306b9ab9
Merge branch 'master' into ci
...
Conflicts:
composer.json
system/dbupdate_3.2.php
vilesci/personen/funktion_det.php
2016-09-12 17:28:03 +02:00
647cd1e8f9
bugfix
2016-09-09 09:36:19 +02:00
29b56af899
funktion_det.php
...
- Filter für OE und Semester
- GUI-Verbesserungen
2016-09-07 18:25:45 +02:00
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
cac1aae235
implemented cascading deletion of persons/employees/students
2016-08-18 11:20:02 +02:00
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
18729af639
Verbesserungen in Personensuche
2016-07-12 10:49:02 +02:00
81ca197020
bugfix
2016-06-30 16:15:05 +02:00
a4a907a83f
bugfix
2016-06-29 15:04:41 +02:00
3622052bd9
Berechnung der bereits aufgenommenen Personen korrigiert
2016-06-28 16:15:19 +02:00
974b5c0fe8
berits aufgenommene Studenten mit einer anderen Studienplan_id werden nun nicht mehr als aufgenommen angezeigt
2016-06-28 12:15:11 +02:00
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
fbf33e708e
Fixed Typo
2016-06-27 09:31:01 +02:00
673e7a2a2f
Berechnung korrigiert damit alle Bewerber einberechnet werden und nicht nur die noch nicht aufgenommenen
2016-06-24 17:15:13 +02:00
ad335ad240
RTPunkte1, RTPunkte2 und Private EMail hinzugefügt.
...
Funktion aus Klasse entfernt
2016-06-24 17:04:56 +02:00
3397192298
Fix: check if data are present
2016-06-16 18:02:18 +02:00
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
c57b84d10c
implemented the aliquote reduction
2016-06-14 10:11:16 +02:00
6089be78f7
Anmerkung/Prio wird bei Aliqoute Reduktion mit angezeigt
2016-06-09 09:53:00 +02:00
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
73b69d8657
Reverted wrong commit
2016-06-01 17:45:39 +02:00
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
d899ccad08
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-05-23 12:25:14 +02:00
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
7bee4b02b7
Aliqoute Reduktion zeigt nun an ob ein Interviewbogen vorhanden/akzeptiert ist
2016-04-25 16:00:48 +02:00
8ee7df5eba
Fixed ob_flush() notice error
2016-04-11 09:59:58 +02:00
ea2276b984
fixed typo
2016-03-17 17:23:17 +01:00
ea66e0944a
some comments added to the aliquote reduction
2016-03-17 16:48:08 +01:00
8f12102ce1
comment update
2016-03-17 10:46:08 +01:00
aa249a044d
bugfix
2016-03-17 10:30:30 +01:00
be9e54b85f
typo fix
2016-03-14 12:26:08 +01:00
Paolo