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
5b4939279c
Rechte zum Drucken von Übernahmebestätigungen erweitert
2016-09-08 17:00:08 +02:00
9e2c60fb91
timetable-week.xul.php
...
UNDO Befehl zum mitloggen von gelöschten Reservierungen
2016-09-07 18:24:41 +02:00
722d39d8ae
Betriebsmittel können jetzt auch gespeichert werden nur die Berechtigung basis/betriebsmittel vorhanden ist
2016-08-24 14:27:25 +02:00
edb60ef17b
- Fixed Fallback if Vorlage doesnt exist
...
- Added Additional Parameters to Message
2016-08-19 11:31:30 +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
233de362f4
Bei Statusbestätigung wird ein Info-Mail versandt
2016-08-17 16:51:41 +02:00
70bd1b795d
ignore empty documentlists
2016-08-11 14:09:48 +02:00
7f6d632935
new features for dokumentenakt
...
-now uses versions of templates
-only takes active templates
-covering page now uses the oe_kurzbz
2016-08-09 11:10:01 +02:00
22118abc5a
template resolution is now handeled recursively
2016-08-09 10:42:47 +02:00
e178f78dba
added tbl_vorlagedokument
2016-08-03 15:20:54 +02:00
c01eecf196
bugfix
2016-08-02 14:49:31 +02:00
feab67a83a
Merged documents are now shown on the covering page
2016-08-02 11:50:22 +02:00
3e386a9208
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-08-02 11:40:13 +02:00
4d800a39d3
Zutrittskarte.php
...
Wenn kein Lichtbild in den Akten vorhanden ist, Foto aus tbl_person
holen;
Wenn der Inhalt des Lichtbilds leer ist, Foto aus tbl_person holen;
Wenn auch kein Foto in tbl_person gespeichert ist, mit der naechsten UID
fortfahren
2016-08-02 11:38:12 +02:00
c6f5d49e3b
better error handling
2016-08-02 09:25:08 +02:00
a705862d18
bugfix
2016-08-01 16:36:38 +02:00
85d397b451
added support for documents
...
if pdf creation failed, show the failed documents and added a button to force creation of the pdf and skip broken files
2016-08-01 16:31:00 +02:00
b820f409aa
bugfix
2016-07-28 16:55:09 +02:00
5743d05478
bugfixes
2016-07-28 13:30:09 +02:00
f4d1edf808
Bugfixes für Dokumentenakt
2016-07-27 17:28:19 +02:00
6d0f5d2bec
Dokumentenakt
2016-07-27 17:18:38 +02:00
4edc917b3d
Menüpunkt für Bewerberakt hinzugefügt
2016-07-27 16:52:04 +02:00
c01175fa5c
reihungstestanmeldung in fas-list
2016-07-13 14:12:25 +02:00
c4d04d60a6
set zeugnisnote from pruefung, add reihungstest_datum to student-list in fas
2016-07-13 13:51:33 +02:00
37c1721aeb
Buttons und Menüpunkt zum Versenden und Antworten auf Messages hinzugefügt
2016-07-07 22:52:48 +02:00
aaef564d52
show user messages in fas
2016-07-07 09:39:27 +02:00
9f49093b38
Aufnahmetermine Editieren und Gesamtpunkte berechnung hinzugefügt
2016-07-06 18:16:08 +02:00
8713b819ba
Erstversion für AufnahmeTermine Karteireiter im FAS
...
Template für Messages Karteireiter im FAS
2016-07-05 17:39:17 +02:00
534a162809
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-06-27 11:33:25 +02:00
4d77c603d0
Letzte Rolle nur durch admin löschbar
2016-06-27 11:29:10 +02:00
942dfb8633
Noteneinträge werden nicht mehr zur Übernahme markiert wenn die Zeungisnote neuer ist als die LVGesamtnote, die Note die selbe aber die Punkte unterschiedlich sind, da sonst die Punkte der komm. Pruefung überschrieben werden falls die Note die selbe bleibt
2016-06-23 11:09:42 +02:00
41f9f5def4
PDF-Export
...
Werden PreStudent-IDs übergeben, wird die Vorlage des betreffenden
Studiengangs ermittelt.
Beim archivieren von Dokumenten wird nun das Style der DB berücksichtigt
2016-06-15 15:36:42 +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
b346bf4dfa
PreStudentID for StudentPrintAusbildungsvertrag
...
- Function StudentPrintAusbildungsvertrag now uses PrestudentID instead
of UID. So the Ausbildungsvertrag can be printed at any time.
- Text-Changes in Ausbildungsvertrag
2016-04-25 11:31:15 +02:00
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
9c9d862bc8
validation before printing studienblatt
2016-04-07 11:59:22 +02:00
80c35f4b6b
Anpassungen für KU Linz; Studienblatt, LV Zeugnis, Anzeige von Noten
...
kompatibler LVs im Studienplan
2016-04-07 10:57:03 +02:00
224be4eb46
Problem beim Speichern der Abschlussarbeiten behoben wenn die Uhrzeit noch nicht gesetzt ist
2016-03-17 09:57:37 +01:00
b9a08a12ae
Fehler behoben bei dem die Projekt im Planner beim Starten nicht korrekt geladen wurden
2016-03-16 19:17:54 +01:00
8f038d53f5
NEW: edit ressource funktion
2016-03-14 15:13:22 +01:00
c40cfc83bc
Excel-export for aliquote reduction
2016-03-08 10:59:50 +01:00
c493de2c85
repaired invocation of aliquote reduction from FAS
2016-03-07 12:26:03 +01:00
012ce5fd51
added Projektwuerdigkeitsanalyse
2016-03-07 11:58:17 +01:00
5501cdbecd
First draft for aliquote reduction
2016-03-03 17:00:32 +01:00
ede359bdca
automatisiertes eintragen des Gebutsdatums anhand der SVNR auskommentiert
2016-02-29 14:55:07 +01:00
fc5ef29ea2
vbox der archivbuttons eine ID verpasst, damit sie mit addons erweitert werden kann
2016-02-25 15:56:42 +01:00
754f24ec7f
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
...
# Conflicts:
# include/lehreinheitmitarbeiter.class.php
2016-02-23 19:30:08 +01:00
0a40c92047
Uhrzeit in treecol eingebaut
2016-02-18 12:52:48 +01:00
oesi