735bd8dd0a
add tabulator6 option; added Filter function "scrollToLastActive" for tabulator setups losing scroll when changing fhc-tabs;
2025-01-28 14:46:33 +01:00
1489706027
Merge branch 'Monika70-Export'
2025-01-16 13:22:51 +01:00
103df5afe5
Merge branch 'Export' of https://github.com/Monika70/FHC-Core into Monika70-Export
2025-01-16 13:21:14 +01:00
ba2b41f63a
Merge branch 'feature-55289/pep_fine_tuning'
2025-01-16 13:12:26 +01:00
f381ef229e
- index tbl_lehrveranstaltung_faktor_lvid hinzugefuegt
...
- sortierung gleichgezogen
2025-01-16 10:38:01 +01:00
f1234c0b99
Update studentenexportextended.xls.php
...
Zusätzliche Spalte Person_id hinzufügen
2025-01-15 14:37:06 +01:00
fd67974d55
fix typo
2025-01-15 13:35:58 +01:00
a1a9e96bc0
permission basis/gehaelter
2025-01-15 13:34:16 +01:00
aab0f339ab
Merge branch 'feature-55316/international_skills_credits_entfernen_neue_massnahmen'
2025-01-15 13:06:04 +01:00
d4bb06c4f6
Merge branch 'feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen'
2025-01-15 09:20:54 +01:00
0770ec2bd8
Merge branch 'master' into feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen
2025-01-15 09:03:41 +01:00
50aca4a545
- umbenennung auf internatinal credits
2025-01-14 11:00:26 +01:00
46914e8a65
bugfix wenn mehrere karenzen im abgefragten zeitraum vorhanden sind
2025-01-07 14:38:08 +01:00
a802e67faf
Merge branch 'pep_deploy'
2024-12-16 13:57:15 +01:00
2c91756a36
Added missing APP PEP to checksystem
2024-12-16 13:29:55 +01:00
0d2882d8aa
Merge branch 'feature-25999/SearchbarStudent'
2024-12-13 12:11:12 +01:00
f62108f1d4
change concatenation of verband, use contact email in Stv search result, use dummy image when viewing anothers profile and foto is null or foto_sperre is not false
2024-12-13 12:09:16 +01:00
746f8ab35a
Merge branch 'feature-54822/filtercomponent_custom_headerfilter' into pep_deploy
2024-12-13 11:51:11 +01:00
70b44c2202
Merge branch 'feature-40717/pep_faktor' into pep_deploy
...
# Conflicts:
# public/js/components/filter/Filter.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-12-13 11:50:53 +01:00
c0d2474ad2
-dbupdate gegencheck eingebaut
...
- delete restrict auf cascade geändert
2024-12-13 11:42:00 +01:00
5a174e554a
use studentStv in Studentenverwaltung config, add aktiv to student and studentStv result, use studentStv in searchbar component, add searchbar_inaktiv css class, use aktiv to render inactive studentStv results with css class searchbar_inaktiv
2024-12-13 11:25:02 +01:00
3451741327
- ON DELETE RESTRICT auf ON DELETE CASCADE bei bei den notizen
...
- sql angepast
2024-12-13 11:03:46 +01:00
a3840d4c77
update(Searchbar/Student):shows dummy image if the student has foto_spere true
2024-12-13 10:47:34 +01:00
9a1777d1aa
fix(_student searchfunction):fixes the sql logic for non active students
2024-12-12 15:35:56 +01:00
4a86a48969
Merge branch 'master' into feature-25999/SearchbarStudent
2024-12-12 15:27:08 +01:00
1f01c55d71
LVPlan Feedback Link auf Startseite entfernt
2024-12-12 15:06:02 +01:00
80222b7186
Merge branch 'master' into feature-25999/SearchbarStudent
2024-12-12 14:55:41 +01:00
d0266e7ef0
add vuejs3_dev to composer.json and ci javascript config file to switch between vuejs dev and prod version, alter FHC-Footer to use new config
2024-12-12 14:49:15 +01:00
3039fd2a1e
Merge branch 'master' into feature-25999/SearchbarStudent
2024-12-12 13:57:03 +01:00
5b3ffcfc9a
- faktor berechtigung angepasst
2024-12-12 12:37:24 +01:00
03d8205722
Merge branch 'feature-46905/LV_plan_feedback_Link_aendern'
2024-12-12 11:30:00 +01:00
df8d4de50b
fix(SearchbarLib/_student): the cis search does not include students that are not aktiv and has a seperate search function for the student search for the Cis and the studentverwaltung
2024-12-12 09:42:38 +01:00
9af3f1ec0f
Merge branch 'feature-25999/LvMenuFix'
2024-12-11 17:50:03 +01:00
85d59f18be
refactor(searchbar/Student): studiengang/verband/email are queried for the display in the searchbar component
2024-12-11 15:30:41 +01:00
6a1e518da1
- defaultheaderfilter function in eigenes file verschoben
2024-12-11 13:44:19 +01:00
8127091e2e
- tags werden im fas nicht angezeigt
...
- class für tags hinzugefuegt
- prop confirmLimit hinzugefuegt
2024-12-11 13:25:38 +01:00
a357001648
feature(Searchbar/StudentenSuche): adds student to the searchbar options and adds shadow to the searchbar
2024-12-11 12:34:58 +01:00
bfc6e86f05
Merge branch 'master' into feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen
2024-12-11 11:54:23 +01:00
3c8bb37a36
Merge branch 'master' into feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen
2024-12-11 11:52:50 +01:00
2567db7725
fix(LvMenu.js): fixes layout of MenuPunkt if multiple moodle links are available
2024-12-11 11:28:40 +01:00
034e1397e8
Merge branch 'feature-52814/infocenter_infocentermitarbeiter_spalte_beim_loeschen_des_dokuments'
2024-12-11 08:36:27 +01:00
35ded7950f
Merge branch 'feature-46974/neuer_filter_ueber_ueberfaellige_buchungen'
2024-12-11 08:00:54 +01:00
a6a74cd1e0
Merge branch 'feature-40413/testtool_sperren_bei_namen_mit_hochkomma'
2024-12-11 07:52:27 +01:00
bae48fa175
Merge branch 'master' into feature-40413/testtool_sperren_bei_namen_mit_hochkomma
2024-12-11 07:13:20 +01:00
94f4761163
Merge branch 'bug-54917/Gruppenmanagement_Berechtigung'
2024-12-11 07:07:44 +01:00
cc99d2b378
Gruppenmanagement: added checks so only Gruppenmanager can edit groups
2024-12-10 12:03:58 +01:00
07ee3e1f4e
Import der Leistungsstipendien angepasst. Neue Spaltenreihenfolge, Keine
...
automatische Gegenbuchung, Import der Bankdaten
2024-12-06 12:50:58 +01:00
3cea79cb28
Merge branch 'feature-25999/C4_cleanup_rc'
2024-12-04 12:44:08 +01:00
e159dc44dc
Merge branch 'master' into feature-25999/C4_cleanup_rc
2024-12-04 12:43:06 +01:00
055cea2002
Termin3 entfernt aus Default Checksystem
2024-12-04 11:25:49 +01:00
f105bdb36a
revert FhcApi.js to current master
2024-12-04 11:09:37 +01:00
1b445005af
remove addMeta debug info
2024-12-04 09:28:59 +01:00
2fee03ebcc
remove sprachen menu from main nav
2024-12-04 09:17:15 +01:00
d30ba24d2f
add config cis_send_profil_update_mails, use it in profil update controllers
2024-12-04 09:15:44 +01:00
631010821b
- check bei projectstunden ob stunden eingetragen sind
2024-12-03 17:08:03 +01:00
b34a7bfabc
- custom filter tabulator
2024-12-03 16:13:48 +01:00
6a1af1b2dd
- fuer lehre tab planungsstatus hinzugefuegt
...
- config fuer planungsstatus
- tags ohne notiz setzen
2024-12-03 15:31:32 +01:00
6f69046b71
use regex with word boundaries to be more specific when replacing
2024-12-03 13:44:24 +01:00
19b56ff252
- tags
...
- phrases
- stundensatzbydatum
- filter nur count
2024-12-03 12:36:54 +01:00
af2f3348b4
Merge branch 'master' into feature-25999/C4_cleanup
2024-12-03 07:37:22 +01:00
41ad440cd4
update newsWidget template & css, fixed carousel css transition;
2024-12-02 16:41:42 +01:00
1a1ed49f8b
- styling für neuen tag
...
- hover effekt
- tagicon statt plus
2024-12-02 13:09:38 +01:00
bf5e8e9c0e
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_anwesenheiten_widget
2024-12-02 10:57:40 +01:00
e63234e7bc
Gegencheck und Anwesenheit App eingefügt
2024-12-02 10:09:09 +01:00
1ca0f35d29
news widget template carousel with menu update;
2024-11-29 15:24:33 +01:00
1336860ecd
feature(Dashboard Transitions): uses Vue's built-in Transition component to add transitions to the widget config elements
2024-11-29 13:23:51 +01:00
278e5d8abd
Merge branch 'master' into feature-25999/C4_cleanup
2024-11-29 13:04:08 +01:00
95e59007cc
refactor(Settings/NavUser Collapsibles): closes the collapsibles if the user clicks outside of the elements
2024-11-29 12:29:59 +01:00
857d4d7282
refactor(Calendar indicator):adds Vue transition to the Calendar indicator through Vue's built-in component
2024-11-29 11:50:27 +01:00
7a7c91b67b
readd lines of code that were lost during merging
2024-11-29 11:19:57 +01:00
9cf6036926
refactor(Paginatino.js): makes the pagionation component responsive on mobile displays
2024-11-29 10:57:14 +01:00
11eae29dab
Merge branch 'feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp'
2024-11-28 14:04:50 +01:00
0f476b4e46
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
2024-11-28 14:02:41 +01:00
677d6e97d6
Config zur Steuerung für welche Studiengaenge die Digit. Anwesenheiten
...
sichtbar sein sollen (Testbetrieb)
2024-11-28 13:38:25 +01:00
021a140dd3
refactor(LvInfo.js): also adds a Profil View link to the lektor name
2024-11-28 13:09:41 +01:00
4f8ca679fb
fix(Calendar/Week/Day/Page.js): removes the calendar indicator when moving the mouse outside of the calendar
2024-11-28 12:52:24 +01:00
9dfa8d13a6
feature(Mylv/Info.js): adds Profil view links to the Lektoren in MyLv Info and fixes the dupplicate lektoren names
2024-11-28 12:46:23 +01:00
71c39edd66
fix(Cis/Sprachen.js): fixes classes of the Sprachen component inside of the Nav Menu when toggled
2024-11-28 10:53:00 +01:00
1346466f79
Merge branch 'master' into feature-25999/C4_anwesenheiten_widget
2024-11-28 10:43:57 +01:00
beb40cfcc9
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_anwesenheiten_widget
2024-11-28 10:22:57 +01:00
0a4d8bb1f6
Falsch verschachtelte Phrase korrigiert
2024-11-28 08:43:25 +01:00
39f1f825a5
fhcApi extendable & reactive; provide reactive viewdata from dashboard to widgets by inject/provide reworked news xslt in db; css change since overflow-auto is in xslt now; WIP anw widget;
2024-11-27 16:30:54 +01:00
6e1943928a
feature(Cms/Content_types/Raum_contentmittitel.js): wraps the h1 title of the content with a link to the Reservierungen of that room
2024-11-27 15:04:56 +01:00
490a658e6d
Merge branch 'feature-8482/Pruefungsprotokoll_zur_Einsicht_exportieren'
2024-11-27 13:45:30 +01:00
fd91a4cb85
Merge branch 'master' into feature-8482/Pruefungsprotokoll_zur_Einsicht_exportieren
2024-11-27 13:44:24 +01:00
800d7ba005
refactor(Cis.css fhc-entry styles): switches the background-colors of the fhc-entry class between selected and not selected
2024-11-27 13:04:52 +01:00
89539d59fd
refactor(components/Cis/Sprachen.js): refactors the Sprachen component with different styles and stores the user_langauge in the global properties of the Vue application by managing a reactive state in the phrasen plugin
2024-11-27 11:50:19 +01:00
1ba857b524
only show digi anw in cis_menu_lv when corresponding lva is from BIF/257 for testphase
2024-11-26 17:12:11 +01:00
0ebc6e820c
refactor(Calendar/Page/Event style): change the margins of an event, so that the border of the event is visible
2024-11-26 16:27:48 +01:00
24740d055e
feature(Sprache/Phrasen aendern): creates a Cis Sprachen component that lists all available Sprachen from the database and lets the user change the currently active language and persist it in the database
2024-11-26 16:26:29 +01:00
c02c1e9955
hinweis "testphase -> keine benotung" phrase
2024-11-26 15:59:42 +01:00
c32f65bc1e
Reihungstestangetreten Check aus BIS-Bewerbermeldung entfernt
2024-11-26 12:49:21 +01:00
82f1a70de5
fix(Calender/Day/Page.js): ausgewaehlte Event wird resetet wenn man den darauffolgenden oder vorherigen Tag auswaehlt
2024-11-26 09:25:24 +01:00
8983af4aef
refactor(Stundenplan_model/getStundenplanQuery):removes wrong comments
2024-11-25 19:59:39 +01:00
290da9f2c0
Merge branch 'master' into feature-25999/C4_cleanup
2024-11-25 17:09:53 +01:00
7fe3a7c8f5
Merge branch 'feature-25999/C4_cleanup_rc'
2024-11-25 16:33:27 +01:00
766bec887a
check if constant CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN is defined
2024-11-25 16:29:41 +01:00
90bdb68175
fix(Stundenplan_model/getStundenplanQuery):changes how the OR sql statments are added to the query
2024-11-25 15:24:36 +01:00
0bec551174
lowercase search in searchfunction fhcapifactory path
2024-11-25 14:24:04 +01:00
f90f5154a0
remove searchdummy function and dummyapi
2024-11-25 13:57:25 +01:00
2ed24ca60f
remove unneeded controllers, views and vuejs apps
2024-11-25 13:48:33 +01:00
699595e891
refactor(DashboardWidget/Stundenplan.js):adds the template for the MonthPage when the Month of the calendar is visible
2024-11-25 13:34:36 +01:00
43fbd1d8f1
refactor(Calendar/Day/Page.js): moves the content to the parent, so that different views can display different content
2024-11-25 13:28:55 +01:00
36c129fcaf
reafactor(Calendar/Day/Page.js-Calendar/Week/Page.js): refactors styles of elements for easier readability
2024-11-25 11:41:22 +01:00
df0ed6715c
add renderif to default room action if no content id is defined
2024-11-25 11:31:13 +01:00
6f1e61fa00
move contentid of cis4 menu root to ci config, remove unused controller components CisVue, modify CISVUE-Header to use config for cis4 menu root content id
2024-11-22 15:16:27 +01:00
1297a8a23a
reafactor(Calendar/Day/Page.js): refactors styles of elements for easier readability
2024-11-22 15:02:42 +01:00
8e51071997
readd v-bind item removing it breaks dashboard customize view instead of plus signs a ghost widget is shown
2024-11-22 14:50:16 +01:00
ecab3ea4d9
remove hardcoded h1 tag, keep the title h1 tag; more cleanup;
2024-11-22 11:43:05 +01:00
14169fafd0
Wording korrigiert
2024-11-22 11:42:24 +01:00
e2b42de6b3
Merge remote-tracking branch 'origin/feature-25999/C4_cleanup' into feature-25999/C4_cleanup
2024-11-22 10:27:12 +01:00
f4d16af68e
change eye watering cms css from green background & white font to white background and black font - as it should be
2024-11-22 10:26:47 +01:00
ab15a8675c
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-11-22 10:25:22 +01:00
20abd6aa05
fix(LvMenu): makes non available menu punkte disabled and non interactable
2024-11-22 10:25:02 +01:00
4bd4301873
more template cleanup profil
2024-11-22 10:15:31 +01:00
fa3d36e99e
Added check if Constant CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN is
...
available at all
2024-11-22 08:46:42 +01:00
16cfb0a3eb
template cleanup profil
2024-11-21 17:32:34 +01:00
1a6b30588d
MyLvApp & Components template & property definition cleanup
2024-11-21 16:11:02 +01:00
fc5ea9f4db
remove unused xmlns:fo add xsl:output method html
2024-11-21 15:59:42 +01:00
61728f3044
dashboard & widgets: template cleanup; property definiton cleanup; delete unwrapInjectedRef -> resolved since vue3.3;
2024-11-21 15:43:35 +01:00
a349a179d0
Merge remote-tracking branch 'origin/feature-25999/C4_cleanup' into feature-25999/C4_cleanup
2024-11-21 15:22:09 +01:00
d400f34e0f
missing phrasen
2024-11-21 15:21:33 +01:00
cdc9e08cd0
cleanup C4 dbupdates
2024-11-21 15:14:13 +01:00
8eb7d18ff9
remove C4 Menu from checksystem
2024-11-21 14:04:35 +01:00
920bd845f8
Merge remote-tracking branch 'origin/feature-25999/C4_cleanup' into feature-25999/C4_cleanup
2024-11-21 13:28:10 +01:00
933ca20e65
tabulator in cms content -> sanitize table header contructs breaking tabulator;
2024-11-21 13:27:39 +01:00
763d038b4c
fix(api/v1/Stundenplan/getStundenplan): fetches groups and studentlehrverbaende based on the date interval of the current and previous semesters
2024-11-21 12:19:22 +01:00
6946028d76
Merge branch 'master' into feature-25999/C4_cleanup
2024-11-21 11:39:50 +01:00
222f31c464
Merge remote-tracking branch 'origin/master'
2024-11-20 16:01:07 +01:00
155e8da35a
Ampel Übersicht tablesorter with filter + date-sort bugfix
2024-11-20 16:00:57 +01:00
a5dd639404
stundenplan header offset class conditionally depending on fhc-calendar widget property
2024-11-20 11:14:55 +01:00
7466e414f8
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-11-20 10:36:04 +01:00
3896aa73ea
fix(Raum_information Calendar): passt die RaumInformations Seite auf die Aenderungen des Calenders an
2024-11-20 10:35:51 +01:00
f6319aa845
add new searchoptions to display search results correct again
2024-11-20 09:29:43 +01:00
9420e22b2a
optimise scrolling behavior of search results and responsive layout of search results
2024-11-19 18:13:15 +01:00
778149880f
Merge remote-tracking branch 'origin/feature-25999/C4_cleanup' into feature-25999/C4_cleanup
2024-11-19 17:46:32 +01:00
2c98438096
add cis4link to widget setup; show link icon in dashboard item header; remove links from widget contents;
2024-11-19 17:46:11 +01:00
a2bdca5551
fix typo
2024-11-19 17:44:44 +01:00
05c52e41eb
search only for active orgunits and rooms, also search room description
2024-11-19 17:33:57 +01:00
00406c50a5
Merge remote-tracking branch 'origin/feature-25999/C4_cleanup' into feature-25999/C4_cleanup
2024-11-19 17:09:58 +01:00
5e9e08d65e
calendar scrollbar css fix;
2024-11-19 17:08:39 +01:00
d8af18673c
always show card header of widgets as in editMode but enable certain tools only when actually in editMode. editMode is active for dashboard not for section; less paddings overall in dashboard; deleted Section headers and put cog besides personal greeting; reformatted name var for greeting into generic viewData property;
2024-11-19 17:07:05 +01:00
c32046002d
add buffer to height calculation
2024-11-19 16:24:36 +01:00
df054a7088
Merge branch 'feature-25999/C4_cleanup_rc' into feature-25999/C4_cleanup
2024-11-19 16:18:45 +01:00
4e4e8a0a5c
improve responsive layout of search results
2024-11-19 16:16:46 +01:00
ad7b43f8a8
Merge remote-tracking branch 'origin/feature-25999/C4_cleanup' into feature-25999/C4_cleanup
2024-11-19 13:35:30 +01:00
f82c669475
provide/inject editModeIsActive from section.js -> currently used in bookmark widget to move redundant config modal into actual widget when said mode is on;
2024-11-19 13:35:06 +01:00
d2466b032a
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-11-19 12:51:50 +01:00
8d01995722
refactor(Studenplan Query):queries all studiensemester from start_date to end_date and matches the gruppen and studentlehrverbaende to the associated studiensemester in the query
2024-11-19 12:51:12 +01:00
3cb9e5b4f8
stpl widget title & show no LVA found on empty days; limit news widget content img max-width by css class;
2024-11-19 12:38:32 +01:00
5d5b2e5bc4
fix(FHCAPI_Controller): adjusts the php doc types of parameters
2024-11-19 11:35:20 +01:00
4cb3521361
Merge branch 'feature-53416/stundenplan_eine_lva' into feature-25999/C4_cleanup
2024-11-19 10:36:34 +01:00
46ef02b54d
deactivate drag mode when widget config modal is opened
2024-11-19 10:33:39 +01:00
9c6509b32a
Merge branch 'feature-25999/C4_cleanup_tablewidget' into feature-25999/C4_cleanup
2024-11-19 10:18:26 +01:00
d6bdad27b2
move room specific stuff to searchconfig, add renderif method to be able to render actions conditionally via config, remove additional prop selectedtypes
2024-11-19 10:17:10 +01:00
4aed321b5e
refactor(Calendar Tagesansicht): changes how the logic for opening a modal or showing the lvMenu next to the calendar is handled
2024-11-19 10:11:49 +01:00
06dab52461
Merge branch 'feature-25999/C4_cleanup_tablewidget' into feature-25999/C4_cleanup
2024-11-19 08:48:06 +01:00
6fc7fd7788
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_cleanup_tablewidget
2024-11-19 08:44:24 +01:00
13e77c8154
Merge branch 'master' into feature-25999/C4_cleanup
2024-11-19 08:43:05 +01:00
b6a5e9b845
load stsemArray from Prestudentstati for select options;
2024-11-18 16:09:16 +01:00
ad31e73212
reset Tabulator fontsize, combine page headings
2024-11-18 11:59:40 +01:00
5596c12af9
use deleteRow instead of getRow and delete to avoid console log error
2024-11-18 11:53:17 +01:00
e044641600
use deleteRow instead of getRow and delete to avoid console log error
2024-11-18 11:50:51 +01:00
65c9d5a84c
adminZeitverfuegbarkeiten reset tabulator fontsize
2024-11-18 10:47:08 +01:00
545a9c31e4
tablewidget footer buttons add missing btn css class
2024-11-18 10:29:28 +01:00
2b98a35f59
bs5 accordion-button class added
2024-11-18 10:20:13 +01:00
96ec9aa8aa
fix(Calender Style): changes the hover style for fhc-entries to have a brighter color than the selectedEvent itself
2024-11-18 09:32:49 +01:00
1b8980a0e2
add css classe with bs3 legacy colors for bg-success and bg-warning and use them in acceptLehrauftrag cis page
2024-11-15 15:58:26 +01:00
1e5d7e01af
reset font-size for tabulator on vilesci page
2024-11-15 15:57:00 +01:00
78f216f9ad
fix syntax error
2024-11-15 15:55:42 +01:00
16cba022e2
add css class to be able to reset tabulator fontsize to 14px for vilesci pages, set active and focus class for filter buttons to new combined button, add css rules to make tooltips on cells in unselectable rows work again
2024-11-15 15:21:46 +01:00
488847984e
change property downloadTitle to titleDownload for Tabulator 5, call tabulator redraw at the end of tableInit callback to ensure renderStart callbacks are run
2024-11-15 15:19:09 +01:00
daf432fe8d
port changes made for BS3 => BS5 to version of current master to get rid of many whitespace and code formating changes and only have functional changes
2024-11-15 15:14:15 +01:00
3146f0795f
Merge branch 'feature-53416/stundenplan_eine_lva' into feature-25999/C4_cleanup
2024-11-15 14:12:00 +01:00
87657a18f1
apply max width only to sanitized p blocks, not column default
2024-11-15 14:10:47 +01:00
6e8aea7feb
Merge branch 'feature-53416/stundenplan_eine_lva' into feature-25999/C4_cleanup
2024-11-15 14:04:53 +01:00
d9f33a279d
apply html sanitization on legacy cms tables intended to be rendered with tabulator 5; clears nested tables, reformats rext nodes and unordered lists to fit into tabulator cells;
2024-11-15 14:02:05 +01:00
fdcef8bdab
feature(Calendar): keeps track of the selected Event in a shared state and highlights the selected Event over different calendar views
2024-11-15 12:52:24 +01:00
65d0e89f06
refactor(Stundenplan events css): moves the class definitions of the events to the slot templates and adds little animations
2024-11-15 11:48:55 +01:00
45fca04029
feature(Calendar Tagesansicht):based on the window with decides wether to display the lvMenu in a Modal or next to the calendar
2024-11-15 11:18:15 +01:00
ef21936975
fix(Calendar scroll):ensures the calendar scroll watcher always triggers by also passing the current focusDate of the Calendar
2024-11-15 09:52:40 +01:00
6b828179b0
revert lehrveranstaltung.class.php lehreinheit.class.php to current master since additional functions were ported to codeigniter models and are no longer used
2024-11-14 16:13:11 +01:00
ebedb30c29
refactor(Stundenplan Tagesansicht):dynamically loads the lvMenu of the first Lv of the day and hightlights the selected LV of the day
2024-11-14 14:40:18 +01:00
8da27a5c77
stpl widget shows selected day + next 7 days
2024-11-14 13:12:56 +01:00
681fb18222
fix(Stundenplan): readds the loadEvents and deletes the template error
2024-11-14 11:15:02 +01:00
f159d6e2a7
fix(Grid CSS): remove unused css rules and css classes
2024-11-14 11:07:58 +01:00
3fff0c5325
Merge branch 'feature-53416/stundenplan_eine_lva' into feature-25999/C4_cleanup
2024-11-13 18:59:33 +01:00
160294bea4
removed grey section background and added fading thing seperator line for every section after the first
2024-11-13 18:39:19 +01:00
a682d6e5ae
overflow-y scroll changed to overflow-y auto -> avoid unnecessary scrollbars
2024-11-13 18:14:58 +01:00
9042f9b83b
change fh logo visibility breakpoint class md -> sm; editable flag in profile based on looking at own profile or being an admin; scrollbar calc in profil app;
2024-11-13 17:27:50 +01:00
cad2756613
Merge branch 'feature-53416/stundenplan_eine_lva' into feature-25999/C4_cleanup
2024-11-13 15:21:33 +01:00
2fd39a9d18
defined active color variable for lvl 2 buttons and use in css class fhc-active for language Buttons. It is yet another shade of grey.
2024-11-13 15:19:42 +01:00
329a418be3
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-11-13 14:53:49 +01:00
e3cbbfa365
feature(Calendar Tagesansicht): LvInfo und LvMenu wird neben der Tagesansicht angezeigt wenn man eine Lv auswaehlt
2024-11-13 14:52:46 +01:00
c85790b637
Merge branch 'feature-53416/stundenplan_eine_lva' into feature-25999/C4_cleanup
2024-11-13 14:14:34 +01:00
5d524c5fda
fix dashboard alert css by adding primevue3 in $includeArray in Dashboard view file
2024-11-13 14:14:11 +01:00
6613b0ea40
remove console.log
2024-11-13 14:08:58 +01:00
a94d8d8fa5
calendar minimized only using slot; showing whole week in stundeplan widget tagesansicht grouped by day; everything in past has 0.5 opacity
2024-11-13 13:57:37 +01:00
3c966e00ba
Merge branch 'feature-47976/KU_Linz_Statistik_Austria_Export_BPK'
2024-11-13 12:11:35 +01:00
e43a890aff
Merge branch 'feature-25999/C4_cleanup' into feature-53416/stundenplan_eine_lva
...
# Conflicts:
# public/js/apps/Cis/Stundenplan.js
# public/js/components/DashboardWidget/Stundenplan.js
2024-11-13 11:17:43 +01:00
59f8f91af9
feature(Calendar Tagesansicht): Calender wird ausgegraut wenn keine LVs an diesen Tag vorhanden sind
2024-11-13 11:00:08 +01:00
b0cd599999
WIP stundenplan widget tagesansicht
2024-11-13 10:41:50 +01:00
c244b3ad1b
fix(Stundenplan): template error
2024-11-12 12:55:14 +01:00
6b04dff4a3
- start tab tags hinzugefuegt
2024-11-12 11:47:16 +01:00
f265e20dce
Merge branch 'feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp' into feature-25999/C4_cleanup
2024-11-12 11:21:16 +01:00
c691d155c9
remove dependecy to legacy phrases from LvMenu controller, add legacy phrases needed in LvMenu controller
2024-11-12 11:05:13 +01:00
3046c29ae2
fix(Calendar): does not display events on the calendar when sliding the carusel to avoid showing overlapping events
2024-11-12 09:57:10 +01:00
6cf7a8e35e
fix(Calendar scroll): extends the id of the scroll anchor to include hour/day/week and changes the logic to search for the anchor depend on the week or day view
2024-11-12 09:48:03 +01:00
35691b39c4
fix(Calendar scroll): fixes the scroll feature for the Calendar
2024-11-11 16:15:14 +01:00
85bec1e0e3
section spacing; dashboard widgets section backgrounds; set scrollbar width css variable via new helper in FhcApp (Dashboard); WIP stundenplan alle Termine einer LV -> c4 link in bfi addon adapted;
2024-11-11 15:49:03 +01:00
094a3ed56a
feature(Calendar): scrolls to the first event of the day if the prop scrollTime is passed to Calendar component
2024-11-11 15:46:09 +01:00
bd1ce9fa63
refactor(Calendar Header): refactors view buttons in the calendar header
2024-11-11 14:57:34 +01:00
bd54399cfd
fix(Calendar Header): adds responsiveness to the calendar header and the view button group next to the header
2024-11-11 14:57:28 +01:00
b7e89ab557
fix(Stundenplan hour lines): fixes the hour lines from disapearing on smaller viewports by using a box-shadow instead
2024-11-11 11:27:23 +01:00
0e49dfaba0
refactor(Calendar day view): changes the classes for fhc-calendar-day-page so that the width is divided in calendar and content
2024-11-11 10:40:58 +01:00
96335a7979
moved email template to fhtw addon; einheiten column visibility default false since pausen are not represented; backend code cleanup; phrase fix;
2024-11-11 09:56:43 +01:00
355652cdb1
- added sql for tags
2024-11-11 07:51:52 +01:00
45bc65d32a
- Tags testversion
...
- header tooltips
- lehre spalte markieren wenn altes semester
- legende-tab hinzugefuegt
2024-11-11 07:33:49 +01:00
ca7ded38d2
refactor(Stundenplan indicator): uses a 5 minute interval for the Stundenplan indicator
2024-11-08 16:08:08 +01:00
f304e79ee0
feature(Stundenplan): adds Tagesansicht for the Stundenplan
2024-11-08 15:18:10 +01:00
68042c1c77
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-11-08 14:14:54 +01:00
b9690988e5
refactor(Stundenplan): uses named slots for week-view template
2024-11-08 10:53:02 +01:00
1691c75a84
replace dependencies on legacy code with ci model functions
2024-11-07 19:18:08 +01:00
f4176b86ee
refactor(js helpers): moves ObjectUtils from composables to the js helpers folder and changes its import statements
2024-11-07 15:00:25 +01:00
da70c77a2b
feature(DateHelpers.js): creates a js helper file to create, handle and manipulate js dates
2024-11-07 15:00:18 +01:00
6732063e6a
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-11-07 13:15:08 +01:00
b65d17e7ae
refactor(LvModal): uses the right format for the date and adds padding to date numbers which are single digits
2024-11-07 13:14:40 +01:00
f68d18f0a8
Stundenplan Bugfix to also load Entries of Semester and Verband
2024-11-07 10:25:42 +01:00
4f2992fbe2
fix(Cis profil menu): fixes the layout of the collapsible in the mobile view
2024-11-07 10:21:39 +01:00
2b516d40c9
remove controllers, views and libraries for CisHtml since not used
2024-11-05 17:46:42 +01:00
39cedfe6a0
remove controllers, views and libraries for CisHmvc since not used
2024-11-05 16:48:30 +01:00
8316290b31
fix(Cis Navbar Collapsibles): closes other colapsibles when opening another
2024-11-05 15:54:26 +01:00
7653bc3e29
fix(Menu User Dropdown): rearranges html elements to make dropdown scroll
2024-11-05 12:03:44 +01:00
37dffbba19
fix(Dashboard widget Url): adds validation method for both input fields and fixes confirm delete dialog
2024-11-05 11:32:02 +01:00
a9fe52d3c6
Merge branch 'feature-25999/C4_cleanup_merge_anrechnungen_bs5' into feature-25999/C4_cleanup
2024-11-05 07:59:21 +01:00
20e0e2e910
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_cleanup_merge_anrechnungen_bs5
2024-11-04 15:59:14 +01:00
835adca419
Debugging option entfernt
2024-11-04 15:42:47 +01:00
50880c696b
use getAuthUID function instead of get_uid, use new permission basis/cis and switch to Auth_Controller where possible
2024-11-04 15:41:02 +01:00
a65e94bc8a
fix phrases variable name because of switch from mixin to plugin
2024-11-04 15:38:04 +01:00
20715d6ef5
add permission basis/cis
2024-11-04 15:36:46 +01:00
c31cef349c
add phrases from legacy code for news extra aside content
2024-11-04 15:35:35 +01:00
50a67a8e88
feature(Dashboard Bookmark): checks whether the link is a valid URL, displays fhcAlert otherwise
2024-11-04 14:37:09 +01:00
eafbdcfffe
refactor(Cis Menu): changes method name and checks if the CIS4_MENU_ENTRY constant is defined
2024-11-04 13:39:13 +01:00
9c637b8575
- added model
2024-11-04 12:20:52 +01:00
86ee48888a
fix(Cis Menu): adds Zahlungen to Mein Studium
2024-11-04 12:09:26 +01:00
9e45394deb
fix(Cis MyLv): uses the moodle course bezeichnung for multiple moodle links
2024-11-04 12:09:12 +01:00
ad068ffe5f
different property name for the different moodle courses names
2024-11-04 09:07:35 +01:00
93ac45308f
Merge branch 'feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5' into feature-25999/C4_cleanup
2024-10-31 16:00:12 +01:00
34c6c63c74
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-10-31 14:24:19 +01:00
f820a0148a
adapts the LV view to incorporate a dropdown if a lehrveranstaltung has multiple moodle links
2024-10-31 14:22:46 +01:00
e78c2e1bf7
Merge branch 'master' into feature-25999/C4_cleanup
2024-10-30 17:19:01 +01:00
d4f3fbfc79
Merge branch 'master' into feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5
2024-10-30 16:45:07 +01:00
c5b81c22f9
adds the target for the lv menu in the studenplan modal and also replaces the tablesorter tables with tabulator5 in other content views
2024-10-30 11:31:39 +01:00
837cc191bf
adds another link regex for the link string '../cms/content?content_id=...' and adds the library content to the CIS4 Menu content
2024-10-30 10:49:27 +01:00
9b4fb2ac2c
bpk job: enabled getting vBPKs with new API version 0.8
2024-10-29 16:28:17 +01:00
6b991c514e
refactors the room actions in the searchbar
2024-10-29 15:49:56 +01:00
bdfea1763d
adds gaps to the LvMenu
2024-10-29 15:38:10 +01:00
587a193a6b
refactors the LvMenu Modal
2024-10-29 15:18:53 +01:00
ec9e73180d
primevue custom tooltip directive zIndex config retrieval fix; studentByLva tabulator height calc abort if no dataTable rendered; phrases fix;
2024-10-29 15:13:00 +01:00
ff367339ea
makes MyLv more responsive
2024-10-29 14:31:20 +01:00
ae80c3415d
betraege im Gehaltsbestandteil als string mit . als komma konvertieren, um zu verhindern, dass locale spezifische Betraege in der verschluesselten DB Spalte gespeichert werden
2024-10-29 10:37:00 +01:00
1e55b13546
force use of insertamum column from antrag table
2024-10-28 15:58:20 +01:00
b9ccafe9db
uses the cis.php file for the anrechnungen url
2024-10-28 15:57:33 +01:00
5f078a76c6
renders the right header (cis or fhtw) conditionally based on the CIS4 constant
2024-10-28 14:54:26 +01:00
3eb2100b3d
Merge branch 'feature-25999/C4_cleanup' of github.com:FH-Complete/FHC-Core into feature-25999/C4_cleanup
2024-10-28 14:16:07 +01:00
fbf0417269
only adds the Events file from addons which are actually active and refactors the Lv Information into its own component
2024-10-28 14:15:45 +01:00
b801401d2b
only shows the Week modus of the calendar if it is not a widget and opens the MyLV links as new tabs instead of showing them in the modal
2024-10-28 13:25:41 +01:00
46c4a30408
css fix & header file import remove
2024-10-28 11:36:49 +01:00
6fc5714fdf
removed language flags; anw phrasen added; added names to apps for easier devtools debugging;
2024-10-25 16:34:57 +02:00
74cf0ad173
use vue header & tooltip translations
2024-10-25 15:58:37 +02:00
e387671e09
added set language feature; phrasen plugin with optional reload if non responsive phrasen are used; stundenplan header mode & buttons reworked
2024-10-24 17:46:42 +02:00
32137479e9
activate email to assistenz on upload; redraw table in case of tabulator scroll bug; navigation.php $root var for Cis4 preperation
2024-10-24 15:07:08 +02:00
2398ca1962
Merge branch 'feature-52916/Unterbrecher_in_serie'
2024-10-24 11:15:36 +02:00
9eb91574c3
semester
2024-10-24 11:08:22 +02:00
2edfd1febc
Unterbrecher in serie problematik
2024-10-24 11:03:28 +02:00
4789bfab42
add columns gehaltsbestandteil_von and gehaltsbestandteil_bis to hr.tbl_gehaltshistorie
2024-10-24 07:57:54 +02:00
e89beb610d
- infocentermitarbeiter spalte deleted by user wird ignoriert
2024-10-23 13:33:50 +02:00
805ed20a18
Merge branch 'feature-52360/C4_fh_logo_remove_and_extend_searchbar_mobile' into feature-52734/C4_moodle_link_stpl_widget_stpl_mylva
2024-10-22 17:52:57 +02:00
f59bdf812a
add phrase mark_person_as_unruly
2024-10-22 17:18:02 +02:00
384de674c0
Merge branch 'feature-40896/kennzeichnung_unruly_person'
2024-10-22 16:50:53 +02:00
fa0fe2a952
hide unruly option in AbmeldungStg for the moment
2024-10-22 16:49:56 +02:00
8ba2a6852b
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-10-22 11:04:07 +02:00
c763e332d8
Merge branch 'feature-52735/C4_stundenplan_query_fix' into feature-25999/C4_cleanup
2024-10-21 17:16:21 +02:00
f3851da10d
add bootstrap class to only show fh logo in header on medium and greater displays; adjusted nav-user-btn css under mobile breakpoint to just take space of contained img and let searchbar flex growth apply to leftover width;
2024-10-21 16:02:54 +02:00
2e3bc855aa
Merge branch 'feature-25999/C4_cleanup' into feature-52735/C4_stundenplan_query_fix
2024-10-21 13:51:21 +02:00
728e2f9b3a
fix getStundenplanQuery query building if benutzer gruppen are empty;
2024-10-21 13:48:32 +02:00
690080035a
fix umlauts in variable name
2024-10-21 13:05:47 +02:00
d8c4c6506a
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
2024-10-21 10:21:42 +02:00
9cd59a1250
add header version switch depending on CIS4 defined
2024-10-18 17:16:12 +02:00
289c99a5a1
fix another 2 file permissions erroneously commited as a21a292da6
2024-10-18 17:03:40 +02:00
cf77a60b35
remove application/controllers/components/Antrag/* since not present in master any more
2024-10-18 16:57:03 +02:00
0775fae67d
remove unnecessary comment
2024-10-18 16:49:52 +02:00
071b0c72dc
Merge branch 'master' into feature-25999/C4_cleanup
2024-10-18 15:45:42 +02:00
44b81d9dff
Merge branch 'feature-25999/C4' into feature-25999/C4_cleanup
2024-10-18 15:44:39 +02:00
7ce426abc2
tooltip css fix; added missing phrase;
2024-10-18 15:14:13 +02:00
501784aba1
Zusätzliche Reihungsteststufen hinzugefügt
2024-10-18 14:24:16 +02:00
8ba370d3a7
makes the active menu punkt bold instead of underlined
2024-10-18 11:58:14 +02:00
59df85b05e
adds Zeugnisse und Documents unter dem Mein Studium Menu Punkt
2024-10-18 11:55:20 +02:00
909b9f5f5a
Merge branch 'feature-25999/C4' of github.com:FH-Complete/FHC-Core into feature-25999/C4
2024-10-18 11:19:18 +02:00
236c4bbdfc
adds placeholders to the empty dashboard fields, that can be used to add new widgets to the dashboard
2024-10-18 11:18:36 +02:00
755e8dd222
add provide to vuejs plugins FhcAlert, FhcApi and Phrasen so they are also useable with inject in composition api
2024-10-17 16:37:27 +02:00
c80e943b3b
readd erroneously deleted folder addons/template commited as 56080f6681
2024-10-17 15:55:05 +02:00
d4494836b1
fix file permissions erroneously commited as a21a292da6
2024-10-17 15:34:00 +02:00
a04b2725f9
csv download lektor table as is; cis_menu_lv link hidden behind berechtigungen check; every tabulator now calculates remaining height by accessing window.visibleViewport.height and tabulator dataset element in order to get virtual DOM behaviour for faster rendering and better UX; filter component now emits uuid on created() lifecycle;
2024-10-17 15:04:03 +02:00
0ab1ec1fc8
Merge branch 'master' into feature-25999/C4
2024-10-17 14:49:43 +02:00
e475fe568e
adds the dashboard menu punkt and adds greeting to the dashboard view
2024-10-17 09:58:28 +02:00
24ce443e95
nur die letzte komm oder zusaetzlichen komm Pruefung einer LV beruecksichtigen
2024-10-15 17:40:11 +02:00
439ae5113d
fix unterbrechung erstellen nicht möglich wenn ein abgelehnter unterbrechungsantrag existiert
2024-10-15 13:59:11 +02:00
14aa98c223
Merge branch 'master' into feature-25999/C4
2024-10-15 10:46:17 +02:00
e2cee7ffa3
Merge branch 'master' into feature-25999/C4
2024-10-15 10:44:56 +02:00
5774cb78c9
Merge branch 'feature-40816/Plausicheck_Anpassungen'
2024-10-15 10:28:38 +02:00
27e3f1d1bc
take status rejected into account when calculating available semster slots for unterbrechung
2024-10-14 15:40:25 +02:00
301466f944
Merge branch 'master' into feature-40816/Plausicheck_Anpassungen
2024-10-14 15:20:16 +02:00
9ed08fb40c
default value for hasConfig is false and the emit update for the URL dashboard widget and only loads the config component if the dashboard widget actually has a config
2024-10-14 13:36:31 +02:00
2893f2ec5a
bugfix lvplan feedback link stpl_detail: correct html
2024-10-14 13:21:19 +02:00
b0e96fbab1
replaces the emits to injections to avoid repassing the emits between intermediate parent elements
2024-10-14 11:42:30 +02:00
0528f3b262
checks the size of the arrays before using the current method and does not allow mitarbeiter to access the student stundenplan
2024-10-14 11:32:23 +02:00
462857080b
makes the parent menu point active if the child menu points gets closed
2024-10-14 11:06:48 +02:00
c67e78d135
phrasen rewording; formatter change; fix save changed anwesenheiten StudentByLvaComponent.js;
2024-10-14 10:42:49 +02:00
4f9591fc3b
fix the z-index of the week stundenplan header
2024-10-14 10:36:46 +02:00
c444e27d0d
adds more styling and fixes little bug in the currentHour Stundenplan indicator
2024-10-14 10:34:01 +02:00
ed1d4b1a50
regex replaces old content links with new CIS4 controller links and adopts the Menu Entry links to not refresh the page when closing the Menu point
2024-10-14 10:17:20 +02:00
9fd02460ce
doesnt refresh the page when the menu entry gets closed, does redirect if the menu entry gets opened
2024-10-14 09:48:54 +02:00
1c61217891
lvplan: changed feedback phrase and Link
2024-10-13 13:34:07 +02:00
f9e72832c9
adds time inidication on stundenplan on mouse position
2024-10-11 12:33:06 +02:00
5359539a09
makes Stundenplan query BLAZINGLY fast
2024-10-10 20:59:55 +02:00
d2ed82cb37
calculates the total amout of hours with an array filter instead of statically inserting all hours
2024-10-10 13:27:26 +02:00
f3fa2fa2dd
adds the hour gutter for the stundenplan with absolute positioned divs instead of a linear gradient
2024-10-10 13:12:01 +02:00
469867e98c
Studstatus: status "EmailVersandt" is not an active status
2024-10-10 12:37:57 +02:00
bf8085f642
starts the stundenplan from hour 7 instead of hour 0
2024-10-10 11:24:26 +02:00
9be5dc3f73
phrasen; tooltips;
2024-10-10 09:47:40 +02:00
9ca59f7928
Paragraph Verweis korrigiert für Master Plagiatsprüfung
2024-10-09 15:22:41 +02:00
b3258e017c
add column path_kurzbz to view vw_oe_path
2024-10-09 13:14:54 +02:00
1da045f58e
Merge branch 'feature-40953/LV-Template_Uebersichtsseite'
2024-10-08 16:38:50 +02:00
3c4b4b6a58
recht lehre/lehrveranstaltung auch am api endpunkt
2024-10-08 16:38:16 +02:00
455d154b63
recht lehre/lehrveranstaltung statt basis/vilesci, schriftgröße verkleinern, menuepunkt in vilesci, headerfilter angepasst
2024-10-08 16:19:57 +02:00
4d50d4380b
little bug fix
2024-10-08 13:54:58 +02:00
45ff067379
makes the url match to the Menu entries better
2024-10-08 13:47:48 +02:00
ebebf8af6d
changes calendar mode to button-group instead of select
2024-10-08 13:29:43 +02:00
79c8edc6cf
makes the calendar week mode header align and highlights the week or day in the Month view depenedent if there is a week view available
2024-10-08 13:20:06 +02:00
a2f70be7e4
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-10-08 09:28:56 +02:00
008bbedd98
phrase
2024-10-07 16:22:27 +02:00
e75872adaa
lets the user change the view of the calendar in the header with a select and highlights the date fields to change the view of the current calendar
2024-10-07 14:49:02 +02:00
41a10320f8
Bugfix LV-Teile Vorrückung, wenn Von-Semester leer
...
Umbenennung Lehreinheit in LV-Teil
2024-10-04 13:51:48 +02:00
25a64cbcae
fixes cis4 Menu for longest matching urls
2024-10-04 12:04:54 +02:00
772fe616ff
remove unused unruly code nr2;
2024-10-03 13:27:05 +02:00
a9d0f177da
remove unused unruly code;
2024-10-03 13:25:02 +02:00
ef0e3f3a66
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
2024-10-03 11:24:48 +02:00
35043ad0ec
Merge branch 'bug-48771/messages_list_limit'
2024-10-03 11:19:47 +02:00
9dbb5291f4
- added limit
2024-10-03 11:17:09 +02:00
dbf5935897
check correct grund phrase to trigger unruly api request;
2024-10-03 11:14:52 +02:00
c754291c6d
Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung'
2024-10-03 10:42:00 +02:00
ed6eb18c4d
fetch termine from vw_stundenplan, not tbl_stundenplan; LE_ID DD chagned to refs (WIP MA_UID DD & Termin DD); removed console.logs(); fhcAlert fix; now find closest termin with absolute value of timeDiff;
2024-10-02 18:04:30 +02:00
8042f3ae0b
makes the menu point active with the url matches
2024-10-02 14:22:34 +02:00
317796c919
- legende und phrasen hinzugefuegt
2024-10-02 14:13:44 +02:00
e8f38bfcf6
sets the events to null before fetching the new events to reactivate the loading spinner
2024-10-02 13:28:18 +02:00
7f9352b820
prototyp fuer die Stundenplan query fuer Studierende
2024-10-02 13:25:39 +02:00
c461480d1d
stundenplanQuery optimization
2024-10-02 10:35:58 +02:00
567dd816be
better descriptions for the cis4_root_menu sql queries
2024-10-01 13:54:53 +02:00
76facc40b9
changes the layout for the LvMenu to a flex instead of a grid
2024-10-01 12:14:34 +02:00
ce058df3a5
Student Component Performance Fix (dont subquery person and anwesenheiten_user table on every anw_user row, just do the entschuldigung offen/abgelehnt logic in client before rendering); entschuldigung tab route; pagination on student entschuldigung page aswell; added config for einheiten länge to calculate/show; mitarbeiter selection in case of admin & lektor in same account behaving as expected; added index creation to initial sql scripts;
2024-09-30 17:25:51 +02:00
23b7d18906
gives the content_childs of the CIS4_ROOT the correct ordering
2024-09-30 14:24:48 +02:00
fa8aec2c2e
adds the MyLv and the Stundenplan Menupunkt to the sql inserts and changes the content for the Dokumente redirect
2024-09-30 14:13:00 +02:00
6f0f3890f9
doesnt show the footer in the editProfil modal when opening a ProfilUpdate
2024-09-30 13:43:26 +02:00
8f617c6222
fixes littel bug with the edit-profil modal in the StudentProfil
2024-09-30 13:20:14 +02:00
f38b0cf78f
changes all the Headers from the CISHTML-Header to the CISVUE-Header
2024-09-30 11:58:20 +02:00
964f6c689c
removes debugging prints
2024-09-30 11:44:31 +02:00
4a5a019841
loads the menu for the CISVUE-Header in the server side and not in the client side
2024-09-30 11:33:55 +02:00
24a2b4ba2f
fixes the bug where the Menu is still selected in the LvModal after clicking on the back button
2024-09-30 11:20:20 +02:00
8c6f9d1bc4
loads the menu for the CISVUE-Header in the server side instead of the client side
2024-09-30 11:14:34 +02:00
0e385e8628
makes the menu of the CISVUE-Header also sticky now
2024-09-30 10:30:11 +02:00
bbed90c814
moves the searchbar from the mobile view to the top of the header
2024-09-30 10:26:23 +02:00
c0596c08c5
changes the header for the Dashboard to the CISVUE-Header and passes the selectedTypes props to fix the CISVUE Header search
2024-09-30 09:43:26 +02:00
d1070656ac
CIS4 MENU sql update COMPLETE
2024-09-27 13:38:29 +02:00
23badc3404
CIS4 MENU sql update WIP
2024-09-27 12:20:37 +02:00
0f708f4934
- added app pep
...
- phrases
- added error
- added model
2024-09-27 11:23:54 +02:00
73a2bf59f3
resolves buggs with the checkActiveUrl method
2024-09-27 10:44:09 +02:00
be412abebc
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-09-26 16:16:24 +02:00
bc6bc930fe
moves the news titel to the component and adds css classes for darker dropdown buttons for the different menu levels
2024-09-26 12:05:44 +02:00
b174818ed2
updates the active state of the menu based on the changed url
2024-09-25 15:02:35 +02:00
b0a78658cf
also makes the menu points active which redirect to an url hash
2024-09-25 13:35:41 +02:00
a1fade0489
fixes the recursive function to find a child content_id
2024-09-25 12:25:19 +02:00
2fc0827d49
revert erroneously merged pull request
2024-09-25 11:22:59 +02:00
951d5bb2c7
all the parents of an active child are also active
2024-09-25 10:46:09 +02:00
3c050438b3
makes the dropdown button of the menu points darker to make them more visible
2024-09-25 09:26:08 +02:00
90931232d9
Merge pull request #49 from FortySeeds/master
...
Enable HTTP-Basic Auth for Demo and Testing
2024-09-25 05:57:13 +02:00
427a301d1a
Merge branch 'FH-Complete:master' into master
2024-09-25 05:51:11 +02:00
f66c3466ed
Extend HTTP-Basic-Auth for Demo-Mode and easier testing
2024-09-25 05:40:04 +02:00
7ed7ce1bb9
active Menu Entry logic for CISVUE
2024-09-24 14:57:41 +02:00
b184cee975
Offset für das Laden von Geschaeftsjahren hinzugefügt
2024-09-24 12:40:12 +02:00
419f608322
- benotung international skills hinzugefügt
...
- phrase
2024-09-24 12:05:09 +02:00
5d70f72cc2
Merge branch 'feature-40348/UHSTAT_1_Unbekannte_Eltern'
2024-09-24 11:22:34 +02:00
5057b2d761
bugfix unbekannte Eltern: unknown can always be chosen, and it is valid. Only if Land des Abschlusses in austria, austrian max Bildung options can be chosen
2024-09-23 18:27:19 +02:00
470192aabd
fixes some bugs in the View/Entry.php for the Menu
2024-09-23 15:14:31 +02:00
45d350a76e
changes the header for the news and puts the LV title in the card header / removes the lines of the lehrveranstaltungs optionenen
2024-09-23 13:24:58 +02:00
3b20f5e45c
Plausichecks: removed check BewerberNichtZumRtAngetreten
2024-09-20 16:12:14 +02:00
2d3643d1f0
Bismeldestichtag: added method for getting next Meldestichtag, loading data only after tabulator is ready
2024-09-20 16:04:27 +02:00
effad6f62d
only fetch person_id, vorname, nachname & unruly from tbl_person on checkUnruly()
2024-09-20 15:16:20 +02:00
98c85f1241
little changes to the view for the content
2024-09-20 14:20:44 +02:00
958c897467
changed unruly html from a tags to p tags since they messed with styles somehow
2024-09-20 13:54:32 +02:00
a2e4704223
developing new components in lektor ui for ux improvements; anw function now explicitely in extension schema
2024-09-20 13:12:50 +02:00
9343d1ee0c
refactor Content_types template
2024-09-20 11:26:08 +02:00
ca4865011d
adds missing parameters to the getContent function
2024-09-20 11:21:59 +02:00
693313a23b
renames/reuses lv-modal and fixes bugs associated with the modal
2024-09-19 09:35:36 +02:00
b9fd95741d
moves the CalendarModal into the Stundenplan component instead of the Calendar component and changes the start_time and end_time computed properties
2024-09-18 14:40:58 +02:00
5877411db8
also loads the stundenplan data when the component is created
2024-09-18 13:52:49 +02:00
f7b3af4939
makes the studiengang_semester reactive using computed when providing the value
2024-09-18 13:17:14 +02:00
164fc4b132
converts the dropdown of the lehrveranstaltungs optionen into a list inside the lv card
2024-09-18 12:52:55 +02:00
e6eea06900
Merge branch 'feature-40348/UHSTAT1_unbekannte_Eltern'
2024-09-18 12:41:05 +02:00
f499110bbf
Merge branch 'feature-41046/wartende_anschreiben_onetimemessages_abgewiesene_werden_nicht_ausgefiltert'
2024-09-18 12:28:50 +02:00
d0281bb3b4
Merge branch 'feature-47888/projektarbeit_endabgabe'
2024-09-18 12:24:37 +02:00
910a467fcc
changes the stundenplan widget to use the new api endpoints that query the stundenplan events
2024-09-18 11:44:47 +02:00
91174ca974
- schickt message, nur wenn wartender der letzte status ist
2024-09-17 15:35:00 +02:00
79ea8c4521
renamed unrulyPerson api to checkPerson; built in logic into infoCenterDetails to trigger a number of checks about any changed data in the info center (in this case unruly) and update the page accordingly; Also fixed a bug when saving stammdaten without kontakt entries;
2024-09-17 14:09:49 +02:00
6edc411a95
adds the LvMenu as dropdown options to the MyLV
2024-09-17 12:34:47 +02:00
5ca639101c
fixes Month display of LVs
2024-09-17 11:39:39 +02:00
7c85e981f9
- absteigende sortierung endabgabe
2024-09-17 11:17:44 +02:00
d931aad11c
solves reactive data problem in CalendarModal
2024-09-17 09:41:17 +02:00
61e6ad063a
solves Telefon displaying as null for some benutzer
2024-09-17 09:28:11 +02:00
e1c395146b
refactors the LvMenu into its own component and removes debugging prints
2024-09-16 14:55:26 +02:00
363a014298
Merge branch 'feature-39161/PV21_Valorisierung'
2024-09-16 09:17:51 +02:00
4836ed8de0
adds LvMenu to the CalendarModel WIP
2024-09-13 13:44:53 +02:00
b30156a65f
catches errors better in Profil
2024-09-13 12:42:57 +02:00
d6966b24fe
Merge branch 'master' into feature-39161/PV21_Valorisierung
2024-09-13 12:39:05 +02:00
88c38c9228
fixes ProfilUpdate bugs
2024-09-13 12:37:13 +02:00
cf1cb44afa
refactors old ProfilUpdate controller functions
2024-09-13 12:27:07 +02:00
2b9406b172
resolves zustellnungs value bug and removes debugging prints
2024-09-13 11:15:46 +02:00
27c312d7d3
filterPerson unrulyPerson api & person model
2024-09-12 15:42:21 +02:00
29fac520f3
component was setting the topic false when trying to delete a kontakt or an adresse
2024-09-12 12:04:42 +02:00
1208c6829c
when an error happenes to editProfil Modal will also be closed then
2024-09-12 11:53:13 +02:00
1de8c00990
fixes an error where the payload i treated like an object but is an associative array in the controller
2024-09-12 11:45:54 +02:00
e247621f95
fixes the profilBearbeiten phrase and does update the topic correctly when adding a new kontakt/addresse in the profil
2024-09-12 10:47:31 +02:00
cfea7e10f2
adds the reservierungen overview action for the search result with a room object and removes debugging prints
2024-09-11 14:51:52 +02:00
6cf3896d49
fixes Calendar.js
2024-09-11 14:38:00 +02:00
b2dbe65739
Berechtigungen korrigiert beim Setzen von Unruly People
2024-09-11 14:32:47 +02:00
cf4105dcb3
Merge branch 'feature-25999/C4_copy' into feature-25999/C4
2024-09-11 14:07:25 +02:00
b79a3bd5e9
Merge branch 'master' into feature-25999/C4
2024-09-11 14:06:49 +02:00
04aaefd5d8
refetches the Stundenplan events also for the Stundenplan and not only for the roomplan
2024-09-11 14:00:53 +02:00
aef267186f
removes typo and debugging print from Calendar.js
2024-09-11 13:56:39 +02:00
d80761d952
Merge branch 'feature-39912/Room_planning_calendar' into feature-25999/C4_copy
2024-09-11 13:54:45 +02:00
8860d9a598
adds quick fix for the query builder error that comes up when fetching content
2024-09-11 11:26:04 +02:00
f2a57f85a8
fixes the errors with the stundenplan/reservierungen data query
2024-09-11 10:19:46 +02:00
ac35ba3e27
puts the logic that adds the object informtion to the json reponse in the controllers instead of the models
2024-09-11 09:50:04 +02:00
1de658ace6
fixes the query for the reservierungen in the stundenplan and in the raum informations
2024-09-11 09:32:28 +02:00
715b8075b8
reworks the query for the reservierungen stundenplan/room
2024-09-10 12:30:40 +02:00
555e74b8cd
Projektexport ist jetzt auch möglich wenn aktuell keine Projekte
...
zugeordnet sind
2024-09-10 11:48:43 +02:00
79d23a4557
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
...
# Conflicts:
# public/js/components/Form/Upload/Dms.js
2024-09-10 11:25:19 +02:00
6bc58c00b7
unruly controller benutzerrechte; studstatus unruly api fix;
2024-09-10 10:50:02 +02:00
d9f5646ad1
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
...
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-09-10 10:17:55 +02:00
888e3878bd
studstatus unruly als grund
2024-09-09 17:16:05 +02:00
7b110aaf50
adds the needed phrase to the api/frontend/v1/Cms Controller
2024-09-09 14:16:37 +02:00
7a63301f08
puts profil settings ul outside of the sticky container
2024-09-09 13:49:38 +02:00
5f50d9f0ec
Merge branch 'feature-40311/Stundenplan_widget' into feature-25999/C4
2024-09-09 13:26:03 +02:00
26a0521379
fixes fhcapi
2024-09-09 13:12:11 +02:00
996a49105b
Merge branch 'feature-40309/Cis_News_widget' into feature-25999/C4
2024-09-09 13:03:47 +02:00
ff51d3964f
Merge branch 'feature-40842/DashboardAmpeln' into feature-25999/C4
2024-09-09 12:56:55 +02:00
c2c30b86a1
Merge branch 'feature-40841/SearchBarChanges' into feature-25999/C4
2024-09-09 12:02:09 +02:00
97b34d98fb
Merge branch 'feature-41133/side_menu_sticky' into feature-25999/C4
2024-09-09 11:51:34 +02:00
1f4628720a
Merge branch 'feature-39911/Suche_um_raeume_erweitern' into feature-25999/C4
2024-09-09 11:50:27 +02:00
a8141e5dac
Merge branch 'master' into feature-25999/C4
2024-09-09 11:45:10 +02:00
33122a0708
WIP performance testing & UI upgrades
2024-09-09 10:49:21 +02:00
ec8b3ccb6f
adds the organisations bezeichnung through a subquery to the lehrveranstaltungs events
2024-09-06 13:11:22 +02:00
122673d291
gets rid of the stunden dependency and uses the beginn and ende property of the queried events
2024-09-06 11:20:20 +02:00
8376e8b92d
bundles the room_events and the reservierungen api calls together with Promise.allSettled
2024-09-06 11:02:14 +02:00
493405951d
zusaetzlicher Filter bei Handyverwaltung nach beendeten DVs
2024-09-05 16:31:56 +02:00
f9b69fe08c
changes how the reservierungen are fetched from the database to have the same information as the room events
2024-09-05 14:57:57 +02:00
e33162d20e
changes the structure of the JSON data from the stundenplan
2024-09-04 14:59:56 +02:00
0e39cfd4e3
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-09-04 11:01:01 +02:00
fda03b88df
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-09-04 11:00:24 +02:00
f74ccb0513
Removed column Lehreinheitgruppen
2024-09-04 10:59:46 +02:00
6076d59c4b
Removed Group by Organisationseinheit
...
Instead added Organisationseinheit as column for filtering reasons.
Column is invisible by default.
2024-09-04 10:59:25 +02:00
87f82b7f5d
also adds the stundenplan information as object in the response of the endpoint
2024-09-03 12:07:13 +02:00
f19c1b4eaf
adds the lector and the gruppe as objects to the endpoint result instead of just strings
2024-09-02 14:47:40 +02:00
8c5ca521ac
adopts the side menu for the desktop and mobile view
2024-09-02 10:42:01 +02:00
7dc7816123
- fas neuer filter ueberfaellige buchungen
2024-08-30 08:21:35 +02:00
d03678e3dc
WIP
2024-08-27 15:30:17 +02:00
ec6efc5c2b
Added studiengang_kz to Akadgrad DropDown
2024-08-21 16:54:22 +02:00
f2be396e7a
Adapted to use new fhcApi.getUri method
2024-08-21 13:53:49 +02:00
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
67a48c6f75
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-08-21 13:44:32 +02:00
7fb7263424
Added phrases for LV Templates Overview
2024-08-21 13:34:11 +02:00
e5e4bb2ea1
Added Component LvTemplateUebersicht.js
2024-08-21 13:32:37 +02:00
fc8c748bc4
Added View LvTemplateUebersicht.php
2024-08-21 13:32:14 +02:00
eb308b78ef
Added App LvTemplates.js
2024-08-21 13:28:56 +02:00
6168a6b806
Added Controller LvTemplateUebersicht.php
2024-08-21 13:26:20 +02:00
d07f19d893
Added api Controller Studiensemester.php + methods getAll and getAktNext
2024-08-21 13:23:26 +02:00
bff5d4ffbe
Added api Controller Lehrveranstaltung.php + method getTemplateLvTree
2024-08-21 13:22:15 +02:00
4dc698a6be
Added navigation menu item 'Lehrveranstaltungen' > 'LV Template Uebersicht'
2024-08-21 13:17:54 +02:00
3963358d95
Added getTemplateLvTree method to Lehrveranstaltung_model.php
...
This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
2024-08-21 13:16:22 +02:00
a2f9fba896
Bugfix: Favorites: Correct loading procedure for Prestudent-Subverbände
2024-08-21 12:50:58 +02:00
97b171176a
Merge branch 'feature-44041/AntragJob_Abmeldungen_durch_Stg_config_mismatch'
2024-08-19 13:33:38 +02:00
a594ddeb75
AntragJob: Abmeldungen durch Stg config mismatch
2024-08-19 13:08:12 +02:00
ebd5aebd33
Merge branch 'feature-39579/Studierendenverwaltung_stabilisieren'
2024-08-14 13:59:18 +02:00
f771b54f10
StV: Favorites use now correct API return functions
2024-08-14 09:16:11 +02:00
67398607d8
dbupdate entry
2024-08-14 09:11:14 +02:00
d33163aae8
Add stv_favorites to variablenames
2024-08-14 09:09:13 +02:00
2c6212f75f
fix reuse of for multiple purposes overwriting each other
2024-08-14 07:36:14 +02:00
30396b3f0e
Merge remote-tracking branch 'origin/feature-40728/Issues_logik_auslagern_in_eigene_library' into feature-39161/PV21_Valorisierung
2024-08-13 18:32:15 +02:00
336cfa8667
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp'
2024-08-13 17:27:28 +02:00
8a9e040554
added Gehaltstyp model
2024-08-13 16:57:05 +02:00
2bd578edb3
remove unused Abstract_Searchbar_Controller
2024-08-13 16:42:09 +02:00
3a466e8e0f
puts nav-toggle and nav-menu-items in a sticky container
2024-08-13 15:27:51 +02:00
8bc8c67f8d
better comments
2024-08-13 15:10:23 +02:00
36bd1795ed
makes the cis4 side menu sticky
2024-08-13 15:04:44 +02:00
308412b5a3
Bugfix Creditpoints
2024-08-13 15:00:13 +02:00
e24c610bf1
Studiensemester now: change getAkt to getNearest
2024-08-13 14:59:54 +02:00
2e3576b06e
Bugfix: Advance Status: object in array
2024-08-13 14:34:53 +02:00
98f335ec00
mising fileextension on import in Prompt.js
2024-08-13 14:30:25 +02:00
50a96b3e4f
Prestudent History: Wrong Function for Permissioncheck
2024-08-13 14:20:40 +02:00
5d169e188a
move permissions from abstract to concrete Notiz Controller
2024-08-13 14:12:55 +02:00
4fc61c342c
Prestudent Permissions
2024-08-13 13:52:04 +02:00
f8f352fe65
Students Permissions
2024-08-13 13:41:35 +02:00
a988ff20c8
Notiz Permissions
2024-08-13 13:38:09 +02:00
6fb050fa58
Tab Config Permissions
2024-08-13 13:32:29 +02:00
f9a41b9685
Studienplan & Studiensemester => Auth Controller
2024-08-13 13:25:10 +02:00
e5217afc09
ZGV Ausstellungsstaat
2024-08-13 13:10:11 +02:00
3d07aa3bd0
UDFs Prestudent aktivieren
2024-08-13 11:29:24 +02:00
761ec96662
Bugfix: uft8 json & codequality
2024-08-13 11:20:32 +02:00
ed69d3a061
Prestudenttab einzelne Felder ausblenden
2024-08-13 11:05:35 +02:00
db8e2bfb69
Interessent hinzufügen und Notenkarteireiter ausblenden
2024-08-13 11:01:49 +02:00
307ee8fb56
Berechtigungscheck f. Studentenverwaltung Controller
2024-08-13 09:00:49 +02:00
d025359f72
Berechtigungscheck Verbandstree
2024-08-13 08:51:01 +02:00
9ac9ab6818
Berechtigungscheck Studentenliste
2024-08-12 16:02:06 +02:00
a45fd217d9
Berechtigungscheck Details
2024-08-12 15:59:23 +02:00
d3025dc4a8
Berechtigungscheck Kontakt
2024-08-12 15:59:15 +02:00
cce58fdc31
removes debugging prints
2024-08-12 14:24:37 +02:00
8232224b21
LvMenu.php added codeigniter phrasen object to params; Using ci_phrases in Events.php for cis4 menu;
2024-08-12 14:20:42 +02:00
38e1308865
revert change on already deprcated file
2024-08-12 14:12:01 +02:00
73dd89e5af
adds phrasen library to LvMenu
2024-08-12 14:09:21 +02:00
054e59a891
Bugfixes PrestudentLib
2024-08-12 12:22:43 +02:00
097a507c9a
Bugfix: missing data in showFeedback function
2024-08-12 09:54:23 +02:00
47ddebf7c4
Bugfix: wrong variablename
2024-08-12 09:54:00 +02:00
d19a47d4b2
Bugfix: missing load->library
2024-08-12 09:47:13 +02:00
fea7ed8f76
copy pasta
2024-08-12 09:45:34 +02:00
0a150a60bb
improved error message
2024-08-12 09:44:12 +02:00
781b4b31cd
Bugfix: misspelled function call
2024-08-12 09:43:45 +02:00
fe7b05cce2
Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-08-12 08:34:32 +02:00
20ed9ffc41
UHSTAT Formular: added "unknown" options to every input
2024-08-11 21:59:13 +02:00
d7abc41137
adds digitaleAnwesenheiten menu point
2024-08-09 13:32:00 +02:00
c378ec4347
Remove unnecessary comments
2024-08-09 13:26:07 +02:00
7e302adf53
Bugfix in Prestudent model
2024-08-09 13:25:42 +02:00
02c12c6a54
Bugfixes in PrestudentstatusCheckLib
2024-08-09 13:25:21 +02:00
d57bd7d7ba
Bugfixes in Students Controller
2024-08-09 13:24:39 +02:00
59e501e52b
use new FHCAPI features in UDF controller
2024-08-09 13:23:41 +02:00
6f0575304c
- ent/sperren mit hochkomma bug fixed
2024-08-09 11:54:01 +02:00
8b1ade86ac
revert wrong changes from "adapt function toolbarInteressent, Phrases"
2024-08-08 16:39:47 +02:00
ffabd681c8
setFirstStudent logic
2024-08-08 16:24:23 +02:00
f1a2ef25c7
Remove unused functions
2024-08-08 12:45:36 +02:00
b54449012b
implement version without processLehrverband for setAbbrecher and setUnterbrecher
2024-08-08 11:30:56 +02:00
0f75b269c3
remove comment
2024-08-07 16:55:20 +02:00
8fbd680ebd
correct rolle_doesnt_exist validation in addStudent
2024-08-07 16:25:56 +02:00
dad5127d4c
addStudent validation
2024-08-07 16:19:30 +02:00
ac29247783
checkIfLastBewerberAndAufgenommenerShareSemesters
2024-08-07 16:19:15 +02:00
59314ae0aa
correct rolle exists check
2024-08-07 15:56:07 +02:00
24d74dd332
correct student check
2024-08-07 15:51:19 +02:00
ba2c450bd2
uses the codeigniter querybuilder to construct the active ampeln query
2024-08-07 15:43:20 +02:00
0621073f8d
correct checkIfExistingAufgenommenerstatus
2024-08-07 15:40:11 +02:00
1fc7f9d3e8
correct checkIfExistingBewerberstatus
2024-08-07 15:37:43 +02:00
3f86961bda
adds parameter to ampeln deadline/overdue phrase
2024-08-07 15:21:22 +02:00
05e0d219f4
Codequality
2024-08-07 14:32:44 +02:00
8b590dc58a
optimizing Ampel Widget
2024-08-07 14:23:35 +02:00
a6bef31862
corrects filter styling problem
2024-08-07 12:00:24 +02:00
e7a29dc21a
Identation
2024-08-07 11:56:00 +02:00
ceb8eb9671
corrects the way how to active ampeln check whether an ampel was bestaetigt or not and adds the Ampel_Benutzer_Bestaetigt_model
2024-08-07 11:52:50 +02:00
e89677c36d
Comments
2024-08-07 11:08:39 +02:00
4b7e445a25
Bugfixes: Eventobject as parameter
2024-08-07 09:53:40 +02:00
47a4b63172
changes the zustellungs warning for the Profil Adressen/Kontakte
2024-08-07 09:53:37 +02:00
911eb66c4a
Missing :
2024-08-07 09:44:28 +02:00
428a56cfd0
Cleanup MultiStatus Component & Dropdown Component
2024-08-07 09:41:36 +02:00
9af8117749
add statusgrund_id
2024-08-06 16:53:48 +02:00
baa7417c22
Status: Wartender
2024-08-06 16:49:11 +02:00
6dd779b421
Status Abgewiesener
2024-08-06 16:47:12 +02:00
b3e105908b
Fix Status Absolvent & Bewerber
2024-08-06 16:41:38 +02:00
f87277e1f2
Status: Aufgenommener & code reuse
2024-08-06 16:35:59 +02:00
749b29a239
Status: Bewerber
2024-08-06 16:30:50 +02:00
942e8a9229
Status: Absolvent
2024-08-06 16:27:45 +02:00
09a0536921
Status Diplomand
2024-08-06 16:24:38 +02:00
21e69c6d94
Status: Unterbrecher & Student
2024-08-06 16:19:35 +02:00
07400e7551
change all setAbbrecher to setAbbrecherNeu and rename
2024-08-06 14:49:20 +02:00
46a0706057
updates roomEvents on change:range / groups the results of a studenplan query
2024-08-06 14:29:24 +02:00
e6676e8868
setAbbrecherNeu
2024-08-06 14:26:52 +02:00
9b034a6753
Status cleanup
2024-08-06 14:21:53 +02:00
ee78a94aa2
codesniff Prestudentstatus_model
2024-08-06 14:20:22 +02:00
34db041ac4
Status Frontend cleanup
2024-08-06 14:19:54 +02:00
7abe95ba5f
Adapted LvsByStudienplan query to retrieve also Lehreinheitgruppen
2024-08-06 10:48:20 +02:00
50b15b9506
codesniff libs
2024-08-06 09:47:39 +02:00
235a8a73e9
codessniff studentlehrverband_model
2024-08-06 08:49:23 +02:00
a728d20b70
codesniff Models
2024-08-06 08:42:20 +02:00
a78976b136
codesniff Status.php
2024-08-06 08:21:02 +02:00
437fd64a6f
refactor setFunctions and processStudentlehrverband
2024-08-05 16:52:46 +02:00
f0db878623
changes the headers from the news template from h5 to h2 but adds the bootstrap h5 class
2024-08-05 11:48:57 +02:00
b0821be465
Added methods getLastOrAktStudienjahr / getAktOrNextStudienjahr to retrieve the last or next Studienjahr during the summer term
2024-08-05 10:52:15 +02:00
e44c1bccb3
adds shorthands with getDataOrTerminateWithError and adds also form_validation
2024-08-05 09:17:04 +02:00
b350c9da56
refactors the news controller
2024-08-02 14:46:22 +02:00
a555067c43
Prepare for Translated fields in DB_Model
2024-08-02 14:24:50 +02:00
90162ed2c9
refactor generate alias, add transaction to addStatus
2024-08-02 13:55:46 +02:00
c5f57a0689
adds the bestaetigt property of the ampel when fetching all the active ampeln
2024-08-02 12:52:21 +02:00
3bb87ef8d3
corrects the translation of the ampel queries
2024-08-02 11:44:58 +02:00
4811f223b9
corrects little typo
2024-08-02 11:01:32 +02:00
e6ba291549
adds the translation of the beschreibung and the buttontext in the Ampel_model and not in the Ampel controller
2024-08-02 11:00:11 +02:00
9e1bd2b64d
adds form_validation
2024-08-02 10:36:34 +02:00
fb6bca0ffb
Merge pull request #46 from FH-Complete/feature-41134/bookmark_dashboardWidget
...
Feature 41134/bookmark dashboard widget
2024-08-02 09:59:51 +02:00
2de307682c
convert identation to tabs
2024-08-02 09:26:39 +02:00
9dc421e789
Form Validations addStudent
2024-08-02 08:25:53 +02:00
1d4f03e3f1
adds single phrase
2024-08-02 08:24:57 +02:00
d4e33eb1df
refactor
2024-08-01 15:04:18 +02:00
4317d5ebe9
tab spaces/ catch alerts
2024-08-01 14:16:20 +02:00
9bec0c61de
Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
...
# Conflicts:
# system/phrasesupdate.php
2024-08-01 13:55:51 +02:00
d301a66f57
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-08-01 13:53:58 +02:00
3213c051b3
Adapted getLvsByStudienplan query to get by given Lehrveranstaltungen
2024-08-01 13:48:06 +02:00
6f0e46ac57
Status: Max Semester
2024-08-01 12:57:06 +02:00
f2180257c5
adapt validation changeStatus
2024-08-01 12:45:55 +02:00
6fcc8cf7e8
code review changes
2024-08-01 11:49:14 +02:00
96b8d49ef2
add changeStatus to PermissionChecks
2024-08-01 08:52:38 +02:00
0be45703b5
validation checks changeStatus
2024-08-01 08:43:59 +02:00
e548e17776
Status insert/edit: Orgform in Mischform Stg
2024-07-31 15:09:09 +02:00
bd7e45547f
adds Phrasen to the Stundenplan dashboard widget
2024-07-31 14:51:43 +02:00
c9471c344d
added unruly person boolean column to tbl_person; studStatus/leitung added a checkbox to mark persons as unruly unrelated to studstatus datastate;
2024-07-31 14:37:26 +02:00
3641047963
adds bookmark phrasen and makes the data shared between the dashboard widget and the configuration view of the widget
2024-07-31 13:51:34 +02:00
cf440ffb43
Shared Data in Widget Component and Widget Config Component
2024-07-31 13:13:16 +02:00
c2be0a4790
adds content to Url.js
2024-07-31 12:41:03 +02:00
085ca2a16d
Adapted getLvsByStudienplan query to get all LVs, not only VZ
2024-07-31 11:44:42 +02:00
009360a127
Confirm Status Message
2024-07-31 09:45:20 +02:00
8c84a63757
corrects how both the ampel and the ui phrasen are loaded
2024-07-31 09:40:50 +02:00
3d27c68dee
adapt functions toolbarInteressent, Phrases
2024-07-31 09:06:42 +02:00
10444e31ce
Add Comment
2024-07-30 16:39:59 +02:00
8492a0aa13
Advance Status
2024-07-30 16:37:39 +02:00
6f216dbe52
Added phrases to Softwarebereitstellung
2024-07-30 15:38:36 +02:00
49bd14496a
Adapted db query to get Lehrveranstaltungen via Studienplan instead of Lehreinheit
2024-07-30 15:38:02 +02:00
414a0d7d6e
Changed filter SoftwareManagement to display column anzahl_lizenzen
2024-07-30 15:36:16 +02:00
39574c1b3a
adds delete endpoint for the dashboard bookmark widget
2024-07-30 15:27:24 +02:00
198b866268
adds fhcalert when confirming an ampel
2024-07-30 12:37:05 +02:00
02cf36c17c
adds Phrasen to the dashboard ampel-widget
2024-07-30 12:25:26 +02:00
b423fff074
Status Delete: cleanup
2024-07-30 11:49:00 +02:00
96b9571ee1
Delete Status: correct confirm
2024-07-30 11:40:57 +02:00
25d6d9b59e
Finish Status delete & correct updateLehrverbandForInsertAndUpdate
2024-07-30 11:36:43 +02:00
284cf711fd
adds the sql scripts to create dashboard.tbl_bookmark and dashboard.tbl_bookmark_sequence
2024-07-30 11:26:22 +02:00
1a4f04cb81
Dropdown close & style improvements
2024-07-30 11:16:32 +02:00
dd23bc26a2
Improvements: Status delete
2024-07-30 09:57:37 +02:00
8a637f3fa9
Fix List Reload Bug
2024-07-30 09:54:46 +02:00
d0f3cee7de
add permissions for vw_oe_path
2024-07-29 18:11:13 +02:00
e6684a0116
add db view that contains oe path
2024-07-29 17:41:24 +02:00
f2b81ea68c
Bug: Anzeige Statusgrund
2024-07-29 13:58:20 +02:00
f4210e7671
fixes the Vue component layout for the ampeln dashboardwidget
2024-07-29 13:44:17 +02:00
2c45478877
fixes the fetched ampeln in the ampelWidget
2024-07-29 13:17:29 +02:00
e81856afb9
Phrases confirmChangeStatus
2024-07-29 11:58:42 +02:00
88b5fbc4c9
PlausicheckResolverLib: resolving of issues without explicit resolver can also be used in extensions
2024-07-28 19:40:10 +02:00
f1d1c3cbfd
issueresolver: improved yet another comment
2024-07-28 19:34:58 +02:00
6680e9b882
issueresolver: improved another comment
2024-07-28 19:15:27 +02:00
31a21954d9
issueresolver: improved comment
2024-07-28 19:12:40 +02:00
65b71191a0
adds +1 to month in getMonth() function because the month index of a javascript date starts with 0, additional cleanup in Ampel.js Widgett
2024-07-26 15:41:21 +02:00
fbcd1bd7de
update prestudentlib
2024-07-26 15:01:21 +02:00
fb30a8e009
translates the ampel queries in separate private function
2024-07-26 14:07:56 +02:00
d4db49e09e
Status->isLastStatus corrected
2024-07-26 12:04:20 +02:00
32a20f4783
ChangeStatusLogic in component Dropdown
2024-07-26 11:56:52 +02:00
57e4f585fe
Bugfixes Status edit
2024-07-26 11:29:08 +02:00
916cecca73
Disable Confirm Button if preconditions not met
2024-07-26 09:51:35 +02:00
d286c3784d
Popup for Status Confirm
2024-07-26 09:47:15 +02:00
dec08f5eb1
Update/Cleanup ConfirmStatus Endpoint
2024-07-26 09:17:26 +02:00
0534ab4ac2
corrected Studienpläne Query
2024-07-25 15:51:30 +02:00
ca6e3a8463
adds endpoint to query all user ampeln that were assigned after the start_working_date with the appropriate beschreibungs translations
2024-07-25 15:16:01 +02:00
e1b179a248
More secure status list
2024-07-25 15:12:59 +02:00
5ab9acfe89
Dynamic Status List
2024-07-25 15:11:08 +02:00
3809e6f994
MultiStatus Modal: +Wartender & SkipCheckPermissions & reload Studienpläne on Student change
2024-07-25 14:50:40 +02:00
60fc774ade
Multistatus cleanup
2024-07-25 13:57:00 +02:00
7250154748
Multistatus Modal as own Component
2024-07-25 13:35:47 +02:00
df6f4a07d6
dynamic toolbarStudent
2024-07-25 13:18:13 +02:00
a3377a77fa
update functions changeStatus, part 1, fix tags
2024-07-25 10:46:45 +02:00
abc74b09b3
Merge branch 'master' into feature-40728/Issues_logik_auslagern_in_eigene_library
2024-07-24 21:15:40 +02:00
7f0373e0e9
bewerbung_abgeschicktamum rechte
2024-07-24 16:08:46 +02:00
df39272544
update dynamic Toolbar Interessent with bootstrap dropdown-menu-right
2024-07-24 15:38:26 +02:00
70dff47f26
Rearrange/Rename functions & outsource shared code into a subfunction
2024-07-24 15:18:16 +02:00
e42e015410
Status update function
2024-07-24 15:04:19 +02:00
0849e795a0
also adds the horizontal line under the heading
2024-07-24 14:59:02 +02:00
012cbe9a25
pulls the header out of the content div which makes the headings smaller in the content view with a specific css
2024-07-24 14:57:11 +02:00
e9d45b6532
removes the old way a modal was shown in the news widget of the dashboard
2024-07-24 14:51:04 +02:00
94df440f88
adds a heading to the Content and the News View again
2024-07-24 14:49:58 +02:00
4e929f4cce
Merge branch 'feature-25999/C4' into feature-40309/Cis_News_widget
2024-07-24 14:40:15 +02:00
563f5e5f9e
merging C4
2024-07-24 14:37:16 +02:00
1e3146d33f
dashboardAmpeln
2024-07-24 13:31:00 +02:00
93b301ee08
Finish Status insert function
2024-07-24 13:24:15 +02:00
4b0878b248
Merge branch 'master' into feature-39911/Suche_um_raeume_erweitern
2024-07-24 13:00:52 +02:00
d9cba6bf5c
Check orgform student/bewerber
2024-07-24 08:45:48 +02:00
7498b327d4
dynamic Toolbars Interessent, Student, update actions interessent
2024-07-24 08:42:19 +02:00
d12f3dd846
Check History for Student status
2024-07-23 14:51:42 +02:00
7a5bec077f
Check Personenkennzeichen
2024-07-23 14:47:23 +02:00
1211d63ccf
adds placeholders for the ampeln and adds new endpoints that fetch activeAmpeln and confirmedActiveAmpeln of the user
2024-07-23 13:59:04 +02:00
7e983292ea
adds the endpoint that fetches all ampeln of a user that are not confirmed by the user yet and also removes some unnecessary comments from other enpoints
2024-07-23 11:26:52 +02:00
2083e95f8c
adds vertical layout for the documents view when the viewport is less than lg
2024-07-23 09:14:38 +02:00
f207419859
removes the import for userdata and profilUpdate from the old fhcapi which should be replaced by the new fhcapi
2024-07-23 08:58:52 +02:00
4b97e33e20
comment
2024-07-23 08:58:33 +02:00
e613ac3255
computes the childactions for the room in the search result independently
2024-07-22 14:33:19 +02:00
9170653260
adds a childaction for the rooms when searching for a room to see the eventoverview of the room
2024-07-22 14:07:00 +02:00
0ee57e488d
PrestudentstatusCheckLib: checkIfExistingPrestudentRolle
2024-07-22 13:42:13 +02:00
f4bf3eec86
merging feature-39911/Suche_um_raeume_erweitern
2024-07-22 12:55:01 +02:00
0df9385f33
Adapted DB query to filter only Lehrveranstaltungen with lehrtyp_kurzbz 'lv'
2024-07-22 12:02:08 +02:00
82417a7f6f
removes old api files and removes the use(fhcApi) because it is already imported in the Phrasen plugin
2024-07-22 11:36:12 +02:00
a0871657ca
adds insertFile to the new ProfilUpdate FhcAPIController and starts a transaction when deleting the foreign key from the profil update and deleting the old file
2024-07-22 11:24:47 +02:00
0cc6222175
adds deleteProfilRequest to the new ProfilUpdate FhcAPIController
2024-07-19 14:57:42 +02:00
8700abd0fa
adds updateProfilRequest to the new ProfilUpdate FhcAPIController
2024-07-19 14:50:00 +02:00
12626511e9
adds insertProfilRequest to the new ProfilUpdate FhcAPIController
2024-07-19 14:00:40 +02:00
fe4b5bf582
Status insert checks
2024-07-19 13:35:21 +02:00
31abd39ba8
PrestudentstatusCheckLib: status history
2024-07-19 13:34:56 +02:00
a06f9b581f
adds selectProfilRequest to the new ProfilUpdate FhcAPIController
2024-07-19 13:11:58 +02:00
be66150631
adds acceptProfilRequest and denyProfilRequest to the new ProfilUpdate FhcAPIController
2024-07-19 11:38:15 +02:00
9eb61649eb
adds getProfilRequestFiles to the new ProfilUpdate FhcAPIController
2024-07-19 09:06:49 +02:00
4075245dcb
getSemesterOfBewerber for Aufgenommen
2024-07-19 09:03:40 +02:00
dcb001e0d9
rename addNewStatus to changeStatus
2024-07-19 07:52:52 +02:00
de41668e71
ToolbarInteressent, Start with Actions Interessent
2024-07-18 16:46:07 +02:00
ddd4d5bafe
parses the links in the moodle addon dynamically, so that other addons can easily override the phrase used for the links
2024-07-18 14:03:15 +02:00
9a4061910a
Status insert-function: some updates
2024-07-18 13:51:44 +02:00
7db059b910
PrestudentCheckLib: correct return value for checkIfMeldestichtagErreicht
2024-07-18 13:51:14 +02:00
605ecb164a
Status: clear validation for statusModal
2024-07-18 13:50:30 +02:00
f4376d44a2
Fix Bugs in Bismeldestichtag_model checkIfMeldestichtagErreicht
2024-07-18 13:40:52 +02:00
5c4c3872f0
Fix missing {{ }}
2024-07-18 13:32:19 +02:00
69b88b35b9
Status: person name in phrase for modal header
2024-07-18 13:28:18 +02:00
3514b02960
Status: Saver list reload
2024-07-18 13:27:30 +02:00
b171959920
Improvements to statusModal & use Status insert function in Component
2024-07-18 13:19:28 +02:00
e38e45c283
Status insert-function & better access testing for updateStatus-function
2024-07-18 12:04:35 +02:00
f55b5120ff
Auth_Controller helper function for checking stg access rights for a prestudent
2024-07-18 12:03:18 +02:00
7a8d2986af
Checklib fix checkIfExistingStudentRolle & checkIfMeldestichtagErreicht
2024-07-18 12:02:12 +02:00
b62634242a
Bismeldestichtag_model fix missing DateTime
2024-07-18 12:01:15 +02:00
2711113a69
solves column title race condition
2024-07-18 11:43:08 +02:00
328a46f16d
adds getTopic to the new ProfilUpdate FhcAPIController
2024-07-18 10:40:30 +02:00
885315c22b
adds getStatus to the new ProfilUpdate FhcAPIController
2024-07-18 09:52:08 +02:00
29aa7f5056
adds isMitarbeiter to the new Profil FhcAPIController
2024-07-18 09:36:30 +02:00
fdd3026212
adds getAllNationen to the new Profil FhcAPIController
2024-07-18 08:53:45 +02:00
965e23dba7
Merge branch 'feature-40743/Anrechnung_Config-fuer-zusaetzliche-Felder'
2024-07-17 14:08:55 +02:00
6475eb838e
Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-07-17 11:59:40 +02:00
287d44f64a
add formatted dates to sql query getHistoryPrestudent
2024-07-17 09:20:31 +02:00
f064a29efc
Merge branch 'master' into feature-40743/Anrechnung_Config-fuer-zusaetzliche-Felder
2024-07-17 08:02:55 +02:00
6dd1dc62bf
Merge branch 'feature-39592/vereinfachte_Sicht_fuer_Assistenz'
2024-07-16 20:59:48 +02:00
da8bb697df
change url of Gesamtnote Menu Punkt
2024-07-16 15:42:42 +02:00
3417dcd41d
centers the text, displays default message and makes # links not clickable and removes the link styling from them
2024-07-16 15:18:23 +02:00
fcacd2a660
Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz
2024-07-16 14:23:16 +02:00
8c9ed2c52c
Textaenderung
2024-07-16 14:19:32 +02:00
36aab1b579
Merge branch 'feature-36555/Studstatus_HinweistextFAS_Pruefungsdatum'
2024-07-16 14:11:34 +02:00
3c50ffd945
remove unnecessary style
2024-07-16 14:07:44 +02:00
7031a4d9c4
Use only active Statusgruende & "--keine Auswahl--"
2024-07-16 09:59:10 +02:00
043d876642
bugfix orgform_kurzbz
2024-07-16 09:20:40 +02:00
8860969649
bugfix redraw only if table, refactor generate_personenkennzeichen
2024-07-16 07:47:18 +02:00
b8601bac51
Multistatus: copypasta
2024-07-16 07:33:52 +02:00
bf1f0428ea
use textbox to retain layout
2024-07-15 19:06:19 +02:00
f49161420d
try to improve layout
2024-07-15 18:18:53 +02:00
630d2659b3
extension/anwesenheit_assistenz -> extension/anw_ent_admin; removed hardocoded status; check for overlapping excuse timespans; and a lot more ;)
2024-07-15 17:38:13 +02:00
58403ff00e
bugfixes changeStatus, generateMatrikelnummer, updateLists, validations
2024-07-15 15:41:45 +02:00
5043f00c97
added missing end tag & removed :value="NULL" since this is not allowed in option tags
2024-07-15 15:16:52 +02:00
0a457c4bac
use "getStudiensemester" from dedicated Lists Controller
2024-07-15 15:13:41 +02:00
780dce293d
refactor addStudent, bugfix updateList after delete, check organisationsform ersterStudent
2024-07-15 11:57:16 +02:00
5dbeea80df
reload Tables correctly on student change
2024-07-15 11:39:05 +02:00
9af7ec3ff5
Prefetch Tab config to prevent reloading tabcontent on student change
2024-07-15 10:58:10 +02:00
af127d666d
Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-07-15 09:35:19 +02:00
14df81cbfb
adds c4_linkList and additional styling to the LvUebersicht Menu
2024-07-12 16:14:20 +02:00
1614771150
loads content of the menu punkte in iframe inside a full-screen modal
2024-07-12 13:17:44 +02:00
eb12b35e37
reload detailtab after changedStatus, update getUserLanguage()
2024-07-12 11:29:38 +02:00
19775fac3f
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-07-12 09:23:00 +02:00
0bb5cb1fdc
bugfix generateMatrikelnnummer, Reihenfolge validierung turnIntoStudent
2024-07-12 09:20:42 +02:00
78471a2c3a
Use Prestudentstatus_model instead of Prestudent_model for status history
2024-07-12 08:30:57 +02:00
464dbba457
add missing api js files
2024-07-11 18:43:31 +02:00
9d455c35d0
Betriebsmittel.js: use arrow function for dynamic ajaxParams, Filter.js: remove required from filterType
2024-07-11 18:32:47 +02:00
3f84024ce8
uncomment null check, layout of hint
2024-07-11 17:35:18 +02:00
e9ae046592
Prestudentstatuschecklib: checks also work when dates of two status are the same
2024-07-11 16:44:22 +02:00
16ab9998b0
Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz
2024-07-11 14:44:44 +02:00
ce7b368a8e
Adapted lv.orgform_kurzbz to selects in Lehrveranstaltung_model.php
2024-07-11 14:33:38 +02:00
4c862932e8
use CI Model functions for Bismeldestichtag_model->getLastReachedMeldestichtag()
2024-07-11 14:28:29 +02:00
8a88aa2128
Correctly use FhcApi in Bismeldestichtag
2024-07-11 14:23:53 +02:00
3706b0f972
Delete action in Tab Contact and Status: primeVueAlert instead of BSModal
2024-07-11 13:22:11 +02:00
115151473a
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-07-11 11:57:45 +02:00
a23b133217
Adapted requestAnrechnung.js to handle submit data and events on Begruendung-zur-Gleichwertigkeit fields
...
...depending on $config['explain_equivalence']
2024-07-11 10:54:43 +02:00
a728bec15f
BewerberZuStudent: new action turnIntoStudent
2024-07-11 10:52:59 +02:00
1139b251ef
Adapted Views to handle display of Begruendung-zur-Gleichwertigkeit fields
...
...depending on $config['explain_equivalence']
2024-07-11 10:52:51 +02:00
8c3b85066a
Adapted Controller RequestAnrechnung.php to handle Begruendung-zur-Gleichwertigkeit fields
...
...depending on $config['explain_equivalence']
2024-07-11 10:49:05 +02:00
0b48e94d3c
Added config variable $config['explain_equivalence'] (Begruendung zu Gleichwertigkeit)
...
...to display and enable 'Begründung zu Gleichwertigkeit'-fields
2024-07-11 10:44:12 +02:00
f2ca9f765f
StV: Prestudent History disabled class
2024-07-10 16:02:13 +02:00
46ea054bac
change text, add config to show hint or not, styling
2024-07-10 15:52:57 +02:00
03205674aa
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-07-10 15:51:51 +02:00
c94f185308
- faktor für lvs hinzugefuegt
2024-07-10 15:13:46 +02:00
eead73f10c
Added phrases for core and softwarebereitstellung to phrasesupdate.php
2024-07-10 14:44:01 +02:00
a83e07350e
makes the pinboard link redirect to all news
2024-07-10 11:35:36 +02:00
d364630d92
instead of modifying the original menu keys, it adds new keys for the cis4 version of the menu
2024-07-10 10:48:24 +02:00
bc9f247323
replaces wrong quatations in the menu items if the link_onclick array key is defined
2024-07-10 09:10:35 +02:00
a930247eec
Cleanup
2024-07-10 08:44:04 +02:00
108045ac54
Betriebsmittel Compontent: names
2024-07-09 16:14:43 +02:00
cccf85f3d9
StV List: Accessibility fix
2024-07-09 16:10:08 +02:00
56080f6681
changes the LVUebersicht and the endpoint
2024-07-09 15:28:28 +02:00
e79a70fc2f
Betriebsmittel: stabilized
2024-07-09 14:06:29 +02:00
8b254b3967
Merge branch 'master' into feature-36555/Studstatus_HinweistextFAS_Pruefungsdatum
2024-07-09 11:52:07 +02:00
c4ef0f998c
Merge branch 'feature-40285/Studstatus_Datum_der_Abmeldung_auf_den_3_Abmeldungsdokumenten'
2024-07-09 11:49:41 +02:00
37fb9dd851
use date that seems more stable than one that depends on a config entry that may change over time and then change the date in previous documents
2024-07-09 11:38:16 +02:00
8a44a9e1af
passes the menu as a reference to the on Events instead of using a callback function
2024-07-09 10:37:43 +02:00
2a537df687
Merge branch 'master' into feature-40285/Studstatus_Datum_der_Abmeldung_auf_den_3_Abmeldungsdokumenten
2024-07-09 10:35:40 +02:00
84029fc729
updates editAdressen in the Profil
2024-07-08 15:15:08 +02:00
66b151dce0
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
...
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-07-08 14:42:01 +02:00
1a8a7cc260
prestudent model gethistoryprestudent: added order by for insertamum, ext_id
2024-07-08 12:42:32 +02:00
4d48dfe018
Added method getLvsByStudiensemesterAndOes to Lehrveranstaltung_model.php
...
getLvsByStudiensemesterAndOes: Gets Lehrveranstaltungen with its Stg, OE and OE-type and filters by Studiensemester and Organisationseinheiten if necessary.
2024-07-08 12:26:41 +02:00
4e053a4769
Updated phrases: Added phrases for Softwareanforderung in category Softwarebereitstellung
2024-07-08 12:24:44 +02:00
0347f8bf02
filters the menu to remove all elements that don't have the position property
2024-07-08 11:43:48 +02:00
e98f59e984
adds all menu punkte from fh-core to the LvMenu endpoint function
2024-07-08 10:54:39 +02:00
578afaeb08
adds fh-core menu logic WIP
2024-07-05 15:21:14 +02:00
08555a77be
makes contentModal bigger for the room content and uses the raum_info component to insert the tabulator in the content
2024-07-05 10:00:54 +02:00
79ffc1c077
creating lvMenu with Event hooks WIP
2024-07-04 15:37:50 +02:00
92afdf71cd
changing fhcapi for the client side for the profil WIP
2024-07-03 15:53:01 +02:00
2a7735bca5
outsources internal queryies to the appropriate classes, to assign the values to the needed variables to fill the menu array of the menu_lv.inc.php
2024-07-03 11:56:18 +02:00
affbe7821a
email vorlagen sql insert; trim entschuldigungs begründung to max size; WIP routing; WIP fancy loader overlay; WIP Api Testing; lektor ui finetuning;
2024-07-02 16:51:42 +02:00
19753a9ef7
test api endpoint to include the lvinfo menu link
2024-07-02 14:50:54 +02:00
57d3d3af13
removes the shared storage for the searchbar and saves the data local in the searchbar again
2024-07-02 10:28:35 +02:00
3d2ea2821e
fixes little typo, that fails to render the widget
2024-07-02 09:26:19 +02:00
ff0f2320e1
changes the layout of the searchbar to be the same in the mobile view and in the desktop view
2024-07-01 14:43:43 +02:00
dd0bdddbc6
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-07-01 14:12:48 +02:00
f4f08c0710
stores the local information of the searchbar inside a collected storage in case more than one searchbar is used
2024-07-01 13:53:55 +02:00
3e3f005525
changes the layout/buttons of the searchbarsettings, adds responsive searchbar in the header for mobile views
2024-06-28 14:34:41 +02:00
d0f457d8ed
changes the data format from the studierendenEmail api call and displays the mailto on the modal
2024-06-28 11:06:44 +02:00
f5286ae66b
Bugfix: Use correct id for attachment preview
2024-06-27 15:55:56 +02:00
6b4e8df411
remove outcommented code
2024-06-27 15:21:51 +02:00
c34144a4e8
creates sql query in the lehreinheit_model to query the studierenden Mail inside a lehrveranstaltung and creates the matching fhcapi methods / frontend/v1 api controllers
2024-06-27 15:09:09 +02:00
18a6262eaf
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-06-27 14:20:26 +02:00
8fa395a582
Refactor Logic Statuschanges
2024-06-27 14:20:11 +02:00
834d03459b
prestudentstatus checks studierendenverwaltung: changed comment
2024-06-27 12:52:12 +02:00
ffc1241188
news widget 'alle News' redirects to the news URI
2024-06-27 11:53:22 +02:00
534faef82c
Notiz: use dms_id instead of name & code cleanup
2024-06-27 10:29:09 +02:00
5658e7a0b4
StV: Notizen: getting rid of horizontal scrollbar
2024-06-27 09:42:59 +02:00
b784ad6b26
Notizen: fixing DB transaction in Delete function & Code Cleanup
2024-06-27 09:42:15 +02:00
32e1e487a9
issues: enabled resolving without explicitely creating a resolver (by using producer method), old resolvers are still working. Created example for "self-resolving" issue: AbbrecherAktiv
2024-06-26 22:46:36 +02:00
5070353bf0
passes the active_addons constant to the LvUebersicht Modal
2024-06-26 16:37:54 +02:00
a540ac3f7e
adds a General view for the content_types that dont need any special extra computation
2024-06-26 15:58:50 +02:00
1305633511
removed 99% of console.logs; fixed entschuldigung update notiz only; added kontrolleDeleteMaxReach Constant from config; updateAnwesenheiten notiz fix; Entschuldigungs studiengang fetch fix;
2024-06-26 15:38:22 +02:00
93b7f6e57c
fixes little typo
2024-06-26 15:20:19 +02:00
4640db5aff
adds a view components for the news if the content that gets loaded has the template_kurzbz news
2024-06-26 14:17:44 +02:00
478adb740e
changes the db query and adopts the layout of the Vue component to show the correct betreff and content of the news
2024-06-26 13:21:32 +02:00
7f32cca476
Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
2024-06-26 11:54:51 +02:00
e8fe3c2eff
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-06-26 11:53:28 +02:00
7cf89392a2
Prestudent History: aktiv & bold highlighting
2024-06-26 11:19:58 +02:00
c8f0bdd6d7
Prestudent History: add prestudent_id
2024-06-26 11:08:00 +02:00
c679e12d16
Tab Prestudent styling
2024-06-26 11:07:40 +02:00
2144982829
Tabulator persistenceID
2024-06-26 11:07:04 +02:00
580f063efe
Updated phrases: Added phrases for Softwareanforderung in category Softwarebereitstellung
2024-06-26 10:48:59 +02:00
3a16c4ebf3
Added method getAutocompleteSuggestions to Lehrveranstaltung_model.php
...
Get Lehrveranstaltungen by eventQuery string. Use with autocomplete event queries.
2024-06-26 10:45:56 +02:00
ac04629f86
Cleanup & Code Identation
2024-06-26 08:50:26 +02:00
f546554f87
changes the layout of the news widget in the dashboard
2024-06-25 16:48:05 +02:00
f4176ebcda
adds the content of the news to the dashboard items and makes them scrollable through css classes
2024-06-25 14:18:11 +02:00
10cd655b67
ZGV config default values
2024-06-25 10:37:32 +02:00
77d7417132
UDF Component checkbox styles
2024-06-25 09:50:13 +02:00
dd044b9146
entschuldigungen reload fix; student anw group header toggle fix; scan error msg fix; delete modal with kontrolle selection; scan code route renamed to profile/scan from student/scan; fixed sum formatting;
2024-06-24 16:35:48 +02:00
27287bd07a
creating the api endpoint that fetches the content of the news instead of text metdata
2024-06-24 16:05:51 +02:00
7267d526bb
rendering content pages
2024-06-24 14:23:34 +02:00
f8c431e0bc
updating comment of the content function
2024-06-24 14:23:34 +02:00
629ea3716e
changes how the content and the news are displayed and also modifies the modals for the roominformation which now get their data from props instead of passing them directly via refs
2024-06-24 14:23:34 +02:00
6230aa47ae
now also displays the room information inside a modal and does not redirect to the content site
2024-06-24 14:23:34 +02:00
b3dfcdc295
the calendar modal is correctly opened when the correct event is called
2024-06-24 14:23:34 +02:00
bb9d4bda04
adds a general modal for the lehrveranstaltungs Uebersicht with all the links connected to the lehrveranstaltung
2024-06-24 14:23:34 +02:00
d92ad0a6c6
links the ort_kurzbz from the Stundenplan in the Dashboard to the Ort Information Content
2024-06-24 14:23:34 +02:00
63f089dc27
changes the layout of the Stundenplan Events
2024-06-24 13:50:13 +02:00
6cca4d2daa
StV: Students consolidation
2024-06-24 13:49:34 +02:00
77cd3bb02d
removes the z-index from the calendar header so that it doesn't show over the menu when used in mobil view
2024-06-24 13:11:55 +02:00
008847e490
adds a sql query for the grouping algorithm
2024-06-24 13:08:44 +02:00
f1605011dd
update phrases
2024-06-24 12:04:30 +02:00
cb617463ed
Validation: Modal AskForAusbildungssemester
2024-06-24 12:03:02 +02:00
570798b5f7
landing page is now container for tabs or single component directly; WIP reworking lektor UI;
2024-06-24 10:51:23 +02:00
e4abc745c8
Bugfix rt-stufe
2024-06-24 08:57:03 +02:00
155d2f9651
Merge remote-tracking branch 'origin/feature-30679/Plausichecks_Behebung_parameter_zur_Identifizierung_eines_Issues_einbeziehen' into feature-40728/Issues_logik_auslagern_in_eigene_library
2024-06-21 15:03:23 +02:00
453f93aba6
outsourcing Issue logic: removed var dumps
2024-06-21 14:58:26 +02:00
d2611ac0a5
put issue logik in own library (so GUIs should not have to reimplement it)
2024-06-21 14:34:31 +02:00
7bf109298b
bugfix Anzeige Abbrecher, Absolvent
2024-06-21 13:26:55 +02:00
b56e8c5f9f
Im Abschlusspruefung Karteireiter wird in der Liste bei der Beurteilung jetzt die
...
Bezeichnung der Note angezeigt anstatt der Kurzbz
2024-06-21 13:02:55 +02:00
e78598900a
Studierendenverwaltung: added new prestudenstatus checks, created PrestudentstatusCheckLib
2024-06-19 20:42:14 +02:00
823579dc59
refactor addNewStatus, cleanup Multi.js
2024-06-19 15:57:36 +02:00
58005d1832
change getStudienplaene from prestudent_id to array prestudent_ids
2024-06-19 14:31:47 +02:00
9c53a7a75b
PDF Download Button während Einspruchsfrist verbergen
2024-06-19 14:02:20 +02:00
1f36a08f05
Merge branch 'merge_37107_37133_39212'
2024-06-19 11:41:11 +02:00
631a552708
Datum bei Abmeldung d Stud PDF
2024-06-19 10:55:48 +02:00
d6be83b48c
Refactor Tab Multistatus: Modal
2024-06-19 10:38:41 +02:00
ea9c35a64b
Merge branch 'feature-37107/Fristenmanagement' into merge_37107_37133_39212
2024-06-19 10:28:39 +02:00
04c006a733
do not create dummy manual events
2024-06-19 10:28:03 +02:00
aff1f9126f
Merge branch 'master' into merge_37107_37133_39212
2024-06-19 09:45:05 +02:00
a8acf91980
Datum bei Abmeldung Fristablauf d WH PDF
2024-06-19 09:21:13 +02:00
fb77ab67e7
Prüfungshonorare im Notenkarteireiter zeigen nur aktive Mitarbeiter an
2024-06-19 09:05:08 +02:00
d3a277f9fb
Merge branch 'feature-39212/PV21-Grund_beim_Beenden_eines_DV' into merge_37107_37133_39212
2024-06-19 08:52:03 +02:00
0aa53f64ff
db Aenderungen Gegenpruefung hinzugefuegt
2024-06-19 08:51:34 +02:00
29a920b1ce
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-06-18 16:25:04 +02:00
0729f2ed1a
refactor actions prestudentLib
2024-06-18 16:24:57 +02:00
b4b44d9a89
added entschuldigung & anw_user notizen; entschukldigung notizen working; WIP anw notizen; api fixes entschuldigung; LE for LVA fetch now disregarding stundenplan; Paths renamed to new controller names;
2024-06-18 14:15:35 +02:00
3e0c15e18f
Datum bei Abmeldung d StgL PDF
2024-06-18 11:12:12 +02:00
f276435750
Student list code rearrangement
2024-06-18 08:36:02 +02:00
d600a6d2c3
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-06-18 07:58:51 +02:00
b5dbb8a16a
Refactor Functions in Prestudent Lib, Unterbrecher as single Action
2024-06-17 18:38:04 +02:00
473815639b
added entschuldigung max reach constant; rewrote SQL queries from string insert to param escaping; removed Stundenplan Lookup from LE for LVA fetch; load LE Stundenplan termine and serve as option when starting new kontrolle.
2024-06-17 17:39:56 +02:00
538c2e09ce
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-06-17 14:20:43 +02:00
752632456c
Bug: Prestudent semester
2024-06-17 12:06:19 +02:00
9220e1f85f
Cleanup Verband & list
2024-06-17 11:07:55 +02:00
1036c97be7
Tab Status: change statusgrund_kurzbz to bezeichnung_mehrsprachig
2024-06-14 15:58:11 +02:00
a0472c6573
little changes
2024-06-14 14:44:29 +02:00
521423a343
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-06-14 14:34:34 +02:00
04c5ccc891
use setAbbrecher, set UnterbrecherFas
2024-06-14 14:34:15 +02:00
e05fa0f4d8
Merge branch 'master' into merge_37107_37133_39212
2024-06-14 11:50:32 +02:00
c3278ad30f
add app softwarebereitstellung to prevent checksystem errors when adding phrases for softwarebereitstellung while not having installed the extension
2024-06-14 11:49:43 +02:00
f83cd3b87a
checks whether the user wants to fetch content or the news
2024-06-14 11:18:29 +02:00
e4326e00e4
Merge branch 'feature-39212/PV21-Grund_beim_Beenden_eines_DV' into merge_37107_37133_39212
2024-06-14 11:02:25 +02:00
93d0f88b0d
function getDVByPersonUID: add dvendegrund_kurzbz and dvendegrund_anmerkung to select
2024-06-14 10:48:43 +02:00
1c385d22cd
Merge branch 'feature-37133/Gehaltsbaender' into merge_37107_37133_39212
2024-06-14 10:41:48 +02:00
24786c6ae6
Merge branch 'feature-37107/Fristenmanagement' into merge_37107_37133_39212
2024-06-13 13:30:38 +02:00
0e5d4b30ed
Merge branch 'master' into feature-37133/Gehaltsbaender
2024-06-13 13:26:48 +02:00
4e233f760d
Merge branch 'master' into feature-37107/Fristenmanagement
2024-06-13 13:26:02 +02:00
dd7c8480f3
removes unwanted methods and properties from CalendarModal
2024-06-13 12:29:36 +02:00
de4accab83
cleans up the Stundenplan grouping algorithm
2024-06-13 12:27:09 +02:00
fd2474cc38
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-06-13 11:51:10 +02:00
20eee62c19
Merge branch 'sonstiges-40279/SWB-Lizenzserverport'
2024-06-13 11:13:30 +02:00
182e370086
Bugfix: Integer cast
2024-06-12 15:58:34 +02:00
ee2c937cbf
Highlight selected Verband
2024-06-12 15:36:03 +02:00
2f65e6a801
Bugfixes
2024-06-12 15:35:42 +02:00
ad440e12b5
remove console.log
2024-06-12 15:22:39 +02:00
f469f7aea9
Students Endpoint => fhcApi
2024-06-12 15:06:43 +02:00
eb327c3adc
update Handyverwaltung filter
2024-06-12 14:52:22 +02:00
d1afd9f09d
groups the uids of the reservierungen in the raum uebersicht and renders different template if the calender entry is a reservierung or a stundenplan event
2024-06-12 14:42:30 +02:00
1e56707e5a
Merge branch 'feature-40415/Studstatus-UID_in_Sancho_Message_Abmeldung_StG_Ablauf_Einspruchsfrist'
2024-06-12 08:13:11 +02:00
6816a300f6
Beschriftung korrigiert
2024-06-11 16:39:20 +02:00
0b8191a435
Beschriftung zu IDs in Sancho Message hinzugefuegt
2024-06-11 16:26:52 +02:00
9c51f25c9e
modifies how the slot template from the Calendar Page is passed to the CalendarApp and prints the reservierungen differently (but the reservierungen are not grouped yet)
2024-06-11 15:03:09 +02:00
f8d8a44a3c
student_uid zu sancho message Abmeldung StG Ablauf Einspruchsfrist
2024-06-11 14:47:54 +02:00
cd0eacf947
Updated phrases: Added phrases 'lizenzserverPort' and 'raumSwZuordnung'
2024-06-11 13:52:03 +02:00
dd47cd2a7c
Updated filter: Added lizenzserver_kurzbz and lizenzserver_port to SoftwareManagement filter
2024-06-11 13:51:03 +02:00
d8460923ca
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-06-11 12:16:48 +02:00
2e06633972
bugfix Validierung Email required
2024-06-11 12:16:35 +02:00
a4b77fc43f
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-06-11 11:32:47 +02:00
5b193e89c0
Cleanup
2024-06-11 10:23:09 +02:00
b7dff7d2c3
Permission-Filter Verband
2024-06-11 10:22:52 +02:00
bef53dadb1
refactor Tab Contact
2024-06-11 09:27:40 +02:00
e7e5d76531
fhcapi use factory merge
2024-06-10 17:23:37 +02:00
52a55a018c
merge fix
2024-06-10 15:13:30 +02:00
f943ae7566
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software'
2024-06-10 14:05:49 +02:00
f1547b069d
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-06-10 13:37:46 +02:00
ac7dc1599c
Corrected path to init.js.php
2024-06-10 13:37:14 +02:00
aa1d70f8f0
fix
2024-06-10 13:35:06 +02:00
9350e9230f
API refactor
2024-06-10 13:30:44 +02:00
022ad26dd2
reservierungen query also joins the studiengangs and mitarbeiter information
2024-06-10 13:01:55 +02:00
392d8f38d2
adding the reservierungen to the room plannung
2024-06-10 11:39:16 +02:00
8442690bc7
splits the multiple stg into different rows if there are more than one stg in one lv
2024-06-10 10:56:12 +02:00
70b0b3fae7
MVP algorithm for stundenplan gruppierung (testing)
2024-06-07 15:06:28 +02:00
46b7dc1ce7
Dauer für die Anzeige von abgelaufenen Projekten in der Zeitaufzeichnung
...
auf 2 Monate verlängert
2024-06-07 10:19:12 +02:00
0b24e1098a
Betriebsmittel Adaptierung Layout Form
2024-06-06 11:20:57 +02:00
068aa03b4f
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
2024-06-06 11:02:56 +02:00
fe69c0a578
Betriebsmittel: Form as Modal
2024-06-06 10:44:37 +02:00
25d284389a
gruppieren algorithm erweitern
2024-06-06 09:25:46 +02:00
accb8f7f82
delete old endpoint betriebsmittel
2024-06-06 08:10:25 +02:00
2d61dea287
refactor resources: endpoint betriebsmittel
2024-06-05 16:53:54 +02:00
cd8fffd2f7
added filter update for Handyverwaltung
2024-06-04 16:20:43 +02:00
125a2da9b3
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-06-04 16:16:49 +02:00
884d930e71
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-06-04 16:05:33 +02:00
49045c06af
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-06-04 16:04:19 +02:00
1a5d270936
calendarDate preparation
2024-06-04 15:00:41 +02:00
48d36cc859
include Phrases wawi
2024-06-04 11:41:05 +02:00
8c4d00b8ef
encode/decode Inventarnummer
2024-06-04 11:31:18 +02:00
3df1aaf371
uses the new fhcApi factory to make the roomInformation get request from the frontent/v1/stundenplan api and uses the CalendarDate class to get the first day of the week and the last day of the week to make the request for the room information over the whole week
2024-06-04 08:24:58 +02:00
7b148b1a39
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-06-03 17:21:50 +02:00
0cbb8997e2
migratecontract config und config check auch in MigrateHourlyRate verwenden
2024-06-03 17:14:55 +02:00
3b3191c407
Kontakt Validation
2024-06-03 16:59:59 +02:00
512002c0e8
Created init.js file and changed link url in stpl_week to open Software-Raumsuche by OrtKurzbz
2024-06-03 16:40:35 +02:00
9652f48044
Added phrases 'zugeklappt', 'softwareliste', 'raumverfuegbarkeit'
2024-06-03 16:27:31 +02:00
7491b9c1b0
try to fix mobile dashboard view
2024-06-03 11:35:11 +02:00
204de30459
make news modal more responsive
2024-06-03 10:46:26 +02:00
9a3a72deb0
Permissions Bankverbindungen
2024-06-03 10:33:11 +02:00
92319b9b29
quick fix for overlapping dashboard elements on mobile phones
2024-06-03 10:27:03 +02:00
b477d814c6
Bugfix: missing end-tag
2024-06-03 09:21:45 +02:00
39321dcde3
adds the roomInformation Calendar to the menu and uses different template for the calendar page slot
2024-05-31 12:28:06 +02:00
b9bd8e1d4d
Merge branch 'feature-25999/C4' into feature-39912/Room_planning_calendar
2024-05-31 08:53:40 +02:00
0c44a497a5
adapt modal add/update status
2024-05-29 16:06:09 +02:00
9454bde14a
backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-05-29 15:19:23 +02:00
5d8df75e86
refactor Tab Contact: backend
2024-05-29 12:34:20 +02:00
a924c9d2bb
backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-05-29 11:49:11 +02:00
0c8d4d830f
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-05-28 16:34:47 +02:00
0a4d89543a
refactor tab contact: form component, dropwdowns plz, ort, gemeinde
2024-05-28 16:34:34 +02:00
f218174ad3
Comments
2024-05-28 14:39:41 +02:00
dccf845e3b
Notiz Anhang Preview & CodeQuality
2024-05-28 14:38:37 +02:00
fb4997b1ac
DmsUpload Preview
2024-05-28 14:37:54 +02:00
5453579c7b
Merge branch 'feature-36963/BIS_check_duales_Studium'
2024-05-28 09:29:44 +02:00
d8ba92e343
Merge branch 'master' into feature-36963/BIS_check_duales_Studium
2024-05-27 19:42:48 +02:00
dd138380c9
Adaptierungen Tab Adresse: show Zustelladresse, Heimatadresse Validierung backend, Layout: Ticks, required
2024-05-27 17:07:09 +02:00
d020537679
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-05-27 14:57:31 +02:00
259a3c218a
Funktionalitaet feature-39602
2024-05-27 14:57:18 +02:00
d5e8227918
Bugfix: api/frontend/fas controller do not inherit from FHCAPI_Controller
2024-05-27 12:45:10 +02:00
5021c47c9f
calendar style changes
2024-05-27 12:20:58 +02:00
69abf1e9e2
Comment
2024-05-27 11:50:17 +02:00
87681351b9
Merge branch 'feature-25999/C4' into feature-39912/Room_planning_calendar
2024-05-27 10:55:44 +02:00
21fb679c08
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-05-27 08:53:54 +02:00
3d1f81a721
address: code quality
2024-05-27 08:53:18 +02:00
16f90604b6
stundenplan modal for LVs and making calendar header sticky
2024-05-24 11:17:06 +02:00
234ec03db9
adds the phrase noGrade
2024-05-24 09:37:07 +02:00
0536ff0044
load person_id & uid for students to navigate them with admin view; WIP studentDropdown selection; WIP changing studentComponent to work with different permissions;
2024-05-23 16:49:53 +02:00
729509a45d
WIP
2024-05-23 15:40:23 +02:00
12b2f3ab07
adding more information to the cis40 stundenplan
2024-05-23 15:39:31 +02:00
854d836e30
Abschlussprüfungsprotokolle: added link in FAS to read-only form
2024-05-23 13:56:18 +02:00
25deb0a440
takes the value of the node not just the node
2024-05-23 13:01:18 +02:00
cef41f3710
fixes html, one closing div to much
2024-05-23 12:44:12 +02:00
471e2e7b86
temp
2024-05-23 09:52:25 +02:00
59a1e84fb2
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
...
# Conflicts:
# public/js/components/filter/Filter.js
# public/js/plugin/FhcApi.js
# system/dbupdate_3.4.php
2024-05-22 15:42:19 +02:00
8cba0aec5a
vertragsarten dvbund, dvanderegk und dvanderebet hinzugefuegt, MigrateContract default oe und ba1code mapping in config verschoben und config check implementiert
2024-05-22 15:32:28 +02:00
7541770fbb
Code Quality & Comments
2024-05-22 13:42:39 +02:00
ae4c06f481
Bugfix: Typo validations
2024-05-22 13:09:18 +02:00
84013e42e7
Bugfixes: correct validation function, cast stg_kz to int, query order
2024-05-22 12:46:05 +02:00
aab198e355
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-05-22 11:03:34 +02:00
5eafa6b5f4
Bugfix: filter not null
2024-05-22 08:54:23 +02:00
b52ea08013
Correct Casting for stg_kz
2024-05-22 08:54:00 +02:00
e20bebad87
Bugfixes: Typos
2024-05-21 16:09:21 +02:00
186e9e6f08
WIP room planning in calendar
2024-05-21 15:56:18 +02:00
1993e20ffc
Notiz component: new layout popupModal
2024-05-21 15:35:57 +02:00
559a6b317d
Fixed multiple display of child software
2024-05-21 14:44:41 +02:00
66a80697c2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-05-21 14:21:34 +02:00
c566d07847
fixes little xml layout issue
2024-05-21 13:34:58 +02:00
6d97a9e9aa
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-05-21 11:47:36 +02:00
9cade51ff4
Dropdown Status Aendern, Phrases
2024-05-21 11:47:24 +02:00
48bb2ef7e1
adds the insert query for the new raum template and the update statement to update the template for every room content
2024-05-21 11:05:22 +02:00
17512e60b2
Favorites => fhcApi
2024-05-21 10:53:23 +02:00
393475e62c
adds the content update script for the room content to the checksystem
2024-05-21 10:49:27 +02:00
d07c568d5e
adds dbupdate queryies for the new raum template
2024-05-21 10:37:53 +02:00
706dad6df6
added DV Ende
2024-05-16 21:58:34 +02:00
1f45ddc17d
minor improvements
2024-05-16 16:40:08 +02:00
7530a74ff3
demo stand gf;
2024-05-16 16:39:54 +02:00
3ef5528196
Vue.js Warnings
2024-05-16 16:32:59 +02:00
e915671a02
Adaptions for Apacheconfirmity
2024-05-16 13:17:28 +02:00
f2a2469e6e
MigrateContract: keine ZeitaufzeichnungsVbs erstellen wenn za oder azg flag null ist. MigrateHourlyRate: kalkulatorische Stundensaetze nur migrieren wenn SAP Sync Tabelle existiert.
2024-05-15 17:25:26 +02:00
c7e01bd3f2
creates the sql query with the needed room information to be displayed in the search
2024-05-15 14:37:18 +02:00
56e6efe416
WIP sql query for the raum search
2024-05-14 15:57:48 +02:00
841e3b0390
raum query
2024-05-14 14:21:52 +02:00
4c671c2ee9
Phrases Validierungen
2024-05-14 14:13:38 +02:00
b3c6127cfe
Merge branch 'feature-25999/C4_TEST' into feature-25999/C4
2024-05-14 14:01:24 +02:00
c4c17f69c7
Added phrase softwaretypKurzbz
2024-05-14 13:41:33 +02:00
1f4b029973
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-05-14 09:25:40 +02:00
33267de4be
Refactor Status, Adaptions Prestudent
2024-05-14 09:25:21 +02:00
141b1523e1
Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-05-13 16:44:15 +02:00
3b762c8065
getStudentsForLvaInSemester data query; getLektorIsTeachingLE veryfication query; getLektorenForLvaInSemester selection query; moved setup from app to landing page, landing page thus unskippable; now checking qr code age in check in; charts smaller size now; more phrasen; lektor tabulator height fix; ma uid selection of lektors for admin and assistenz; tested and implemented QRDelete Cronjob;
2024-05-13 16:01:26 +02:00
8a0d2a2f10
Refactored Tabs title assignment to utilize computed property
...
This is necessary to render language phrases correctly
2024-05-13 14:02:05 +02:00
6d728ae0e7
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
...
# Conflicts:
# public/js/components/Tabs.js
# public/js/components/filter/Filter.js
2024-05-13 12:07:37 +02:00
58f52dfaae
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-05-13 11:07:16 +02:00
5643607845
Added phrases 'statusErfolgreichUebertragen' and 'statusUebertragenMsg' to Softwarebereitstellung app
2024-05-13 11:06:32 +02:00
a0284c313a
- funktion fuer das alle markierten akzeptieren getrennt
...
- fehlende phrasen hinzugefuegt
2024-05-13 09:16:29 +02:00
fd8e49c11f
hotfix in Modal.js
2024-05-08 14:35:41 +02:00
6fa5ff81d6
Merge branch 'feature-25999/task-39464' into feature-25999/C4_TEST
2024-05-08 12:01:53 +02:00
0942480428
adds the missing model for the function
2024-05-08 11:58:35 +02:00
2fd2746a74
Merge branch 'feature-25999/task-39464' of github.com:FH-Complete/FHC-Core into feature-25999/task-39464
2024-05-08 11:56:50 +02:00
8e2129902c
Merge branch 'feature-25999/task-39464' into feature-25999/C4_TEST
2024-05-08 11:29:39 +02:00
d0509abb8b
also adds the new controller functions to the CisVue/Cms and CisHmvc/Cms
2024-05-08 11:28:16 +02:00
c2a782e164
updates news fetching and DB_Model pagination methods
2024-05-08 11:28:16 +02:00
5ac0b249ec
makes component Pagination page_size prop a required prop
2024-05-08 11:28:16 +02:00
5142f5656b
passes the page_size down from the parent component to the child component
2024-05-08 11:28:16 +02:00
7bd70a6436
makes it possible to send the page_size from the frontend to the backend to adopt how many rows to query
2024-05-08 11:28:16 +02:00
c017014171
changes how the pagination is done in the DB_Model
2024-05-08 11:28:16 +02:00
36c8862b99
implementing frontend pagination for components
2024-05-08 11:28:16 +02:00
29f7e34e10
adds pagination logic to C4 news
2024-05-08 11:28:16 +02:00
730db74743
Merge branch 'feature-25999/C4_ma0594_profilePage' into feature-25999/C4_TEST
2024-05-08 11:14:41 +02:00
d1207ced02
Merge branch 'master' into feature-25999/C4_TEST
2024-05-08 11:06:34 +02:00
fb6bb96fbd
making Filter-core-cmp emit the tableBuilt event
2024-05-08 10:58:38 +02:00
9db09a040a
Merge branch 'master' into feature-25999/C4_ma0594_profilePage
2024-05-08 09:58:18 +02:00
93b111af93
fix handleSystemError is not a function
2024-05-06 16:48:38 +02:00
6a8a96b748
fix long lasting request getPrestudents to block browser when timedout once
2024-05-06 16:04:45 +02:00
a563f053ef
adds the width and the height properties to the dashboard item, they were missing and caused a bug where the news widget was not displaying correctly
2024-05-06 14:19:04 +02:00
3846f38a6f
added PK to tbl_anwesenheit_check; chenged anwesenheiten sum function to account for timespans of the checks; added extension/anwesenheit_admin berechtigung; fotos are now being sent as links to bild.php; studentByLva table now with von & bis times of the check; now updating attendance check times when starting further checks on the same date; checking if time the code is being sent is in the timespan of the kontrolle; added method to delete QR codes older than certain ms to be called from QRDelete Cronjob;
2024-05-06 11:21:01 +02:00
d1b813b1cc
update editStatus: getHistory, setAbbrecher, dropdown newStatus, validations
2024-05-03 16:53:31 +02:00
69b0b3601d
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-05-03 13:08:12 +02:00
8663d86f7a
adaption NotizComponent
2024-05-03 10:59:41 +02:00
efcebb567f
responsive adjustments
2024-05-03 10:46:20 +02:00
e6ad3b3168
adjust responsiveness of createAnrechnung.php
2024-05-03 10:35:46 +02:00
f9058b954e
adjusting the responsive layout for approveAnrechnungDetail view
2024-05-03 10:31:53 +02:00
4aa8807830
adds responsiveness for the view approveAnrechnungUebersicht
2024-05-03 09:48:18 +02:00
40c0393bc0
Voller Name der Kritikalität des Services wird angezeigt im
...
Servicekatalog
2024-05-02 16:31:34 +02:00
c6193530db
Merge branch 'feature-39288/Servicekatalog_Kritikalitaet'
2024-05-02 16:27:09 +02:00
9975f767b8
adds responsiveness to reviewAnrechnungDetail.php
2024-05-02 12:15:57 +02:00
0b58d4fd6f
also adds the programmatically unselectable logic to the reject button
2024-05-02 11:43:19 +02:00
ce72294273
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-05-02 11:32:30 +02:00
bcafb6cea6
removes unnecessary function call from reviewAnrechnungUebersicht.js
2024-05-02 11:30:38 +02:00
6ea802717b
adds pointer-events none to all rows with the class .tabulator-unselectable except for the links inside those rows, because it was not possible to programmatically retrigger the selectableCheck
2024-05-02 11:14:12 +02:00
12e06776be
Notizcomponent: using factories as endpoint
2024-05-02 11:13:45 +02:00
2c08a482e3
finished phrasen in backend; setup component is no a modal in landing page and only for lektors with multiple LE assigned in an lva; assistenz skips landing page; tabulator formatting fixes; getAllAnwesenheitenByLektor now fetches students and their anwesenheiten entries seperately which is significantly faster;
2024-05-02 09:29:50 +02:00
3a3d28e9e6
Merge branch 'feature-37246/APIs_Konsolidierung'
2024-04-30 21:45:48 +02:00
3b8776f947
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-04-30 16:26:15 +02:00
23255ed84f
Merge branch 'feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen'
2024-04-30 16:17:00 +02:00
a3b5996c50
Stundensatz wird abhängig vom Studiensemester der Projektarbeit /
...
Lehreinheit ermittelt
2024-04-30 16:16:03 +02:00
10bfb6c9e8
also fixes the isSelectable bug when rejecting a anrechnung in the approveAnrechnungenUebersicht view
2024-04-30 15:03:30 +02:00
86d3042cc6
makes the rows that were recently selected unselectable and adds the correct styling in the approveAnrechnungUebersicht view
2024-04-30 14:18:22 +02:00
9d0e63e695
API Konsolidierung Verband
2024-04-30 13:22:08 +02:00
a606add6eb
Merge branch 'master' into feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen
2024-04-30 10:55:58 +02:00
ac0103751d
adds a border to the tableWidget and also adds a function that finds the tableunqiueid using the tableInstance
2024-04-30 09:48:08 +02:00
fe06b2360e
API Konsolodierung: stv address
2024-04-30 08:48:15 +02:00
c8009a8a6c
API Konsolodierung: stv lists
2024-04-30 08:33:39 +02:00
20a2e369c5
adds new button to show all new and changed lehrauftraege in the orderLehrauftrag view, so that the user can set the initial filter himself
2024-04-29 15:53:56 +02:00
c2ffd02907
Consolidate FHCApi childs
2024-04-29 15:00:38 +02:00
0536deda1a
StV: static primevue
2024-04-29 14:47:44 +02:00
18dabf26e4
service uebersicht in cis: loading only one moodle config instead of all addon configs to avoid php notices
2024-04-29 14:00:30 +02:00
555db0d5af
fixes the selection of the tableUniqueID
2024-04-29 11:45:08 +02:00
7bb98479dd
API konsolidierung StV Config
2024-04-29 11:40:46 +02:00
b0d31361c1
updates fontawesome version
2024-04-29 11:38:03 +02:00
8cf63f3b76
replaces the icons images with actual icons from the fontawesome6 library
2024-04-29 11:34:18 +02:00
b5c830ed35
FHCAPI stabilize addError function
2024-04-29 11:19:10 +02:00
8e56b404b9
Merge branch 'feature-37246/APIs_Konsolidierung' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-29 11:17:12 +02:00
e4ee83c590
Multistatus Adaptions Design
2024-04-29 10:51:02 +02:00
ef5040557d
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-04-29 09:37:06 +02:00
ffe4fcb0b3
removes the cis styles from the admin views
2024-04-26 14:43:56 +02:00
bc7fa71894
Multiactions Status Change
2024-04-26 14:16:36 +02:00
dec6b160a6
fixes the acceptLehrauftrag view with bootstrap5 and tabulator5
2024-04-26 14:07:24 +02:00
8999b59f4e
Renamed Field
2024-04-26 13:41:33 +02:00
81612da80c
collapse-auto-close: better event handling
2024-04-26 13:18:06 +02:00
47130b48ec
Auto close filter
2024-04-26 13:06:24 +02:00
1b35b95173
Comment
2024-04-25 15:54:27 +02:00
e4f1da751d
migrating the acceptLehrauftrags view to bootstrap 5
2024-04-25 15:19:24 +02:00
2ea3597a10
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-04-25 15:11:41 +02:00
08dd6a7783
add dvendegrund_kurzbz and dvendegrund_anmerkung when reading dvs from db
2024-04-25 15:11:16 +02:00
88fd26d192
Merge branch 'master' into feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5
2024-04-25 14:35:50 +02:00
580b6239c2
remove the body tag from all views that use the FHC-Header view
2024-04-25 14:35:06 +02:00
d55cb56a1a
Merge branch 'bug-39609/automatischer_abgewiesener_status_setzen'
2024-04-25 14:24:43 +02:00
8bac75ae52
- bug behoben, damit keine leeren "Status Abgewiesen gesetzt" Mails verschickt werden
2024-04-25 14:20:18 +02:00
7944ce091e
Konto: save filter settings
2024-04-25 14:17:08 +02:00
b7ffe00c69
sets the height of the adminZeitverfuegbarkeit to 50% of the screen ehight
2024-04-25 14:16:28 +02:00
d01b05fd73
edit anrechnungszeitfenster does actually edit and not insert a new anrechnungszeitfenster
2024-04-25 13:30:32 +02:00
deb0197452
fixes the adminAnrechnungen page
2024-04-25 13:13:24 +02:00
4f4df8a8b7
Konto: more phrases
2024-04-25 13:09:10 +02:00
912b018e32
Config typo
2024-04-25 11:59:12 +02:00
ab8b46203e
fhcapifactory add stv
2024-04-25 11:57:54 +02:00
1a6c107f0b
Bugfix: phrasesupdate missing insertvon
2024-04-25 11:55:50 +02:00
e3ff62001b
StV Phrasen
2024-04-25 11:47:53 +02:00
f47f8d5da4
Konto: Phrases
2024-04-25 11:36:37 +02:00
fed30daad0
bug fix, only appending the event to the accept and deny action button if they were actually created
2024-04-25 09:41:32 +02:00
a2e943ac40
adjusts the actions of the ProfilUpdateView table with accept and deny buttons
2024-04-25 09:29:47 +02:00
f5d534a409
added require branch update file in dbupdate_3.4.php; added phrasen everywhere in frontend, WIP translating backend messages;
2024-04-24 15:52:53 +02:00
3b06519f2f
updated phrases for salary range
2024-04-24 15:25:42 +02:00
cea06994de
fixes the bug with the columnDefault tooltips that was inside the TableWidget.js file
2024-04-24 14:59:46 +02:00
c15a350392
moved dbUpdate for gehaltsband to extension
2024-04-24 14:55:22 +02:00
b1e85fe92b
- international skills auf vuejs
...
- note uebernehmen hinzugefuegt
2024-04-24 14:18:55 +02:00
1b19a0821f
Konto filters for Student list
2024-04-24 14:02:58 +02:00
5a62dbc740
refactors the adminAnrechnung page because it is used in an bootstrap3 environment
2024-04-24 11:35:02 +02:00
7dfe2f1932
tabulator5 function changes
2024-04-24 10:00:12 +02:00
c33a11e952
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-04-24 08:30:25 +02:00
844c07be9c
Merge branch 'feature-39174/Studstatus_AbmeldungStglFuerUnterbrecher'
2024-04-24 08:25:51 +02:00
633b9eeafe
loading STG permissions for assistenz into frontend and only fetching entschuldigungsdata for those; new data fetch api methods for lektor to visualize graphs: getAllByLva & getAllByStudiengang. old one renamed to getAllByLvaAssigned; automatic email to responsible adress on entschuldigung upload of a student; focused on pie charts for reusable landing page design; fixed entschuldigungen date filter validation; WIP extension specific phrases;
2024-04-23 17:00:32 +02:00
5175dcdbe4
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-04-23 15:57:50 +02:00
96b79c8740
corrects reviewAnrechnungDetail style typo, and adds the height function to the adminAnrechnung table again
2024-04-23 13:43:00 +02:00
bebec98285
adds a little space with a br between the tablewidget header and the table itself
2024-04-23 13:16:04 +02:00
8d68faf922
replaces the pull-right class with a conditional if bootstrapVersion was set to 5
2024-04-23 13:06:02 +02:00
9ae36b54e1
remove the 50% height from the table and add fitColumns to the table so that the columns take the whole available space
2024-04-23 12:55:44 +02:00
11c9622186
replaces the anrechnungen.css with styles in the zeitverfuegbarkeit view
2024-04-23 12:50:29 +02:00
3a1ac15740
adds the button width and margin classes from the Tabulator.css (used in Tabulator4) to the anrechnungen.css file
2024-04-23 12:47:17 +02:00
51ee16926c
adds a tabulator redraw when adding the details column to the tableWidget
2024-04-23 09:49:41 +02:00
5e3a7d4307
bugfix tooltip
2024-04-23 08:12:57 +02:00
e1fac8e871
adds the bootstrapVersion flag to all the TableWidgetData files
2024-04-22 17:11:02 +02:00
ab978592a0
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-22 16:22:07 +02:00
fd0fb7c9b4
Refactor Notizcomponent: add Endpoint and core NotizController
2024-04-22 16:21:54 +02:00
977c2d4432
Merge branch 'master' into feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5
2024-04-22 15:18:19 +02:00
258c5f7777
Merge branch 'master' into feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5
2024-04-22 14:56:07 +02:00
e2e7966f83
adds accept and deny actions in the actions column of the ProfilUpdateView component
2024-04-22 14:55:37 +02:00
349865b8fb
fixes the phrasen for the column titles of the ProfilUpdateView
2024-04-22 13:52:38 +02:00
27428b15bb
changes the escaping string for the xslt_xhtml_c4
2024-04-22 11:49:19 +02:00
93ae5577f8
try with here documents
2024-04-22 11:25:24 +02:00
28ab904144
Download PDF & Bugfix New
2024-04-19 14:52:50 +02:00
1447a930d3
adds more phrasen to the profil and the profilUpdate views, headers of tables phrasen
2024-04-19 14:24:32 +02:00
0655118f2b
Merge branch 'feature-39349/tdb_phrasen'
2024-04-19 10:38:39 +02:00
8d61025afa
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-19 07:08:01 +02:00
a65336993c
Bugfix Notiztab
2024-04-19 07:07:44 +02:00
412bb10a06
Servicekatalog: renamed Kategorie column to Kritikalität in vilesci, added column Kritikalitaet in cis overview
2024-04-18 15:38:22 +02:00
6025660e23
Konto counter & Zahlungsreferenz
2024-04-18 15:14:41 +02:00
ed59de7e80
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-18 15:12:55 +02:00
4bb9c61168
also fixes the phrasen for the student/Mitarbeiter View Ansicht
2024-04-18 15:06:38 +02:00
c90b875aa2
Bugfix reload Prestudent
2024-04-18 15:01:54 +02:00
bc0d581402
fixes phrasen in the studentProfil
2024-04-18 15:00:28 +02:00
eda68ef5e0
BugFix Watch Reload Tabs
2024-04-18 14:54:18 +02:00
4e5379c5d9
adds an edit button over every section in the profil page to edit that section
2024-04-18 14:53:51 +02:00
cc0ea44de3
also adds the new controller functions to the CisVue/Cms and CisHmvc/Cms
2024-04-18 11:56:55 +02:00
3993d614d4
updates news fetching and DB_Model pagination methods
2024-04-18 11:52:58 +02:00
3a4492671d
Fixed Signing Documents via CIS
2024-04-18 08:53:22 +02:00
b2deea6962
added db schema for Gehaltsbaender
2024-04-17 16:40:12 +02:00
71f63095c2
makes component Pagination page_size prop a required prop
2024-04-17 15:15:51 +02:00
92f2c6e0a2
passes the page_size down from the parent component to the child component
2024-04-17 15:12:55 +02:00
284ae0637e
makes it possible to send the page_size from the frontend to the backend to adopt how many rows to query
2024-04-17 14:54:22 +02:00
6c642f1242
changes how the pagination is done in the DB_Model
2024-04-17 14:23:09 +02:00
9da2854e61
temp save
2024-04-17 12:25:24 +02:00
6211a77119
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-16 15:43:03 +02:00
2f08d1b1c1
Notizcomponent: add twoColumnsLayout, refactor UX
2024-04-16 15:42:49 +02:00
006a763436
Konto delete
2024-04-16 14:34:45 +02:00
e15f4981fb
Konto new
2024-04-16 12:56:12 +02:00
8a115626ba
CDATA bei Lernergebnisse hinzugefügt
2024-04-16 10:33:27 +02:00
20aba9aa90
Merge branch 'feature-27349/DiplomaSupplementQuereinstiegerRahmenvertrag'
2024-04-16 10:22:48 +02:00
63d7716a6c
Konto Edit: Date config
2024-04-16 09:19:17 +02:00
b51ce13024
CSS correction
2024-04-16 09:18:19 +02:00
8057ecbc60
Merge branch 'feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten'
2024-04-15 15:41:53 +02:00
d77499b73b
implementing frontend pagination for components
2024-04-15 13:35:33 +02:00
563e7bebc0
setupComponent currently uses globalProperties as model for le selection; lektorComponent uses globalProperties for le_id; le_selection now has sophisticated info String detailing every group associated with le for lektor; WIP assistenz filter setup; WIP checking in router guard for missing le_id when they have not loaded yet;
2024-04-12 15:01:37 +02:00
ad956bef8e
adds pagination logic to C4 news
2024-04-12 14:38:01 +02:00
69067c1ef9
Notizcomponent refactor: fhcapi, validations, phrases, format dates
2024-04-12 10:48:40 +02:00
efebaeeb27
Edit
2024-04-12 10:38:06 +02:00
8705341563
FormInput: remove input and update:modelValue event from $attrs to prevent double emits
2024-04-12 10:35:31 +02:00
e32bf2df57
BsModal: send event objects on emit
2024-04-12 10:33:40 +02:00
44d60e5f52
Validation Stg Permissions
2024-04-12 10:31:22 +02:00
10a6d374f1
FHC-Core-SAP Phrases
2024-04-12 10:29:57 +02:00
054ef5d00f
Bugfix Api: clearValidation
2024-04-12 10:29:06 +02:00
1fb019b795
Search by person
2024-04-12 10:28:39 +02:00
ea9bd93e73
phrasen fix and bug where profilUpdates were only sorted when accepting the request and not denying
2024-04-12 09:39:28 +02:00
e0c7691e04
missing catch
2024-04-11 15:14:15 +02:00
86504fd663
doesn't show the footer if the view inside the EditProfil Modal is set to Status
2024-04-11 11:39:29 +02:00
2b68831415
adds more filter options for the ProfilUpdateView
2024-04-11 11:20:32 +02:00
4fc4cd762d
adopts logic to fetched profilUpdate status and topic from the database
2024-04-11 09:15:19 +02:00
c03e6deb95
Removed useless code
2024-04-10 16:45:46 +02:00
21c2bafed6
adapt the logic of the profilUpdate feature to use constant status and topics from the database
2024-04-10 15:08:21 +02:00
941dce6032
Diplomasupplement: Adaptierung Wording Niveau
2024-04-10 14:48:04 +02:00
94224f7ef7
dvendegrund Ablauf durch Zeit added
2024-04-10 14:28:07 +02:00
f51f006377
Corrected phrase anmerkungIntern
2024-04-10 14:07:41 +02:00
487a2b6037
Phrases valdidations, format dates, design adapations
2024-04-10 10:42:16 +02:00
637392c844
Merge branch 'master' into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten
2024-04-10 09:56:58 +02:00
e11dd21a1e
add parameter dvendegrund_kurzbz and dvendegrund_anmerkung
2024-04-09 16:35:00 +02:00
675ce0e9aa
Bug utf8_decode Umlaute in betriebsmitteltyp
2024-04-09 16:20:29 +02:00
aed3f99365
Phrases Betriebsmittel
2024-04-09 16:09:14 +02:00
1a1cd76bc4
add grant on hr.tbl_dvendegrund to user vilesci
2024-04-09 15:42:00 +02:00
a9818e1f63
add initial values to hr.tbl_dvendegrund
2024-04-09 15:27:47 +02:00
56900e31db
add table hr.tbl_dvendegrund, add columns dvendegrund_kurzbz and dvendegrund_anmerkung to hr.tbl_dienstverhaeltnis
2024-04-09 15:08:32 +02:00
456700a06e
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-09 15:07:33 +02:00
d63c7c3457
Logik Inventar, Validierungen
2024-04-09 15:03:43 +02:00
5b2365a1e2
stores the status of profilUpdate with their language in the database and adapts the logic to it
2024-04-09 15:02:17 +02:00
e41eada893
Removed unused Code
2024-04-09 14:08:58 +02:00
a32e78c9b8
Merge branch 'master' into feature-27349/DiplomaSupplementQuereinstiegerRahmenvertrag
2024-04-09 13:53:37 +02:00
1d0c2be449
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-04-09 11:33:38 +02:00
bdb0a5702d
Fehler behoben wodurch keine Note im Freigabemail angezeigt wurde
...
Fehler behoben wodurch keine Punkteübernahme bie Nachprüfungen möglich
war
2024-04-09 11:24:44 +02:00
026a276c02
add grant on frist_id sequence
2024-04-09 11:11:03 +02:00
3b41df5ddc
Merge branch 'master' into feature-37107/Fristenmanagement
2024-04-09 10:44:02 +02:00
78031bf1ad
fixes buggs that were produced with the introduction of new phrasen
2024-04-09 09:08:47 +02:00
2df91bce5c
adds phrasen to the ProfilUpdateView.js file
2024-04-08 15:49:28 +02:00
960341e25d
adds more profil phrasen error messages
2024-04-08 15:08:20 +02:00
1b04d70839
adds phrasen for profil in php controller and adds error message phrasen
2024-04-08 15:03:08 +02:00
8a9477eaf0
Fixed PHP7.4 Warning
2024-04-08 12:54:05 +02:00
ee6221e325
add konto tab
2024-04-08 12:40:23 +02:00
cf0c7a2f8c
put le_ids aswell as viewdata for le selection in globalProperties to share between components; using FhcApi Plugin for API calls; le selection in setup now with info (gruppe_kurzbz, lehrform_kurzbz, semester, verband, gruppe); fixed setting foto in viewData after refreshing sum eg after kontrolle;
2024-04-08 12:25:25 +02:00
b77e56161d
fixing some not working phrasen
2024-04-08 09:58:53 +02:00
f2ba0fd469
update phrases and added events for fristenmanagement
2024-04-07 00:33:25 +02:00
0cd86e3e54
cannot use this keyword when assigning default values to props in componenets
2024-04-05 14:57:00 +02:00
53e44b9df5
Action PrintÜbernahmebestätigung
2024-04-05 14:22:42 +02:00
257c7a5aac
Projektzeitenexport für Administration/HR im Vilesci hinzugefügt
2024-04-05 14:14:13 +02:00
150b4ec09d
phrasen for acceptDenyUpdate.js and ProfilUpdateView.js
2024-04-05 10:33:23 +02:00
a5daa63da4
Table, Form, Backend Crud Betriebsmittel
2024-04-04 16:28:24 +02:00
753a193be1
- added phrases for bpks details
2024-04-04 15:41:18 +02:00
c1cb2904e6
adding phrases for Profil and ProfilUpdate
2024-04-04 15:02:47 +02:00
6af2a01166
tabulator5 migration changes
2024-04-04 09:55:41 +02:00
2e5f53f59a
changes tabulator cell alignment in tabulator5
2024-04-04 09:36:46 +02:00
2132fe76ae
added Plausicheck: students in DUAL Studiengang should have set boolean value dual to true, plausicheck bugfixes (loading model, remove unnecessary property)
2024-04-03 17:39:00 +02:00
cfe73b361e
Sorted project phases by start date and bezeichnung in Zeitaufzeichnung
...
Sorted within dropdown
2024-04-03 15:13:32 +02:00
dd2f982e95
adding the uniqueID jquery identifier to acceptLehrvertrag.js
2024-04-03 14:33:35 +02:00
a2791fecd1
Sorted projects in alphabetical order in Zeitaufzeichnung
...
Sorted within dropdown and in project cvs export file.
2024-04-03 13:10:30 +02:00
d2a8d59f6d
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-04-03 12:59:00 +02:00
9907ee2267
Added phrase global/zeilenAuswaehlen
2024-04-03 11:45:43 +02:00
2951b2a0d1
Start Tab Betriebsmittel
2024-04-03 10:26:26 +02:00
5cabac62d7
add frist events for befristung
2024-04-02 18:33:37 +02:00
a2d71d3a8d
adjusts how the AcceptDenyModal is used and included in the ProfilUpdateView
2024-04-02 16:38:29 +02:00
51a65495aa
corrects the insertion of the dms_kategorie profil_aenderung in the checksystem
2024-04-02 15:31:56 +02:00
e33d863732
upgrades pruefungsprotokollUebersicht to tabulator 5
2024-04-02 13:03:52 +02:00
4e3ab802b6
removes unnecessary debugging log
2024-04-02 12:49:33 +02:00
d8fb36543f
migrates adminZeitverfuegbarkeit to tabulator5
2024-04-02 12:46:51 +02:00
e29dfd99f3
migrate approveLehrauftrag/acceptLehrauftrag/orderLehrauftrag to tabulator 5
2024-04-02 12:34:51 +02:00
61af95b7e5
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-02 09:23:41 +02:00
ab3c631030
update Phrases Status
2024-04-02 09:22:59 +02:00
2d88ee031c
refactor Tab Kontakt api Controller, Phrases alerts
2024-04-02 09:12:26 +02:00
8ffc8a20d3
s&d
2024-03-29 14:27:45 +01:00
d34ce78c94
s&d
2024-03-29 13:00:54 +01:00
c6f4fbb0b8
Use Udf Component
2024-03-28 15:39:19 +01:00
b1c094383f
Udf Component
2024-03-28 15:38:50 +01:00
46fff01eaa
Form_validation: extra functions
2024-03-28 15:37:50 +01:00
24641d1444
Tabs: use computed on titles
2024-03-28 15:35:43 +01:00
abfd92e387
Fetch: check for intermediate properties of error object
2024-03-28 15:35:26 +01:00
5d49516b77
Merge branch 'ReportingFilterParameter'
2024-03-28 13:56:07 +01:00
538264e577
Merge branch 'master' into ReportingFilterParameter
2024-03-28 13:55:29 +01:00
2f99457283
GET-Parameter auch für Text übernehmen
2024-03-28 13:54:45 +01:00
ba1fa6add4
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-03-28 13:20:51 +01:00
8d8e45b6de
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-03-28 13:20:16 +01:00
05516f2952
Fixed: issue with component tabs not recognizing loaded phrases
...
Vue.computed ensures loading phrase reactively when phrases are loaded
2024-03-28 13:19:31 +01:00
d34f5b92f4
Added new phrases for softwarebereitstellung- and for core app
2024-03-28 13:14:34 +01:00
4ccf2aebcc
Prüfungstyp Termin3 wird nicht automatisch angelegt
2024-03-27 12:57:17 +01:00
3023cd2e94
Refactor status for api-controller, add phrases for alerts
2024-03-27 11:23:38 +01:00
21b05394c8
Merge branch 'master' into ReportingFilterParameter
2024-03-26 17:24:07 +01:00
7240a97d6e
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-03-26 17:16:57 +01:00
e469f54901
Typ "Text" bei vordefinierten Filtern ergänzt
2024-03-26 17:16:44 +01:00
42ddea9f51
Fixed Typ in Variable Name
2024-03-26 16:37:13 +01:00
058ed94c2b
Merge branch 'feature-36196/DVUH_Meldestatus_beruecksichtigen'
2024-03-26 11:34:26 +01:00
a95c2fe47e
studstatus switch fullname to have surname first
2024-03-26 11:27:44 +01:00
1e9a681c9a
Gegencheck für tbl_tmp_store und tbl_audit_log entfernt da dies Tabellen
...
aus der Personalveraltung Extension sind
Gegencheck für Habiliation hinzugefügt
2024-03-26 09:19:36 +01:00
aabc10d1fc
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2024-03-25 16:54:00 +01:00
d4bc5148a7
fix disappearing searchbar when session expires, add functions to fetch dvs at a certain duedate for valorisation
2024-03-25 16:53:03 +01:00
fe1ea63496
Merge branch 'feature-33294/StudienerfolgsbestaetigungAbbrecher'
2024-03-25 15:59:12 +01:00
2a26765ff6
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter'
2024-03-25 15:05:46 +01:00
5413292529
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-03-25 14:55:46 +01:00
8a86bce567
Merge branch 'feature-33003/BIS_Meldung_Personal' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-03-25 14:55:11 +01:00
ad415ad665
deactivateDienstverhaeltnis: only set user to inactive if no other dv is active
2024-03-25 14:04:21 +01:00
6a6db4292f
Merge branch 'feature-18571/EntwicklungsteamBisMeldung'
2024-03-25 13:54:42 +01:00
65c7db7ae4
bugfix phrases tabulator, refactor Prestudent.js using FHCAPI_CONTROLLER
2024-03-25 13:28:28 +01:00
5fd4ded184
Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung
2024-03-25 13:12:35 +01:00
9f2dd82009
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-03-25 13:08:10 +01:00
b907f01ebb
Phrases History and Status, Formvalidation Prestudent
2024-03-25 09:09:40 +01:00
927ed934c0
new Controller & routes for Landing Page; Fixed querying students for n LE; Pictures in LektorOverview & Detailview; WIP SetupComponent to select missing parameters in case; added highcharts library as pure JS; WIP designing Charts based on role & parameter input or setup; Integration in old cis via Mein Cis/Meine LV aswell as Studium/Studiengänge currently as "Anwesenheiten NEU"; WIP Landing Page Design; WIP LE Selection from Stundenplan Entries with appropriate Classification; defined settings for QR Regeneration and showing time left on a progress bar; entry query parameters are being handled inside globalProperties, controller parameters are still inside permissions array;
2024-03-22 14:12:17 +01:00
1b3c052c12
codesniffer
2024-03-22 13:00:05 +01:00
9038910303
phrases
2024-03-22 10:36:57 +01:00
06b0529813
Autocomplete: empty message
2024-03-22 09:10:13 +01:00
c4942cc70e
Studstatus => FhcApi
2024-03-21 15:45:55 +01:00
7dec1178e4
changes the parameter list of the tooltip function in tabulator 5 for approveAnrechnungUebersicht and reviewAnrechungUebersicht
2024-03-21 14:51:04 +01:00
72b19987bd
removes unnecessary debugging prints
2024-03-21 14:46:03 +01:00
1a76231df0
migrated orderLehrauftrag to tabulator5
2024-03-21 14:37:28 +01:00
57e5626fe4
reset the navbar to use bootstrap3
2024-03-21 13:52:56 +01:00
a8c60c105d
migrating approveLehrauftrag to tabulator5
2024-03-21 13:42:43 +01:00
27715c7f5f
update prestudent: uft8-coding, foerderrelevant, permissions
2024-03-21 13:28:51 +01:00
47dfb66b8d
replacing string concatenation with string literals for tableWidget Header and Footer
2024-03-21 09:27:44 +01:00
081a2d69f5
set version 3 as the default version of bootstrap for the tableWidget
2024-03-21 08:49:28 +01:00
1b4a2f2d7a
Refactor right hasPermissionToSkipStatusCheck
2024-03-21 07:58:37 +01:00
59f25bd3a2
adding the bootstrapVersion flag to the /widget/table view to dynamically render css classes + little fixes
2024-03-20 13:26:23 +01:00
78a16982f8
updates the tableHelpsite to use bootstrap5 classes if the bootstrapVersion flag is set to 5
2024-03-20 13:25:32 +01:00
bc798bd0b4
Added uniqueId prop to Filter.js to fix URL using apiFunctionParameters.filterUniqueId
2024-03-20 09:58:25 +01:00
f6eceb892d
Added label property 'class' to Input.js
...
...which fixes style issues when creating input-group buttons using the Input.js component
2024-03-20 09:52:26 +01:00
6eae83f4eb
Added primevues autocomplete slot template to Input.js
...
Now, when using the Input Component with type 'autocomplete', it is possible to add also primevues built in slot templates there
2024-03-20 09:50:03 +01:00
842e62b0dd
Fixed Input.js error causing to keep last entries' first letter in form inputs, even when formdata was emptied
2024-03-20 09:42:23 +01:00
10e57dae2d
Adapted style of .tabulator-cell .btn to be squared and increased padding
2024-03-20 09:38:08 +01:00
69803cdb0d
Phrasen: Bugfix - correct function for multiple categories
2024-03-20 08:27:26 +01:00
426a439552
added sort column to frist
2024-03-20 00:13:55 +01:00
4e6b7a845b
FhcApi: use errorHeader for multiple calls
2024-03-19 16:54:14 +01:00
30efd55d6c
FhcApi: settle handled Promises & discard them in FhcAlert
2024-03-19 16:53:36 +01:00
e1b5a86390
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-03-19 15:55:00 +01:00
be0d73cd22
Sortierung der Studiensemester absteigend; Ziel-Studiensemester passt sich automatisch an
2024-03-19 15:54:54 +01:00
de15d43bb7
adds bootstrapVersion flag to the tableWidget options to render bootstrap3 classes or bootstrap5 classes
2024-03-19 15:29:28 +01:00
a495ff9b98
Popup Löschen bei letzter Rolle
2024-03-19 14:31:50 +01:00
54b2dce3d6
update DeleteStatus and Prestudent, with Logs and Transactions
2024-03-19 10:58:59 +01:00
8f0e837fb7
Phrasen Plugin: Bugfix this
2024-03-19 08:45:10 +01:00
acac5dfc65
trying to independenly restyle the navigationWidget
2024-03-18 15:17:14 +01:00
92cb4dedef
migrates adminAnrechnungData and adminAnrechnung.js to use tabulator5
2024-03-18 11:49:54 +01:00
3cdc051861
updates adminAnrechnung view to bootstrap5
2024-03-18 11:42:34 +01:00
961526925c
updates reviewAnrechnungDetail.js to change the correct bootstrap5 classes in the javascript
2024-03-18 11:07:12 +01:00
571bf8ebad
update reviewAnrechnungenDetail to Bootatrap5 and little styling fixes for other Detail views
2024-03-18 11:02:26 +01:00
44260ddb4d
basic link to Anwesenheit Extension from cis_menu_lv.inc.php checking on CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN in global.config-default.inc.php
2024-03-18 10:58:14 +01:00
b39b8559d9
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
2024-03-18 10:55:05 +01:00
72bf2525b7
updating reviewAnrechnungUebersicht to bootstrap5 and tabulator5
2024-03-18 10:14:05 +01:00
b147f73954
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-03-18 09:51:29 +01:00
83ccc93305
little adjustments and migrations
2024-03-15 15:02:17 +01:00
5ecac3cb99
migrates createAnrechnung to bootstrap 5 and tabulator 5
2024-03-15 15:01:55 +01:00
2cce61ca6a
Korrekturen für Gehaltsimport
2024-03-15 13:37:07 +01:00
183cb1ac17
little adjustments on requestAnrechnung
2024-03-15 12:52:21 +01:00
cc461aab8b
updates js file of approveAnrechnungDetail to be bootstrap5 conform
2024-03-15 12:52:00 +01:00
f9c894307d
buttons with attribute disabled and title fix
2024-03-15 11:58:31 +01:00
9360c8a470
migrates approveAnrechnungDetail to bootstrap5 and adds little adjustments to requestAnrechungImportant
2024-03-15 11:57:11 +01:00
868d10ffd6
adds bg-secondary-subtle to the color palette and fixes buttons that are disabled and have a title attribute
2024-03-15 11:56:16 +01:00
465ab736ee
changed AnrechnungenInfo panel to bootstrap5 accordion
2024-03-15 11:18:31 +01:00
1d81a4c2e8
Buttonbeschriftung geändert um barrierefreier zu sein
2024-03-14 17:08:03 +01:00
79a1e6a7fd
Merge branch 'benutzerberechtigungGUIneu'
2024-03-14 16:41:53 +01:00
7bec921018
Merge branch 'master' into benutzerberechtigungGUIneu
2024-03-14 16:40:07 +01:00
d9caf746a1
Rechte-GUI verbesserungen
...
- Inaktive und WaWi-Einträge ausgblenden
- Kopie-Anmerkung verkürzt
- Inaktive OE Kennzeichnen
- Link ins CIS-Profil
- Shortcut zum einfügen von Datum und Kürzel
- "Mitarbeiter" ist default bei Benutzersuche
- GUI-Verbesserungen bei Rollenvergleich
2024-03-14 16:39:01 +01:00
e5a0dcb829
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-03-14 15:53:39 +01:00
4f8d620814
refactor updateStatus
2024-03-14 15:42:20 +01:00
bacfbd33f3
Merge branch 'feature-36016/Studstatus_QMB'
2024-03-14 12:37:21 +01:00
77221e507f
set tabulator to fixed height, fix missing grund when editing unterbrechung
2024-03-14 11:42:39 +01:00
8556632f90
updating approveAnrechnungDetail to boostrap5
2024-03-14 11:36:42 +01:00
ac508a9f19
bug Anzeige Orgform
2024-03-14 11:02:45 +01:00
e32c68e0e3
update function advanceStatus
2024-03-14 10:32:39 +01:00
bc5d42b310
Studstatus: ausbildungssemester in getAllPrestudentsWhereCommitteeExamFailed
2024-03-14 08:52:55 +01:00
cba4c8e365
Studstatus: Fallback for antrag details
2024-03-13 16:46:10 +01:00
af79736d67
documents use ausbildungssemester from prestudentstatus in semester of antrag, fix missing grund when editing unterbrechung
2024-03-13 16:16:23 +01:00
8a835cb7f8
reset searchbar.js fixing searchbar style
2024-03-13 14:44:56 +01:00
9ae3a6dc29
Form Input: label as prop
2024-03-13 14:25:01 +01:00
3c2190b280
fixes zustellAdressenCount for EditAdresse and formats code files
2024-03-13 14:01:29 +01:00
c0e6552c08
fixes zustellKontakteCount in EditKontakt
2024-03-13 13:44:08 +01:00
87384f42f9
Update Logik Lehrverband: as function, with transactions
2024-03-13 13:31:53 +01:00
e7480eb9ff
hotfix, editProfil modal in fetchProfilUpdates component
2024-03-13 12:23:45 +01:00
f5bc8bdcb2
Studstatus: Unterbrechung: get semester for current status on new Antrag
2024-03-13 10:40:32 +01:00
673fd889fe
Studstatus: get details without whitelist
2024-03-13 10:39:51 +01:00
1816f3f5f6
fully upgrades the approveAnrechnungUebersicht to tabulator5
2024-03-13 10:22:10 +01:00
ab7a5bac68
Unterbrechung studienjahr und semester anzeige
2024-03-13 08:37:40 +01:00
e28627a676
removed verantwortlich column from tbl_frist
2024-03-12 17:34:13 +01:00
6722fde9c9
adapts approveAnrechnungUebersicht for the new tabultor5 functions
2024-03-12 15:33:24 +01:00
874f08f6dd
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-03-12 15:16:54 +01:00
77ebf1d857
Apply to changes from master
2024-03-12 15:08:33 +01:00
4c8486af22
use correct config property
2024-03-12 14:36:27 +01:00
70418b8ff6
updates TableWidget.js functions that are no longer valid in tabulator5
2024-03-12 14:30:40 +01:00
d05df01178
move load lib from function handleAbmeldungenStglDeadline to constructor as its also used in handleWiederholerDeadline
2024-03-12 13:22:01 +01:00
1dc4f5b56a
upgrading tableWidget to tabulator 5 with custom jquery_wrapper
2024-03-12 12:28:59 +01:00
7bdf5b832b
Merge branch 'master' into feature-36016/Studstatus_QMB
2024-03-12 11:32:25 +01:00
1a39abf7c7
Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-03-12 11:31:49 +01:00
9504b713fc
add missing insertvon to phrases definition
2024-03-12 11:31:12 +01:00
691bbaaf82
workaround for tabulator jquery_wrapper
2024-03-12 09:59:21 +01:00
8d2d1c049a
Removed wrong Semicolon
2024-03-12 08:28:16 +01:00
a49075bcb7
check Bismeldestichtag, refactor Lehrverband
2024-03-12 07:52:51 +01:00
ac39ce8e71
Studstatus create view: fallback for studierendenantrag_id
2024-03-11 15:27:34 +01:00
6acf65b49f
Form Component: expose _defaultErrorHandlers
2024-03-11 15:24:48 +01:00
40c98b1dcc
FHCAPI Controller: optional status param for error function
2024-03-11 15:23:54 +01:00
b359a77a8d
Comments
2024-03-11 09:56:34 +01:00
d259c0d35c
Fetch: more robust error handling
2024-03-11 09:46:59 +01:00
011b4a83eb
Filter => FhcApi
2024-03-11 09:46:39 +01:00
aa7982fea9
adds jquery adjustments
2024-03-08 12:34:26 +01:00
664fe3830f
Merge branch 'master' into feature-33003/BIS_Meldung_Personal
2024-03-08 11:39:02 +01:00
b17f253273
Tabs component: add flex-grow-1 class to use available space
2024-03-08 11:37:23 +01:00
d9e44c8c23
Merge branch 'master' into feature-33003/BIS_Meldung_Personal
2024-03-08 11:08:40 +01:00
85f9b14326
Comments
2024-03-07 16:56:37 +01:00
5f77bdd6fc
Spelling
2024-03-07 16:56:30 +01:00
d2eadb98ce
Navigation => FhcApi
2024-03-07 16:56:14 +01:00
1b65f6f4e6
trying to add callbacks after the tabulator called the tableBuilt event with jquery
2024-03-07 14:48:11 +01:00
291f32bfe2
Tabs => FhcApi
2024-03-07 14:35:29 +01:00
3a9f6a0edd
check Meldestichtag, update function getHistoryPrestudent
2024-03-07 14:20:46 +01:00
7eda02f366
adds include variable tabulator5JQuery to FHC-Common.php
2024-03-07 11:46:05 +01:00
b1411549f3
better folder structure for Cis Profil
2024-03-07 11:14:58 +01:00
96e0bfa72c
changes how the EditProfil Modal passes props to its children
2024-03-07 11:08:43 +01:00
f539ed8977
Depricated comment
2024-03-07 08:54:28 +01:00
20619311e3
Use fhcApi in Searchbar
2024-03-07 08:50:27 +01:00
4ac46d19e9
Testsearch view: naming convention
2024-03-07 08:23:29 +01:00
dad459e023
Testsearch: Codequality
2024-03-07 08:18:49 +01:00
8f6fbda4cf
Testsearch: Bugfixes
2024-03-07 08:11:58 +01:00
b753a05f0e
Anpassungen am Import Script für Gemeinden von FHB übernommen
2024-03-07 08:10:17 +01:00
b6723e92d8
Code Quality
2024-03-07 08:01:11 +01:00
1344ab987e
Options for custom FhcApiFactory
2024-03-06 16:52:42 +01:00
1dcece8563
Use Factory for Phrasen
2024-03-06 16:52:10 +01:00
f2ebf25640
Use new FhcApiFactory Folder
2024-03-06 16:51:25 +01:00
f6427f57b8
Use FHCAPI Controller for Phrasen
2024-03-06 16:49:35 +01:00
68459e086a
Auth_Controller special permissions
2024-03-06 16:15:04 +01:00
464799d22b
tabulator upgrade
2024-03-06 14:46:21 +01:00
03e166dc89
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
...
# Conflicts:
# public/js/components/filter/Filter.js
# public/js/plugin/FhcAlert.js
# system/filtersupdate.php
2024-03-06 14:07:19 +01:00
0940ea77de
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-03-06 13:59:06 +01:00
872ef7c31c
Move Phrasen API
2024-03-06 13:02:34 +01:00
e89aa824d2
FHCAPI_Controller extends Auth_Controller + auth error handling in FhcApi
2024-03-06 11:48:15 +01:00
1b65378d6c
Auth_Controller private functions
2024-03-06 11:47:34 +01:00
77666e5210
added column verantwortlich_uid
2024-03-06 08:27:39 +01:00
1085b9243d
Merge branch 'master' into feature-33003/BIS_Meldung_Personal
2024-03-05 17:07:17 +01:00
3d6b2eb202
add app fhctemplate if it does not exist
2024-03-05 17:04:43 +01:00
5ad3510af6
add use of phrasen plugin to apps
2024-03-05 16:47:29 +01:00
d5d190777a
Merge branch 'feature-34543/UX_Template'
2024-03-05 16:46:48 +01:00
fdbbba5038
add phrase location
2024-03-05 16:42:06 +01:00
5b795c2ccf
phrases update merge conflict
2024-03-05 16:36:43 +01:00
7bec7016c3
merge master into branch FHC4
2024-03-05 16:31:41 +01:00
e41e24be04
adding the option to add css classes to the HTMLWidget
2024-03-05 15:38:51 +01:00
aadaa3f2a3
Revert "css"
...
This reverts commit 91c01f36f4
2024-03-05 15:18:14 +01:00
7f735e9a10
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-03-05 13:05:03 +01:00
7524d054db
Merge branch 'feature-36530/bis_internationalisierung_codextabelle_neuerungen'
2024-03-05 13:04:25 +01:00
6869c147ef
Beim deaktivieren von Benutzern wird Updateaktivam und Updateaktivvon
...
gesetzt
2024-03-05 11:32:30 +01:00
91c01f36f4
css
2024-03-05 10:34:01 +01:00
144a872c98
adds cutsom cis css style which lowers the overall font size
2024-03-05 09:36:16 +01:00
35bf6a2efd
Tab Status: show Dropdown Statusgruende only if exisiting
2024-03-05 09:31:50 +01:00
861f8a7288
Prestudent: Button Save inactive, if there are changes
2024-03-05 08:47:45 +01:00
caac612a0d
confirm status and add transactions
2024-03-04 15:45:54 +01:00
b7a1236acc
anrechnung.css update
2024-03-04 15:06:08 +01:00
dd309e972b
js alert messages update, need to update the phrasesupdate.php
2024-03-04 15:03:49 +01:00
84ba0dbb64
bootstrap 5 upgrade (tooltips,cards,margins,..)
2024-03-04 13:50:06 +01:00
a7f1e43225
Status als eigener Tab
2024-03-04 10:10:35 +01:00
b98794a292
fix bug Validierung checkifExistingStudentRolle
2024-03-04 08:40:08 +01:00
c60f7ed8b0
dbUpdate for fristenmanagement completed
2024-03-01 15:43:15 +01:00
ccf01100bb
adds new classes because alert-info/warning/... are not consistent in the new bootstrap versions
2024-03-01 15:36:10 +01:00
e32d464b7f
Merge branch 'master' into benutzerberechtigungGUIneu
2024-03-01 15:28:10 +01:00
2e4f2709ed
Merge branch 'RechteAnpassen' into benutzerberechtigungGUIneu
2024-03-01 15:27:11 +01:00
474c4ad34f
removes file that belongs to CIS_Profil
2024-03-01 10:53:06 +01:00
7a6d095b78
create db tables for fristenmanagement
2024-02-29 17:09:59 +01:00
77e31f2da6
Delete Prestudent
2024-02-29 10:58:45 +01:00
621429798c
Abschlussgrad in Studienblatt erst aus Studienordnung ermitteln
2024-02-29 09:50:58 +01:00
6500708f90
Code Quality
2024-02-29 09:02:20 +01:00
2d2098984a
Pause feature
2024-02-29 08:34:58 +01:00
c4d4f55d06
use tabulator5 simple theme to get smaller tables
2024-02-28 18:22:35 +01:00
a4a06507dc
Merge branch 'feature-229015/SAPByD_EBCL_Buchungen_sollen_auf_eigene_Kostenstelle_zugeordnet_werden'
2024-02-28 15:08:57 +01:00
23b1a76190
Merge branch 'feature-36148/tdb_uebersicht_erweitert_und_job_bug'
2024-02-28 13:43:19 +01:00
f94b1700e7
Renamed filter- and phrases app for Fhc-Core-Extension
...
Renamed from extension to fhctemplate
2024-02-28 13:38:59 +01:00
88df5057fb
Update, Vorrücken, Delete, Refactoring Statusvalidations
2024-02-27 16:53:37 +01:00
45f2593b13
fix bug with excel showing file error when switching to editmode
2024-02-27 13:54:58 +01:00
8ccc621a91
Finalized db schema changes for Anwesenheitskontrolle and Checkin; Multiple Lektor scenario not being managed yet; reworked frontend requests towards API Controller to not confuse vue router; WIP UX;
2024-02-27 11:42:42 +01:00
e243980ae6
Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung
2024-02-26 15:58:49 +01:00
4862168b8d
Merge branch 'feature-36986/fas_filter_reihungstest_dual'
2024-02-26 14:49:46 +01:00
93f1bc752b
Merge branch 'feature-36744/uebersetzungen_payments_karteireiter'
2024-02-26 12:57:18 +01:00
4bbac35540
Status colors
2024-02-26 11:56:29 +01:00
aa6c5c50c2
- fas filter gefixt
2024-02-26 09:03:06 +01:00
d9ec506c86
Codextabelle Mobilitaetsprogramm Neuerungen: changed name of some programs, set correct sichtbar and sichtbar_outgoing booleans
2024-02-23 16:54:51 +01:00
21f7099878
refactor
2024-02-23 14:32:06 +01:00
843ddad987
Statuschecks, Berechtigungen, add new Status
2024-02-23 12:28:26 +01:00
f09692edd1
adds primevue autocomplete field for EditAdresse
2024-02-22 15:04:24 +01:00
ee7a819094
Merge branch 'master' into feature-25999/C4_ma0594dev
2024-02-22 12:06:16 +01:00
989f1ecf02
finishes the documentation in Profil.php controller and refactors getView
2024-02-22 11:50:08 +01:00
296741b584
Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template
2024-02-22 11:17:38 +01:00
c232eddf89
Added filter and phrases for Fhc-Core-Extension
2024-02-22 11:17:27 +01:00
63a06dfef2
WIP api controller backend; WIP adapting queries to new db schema;
2024-02-22 10:30:18 +01:00
0b84e1b608
finishes documentation on Profil.php controller
2024-02-22 09:00:53 +01:00
fff0e937cc
added Method to end DV and deactivate Benutzer
2024-02-21 16:23:39 +01:00
4edd242f09
adds documentation to the Profil.php controller not finished
2024-02-21 15:44:41 +01:00
2d1e8a829d
userdata changes
2024-02-21 13:50:38 +01:00
2a393f0087
adds the fields gemeinde and nation to the EditAdresse Component and adds autocomplete for the gemeinde if the nation is A
2024-02-21 12:31:41 +01:00
c034efb8b0
Unterbrechung bei laufender Unterbrechung
2024-02-21 09:19:56 +01:00
6f92698631
- bewerbungstool payments uebersetzungen anpassungen
2024-02-20 17:01:49 +01:00
1bed062a01
querying the right data for the EditAdresse Nation and Gemeinde Fields
2024-02-20 15:57:17 +01:00
cd64df28bb
added phrase for habilitation
2024-02-20 15:02:14 +01:00
6f7bca6eab
adds loading modal to ProfilUpdateView
2024-02-20 14:32:28 +01:00
47abce4aad
handles the loading modal in the root Profil app when inserting a new profil update that may takes some time because it has to send out emails
2024-02-20 10:50:35 +01:00
72d166a050
FHCAPI Controller: multipart upload
2024-02-20 08:38:29 +01:00
dfe0434cce
added new mobilitaetsprogramm codes
2024-02-19 17:59:20 +01:00
013664db70
FhcApi Controller: new helper functions
2024-02-19 15:23:43 +01:00
469b3e9833
Form Input: auto classes
2024-02-19 15:23:13 +01:00
8ad2908ca9
UploadDms: Delete Button styles
2024-02-19 15:23:00 +01:00
1afb9130c0
adds a loading animation when waiting for the emails to be sent out when inserting a new profil update request
2024-02-19 15:12:16 +01:00
2e9cc2b291
/ProfilUpdate/id/ was added to the ProfilUpdate controller to automatically open the necessary profil_update on startup of the page, this functionality is used when sending emails with the link to the profil_update
2024-02-19 14:36:45 +01:00
6aebbada06
Form Input: only setFeedback on last radio/checkbox in production mode
2024-02-19 10:39:18 +01:00
e433ca3d9b
Fehlende Gegenpruefungen im DB Check hinzugefuegt
2024-02-19 09:22:54 +01:00
2d5aea2bb8
translates the english status into a german version for the email vorlage
2024-02-19 09:14:45 +01:00
7962e181df
Merge branch 'feature-21620/Neues_Feld_zum_Erfassen_des_ESI'
2024-02-19 08:58:49 +01:00
318087c572
sends email to the user if a profil update was accepted or rejected
2024-02-16 15:37:20 +01:00
126defadb7
Link hinzugefügt beim Zusammenlegen von Personen wenn beide Personen
...
UHSTAT ausgefüllt haben damit diese direkt verglichen und gelöscht
werden können.
Fehlende DB checks hinzugefügt
2024-02-16 14:59:53 +01:00
501224b9b7
sends emails on insertion of an profil update to the studiengänge in case of students and to hr in case of a mitarbeiter
2024-02-16 14:33:49 +01:00
01c3a67762
Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI
2024-02-16 14:11:02 +01:00
658212a6eb
Show Antrag to Student when finished
2024-02-16 13:28:26 +01:00
ab2fc11797
PDF Download Wiederholung Deadline
2024-02-16 11:44:27 +01:00
cbf71a416f
Deprecated Spalte Gesamtstunden aus Projektarbeitsexport entfernt
2024-02-16 11:23:20 +01:00
75e05d6eed
PDF Download korrektur
2024-02-16 09:27:42 +01:00
70386a58f3
Tabs Component: removed TODOs
2024-02-16 08:53:34 +01:00
6a5b2db79d
Start Actions New, Edit, Delete
2024-02-15 17:02:16 +01:00
34b995ed6d
adds dms_kategorie for profil updates as an insert into statement in the dbupdate file
2024-02-15 16:20:54 +01:00
04f6ee6156
Merge branch 'master' into feature-25999/C4_ma0594dev
2024-02-15 15:16:07 +01:00
6eeeb8b4b7
send email
2024-02-15 15:09:41 +01:00
279fbe51c3
sendMail function now gets all the studiengang emails of an active student or sends the mail to personalverwaltung if it is a mitarbeiter
2024-02-15 14:24:07 +01:00
afa00caa4c
Merge remote-tracking branch 'origin/feature-34543/UX_Template' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
...
# Conflicts:
# system/filtersupdate.php
2024-02-15 14:16:33 +01:00
fd260a6307
changes the check if a user has permissions to accept or deny a profil update
2024-02-15 09:59:27 +01:00
caa7ad6cc4
Merge remote-tracking branch 'origin/feature-34543/UX_Template' into feature-34543/UX_Template
2024-02-15 09:54:51 +01:00
3322f5115a
FhcApi: Clean return value
2024-02-15 09:41:11 +01:00
f5b5f39689
FhcApi: return value
2024-02-14 16:00:48 +01:00
028be08ec3
fixes little bug with profil update checking
2024-02-14 14:38:21 +01:00
5758d7cf4f
overrides old zustelladressen/kontakte when changing or adding a new zustelladresse/kontakt
2024-02-14 14:18:31 +01:00
b655c4021a
instead of calculating how many zustelladressen or zustellkontakte a user has in the backend, it is calculated in the client side to prevent an extra api call
2024-02-14 11:42:20 +01:00
65a9b8c80f
little fix
2024-02-14 09:01:40 +01:00
bfba05753e
also shows the zustellungs warning when there is more than one kontakt marked as zustellung
2024-02-14 08:56:25 +01:00
5ee241d914
now editAdressen shows a warning message if a new adresse is marked as zustelladresse
2024-02-13 15:30:23 +01:00
8f81426fa4
Corrected error when using alertMultiple and handleSystemMessage
2024-02-13 14:54:42 +01:00
091d8509f0
Send E-Mails after Wiederholer deadline
2024-02-13 14:53:58 +01:00
6140e15139
Removed unused tabulatorAdditionalColumns property. Instead additional cols like 'action buttons' are now checked by index.
2024-02-13 14:53:01 +01:00
409221434a
removes the checkbox for heimatadresse because it should not be changed by the user
2024-02-13 14:25:07 +01:00
66b843be1b
hides the profil updates list if no profil update is present
2024-02-13 14:20:01 +01:00
1be8c27cb5
checks the permissions of a user when accepting or denying a profil update
2024-02-13 13:37:10 +01:00
acb29c5c69
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
...
# Conflicts:
# application/views/templates/FHC-Footer.php
# composer.json
# public/js/components/Bootstrap/Modal.js
# public/js/components/filter/Filter.js
# public/js/plugin/FhcAlert.js
2024-02-13 11:54:55 +01:00
92f2f5108c
refactor of Profil.php to reuse function functionalities
2024-02-13 11:39:57 +01:00
91f43665fd
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-02-13 10:54:14 +01:00
4d8dbb2e78
Created Core BaseLayout Component
2024-02-13 10:52:11 +01:00
565f89c884
Added phrases anrechnung, geloescht and aenderungGespeichert
2024-02-13 10:51:37 +01:00
7ec24bfc7b
Component Status: Tabelle
2024-02-13 10:45:00 +01:00
24b467cd90
show different options for address types if the user is a mitarbeiter or a student
2024-02-12 16:29:19 +01:00
9ac523c087
deletes column name from public.tbl_profil_update
2024-02-12 16:00:17 +01:00
4b898bd976
queries full name of user that created profil_update using join in Profil_update_model
2024-02-12 15:58:52 +01:00
f4197f090b
Component Gesamthistorie
2024-02-12 15:11:00 +01:00
78bffb1348
little bugfix
2024-02-12 14:08:26 +01:00
6aa0bbb037
fixed little bug with fileOutput
2024-02-12 12:27:15 +01:00
a09a350338
berechtigungen für die Ansicht von Profil Update Dokumente
2024-02-12 11:30:49 +01:00
e6774024b9
Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template
2024-02-12 11:25:07 +01:00
824423f3ea
Update Fkt getTypenStg()
2024-02-12 11:00:35 +01:00
a21a5ce044
edit field priority only with right basis/prestudent
2024-02-12 09:18:33 +01:00
b21d3448cb
fixes some data handling errors in controller functions
2024-02-12 09:07:51 +01:00
90012856dc
EditAdresse layout change
2024-02-09 15:21:53 +01:00
b4d6a46426
Fixed Typo in phrase
2024-02-09 15:18:14 +01:00
bbf6616cd9
corrects the display of links to attachments of a profil update request
2024-02-09 14:41:29 +01:00
43492add0b
changes how files are attached/replaced to a profil update
2024-02-09 13:55:08 +01:00
bffaea8dda
Merge branch 'feature-36028/uebersetzungen_zahlungen'
2024-02-09 12:50:45 +01:00
f5dacefbbe
Merge branch 'master' into feature-36028/uebersetzungen_zahlungen
2024-02-09 12:50:00 +01:00
752408aa3a
Fixed LineEndings
2024-02-09 12:49:14 +01:00
898f40e8a5
hidden fields ZGV depending on Config entries
2024-02-09 12:14:14 +01:00
e34ff8819c
Merge branch 'feature-33981/testtool_text_kopieren_verhindern_erschweren'
2024-02-09 11:11:41 +01:00
ce9ebee57d
CSS: fhc-header w/o bottom border
2024-02-09 11:10:03 +01:00
0a8a17e49f
Merge branch 'feature-36197/reihungstest_auswertung_bewerberstatus_setzen'
2024-02-09 10:48:51 +01:00
8c6c2b7e11
FilterCmpt: defaults & Bugfix
2024-02-09 09:32:02 +01:00
6e85b37b0f
Tabs: optional border
2024-02-09 09:31:26 +01:00
c3ec909448
CSS improvements
2024-02-09 09:30:59 +01:00
c5f69d0e44
Prestudent: Form und Save/Upload Logic
2024-02-09 08:36:33 +01:00
ba972c1d8a
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-02-08 16:36:52 +01:00
ddfe0843de
Defaultwert "aggregators "aus Statistik entfernt, weil Fehler wenn leer
2024-02-08 16:36:45 +01:00
cda13ac705
makes the send button in the profil update popup disabled instead of not showing it
2024-02-08 13:47:03 +01:00
89bc5a5d9d
Assistenten koennen nur Profil Aenderungen von Studenten ansehen deren Organisationseinheit in den Berechtigung des Assistenten vorhanden sind (und kleiner sessionStorage fix der einen String zu Boolean converted)
2024-02-08 11:48:14 +01:00
5279a7d45a
Merge branch 'feature-35768/Studstatus_Status_Abgebrochen_fuer_Wiederholerdeadline_verwenden'
2024-02-08 08:48:26 +01:00
7dfb0429ae
Merge branch 'master' into feature-35768/Studstatus_Status_Abgebrochen_fuer_Wiederholerdeadline_verwenden
2024-02-08 08:25:11 +01:00
f67a106357
Merge branch 'feature-35637/Studstatus-Wiederholungsdeadline_abbrecher_status_current_semester'
2024-02-08 08:15:19 +01:00
1d300a604f
Funktion zum Migrieren der Habiliation hinzugefügt
2024-02-08 08:03:34 +01:00
912f62dc01
Merge branch 'master' into feature-33003/BIS_Meldung_Personal
2024-02-08 08:03:00 +01:00
32ed034ad2
Merge branch 'master' into feature-35637/Studstatus-Wiederholungsdeadline_abbrecher_status_current_semester
2024-02-08 08:00:22 +01:00
9d6159c202
Start Prestudent Tab - Forms
2024-02-07 17:54:52 +01:00
36d4879b90
Hinweistext für Lehrauftragsannahme ergänzt
2024-02-07 16:35:21 +01:00
fa1871a059
adopting profil controllers/models/views to db table change
2024-02-07 16:34:00 +01:00
3739581a29
db tabellen anpassung
2024-02-07 16:25:39 +01:00
bc0f7f7087
Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template
2024-02-07 15:50:50 +01:00
9362aea0cf
when user does not have permissions to accept/deny a profil update request it is notified via alert modal
2024-02-07 14:21:25 +01:00
286c7be83d
only displays profil update requests the uid has permissions for (mitarbeiter/stammdaten or student/stammdaten), also fixes bug and adds JSON.parse to get the value in the sessionStorage
2024-02-07 13:25:50 +01:00
72197bf993
Merge branch 'master' into RechteAnpassen
2024-02-07 12:58:43 +01:00
e01d97849a
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-02-07 12:58:13 +01:00
d56dbdf563
Adaptierung Notizcomponent: teleport datepicker, tinymce mount conditionally, fehlerhandling missing id and type
2024-02-07 09:28:30 +01:00
2f79ae1ece
Form/Validation bugfix: dismiss cache problem (correct solution)
2024-02-07 09:19:19 +01:00
a2c5ebb291
Fhc.css: fhc-header
2024-02-07 09:13:21 +01:00
1f3e283d3c
Code cleanup
2024-02-07 09:12:47 +01:00
eb69f77113
Form/Validation bugfix: dismiss cache problem
2024-02-07 09:12:06 +01:00
6bc6c7c074
Form/Input: Injection defaults
2024-02-07 09:11:20 +01:00
1e260a178c
trying to restructure where editData is created
2024-02-06 16:24:43 +01:00
3b97d8d93f
Merge branch 'bug-36275/vertrag_oezuordnung'
2024-02-06 12:42:44 +01:00
1b70d70edd
- Pruefung hinzugefuegt ob eine Person Vorgesetzte oder indirekt
...
Vorgesetzte einer anderen Person ist
- Bei mehreren OEZuordnungen wird bevorzugt die nicht karenzierte
ermittelt
2024-02-06 12:40:11 +01:00
3d2c7e4026
sorts the data of the profil updates before displaying them in a table and tooltips have been added to the hr profil update requests table
2024-02-06 11:26:45 +01:00
1ddf5a8370
Notizcomponent: Tinymce optional
2024-02-06 08:08:17 +01:00
b5024b86ea
OEZuordnung wird priorisiert ermittelt bei Karenzen
2024-02-05 18:54:33 +01:00
238208f252
Zeitwünsche mit mitarbeiter/zeitwuensche einsehen
2024-02-05 16:39:53 +01:00
f47650f5e9
shows a menu when right clicking a profil update request in the hr view
2024-02-05 15:33:51 +01:00
c6d4c34cad
define AnwesenheitenByLektor in system/filtersupdate.php
2024-02-05 15:32:03 +01:00
ff88581ecd
stores the value of the selection to show all or only the pending Profil update requests in the sessionStorage
2024-02-05 14:26:38 +01:00
4faaa78ee1
also shows the zustelladresse checkbox when viewing an Adresse component in the hr View for Profil Updates
2024-02-05 13:16:51 +01:00
a2d0f9e39a
funciton that queries the ProfilUpdates now takes a associative array instead of multiple separate parameters
2024-02-05 11:17:07 +01:00
6e55382d15
adds zustelladresse as a field to EditKontakte component
2024-02-05 09:52:27 +01:00
23853e4a19
temp
2024-02-05 07:56:24 +01:00
1c2c12f0a5
Bismeldestichtag Model: added getByStudiensemester method
2024-02-02 18:41:18 +01:00
2fcbbcac84
refactor NotizComponent
2024-02-02 15:10:46 +01:00
c88da53c03
only allows to user to send profil updates when the input doesn't correspond the original values
2024-02-02 09:49:07 +01:00
dfbd67c52b
Form/Input: Multiple radios/checkboxes
2024-02-01 15:43:36 +01:00
e5182a20ac
adds a select to the profilUpdateRequests to change display between only pending and all requests
2024-02-01 15:27:24 +01:00
d813f55a9b
makes it possible to display documents when reviewing profil update requests
2024-02-01 14:08:55 +01:00
fe798506a6
raw_input_stream as array instead of stdobj & terminateWithSuccess
2024-02-01 08:59:35 +01:00
51e556a731
Remove textarea+ & Form.send()
...
Add $clearValidationForName()
2024-02-01 08:58:32 +01:00
a193a7a1c8
Naming Convention korrigiert fuer DBUpdate File
2024-02-01 08:50:06 +01:00
53fc8fc807
Berechtigungen für Entwicklungsteam ins Studiengangsverwaltungs Addon
...
verschoben
2024-02-01 08:38:55 +01:00
ef64aa7da2
- Fehler behoben wodurch Entwicklugnsteam nicht gespeichert werden konnte
...
wenn das Endedatum leer ist.
- Entwicklungsteam update aus alten DB-Update entfernt
2024-02-01 08:20:10 +01:00
ac9b36cc1a
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-01-31 16:02:41 +01:00
1b3c509ee8
Rechte in Rollen kopieren
2024-01-31 16:02:29 +01:00
1460e6ed80
modifing uploaded files int the fetchProfilUpdates component works correctly
2024-01-31 15:22:03 +01:00
0e69e432da
fixes a lot of bugs and adds the inseramum/insertvon/updateamum/updatevon fields to the cis_profil_update db table
2024-01-31 14:26:54 +01:00
fae185958b
Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung
2024-01-31 13:27:58 +01:00
02f0c54f10
Adapted Filter.js to ensure displaying tabulator 'formatter' columns not provided by filtersupdate filter definition
...
...like rowSelection checkboxes or custom formatted action buttons
2024-01-31 13:25:44 +01:00
559835becd
Merge branch 'feature-35653/personensuche_deaktivieren'
2024-01-31 12:50:30 +01:00
603ef170ba
Merge branch 'feature-34728/notenauswahl_im_fas_deaktivierte_noten_durchstreichen'
2024-01-31 12:33:02 +01:00
cd7478539d
Merge branch 'master' into feature-34728/notenauswahl_im_fas_deaktivierte_noten_durchstreichen
2024-01-31 12:29:23 +01:00
ef3c680e91
- auswertung_fhtw funktionen "Zu Bewerber machen" entfernt
2024-01-31 12:28:03 +01:00
2dbdf41086
FHC-Api: finetuning
2024-01-31 09:39:51 +01:00
6f081e4136
removes logs
2024-01-31 09:15:48 +01:00
df1fe01abe
makes watcher eager and aligns files vertically
2024-01-31 09:05:23 +01:00
7e14fff7f3
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-01-30 17:18:55 +01:00
6bd834c509
Added filter AnrechnungTable (for testing)
2024-01-30 17:05:03 +01:00
aa06a97eb3
Corrected alertMultiple to display all messages
...
Before it stucked with only the first message. Now all messages are displayed.
2024-01-30 17:04:02 +01:00
b868024175
Corrected wrong variable name in FhcAlert handleSystemMessage
2024-01-30 17:00:49 +01:00
bea14724b0
Phrasen für Anrechnungen korrigiert
2024-01-30 16:56:19 +01:00
3362eb8e31
changing the text_input component to accept documents for the name or the title of a PersonUpdateRequest
2024-01-30 15:59:56 +01:00
ef3ee76fa1
Form Validation
2024-01-30 11:39:17 +01:00
272c4d5ccc
FhcApi cleanup
2024-01-30 11:39:08 +01:00
30bd6ea6a4
FhcApi Plugin + Form updates
2024-01-30 10:42:48 +01:00
b010cbb35d
FhcAlert: CSS
2024-01-30 10:42:12 +01:00
ea9e58a640
Bugfix: Typo
2024-01-30 10:41:45 +01:00
a21a292da6
dokument upload
2024-01-29 16:48:41 +01:00
ed71077243
update lastupdate Contacttable
2024-01-29 16:09:07 +01:00
5e99ff9c8b
- uebersicht erweitert
...
- job angepasst
2024-01-29 14:29:39 +01:00
b99b09ca6a
Form Validation Notiz und Kontakt-Tab
2024-01-29 14:24:47 +01:00
76f2501fec
little layout fix
2024-01-29 11:14:51 +01:00
9ebb04a01b
StudentView also uses the layout components
2024-01-29 09:49:50 +01:00
783a2fb2b0
removes print in MitarbeiterView Controller and MitarbeiterView uses the components to render the information
2024-01-29 09:22:20 +01:00
b7fa6b2072
update Forms
2024-01-29 07:52:15 +01:00
bdf59f3230
layout fixes and adding profilUpdateRequests component to Student view
2024-01-26 17:51:08 +01:00
bece495ac8
fixes edge cases realted to creating new profil update requests
2024-01-26 16:37:39 +01:00
e824d48edf
update action and delete buttons in Kontakt-Tab
2024-01-26 14:40:57 +01:00
c49a36e9ca
insert Phrasen to Modals and Tables in Tab Kontakt
2024-01-26 14:02:34 +01:00
1d779feb4b
Merge branch 'feature-35202/internationalisierungsmassnahmen_wording_anpassen_fuer_akzeptieren'
2024-01-26 10:50:59 +01:00
15cd9155f1
updates kontakt_id / adresse_id in profilUpdateRequest after inserting new kontakt/adresse in db
2024-01-25 16:43:47 +01:00
1fec3543cd
FHCAPI Controller
2024-01-25 16:41:05 +01:00
cd37972cad
- ubersetzuengen hinzugefuegt
2024-01-25 12:54:57 +01:00
cf40f33fc6
prevent returning html entities in sanitizeProblemChars helper
2024-01-25 12:44:20 +01:00
72bcb919aa
prevent returning html entities in sanitizeProblemChars helper
2024-01-25 12:41:32 +01:00
4706b16a99
Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template
2024-01-25 10:40:09 +01:00
afc995b4bd
Form Input modelValue dummy
2024-01-25 10:29:19 +01:00
4653e070b1
Notiztab: Phrasen für Form und Tabulator Notiz, Update Actionbuttons
2024-01-25 10:27:43 +01:00
70303dbec6
CI Environment im CIS Config hinzugefügt
2024-01-25 10:19:40 +01:00
20672cd311
add/delete/update von Adressen funktioniert
2024-01-24 17:03:06 +01:00
a390eefd75
add/delete/update kontakt is possible
2024-01-24 16:06:22 +01:00
20d6a34506
little style changes and adds name field to the public.tbl_cis_profil_update table
2024-01-24 12:18:21 +01:00
b8c885c8a4
Remove html-Tags in tabulator text
2024-01-24 09:04:53 +01:00
89f5613373
Fehler behoben wodurch die Homeoffice Checkbox nicht angezeigt wurde
...
wenn die Person keinen Projekten zugeordnet ist
Fehler behoben wodurch die Homeoffice Checkbox am ersten Tag der
Homeofficegültigkeit nicht
korrekt angezeigt wurde
2024-01-24 07:02:28 +01:00
5f55834ccf
controller functionality to apply profil update requests to the user
2024-01-23 18:03:38 +01:00
7d4bc9c1d0
change => to >= in sql comparison
2024-01-23 14:21:04 +01:00
2f5d93daa2
change config-ul auf config
2024-01-23 13:38:47 +01:00
e513550cba
bugfix eingabe textarea Tinymce
2024-01-23 13:22:26 +01:00
13f2bb4e85
fixes little bug where status timestamp was converted from null to the current date, with create_date in php
2024-01-23 11:40:02 +01:00
df74bade9b
fixes bug when getting all the profil update requests and makes it possible to add a message when dening or accepting a profil update
2024-01-23 11:00:43 +01:00
693d59e8bc
Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template
2024-01-23 09:57:51 +01:00
e2a66d5143
Fragment Component
2024-01-23 09:43:41 +01:00
41e5c52d2f
Css updates
2024-01-23 09:42:33 +01:00
be82d9b6cb
Tabs Component update
2024-01-23 09:32:26 +01:00
d66a6567b0
Form Components
2024-01-23 09:29:47 +01:00
7abe04a69f
fixes little bug for View Profil and changes layout of the profil update fetch component
2024-01-22 16:02:52 +01:00
4bd430ae79
tiny mce, workaround for binding textfield variable
2024-01-22 14:51:40 +01:00
fb9b65b138
changes how to display the hr table with all the user update requests and the update request table in the profil view, also adds some new columns to the cis_profil_update table to store the status, status date and status message
2024-01-22 14:45:32 +01:00
e90f0c75fa
fix missing entries due to missing prestudentstatus for target semester
2024-01-22 13:47:35 +01:00
a3a28a428c
Merge branch 'feature-35636/Studstatus-Leitung_AntragId_sort_by_number'
2024-01-22 12:54:39 +01:00
3b85729b6f
Syntaxfehler und Styling korrigiert
2024-01-19 15:27:04 +01:00
72bde46ca6
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
...
Update Routine
2024-01-19 15:20:12 +01:00
33a93457ec
finished Handling of Fileuploads
2024-01-19 15:19:57 +01:00
0d5e8e89a6
splits the ProfilComponents.js file into multiple components in the ProfilComponents Folder and StudentProfil uses the components
2024-01-19 15:07:57 +01:00
1b27dbcb5f
Bugfix: WH Antrag Prüfungstest kleiner vs kleiner gleich
2024-01-19 13:17:41 +01:00
3e912f9545
bugfix prop
2024-01-19 09:04:37 +01:00
363ec9aa2f
Merge branch 'master' into benutzerberechtigungGUIneu
2024-01-18 20:33:42 +01:00
146b62d185
Filter in GET-Parameter
2024-01-18 20:33:03 +01:00
f298814619
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-01-18 20:31:31 +01:00
7861829ee4
input color
2024-01-18 15:54:23 +01:00
604bfeea20
Form input component: improvements
2024-01-18 15:41:24 +01:00
dc973217b7
Css improvements
2024-01-18 15:40:56 +01:00
bc71415dd5
Tabs: rename prop configUrl => config
2024-01-18 15:40:42 +01:00
84b23a148e
modulerizing the profil page in multiple reusable components
2024-01-18 15:32:52 +01:00
98c877e9ea
Tiny MCE: neue Notiz erstellen
2024-01-18 14:38:23 +01:00
304caf9157
added time recording query
2024-01-18 12:30:35 +01:00
5e7e2b63dd
disables the kontakt input field in the EditKontakt component if no Kontakttyp was selected
2024-01-18 11:31:28 +01:00
0512295b8b
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-01-18 09:46:39 +01:00
b9329aa417
temp
2024-01-18 09:46:31 +01:00
c5f6ce861b
when adding a new kontakt or address, it is possible to modify it afterwards
2024-01-18 09:20:01 +01:00
bd4bbe0b7a
Update response/error handling
2024-01-18 07:45:08 +01:00
0c0d529478
Tabs: vertical usage & reactive configUrl & configUrl accepts object
2024-01-17 16:03:24 +01:00
f17591327d
Quickfix missing "!"
2024-01-17 16:00:56 +01:00
8bda0f2f96
first template for the functionality to add a new kontakt/address
2024-01-17 15:34:53 +01:00
5c9e1b3fd3
Use new Form Components in Details
2024-01-17 15:28:39 +01:00
8762e87658
Noten: Switch all/current semester
2024-01-17 15:24:44 +01:00
abb9885b3b
Fhc.css
2024-01-17 15:23:00 +01:00
22f6e3fe3b
Upload Dms Component
2024-01-17 15:18:38 +01:00
49fda27e56
profilUpdates need to have unique adresse_id or kontakt_id
2024-01-17 13:53:32 +01:00
364c3f0518
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
...
update routine
2024-01-17 13:24:11 +01:00
dc5368f346
Letzte Änderung
2024-01-17 13:23:52 +01:00
a5c77543b1
adds functionality to delete a Kontakt or an Adress
2024-01-17 12:07:06 +01:00
af010a51e9
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-01-17 11:33:54 +01:00
125a0174b9
Berechtigung für Web User zu Freitextbestandteilen hinzgefügt damit die Zeitaufzeichnung auf
...
AllIn prüfen kann
2024-01-17 07:41:17 +01:00
c7e86950f4
FreierDV auf Darunterliegenden externerLehrender geändert da freierdv
...
nicht zu einem Dienstverhaeltnis zugeordnet werden soll
2024-01-17 07:36:28 +01:00
69e6c4ca29
Fehler beim Laden von Reports mit mehreren Variablen behoben
2024-01-16 17:01:09 +01:00
b53dec6a31
adds breadcrumb to modal and adjusts controller functions and api calls
2024-01-16 15:44:04 +01:00
28fe3ef839
Funktionserweiterungen um idType
2024-01-16 14:34:13 +01:00
6c95e31bae
remove files moved to FHC-Core-Personalverwaltung Extension
2024-01-16 11:52:13 +01:00
9552077209
Merge branch 'deploy-PV21'
2024-01-16 11:36:57 +01:00
514ac2050f
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21
2024-01-15 18:18:35 +01:00
34a083d0ee
update Logik beim Beenden von DVs verwenden
2024-01-15 18:16:54 +01:00
73792d1e78
the user is now able to delete an existing change request that he made
2024-01-15 15:40:55 +01:00
09c02b0906
refactoring controllers, codesniffer
2024-01-15 15:29:04 +01:00
e881abe904
allows user to make profil changes requests and to oversee his requested changes
2024-01-15 15:15:16 +01:00
70d7496ed9
bei Löschen von Notiz Entfernen aller DMS- und Einträge in Notizdokument
2024-01-15 14:54:24 +01:00
20edb299a7
Form validation
2024-01-15 14:05:34 +01:00
61616fbaef
Update AppendForm mit JSON.stringify, Update Form, authUid
2024-01-15 13:56:17 +01:00
a2905c3e93
- scheduler angepasst
...
- config erweitert um mahnsperre und zahlungsbedingungen
- fas config hinzugefuegt
2024-01-15 12:25:34 +01:00
a9bae3f17d
- zgv class erweitert um nur aktive zu holen
2024-01-15 11:58:10 +01:00
bed5a62d82
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21
2024-01-15 11:23:11 +01:00
7b9bfd70c8
make name of enc key more specific
2024-01-15 10:39:54 +01:00
3b952b3838
Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-15 10:36:34 +01:00
579c1c6aff
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2024-01-15 10:28:10 +01:00
8d8c25bd6e
Autocomplete Feld Mitarbeiter für Bearbeiterlogik
2024-01-15 09:39:46 +01:00
45c5b4fd37
Merge branch 'deploy-PV21' of github.com:FH-Complete/FHC-Core into deploy-PV21
2024-01-12 16:17:06 +01:00
57af22a623
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21
2024-01-12 16:16:56 +01:00
d95e972e6c
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of github.com:FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-12 16:15:15 +01:00
8824ffd182
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-12 16:14:40 +01:00
81244a06ca
antrag_prestudentstatus_whitelist_abmeldung damit Unterbrecher sich auch abmelden koennen
2024-01-12 16:13:19 +01:00
8d5cb39a3d
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21
2024-01-12 14:57:01 +01:00
a49394f456
fix sql
2024-01-12 14:47:40 +01:00
5a2ddbe2b2
use new hr tables depending on config DIENSTVERHAELTNIS_SUPPORT
2024-01-12 14:44:26 +01:00
4526c10d30
temp
2024-01-11 12:56:36 +01:00
ef6634a38e
bugfix FileUpload Component
2024-01-11 09:56:59 +01:00
fc89224dc8
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21
2024-01-11 09:46:30 +01:00
0f06c8a386
s&d
2024-01-11 08:34:10 +01:00
13b5b017b8
Expose Antrag Id
2024-01-11 08:34:00 +01:00
981f6970bc
Status severity for "Abgemeldet"
2024-01-11 08:33:43 +01:00
db6e1add8a
refactoring Fkt addNewNotiz
2024-01-11 07:37:46 +01:00
f40862c019
Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-10 17:16:32 +01:00
d3a3ebacfc
first templates for the components Select and Breadcrumbs
2024-01-10 15:02:11 +01:00
7f4ae3a378
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21
2024-01-10 15:01:48 +01:00
d5f6ee2265
improve search to handle multiword search
2024-01-10 15:00:16 +01:00
751c1fd31e
Profile Image: Slash removed from path
2024-01-10 14:51:28 +01:00
73ba14cdec
Removed unused function check_isVorgesetzter
...
This was replaced by using getVorgesetzer / getVorgesetzterByDate method.
2024-01-10 14:44:33 +01:00
e3f10069ef
Adapted getUntergebene to allow to include also Mitarbeiter, who ended Dienstverhältnis/changed OE last month
...
These allows Vorgesetzte to still access their data, for example to be able to accept their November-Monatsliste (last working month)
in December (month to accept the November-Monatsliste)
2024-01-10 14:42:13 +01:00
37493d1af7
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21
2024-01-10 14:40:18 +01:00
97a020460d
Adapted: getVorgesetzteByDate to retrieve only the latest Vorgesetzte by a specific date
...
Added order by and limit to get only one and the most actual Vorgesetzte by given date.
Changed name. Before it was getVorgesetzteMonatTimesheet, but it is also used independently from timesheet.
2024-01-10 14:31:26 +01:00
5452dc6fe3
Adapted: getVorgesetzte retrieve only the latest Vorgesetzte
...
Added order by and limit to get only one and the most actual Vorgesetzte
2024-01-10 14:29:16 +01:00
36f97bafd6
Merge branch 'feature-30659/SearchBar_Controller_sollte_Berechtigungen_berücksichtigen_können' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-10 14:19:37 +01:00
dff97f7c53
Merge branch 'feature-34874/pv21_fas_stundensaetze' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-10 14:18:25 +01:00
49d24d74b0
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-10 13:54:06 +01:00
75ce2a0aa8
Shows Select option names without _
2024-01-10 09:11:24 +01:00
7ef88fcc02
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
...
pull and push routine
2024-01-09 16:39:51 +01:00
284351a024
bugfix format date vuedatepicker
2024-01-09 16:39:38 +01:00
b1d8a2f5a4
adds topic field to the cis_profil_update table and changes the layout of the editProfil Modul
2024-01-09 15:51:50 +01:00
e907c0b596
Studstatus: use current semester in WiederholerDeadline Job
2024-01-09 15:05:05 +01:00
2faf310105
Studstatus: Leitungsansicht Sortierung AntragId
2024-01-09 13:40:48 +01:00
a3f9e19bd6
Noten manuell ändern
2024-01-09 13:22:37 +01:00
d99e260b47
Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-01-09 12:57:28 +01:00
83335d6d30
neue Component File, filehandling mit datatransfer
2024-01-09 12:55:35 +01:00
125bf40fd1
- personensuche im cis ueber die globale suche mithilfe einer config deaktivierbar
...
- vereinfachte logik fuer die profi link anzeige ueber die globale suche
2024-01-09 12:00:11 +01:00
64279bace2
change function type from volatile to stable for public.get_rolle_prestudent
2024-01-09 09:40:56 +01:00
fde1623dc0
Merge branch 'feature-35545/Studstatus_Status_Abgemeldet'
2024-01-08 18:23:10 +01:00
3687f63189
Merge branch 'feature-35411/Studstatus_Query_Performance'
2024-01-08 17:42:20 +01:00
5b597dbc31
changing the editProfil Modal from an Accordion to a select
2024-01-08 15:19:18 +01:00
d522389f76
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-08 11:47:17 +01:00
ff6f23b3f4
Notiz löschen mit Dokumenten, Start Umbau Funktionen von person_id auf typ
2024-01-05 15:13:10 +01:00
e479a7aa49
stores the old and the new value in the profil update request, to track which information has to be updated in the database
2024-01-05 10:40:47 +01:00
ee8051915e
formats the update timestamps in php, differently tracks which properties and informations where changed by the user
2024-01-04 16:06:47 +01:00
c7e008b615
Noten anzeigen
2024-01-04 15:00:13 +01:00
ef91489b29
Bugfixes
2024-01-03 15:49:10 +01:00
b070607f91
reload details on tab change
2024-01-03 15:39:31 +01:00
b4505536f6
track tab changes with event
2024-01-03 15:38:39 +01:00
9a81111ebc
Propagate reload into details tabs
2024-01-03 15:14:44 +01:00
b5bbf89b7d
Make current tab accessible from outside
2024-01-03 15:14:11 +01:00
49c2911557
Bugfix
2024-01-03 15:13:53 +01:00
d412c1d00e
first template for the hr view to accept or deny profil update requests
2024-01-03 14:38:40 +01:00
b07d9a9a63
single fileupload
2024-01-03 09:50:06 +01:00
ddab42123b
refactores the modal out of the view into its own modal component
2024-01-02 12:50:04 +01:00
5b62271711
s&d
2024-01-02 09:36:28 +01:00
9460d2b2cd
removed reactivity warning 'Vue received a Component that was made a reactive object'
2023-12-29 17:09:38 +01:00
bb0656c480
http response returns the timestamp of the change
2023-12-29 12:01:25 +01:00
a27b80c394
show the date of the last edit profil information request if there is any
2023-12-29 10:17:33 +01:00
59b848c576
fetches profil update request if an entry with uid in table public.tbl_cis_profil_update exists
2023-12-28 11:51:58 +01:00
414541b6cf
checks if table entry for uid exists and performs update or insert on result
2023-12-28 10:43:21 +01:00
981e782c57
checks whether the editProfilData was changed by the user and is not in the original state
2023-12-28 10:15:24 +01:00
87f640d66a
little layout fix for MitarbeiterViewProfil.js
2023-12-27 11:20:54 +01:00
d8cd52f7a0
accordion styling
2023-12-27 11:16:18 +01:00
43813b3ef0
getActiveStgs
2023-12-27 10:51:57 +01:00
f3e23b888d
fixing the accordion with editData
2023-12-27 10:42:33 +01:00
aa5868826f
getAntraege
2023-12-27 10:26:42 +01:00
620528fa50
moves the collapseFunction to the parent component Profil and also manages the collapse state from the parent
2023-12-27 09:27:18 +01:00
2c16e293a0
Merge branch 'master' into feature-33003/BIS_Meldung_Personal
2023-12-24 00:00:27 +01:00
3e7d917184
deleted anrechnung von outgoing lvs file in dbupdate folder
2023-12-22 19:07:15 +01:00
f03d218872
s&d
2023-12-22 14:49:40 +01:00
733275a162
first profil info edit template
2023-12-22 14:18:49 +01:00
c2fb582db0
temp
2023-12-22 12:04:03 +01:00
cbd7566e3c
CSS improvements
2023-12-22 11:34:51 +01:00
7dbf29d655
Filter Cmpt: filterType not required (if tableOnly is true)
2023-12-22 11:33:55 +01:00
151012fedf
AntragJob: nur Personen die eine Aufforderung oder einen Reminder zur Wiederholung erhalten haben und die Frist abgelaufen ist zum Abbrecher machen
2023-12-22 11:08:56 +01:00
4503e0db71
Filter Cmpt: handle rowselection via setup option
2023-12-22 11:05:41 +01:00
787d479a33
Filter Cmpt: correct type for Column names
2023-12-22 11:04:42 +01:00
a2f944ff92
VueJs Warning: FhcAlert number/string
2023-12-22 11:01:43 +01:00
2db669ca2e
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-12-22 10:47:55 +01:00
e7703f3c9b
neues Attribut abschlussbeurteilung_deutsch
2023-12-22 07:55:29 +01:00
1530726b0a
Merge branch 'feature-20037/reihungstestjob_neue_studienplaene_werden_nicht_korrekt_zugeordnet'
2023-12-21 15:44:58 +01:00
250434b806
Merge remote-tracking branch 'origin/master' into feature-20037/reihungstestjob_neue_studienplaene_werden_nicht_korrekt_zugeordnet
2023-12-21 15:41:28 +01:00
4b5e784081
Tabs: handle null and array values
2023-12-21 15:10:30 +01:00
f479e7ff62
Better List Click handling
2023-12-21 15:09:50 +01:00
dcc0093987
sachaufwand_id_seq rechte fuer vilesci user
2023-12-21 14:49:50 +01:00
52b1598ab4
zusaetzlicher Teilzeittyp Wiedereingliederungsteilzeit
2023-12-21 14:44:07 +01:00
c7ee0ce82b
Tabs.js: MarkRaw Warning
2023-12-21 14:02:01 +01:00
d38ed229bf
Korrekturen Bugs
2023-12-21 14:01:25 +01:00
2e742a7913
Merge branch 'feature-29144/Prestudent_status_nach_Bismeldung_sperren_2'
2023-12-21 13:29:02 +01:00
d6ef9c4ec4
adds custom floating label css construct to the rest of the profil views
2023-12-21 11:46:42 +01:00
fed4f7f929
replaced form-control with custom css construct
2023-12-21 08:53:56 +01:00
5bfa8ca53c
Merge branch 'feature-35066/Studstatus_divers'
2023-12-20 19:57:33 +01:00
ef117fbe12
- neue vorlage beim akzeptieren
...
- neuer filter
- button "alle geplanten markieren"
2023-12-20 16:02:44 +01:00
60ad46b2fb
and another dependency of Tabs
2023-12-20 15:24:56 +01:00
2a9181d28d
add another dependency of Tabs
2023-12-20 15:20:06 +01:00
1aa6d07559
add dependency for Tabs
2023-12-20 15:09:49 +01:00
d9cd3a0b1d
add files for manipulating tabs from feature-30660
2023-12-20 14:30:11 +01:00
29d7a97ee8
Wording korrigiert
2023-12-20 14:26:30 +01:00
20f9f52eef
Doppelten Composer Eintrag entfernt
2023-12-20 14:11:49 +01:00
72217d9793
Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren_2
2023-12-20 14:06:18 +01:00
c400e112fd
Merge branch 'feature-35007/Text_zu_UHSTAT_Formular_hinzufuegen'
2023-12-20 13:43:23 +01:00
3f88bba9bb
Negative Prüfungen sortiert und bei bestehenden Anträgen nach Antragsdatum und Stdsem gefiltert
2023-12-20 12:06:45 +01:00
5d4ec93b09
Change Font-Size in Tabulator 5, Start Dateiupload
2023-12-20 11:39:28 +01:00
ca55b63e01
Load Language before Anträge
2023-12-20 09:30:44 +01:00
ba7f60b16e
Filter Beschriftung
2023-12-20 09:18:44 +01:00
6c0fa3fed3
Leitungsansicht: Aktiv Default & korrekter Filter beim Neuladen der Seite
2023-12-20 09:14:58 +01:00
a02e79a33a
fix sancho mail template kurzbz too long
2023-12-19 18:14:08 +01:00
6f8bd9527c
changes the styling when hovering over form-control fields in the profil view, so that it does not also change the behavior of other elements that use form-control on the web page
2023-12-19 16:00:43 +01:00
9c69d8cc46
trims the student information so that the value is falsy in javascript
2023-12-19 15:49:57 +01:00
8666dbe3a6
wrong uid was used to get the emails of the student profil view
2023-12-19 15:36:11 +01:00
c08171536c
changes the tel and mailto links of all profil views
2023-12-19 15:34:28 +01:00
030be5b83f
queryies the telefon number of the mitarbeiter with standort and adds tel links to all phone numbers
2023-12-19 11:02:44 +01:00
a3e70afdc1
adds font-size 1rem to the .tabulator class of the FilterComponent
2023-12-19 11:01:51 +01:00
8b9c023781
Personen zusammenlegen: Rueckstellungen are checked
2023-12-18 17:51:05 +01:00
e60157dd9b
Personen zusammenlegen: uhstat1daten are checked
2023-12-18 17:16:20 +01:00
f6e7d2858a
Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI
2023-12-18 17:01:25 +01:00
8b06ef030a
adds icons and some layout changes
2023-12-18 15:27:45 +01:00
f4194c251a
loadActiveForStudiengaenge eigene Funktion
2023-12-18 14:27:32 +01:00
d8dc19ef2f
Merge branch 'master' into feature-35066/Studstatus_divers
2023-12-18 14:19:50 +01:00
7868c2e073
Merge branch 'feature-35019/visual_library_abgabetool_nutzungsbedingungen_fuer_epub'
2023-12-18 13:32:41 +01:00
f0a3b8db95
Merge remote-tracking branch 'origin/feature-25999/C4' into feature-25999/C4_ma0594dev
...
merges menu width
2023-12-18 12:26:01 +01:00
eb05922043
menu width
2023-12-18 12:25:16 +01:00
5fbe374ea3
removes the p-4 for all screensizes from the cis-main and adds different padding for mobile view Cis-main in Cis.css
2023-12-18 12:21:17 +01:00
64326136d5
Merge remote-tracking branch 'origin/feature-25999/C4' into feature-25999/C4_ma0594dev
2023-12-18 12:14:07 +01:00
fa3d9e1e05
layout changes
2023-12-18 12:13:03 +01:00
9c2f062d34
Css update
2023-12-18 09:56:59 +01:00
2e1f38cc91
Merge remote-tracking branch 'origin/feature-25999/C4' into feature-25999/C4
2023-12-18 09:54:15 +01:00
ae0c311be3
Css korrektur
2023-12-18 09:53:52 +01:00
55fbf40374
- abgabetool text anpassungen
...
- nutzungsbedingungen
- delay config hinzugefuegt
- required inputs hinzugefuegt
2023-12-18 09:20:01 +01:00
b6adf1ad53
Merge branch 'master' into feature-30679/Plausichecks_Behebung_parameter_zur_Identifizierung_eines_Issues_einbeziehen
2023-12-17 19:12:05 +01:00
1d75a26230
responsive layout
2023-12-15 14:40:56 +01:00
7c29a726f2
Aktionen Start New, Update, Delete
2023-12-14 16:33:49 +01:00
798469dfcc
Start Component Notiz und Tab Notizen
2023-12-14 16:01:18 +01:00
e698564202
StudStatus: Toggle "nur aktive anzeigen"
2023-12-14 11:28:19 +01:00
98006b3d2b
puts hidden quick links in card
2023-12-14 09:19:07 +01:00
00a1c66d86
Corrected: Tagesgenaue Prüfung auf AZG-relevant
2023-12-13 16:14:08 +01:00
adc66695e4
Merge branch 'feature-34727/Studstatus_Studienplaene_w_multiple_languages'
2023-12-13 16:05:04 +01:00
91781d3a38
adds cards to the main information of the mitarbeiter profil view
2023-12-13 15:56:24 +01:00
d87670edb8
adds Mailverteiler in card
2023-12-13 15:49:51 +01:00
9e59caf7bc
Merge branch 'master' into feature-34727/Studstatus_Studienplaene_w_multiple_languages
2023-12-13 15:10:21 +01:00
5671bb340b
resposive profil information column change and remove default table sideMenu prop
2023-12-13 14:47:40 +01:00
bff4fa5544
Merge branch 'master' into feature-25999/C4_ma0594dev
2023-12-13 14:34:37 +01:00
bf20854878
Corrected: Tagesgenaue Prüfung auf Homeoffice
2023-12-13 14:09:20 +01:00
b6dbe1513e
adds the collapsing funktions to all the different profil view that use a table with more than one column
2023-12-13 13:59:23 +01:00
8fe19d40bc
little fix for the collapsing columns function
2023-12-13 13:26:44 +01:00
ba17974371
adds the collapsing function to the column itself
2023-12-13 12:58:34 +01:00
b400ea758c
fixing the hide/show all collapsed table columns function by calling the click event instead of changing the classes and styles manually
2023-12-13 12:54:44 +01:00
058863ba8d
fix for show/hide all collapsed columns icon function, weird bug where collapsed columns icons don't work on first click
2023-12-13 11:22:47 +01:00
4715ce3b95
icon to show or hide all collapsed columns
2023-12-13 10:58:05 +01:00
a72b8a153e
layout changes
2023-12-12 15:34:28 +01:00
633cd6be0f
adds wrap word to every view and deltes the old profil view
2023-12-12 14:48:26 +01:00
a75234165b
Merge branch 'hotfix_Anrechnungsantraege-in-zukuenftigen-Studiensemester-ermoeglichen'
2023-12-12 14:45:18 +01:00
5b03abb50c
restyling for the hidden dropdown quick links
2023-12-12 14:42:15 +01:00
036365e148
shows all columns, removes the hidding of a column
2023-12-12 14:00:01 +01:00
4b45914d4f
adds the collapse formater function as a global Vue function that can be used by alle the different view components
2023-12-12 13:50:38 +01:00
18f88b7697
Merge branch 'infocenter_2023_12_04'
2023-12-12 13:27:05 +01:00
5c3f5b26d3
Composer Lock aktualisiert und neuen Config Eintrag für Zahlungstypen
...
hinzugefügt
2023-12-12 13:25:10 +01:00
b2c8bcb2bf
adds a little shadow to the collapsed columns in the tables
2023-12-12 13:21:15 +01:00
350911d474
adds responsive layout collapse to both tables
2023-12-12 12:15:27 +01:00
3a191f4a11
adds responsive layout to the tables by collapsing the columns of a table
2023-12-12 12:09:03 +01:00
14c24005fe
Wiederholung wenn Studierende das letze Semester wiederholen
2023-12-12 11:02:12 +01:00
38301572ae
Mailverteiler nehmen ganze Spalte ein bei Viewport lg
2023-12-12 09:41:53 +01:00
aefe73b642
overflow-wrap: break-word style for better text wrapping
2023-12-12 09:28:49 +01:00
efc8e7c5fe
css fix to wrap words when space gets little
2023-12-12 09:04:07 +01:00
52cc0db5da
phrases for off time view
2023-12-11 21:28:52 +01:00
37f89010a4
adds Mitarbeiter und Studenten Profil Titel
2023-12-11 15:18:44 +01:00
84706c957e
changes dynamically the col width if a kontakt anmerkung is vorhanden or not
2023-12-11 14:35:17 +01:00
9beb426531
adding word wrap to bootstrap columns
2023-12-11 13:47:56 +01:00
289358ac6e
- inaktive noten durchgestrichen im fas
2023-12-11 13:46:18 +01:00
832a3de8c5
centers the text of the link under the image
2023-12-11 13:38:44 +01:00
8f46613620
- kopieren von fragen erschweren
2023-12-11 13:30:39 +01:00
1797abdc5f
Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-11 13:22:58 +01:00
bb9eb31e6e
Adapted getWochenstunden in Vertragsbestandteil Class to handle Karenz
...
Karenzierte Dienstverhältnisse werden nicht zurückgegeben.
Dafür aber ein eventuelles 2.DV mit geringfügiger Beschäftigung neben der Karenz.
2023-12-11 13:11:33 +01:00
a361036aa9
Added method isKarenziert to Vertragsbestandteil Class
...
Prüft, ob MitarbeiterIn zum Abfragedatum karenziert ist.
Wenn kein Datum übergeben wird, wird das heutige Datum gesetzt.
2023-12-11 13:09:56 +01:00
26ab9ff221
Updated 3 Vertragsbestandteil-Methods: Set 'Order By' to retrieve very last active Vertragsbestandteil
2023-12-11 13:08:57 +01:00
d378cd3002
center profil image in the middle
2023-12-11 13:05:25 +01:00
f45d692e66
used new layout for the different views
2023-12-11 12:55:54 +01:00
e8a89cf277
add comments to the layout to logically seperate the different columns and rows
2023-12-11 09:47:39 +01:00
8f152cdf50
fixed layout bug, table now shows under profil information without disturbing the right panel
2023-12-11 08:51:51 +01:00
28128ee35e
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-11 08:02:21 +01:00
3f84fa7f2d
use smaller base font-size
2023-12-07 17:17:48 +01:00
9fa7e6e56c
modify label of Studiengaenge in Dropdown and Table
2023-12-07 17:12:38 +01:00
b6585dc186
add margin-right to prevent scrollbar from overlaying table
2023-12-07 16:05:52 +01:00
0b97a92ae9
use smaller base font-size
2023-12-07 16:03:14 +01:00
a48cbaabb9
layout template
2023-12-07 15:59:01 +01:00
85a743b43a
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-07 08:03:34 +01:00
a246513597
Spalte Organisationseinheit
2023-12-06 18:18:34 +01:00
a2e6927740
Merge branch 'master' into benutzerberechtigungGUIneu
2023-12-06 18:11:07 +01:00
13092be05c
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-12-06 18:07:26 +01:00
c87ae7e74d
Suche Person in OE; OE in Rechteliste OE-Suche
2023-12-06 18:06:46 +01:00
d35223c1a3
Merge branch 'master' into benutzerberechtigungGUIneu
2023-12-06 18:04:25 +01:00
6fa680d19f
Fix: use modelValue instead of student in Kontakt.js
2023-12-06 16:33:18 +01:00
8a29146fc2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-12-06 14:42:45 +01:00
b15adf7b23
Revert "task-35010: Abmeldung d. StG Pre-Abbrecher Statusgrund nach zurückgezogen wieder rückgängig machen"
...
This reverts commit 3e9dcf2911
2023-12-06 14:32:29 +01:00
b6b21d54fc
Pre-Abbrecher Statusgrund nach zurückgezogen wieder rückgängig machen
2023-12-06 14:26:59 +01:00
02e7ef12de
Profil information layout
2023-12-06 13:47:35 +01:00
bd4a0af690
Removed 'Lehre Saldo anzeigen'
2023-12-06 13:31:06 +01:00
f18aa42966
Added function getWochenstunden to Vertragsbestandteil Class
2023-12-06 13:24:52 +01:00
617c126aa8
store getAuthUID and getAuthPersonID inside Profil controller to avoid extra calls
2023-12-06 09:52:46 +01:00
3e9dcf2911
task-35010: Abmeldung d. StG Pre-Abbrecher Statusgrund nach zurückgezogen wieder rückgängig machen
2023-12-06 09:46:34 +01:00
32459ccff8
Statistik Load TimeLimit auf 600 gesetzt
...
Default Parameter bei Statistik aktualisiert
2023-12-05 14:38:07 +01:00
28b7a41b80
cleaning up the code not needed in the Profil controler
2023-12-05 13:55:51 +01:00
0d3c55b019
dynamic component inside the profil app now controlls the view and the data
2023-12-05 13:52:31 +01:00
087bf229af
restructuring controller
2023-12-05 10:39:39 +01:00
98de634393
s&d
2023-12-05 09:27:20 +01:00
83e3898b31
Merge branch 'feature-28269/Zeiterfassung-an-neue-Vertragsstruktur-anpassen' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-04 17:35:01 +01:00
7d701835cc
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-12-04 17:34:19 +01:00
4552050c8a
Changed: Allin Saldoanzeige an neue Vertragsstruktur angepasst
2023-12-04 17:30:10 +01:00
b6b8f0d182
Removed unused require_once files
2023-12-04 17:25:43 +01:00
f3be186c5a
Merge branch 'feature-27398/Offene_Rechnungen_im_Bewerbungstool_anzeigen' into infocenter_2023_12_04
2023-12-04 12:46:16 +01:00
ab5d0693eb
Merge branch 'feature-16354/TinyMCE_move_to_new_version' into infocenter_2023_12_04
...
# Conflicts:
# composer.lock
2023-12-04 12:44:10 +01:00
a4417bdd98
Merge remote-tracking branch 'origin/feature-32978/bewerberstatus_cronjob_aktivieren' into infocenter_2023_12_04
2023-12-04 12:33:25 +01:00
a8efe3c109
Merge remote-tracking branch 'origin/feature-33037/bewerbungstool_textanpassung' into infocenter_2023_12_04
2023-12-04 12:32:55 +01:00
4ceca78ebc
Merge remote-tracking branch 'origin/feature-33185/statusfilter_im_fas_fuer_neuen_bewerber_prozess' into infocenter_2023_12_04
2023-12-04 12:32:34 +01:00
af1db47e1d
Merge remote-tracking branch 'origin/feature-33250/messages_von_reihungstestverwaltungsseite_aus_schicken' into infocenter_2023_12_04
2023-12-04 12:29:43 +01:00
fa80c49eba
Merge remote-tracking branch 'origin/feature-33714/erhoehter_studienbeitrag_fuer_drittsaatenangehoerig' into infocenter_2023_12_04
2023-12-04 12:29:17 +01:00
44cc6a3a83
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-12-04 10:42:00 +01:00
9c2ece2bda
References like in CI4
2023-12-04 10:37:10 +01:00
71fda916a3
added Menu link and Profile pop up link
2023-12-04 09:25:08 +01:00
75547ea5e3
adding link to search to view profile
2023-12-01 13:35:29 +01:00
4fb8bdd5d9
PV Autocomplete
2023-12-01 12:47:53 +01:00
4ba828d0e8
Add Student Images
2023-12-01 12:44:10 +01:00
da9002356c
Tabs Component
2023-12-01 12:43:39 +01:00
a105143771
Überarbeitung Tab Kontakt
2023-12-01 12:18:42 +01:00
48f4afae73
adds Ort_kurzbz for the View_Mitarbeiter
2023-12-01 11:41:17 +01:00
38f76f68f1
conditional rendering for different Profile Views
2023-12-01 11:07:25 +01:00
483b6171c7
add space between firstname and surname
2023-12-01 09:39:46 +01:00
0e04138480
Merge branch 'feature-34998/Studierendenstatus_Mail_nicht_an_private_Adresse_schicken'
2023-11-30 15:04:10 +01:00
776908792a
Datepicker css
2023-11-29 16:38:20 +01:00
4e73b40a84
Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-11-29 15:40:24 +01:00
c0252e5ad9
Modal from Master
2023-11-29 15:38:16 +01:00
9ac31f3925
line ending
2023-11-29 15:32:13 +01:00
6f3335cc3d
vue-datepicker
2023-11-29 15:25:39 +01:00
a8b4e2b399
dont use "useForm" anymore
2023-11-29 15:18:15 +01:00
dd2867a23d
composer
2023-11-29 15:14:34 +01:00
a3963248dd
s&d
2023-11-29 14:37:35 +01:00
5d7370e4af
Form Validation reverse Arguments
2023-11-29 13:31:01 +01:00
ea14fa1a4b
- infocenter kaution spalte angepasst
...
- infocenter abgewiesen nachricht spalte angepasst
2023-11-29 13:05:49 +01:00
d0779eadf9
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-11-29 12:15:43 +01:00
a0635840b7
New Validation
2023-11-29 12:14:45 +01:00
74f9ac7600
Cleanup & CSS
2023-11-29 12:14:29 +01:00
8b55a7843d
altersteilzeit geblockt mit 0 Stunden zulassen
2023-11-29 07:33:38 +01:00
734ab45264
UHSTAT form: added SVNR text
2023-11-29 01:06:42 +01:00
1310dea4a5
Changed Tabulators new-Button to btn-primary color
2023-11-28 18:55:14 +01:00
be0e2a6dca
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-11-28 18:49:37 +01:00
7a3bb2a374
Section Kontakt und Bankverbindungen überarbeitet
2023-11-28 16:55:20 +01:00
f26801b7de
adds a prop to the FilterTable component to conditionally render the filter columns, this was added because there is no need for a filter column when the table only has 1 column
2023-11-28 14:58:16 +01:00
c68856b740
completes the index view for both student and mitarbeiter
2023-11-28 14:56:42 +01:00
e3ec0fc36c
upadtes api calls
2023-11-28 14:55:42 +01:00
ff302e6173
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-28 13:08:14 +01:00
0f2f21aa19
Merge branch 'feature-34537/Phrasenmixin_als_Plugin'
2023-11-28 12:56:31 +01:00
bbd41f17cc
use textarea instead of pre
2023-11-28 12:53:44 +01:00
a5d21b3b8d
extend DV overlap check
2023-11-28 12:43:25 +01:00
a613abea39
fix kurzbz check
2023-11-28 12:18:13 +01:00
c123ad0578
Merge branch 'master' into feature-34537/Phrasenmixin_als_Plugin
2023-11-28 09:28:02 +01:00
6b2d728143
- textänderung
2023-11-28 08:57:30 +01:00
a6f18ae424
Bugfix: parameter missing
2023-11-27 12:21:25 +01:00
2df956ef20
layout for index Mitarbeiter
2023-11-27 12:04:57 +01:00
1817757745
adds the @ to the emails and changes the layout of the information displayed on the profile page
2023-11-27 12:01:04 +01:00
71495877f3
Merge branch 'feature-29767/anpassung_abgabetool_fuer_vl'
2023-11-27 10:09:45 +01:00
b80df4f0eb
refactor benutzerfunktion handling
2023-11-27 07:37:19 +01:00
28e533fb3c
replace pre with textarea to fix reason being overlapped by scroll bar
2023-11-23 17:53:43 +01:00
a1aff9bd0c
Merge branch 'feature-34883/Studstatus_insertvon__bestaetigtvon_bei_Abbrechern'
2023-11-23 16:29:40 +01:00
66cbe5199a
correct phrasestext
2023-11-23 16:17:05 +01:00
b0d6212c5e
Merge branch 'feature-34922/NeuerAbmeldungsgrundPhrase'
2023-11-23 16:06:54 +01:00
c93a4d2fb5
Studstatus: Wiederholer Reminder 1 wird vermutlich mit einem Tag delay versandt
2023-11-23 15:51:35 +01:00
27e2286096
getNations
2023-11-23 15:50:02 +01:00
9f336b4590
Formatierungen modals, Tabulator
2023-11-23 15:38:55 +01:00
4932f21204
s&d
2023-11-23 15:37:01 +01:00
dee3b35a5d
solved table bug
2023-11-23 14:48:05 +01:00
1d9899d830
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-11-23 10:24:08 +01:00
d105ea7a56
Interessenten anlegen (Debug Version)
2023-11-23 10:22:48 +01:00
d08b904530
mailverteiler und deren mailto href
2023-11-23 10:02:22 +01:00
2d25e08227
Longtext ZGV ohne Hinweis auf Ausbildungsvertrag
2023-11-23 09:45:29 +01:00
801780de29
- wording
2023-11-23 09:24:34 +01:00
d0bebeaa4a
neue Phrase MissingZGV, entfernen new lines
2023-11-23 09:16:56 +01:00
594dbdca21
Merge branch 'feature-34883/bestaetigtvon_bei_Abbrechern'
2023-11-22 17:08:20 +01:00
a32cda96d0
tidy up, z-Index for Modal
2023-11-22 15:58:18 +01:00
8142982ac7
s&d
2023-11-22 14:57:24 +01:00
ca2256bb32
Fix: Better handling of uninitialized variables
2023-11-22 14:57:06 +01:00
3674315305
update speichern/löschen autocomplete
2023-11-22 13:33:19 +01:00
ad8a18ed7d
change lvzuweisungurl to use VILESCI_ROOT if defined for Sancho_Mail_Antrag_W_New
2023-11-22 13:08:47 +01:00
f7d1f459ca
reset Modals
2023-11-22 12:49:16 +01:00
cc589a401c
- stundensaetze fas
2023-11-22 12:47:33 +01:00
cc52a9a28b
update search
2023-11-22 11:24:27 +01:00
0e813f78fb
updates the foto_sperre_function to automatically update the data of the vue component
2023-11-22 09:51:49 +01:00
92fdf3da4c
Autocomplete, überarbeitung Modal
2023-11-22 09:02:54 +01:00
58fa399436
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-21 21:29:18 +01:00
cccdfa1ac8
extracted function for generation employee kurzbz
2023-11-21 17:45:20 +01:00
d67d71abd5
Beträge am Lehrauftrag werden Abhängig von der Vertragsart angezeigt und nicht mehr
...
anhand der Inkludierten Lehre
2023-11-21 11:20:05 +01:00
73e8761728
Bugfix: Lvzuweisung - DB Errors in production
2023-11-21 10:46:23 +01:00
5263ffbb7b
Lehreinheiten Vorrückung berücksichtigt neue Vertragsstruktur und
...
Stundensätze
2023-11-21 09:53:00 +01:00
cc779f3d27
finish
2023-11-21 08:48:34 +01:00
16b61d0560
Daten fuer die Betriebsmittel und zutrittskarten_ausgegebenam gesammelt
2023-11-20 17:30:58 +01:00
2158e7a28d
- wording
...
- standardwert
- absage infocenter
2023-11-20 11:55:05 +01:00
11926ca9b2
refactor creation of benutzerfunktiondata, add check for already used benutzerfunktionen in another vb
2023-11-20 09:19:32 +01:00
4fead18c06
adds the model calls for the benutzerfunktionen information for the cis profile
2023-11-17 15:27:41 +01:00
72210867a5
Suche an neue Vertragsstruktur angepasst und Feature-Toggle Config
...
hinzugefügt zum Umschalten zwischen alter und neuer Vertragsstruktur
2023-11-17 14:43:23 +01:00
9f2eeabdd1
BIS-Verwendung aus Lehrtaetigkeitsbestaetgung entfernt da nicht vewendet
2023-11-17 14:07:18 +01:00
66d8db7987
Berechtigung für Zugriff auf HR Schema für Web User hinzugefügt
2023-11-17 13:55:32 +01:00
6b27c00d30
new data collection
2023-11-17 13:09:32 +01:00
40a58ad9d0
Merge branch 'feature-25999/C4' of github.com:FH-Complete/FHC-Core into feature-25999/C4
2023-11-17 13:05:48 +01:00
364217c36d
Accessibility for Details Tabs
2023-11-17 12:31:10 +01:00
4158a66da4
accessibility directive first draft
2023-11-17 11:54:36 +01:00
9c73908733
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-11-16 16:49:12 +01:00
b684c6a34d
DatePicker & Form with v-model & validation in fhcAlert
2023-11-16 16:41:22 +01:00
a82df1058d
Phrasen Plugin: async loadCategory function & use Vue.computed()
2023-11-16 15:23:40 +01:00
4502eefaae
neuer Controller Kontakt.php, Abfragen Adressen
2023-11-16 07:46:48 +01:00
cf85cb084f
dbupdate habilitation: added file to dbupdate3.4, code formatting
2023-11-15 20:51:44 +01:00
dee0bdaa17
querying new data for the cis profile page
2023-11-15 15:09:59 +01:00
9fdef54efc
Funktion json2odt für newline Qualifikationsziele
2023-11-15 14:24:47 +01:00
7c229bbcee
importing the api calls in the component and creating api endpoints for the cis profile page
2023-11-15 13:49:06 +01:00
dc76ae8506
neue Tags addon_aktiv und lernergebnisse
2023-11-15 09:44:25 +01:00
f9cf1a5b32
change perstistenceID to force new settings in browser localstorage
2023-11-14 22:55:29 +01:00
9227cc12f0
retrieving user data from mitarbeiter and benutzer models
2023-11-14 14:36:47 +01:00
b7c60fe1ef
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of github.com:FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-14 14:09:16 +01:00
98eb3fbd8b
exclude werkvertrag from overlap check
2023-11-14 14:09:06 +01:00
7f3b1417fd
Neuen Gehaltstyp für Zusatzvereinbarung hinzugefügt
...
Anpassung am Gehaltsimport:
- All-In Bestandteile werden als Zulage importiert
- Zusatzvereinbarungen im neuem Typ Zusatzvereinbarung
- Import funktioniert jetzt auch für Personen die ihr DV nicht mit
Monatsersten starten sondern ein paar Tage später
2023-11-14 13:37:03 +01:00
5b385d376e
creating the controller/view/api base
2023-11-14 11:52:45 +01:00
d6ce81462f
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of github.com:FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-14 10:36:25 +01:00
7640d4024f
alter handling of benutzerfunktion and vertragsbestandteilfunktion
2023-11-14 10:36:01 +01:00
c0fbc74862
Bug: search url not dynamic
2023-11-13 15:04:41 +01:00
1b19c2c306
- feature-34579
...
- gehaltsabrechnung umbenannt
- historie uid hinzugefuegt
2023-11-13 14:21:35 +01:00
5b2bfb9340
Code optimizing
2023-11-13 09:52:04 +01:00
f2208aa684
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-10 17:01:37 +01:00
89c546f74f
fix resize-handle in right column header
2023-11-10 15:29:50 +01:00
18f36c9d23
update tabulator5 to version 5.5.2 to get better behaviour of frozen right column
2023-11-10 15:16:40 +01:00
cb009529af
Mixin auf Plugin ändern
2023-11-10 14:46:18 +01:00
e56ccffe8d
Bugfixes: Studstatus
2023-11-10 14:30:41 +01:00
479d1a900f
Orgform PDFs
2023-11-09 14:19:36 +01:00
1d2a92f37f
Merge branch 'feature-34545/Bug_StudStatus_Orgform_falsch'
2023-11-09 13:46:07 +01:00
46855c9547
Blacklist für Noten
2023-11-09 13:37:56 +01:00
85f178fcf3
remove var_dump
2023-11-09 13:26:54 +01:00
9111a10414
Changed Tabulators new-Button to btn-primary color
2023-11-09 12:25:44 +01:00
410dc022d4
Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-09 12:21:30 +01:00
441a95de7e
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-11-09 12:12:26 +01:00
4bfc26006b
Merge branch 'feature-28886/Filter_Component_vs_Table_Component'
2023-11-09 11:48:51 +01:00
3a8216577f
added column habilitation to tbl_mitarbeiter
2023-11-09 10:53:04 +01:00
c65fc571ac
fix: copy pasta
2023-11-09 09:25:13 +01:00
95fa0cfbf6
change date handling benutzerfunktion
2023-11-08 11:57:57 +01:00
05744f3921
Bugfix
2023-11-08 09:35:23 +01:00
3b5f2e6494
added delete for Gehaltsabrechnung
2023-11-08 09:22:14 +01:00
178a383c04
fix typo
2023-11-07 16:26:18 +01:00
e4a99b4c84
upgrade datepicker to version 7.2.0, change Dienstverhaeltnis class to honor checkoverlap flag
2023-11-07 11:04:39 +01:00
a806df72e8
increased REST TIMEOUT constant to 5000
2023-11-07 10:52:01 +01:00
9c1cc947e6
removed superfluous library for multiselect
2023-11-07 10:46:38 +01:00
624df81da1
add primevue multiselect
2023-11-07 10:33:37 +01:00
a4b24880f6
Merge remote-tracking branch 'origin/feature-30660/FHC4_StudierendenGUI_Prototyp' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-11-06 14:29:25 +01:00
219113bc73
InteressentIn anlegen: check + getGeschlechter return value
2023-11-06 14:25:38 +01:00
8e3939a885
bug: path seperator
2023-11-06 11:20:00 +01:00
52d406bca7
FhcAlert improvements & InteressentIn anlegen part 1
2023-11-06 11:06:10 +01:00
fad475fb64
Fixed Loading Lehraufträge with Postgresql 15
2023-11-06 09:00:28 +01:00
e0a2fba209
- erhoehte studiengebuehr hinzugefuegt & filter
2023-11-03 11:37:58 +01:00
6e18d2ee2b
- rt verwaltung message an prestudent
2023-11-03 11:22:27 +01:00
c7508d2b8c
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2023-11-02 16:50:06 +01:00
c12169557b
rename vuepic/vue-datepicker to vuejs/vuedatepicker
2023-11-02 16:49:38 +01:00
81b080ec41
Modal Adressen
2023-11-02 16:41:28 +01:00
94fe3b594d
Anlage Kontakttab
2023-11-02 12:52:38 +01:00
45715d78f7
Bootstrap Modal Component
2023-11-02 11:47:09 +01:00
5a8a7d2401
add multiselect used by pv21
2023-11-02 08:19:33 +01:00
818a93ab2c
search for studiengang_kz
2023-10-31 14:52:54 +01:00
29600f1059
Basic Search
2023-10-31 14:45:47 +01:00
bd9f3abfea
add FhcAlert file
2023-10-31 14:45:29 +01:00
562b8b000f
Don't submit field that is empty when original value is null
2023-10-31 14:44:52 +01:00
be7321723a
add FhcAlert
2023-10-31 14:44:04 +01:00
f956db5889
Merge branch 'feature-34495/LinkSammelmailStgl'
2023-10-31 13:34:57 +01:00
8971f79a77
Verwendung von APP_ROOT
2023-10-31 13:23:56 +01:00
fdb4eb5e7d
Link Stgl Sammelmail
2023-10-31 13:16:25 +01:00
f7ffbfb914
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-10-31 13:01:41 +01:00
d37a8f1357
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-10-31 12:58:03 +01:00
ccace2f826
Fehler beim Laden der Lehrauftragsliste korrigiert mit Postgres15
2023-10-31 11:16:53 +01:00
c494dd1cdc
Added handleFormErrors- and resetFormErrors method to FhcAlert Plugin
2023-10-31 10:41:00 +01:00
5a002c0f04
Minor change: Adapted mail-text
2023-10-31 10:40:06 +01:00
2254aa3643
Merge branch 'bug-34481/infocenter_bug_rueckstellung'
2023-10-31 08:34:11 +01:00
684a741f2a
- bugfix
2023-10-31 08:33:10 +01:00
f53bca1ba6
Merge branch 'feature-33948/Studstatus_CSV_Export'
2023-10-27 10:47:10 +02:00
2ed6f30bea
Merge branch 'feature-33947/Studierendenantraege_SammelmailAnAssistenz'
2023-10-27 10:45:35 +02:00
aacba9f6ae
Accessibility
2023-10-25 16:55:01 +02:00
6d8606795f
Favorites keyboard navigation
2023-10-25 14:04:50 +02:00
fbb00be7cd
Added slot 'search' to Filterwidget.js
...
Slot to inject a autoselect / inputfield to search tabulator, if tabulator should stay empty until search results are provided. (Example: performance reasons if too many data; search for multiple at once)
2023-10-25 12:55:35 +02:00
c6d82fe029
Minor style change of confirmDelete message
2023-10-25 12:49:37 +02:00
6b2150b066
Fixed: unknown 'fhcerror' to this
2023-10-25 12:48:00 +02:00
8c7bbff1c1
Favorites
2023-10-25 10:37:51 +02:00
e34bacb443
Routing & dynamic tab loading
2023-10-24 15:52:28 +02:00
007ee49844
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2023-10-24 15:51:10 +02:00
bae7096ca1
Better Primeview esm path
2023-10-24 15:04:45 +02:00
73cbaf77f1
CSV Options adjusted for German MS Office
2023-10-24 14:16:13 +02:00
22453c71b4
fhcAlert: slight improvements 2
2023-10-24 13:35:50 +02:00
d57fd9eb60
fhcAlert: slight improvements
2023-10-24 12:23:12 +02:00
aead4f3380
Assistenz als CC zu SammelmailSTGL hinzugefügt
2023-10-24 10:44:17 +02:00
05e2808f00
add Models for Vertragsbestandteiltyp and VertragsbestandteilFreitexttyp, implement IValidation Interface on AbstrcatBestandteil, add OverlapChecker checking for overlapping VBs against DB
2023-10-23 17:58:18 +02:00
c9331771b3
lock Prestudentstatus after Bismeldestichtag in FAS: possible to edit student with prestudentstatus check permission, all fields are greyed out when not editable, changed BIS-Meldestichtagsverwaltung menu point text
2023-10-23 16:39:33 +02:00
dc496deadd
Merge branch 'bug-33290/ZeitsperreEndeDatumFehlenderMaxwert'
2023-10-23 16:18:54 +02:00
ecba22acfc
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2023-10-23 15:03:21 +02:00
01ca583167
Vertragsstunden werden auf 2 Nachkommastellen gerundet anstatt auf 1
2023-10-23 15:02:34 +02:00
a1ee027ea4
- phrasen
2023-10-23 09:51:04 +02:00
548a3e39b9
change label
2023-10-20 15:50:48 +02:00
479df7189c
add oetyp to oe and kst labels in search results
2023-10-19 16:38:15 +02:00
b01cd99a93
Plugin: Fhc Alert
2023-10-19 14:10:55 +02:00
eee6f918cd
add oe_typ_kurzbz and oe_typ_bezeichnung to use in labels
2023-10-19 13:05:02 +02:00
645972d549
primevue esm & search & favorites
2023-10-19 09:48:42 +02:00
6a008fc5da
- filter hinzugefuegt
2023-10-17 16:38:05 +02:00
c0b4ad2633
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2023-10-17 11:38:29 +02:00
d85bbac19b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-10-17 11:32:01 +02:00
0f80b9d31b
Added Primevue-Toast and -Confirmdialog libraries to FHC-Footer
2023-10-17 11:30:35 +02:00
1bc957821e
Merge branch 'bug-29815/ModifyCoodleIcalTerminbestaetigungen'
2023-10-17 07:27:30 +02:00
65bf35fa3e
Studiensemester now
2023-10-16 13:51:21 +02:00
22d3b08a06
Escaping von LVs mit Sonderzeichen
2023-10-16 11:08:34 +02:00
60ee3ec8f0
UID Generierung bei Incoming um Nachname, Vorname ergänzt
2023-10-16 10:26:23 +02:00
dcb308a535
change datum_von of benutzerfunktion if vb gueltig_ab is earlier
2023-10-13 16:45:30 +02:00
697b1e5c00
Save Button -> Top Right
2023-10-13 10:40:37 +02:00
52dd2c56a2
Merge branch 'bhdev-studstatus'
2023-10-12 16:24:20 +02:00
d06819f25f
comment out info_ studierendenantrag phrase
2023-10-12 16:07:20 +02:00
c744d48aef
"keep-alive" component caching
2023-10-12 15:49:44 +02:00
93ef1151df
Prestudent Query
2023-10-12 15:47:54 +02:00
c74d22d46c
Verband Order
2023-10-12 15:47:44 +02:00
b5c0c14e2a
fix typo
2023-10-11 19:20:40 +02:00
41a51ee286
Allin und Befristung wird mit Titel und Anmerkung migriert
2023-10-11 16:50:18 +02:00
7042427110
fix sql _mitarbeiter_ohne_zuordnung
2023-10-11 16:11:19 +02:00
56f26e6ebe
Bugfix: FilterCmpt: reload function
2023-10-11 15:39:14 +02:00
1e449e6fd1
Bugfix: FilterCmpt: reload function
2023-10-11 15:38:30 +02:00
9d31cdffe6
Bugfix: handle reload event of Table.js
2023-10-11 14:59:54 +02:00
95d3b6ac5b
Bugfix: Phrasen: local variable has overwritten function parameter
2023-10-11 14:57:44 +02:00
af89ec3942
Bugfix: Phrasen: local variable has overwritten function parameter
2023-10-11 14:44:24 +02:00
c3b6a77dad
switch visibility only for not frozen columns with title
2023-10-11 13:18:33 +02:00
16fdb0de69
cleanup
2023-10-11 13:17:45 +02:00
9db6874dc4
CSS for tabulator
2023-10-11 13:17:32 +02:00
ebdd6a2040
Bug: Wiederholer Reminder werden nicht versandt - Fehlerquelle Datumsbereich wenn Prüfungen mehr als ein Monat verteilt
2023-10-10 14:16:32 +02:00
6137cf3347
Remove unnecessary comment
2023-10-10 14:11:21 +02:00
b5ce0ba7ed
Remove unnecessary comment
2023-10-10 13:12:51 +02:00
5010a1653a
cleaner config
2023-10-10 13:09:43 +02:00
0a25982fa2
Do not allow frozen columns to be invisible
2023-10-10 13:09:28 +02:00
c5b246dc8e
CSS table row hovering
2023-10-10 13:08:43 +02:00
229d34d168
phrases update
2023-10-09 20:29:54 +02:00
15225d0b03
added Benutzerfunktion CRUD methods
2023-10-09 20:29:54 +02:00
bf85534011
phrases update
2023-10-09 20:29:54 +02:00
2298823f70
added phrarses for job functions
2023-10-09 20:29:54 +02:00
a4d0653c44
add IF NOT EXISTS to schema and extension creation
2023-10-09 15:49:59 +02:00
17d5cff178
slightly better css
2023-10-09 15:13:00 +02:00
af678b3c56
added vue datepicker to composer
2023-10-09 14:29:38 +02:00
2a72d48dea
update composer.lock for php7.0
2023-10-09 11:48:50 +02:00
c1a53a1be3
do not use phrases from FHC_JS_PHRASES_STORAGE_OBJECT at all
2023-10-09 11:47:02 +02:00
4cc8b555d2
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-10-09 11:38:37 +02:00
39ed309dd5
autoselect rows
2023-10-09 11:10:06 +02:00
3ab8fd22f4
minor layout changes
2023-10-06 20:22:05 +02:00
23aeba4620
Verwendung von datetime-funktionen anstelle von strtotime, Adaptierung config-eintrag, update Phrasen
2023-10-06 12:30:14 +02:00
e28261f4f6
Studiensemester in Variable
2023-10-05 15:41:55 +02:00
484a48e309
Studiensemester in Variable
2023-10-05 11:08:52 +02:00
e30ad887c9
- msg an alle moeglich
2023-10-05 10:26:19 +02:00
cda93ce85b
Fixed PHP81 Warning on Loading Adresses
2023-10-05 08:14:32 +02:00
c1171bc716
add user_language to FHC_JS_DATA_STORAGE_OBJECT
2023-10-04 12:20:44 +02:00
d1377b3f4e
Searchbar Student Prestudent
2023-10-03 16:19:40 +02:00
b618ad247a
Merge branch 'feature-33459/Studierendenstatusverwaltung_Unterbrechung_Studiensemester'
2023-10-02 16:45:44 +02:00
fa74438f66
Validation
2023-10-02 16:38:11 +02:00
6c8b3b4ec4
- nur an markierte msg moeglich
2023-10-02 14:12:03 +02:00
2a0a0a81f2
Feld Bpk
2023-10-02 11:33:23 +02:00
ad191f3f90
Optische Verbesserungen select field
2023-10-02 11:06:53 +02:00
54bcf83781
s&d
2023-10-02 11:06:34 +02:00
468d334530
Feld Zugangscode
2023-10-02 10:44:08 +02:00
cc7067d8e5
updated phrases
2023-09-29 15:28:19 +02:00
c828fe2ee4
Version für Legacy BPK Schnittstelle angepasst
2023-09-29 12:58:30 +02:00
dc78660433
- fix for fas
2023-09-29 09:49:12 +02:00
8fe72ebcf5
neues Element last_prestudentstatus for studienerfolg.xml
2023-09-28 16:47:44 +02:00
a237cb1808
check if there are any entries
2023-09-28 15:58:35 +02:00
af3588aa61
revert commented lines for the moment until there is a better solution
2023-09-28 15:45:03 +02:00
867a1e94c7
Merge branch 'feature-27351/Digitalisierung_Formulare_Neu'
2023-09-28 14:37:04 +02:00
137c5f28ec
modify Phrasen.js so that it can be used by composition api and does not use legacy categories at all
2023-09-28 14:27:35 +02:00
f9af5638f5
Update Config: Format in Tagen für Validierung JS
2023-09-28 09:31:40 +02:00
41ff430464
Detailsicht StudentIn, Speichern
2023-09-28 08:45:54 +02:00
285af0a7f4
composer: updated datepicker
2023-09-27 13:52:31 +02:00
2d963c92cc
- msg aus rtverwaltung moeglich
2023-09-27 10:38:44 +02:00
4fcf4a57d1
Adaptierung rdfs mit CDATA
2023-09-27 09:57:39 +02:00
9eeaeb2a14
Details Person
2023-09-27 09:16:42 +02:00
1809ff3008
accept days, weeks, month and years in config
2023-09-27 08:30:03 +02:00
909fc896cd
added phrases
2023-09-26 22:38:12 +02:00
5827bde6b0
update phrasen
2023-09-26 15:27:50 +02:00
822e269f88
add composable wrapper for phrasen mixin
2023-09-26 15:25:49 +02:00
f5bbc8a0c0
do not use category from window.FHC_JS_PHRASES_STORAGE_OBJECT since it is propably not complete
2023-09-26 15:11:16 +02:00
67a61c5d2a
add phrase to try vue Phrasen
2023-09-26 11:46:48 +02:00
f3809b01b2
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-09-26 11:14:47 +02:00
5febccba8a
port phrases mixin and Endpoint from branch feature-27351/Digitalisierung_Formulare_Neu
2023-09-26 11:12:15 +02:00
d8bd100dbb
Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu
2023-09-25 16:53:33 +02:00
31426d3c5e
Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu
2023-09-25 16:50:40 +02:00
972e9b7025
UHSTAT1 form: nations with sperre = true are not loaded
2023-09-25 16:45:39 +02:00
be3e4e552b
Adapt diffTageMax
2023-09-25 15:44:48 +02:00
b1f3916e49
Adaptierung bismax-Validierung
2023-09-25 15:33:17 +02:00
746ee76a3b
Validierungen Von- und Bis-Felder vilesci
2023-09-25 15:11:14 +02:00
f71b0e500e
Adaptierung Berechnung diff
2023-09-25 14:15:33 +02:00
9eeeeca62c
Fix format
2023-09-25 09:54:49 +02:00
9b11b19cf9
Zeitsperre: Maxwert bei Bisdatum
2023-09-22 13:33:54 +02:00
4e11e12c99
Removed aktiv column from SoftwareManagement Filter
...
Not used anymore.
2023-09-21 14:40:50 +02:00
fa3a718ad4
Added getAutocompleteSuggestions method to OE Model
...
Get OEs by eventQuery string. Use with autocomplete event queries.
2023-09-21 14:40:05 +02:00
e886b4742b
Neue Mailvorlagen Sancho_Mail_Antrag_U_Student(SB)
2023-09-19 14:56:30 +02:00
9bfcbf3bf1
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-09-19 11:06:32 +02:00
cbe73ae37c
Merge branch 'feature-31018/pv21_stundensaetze' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-09-19 10:42:11 +02:00
4242f75fde
Hiweistext bei Geburtsdatumsformat korrigiert bei Testclient
2023-09-18 12:35:45 +02:00
47c956bf1e
Geburtsdatum Format korrigiert
2023-09-18 12:22:21 +02:00
cdb351b66b
Delete Testdata and outputs
2023-09-18 10:37:14 +02:00
418a149840
Merge branch 'TechnikumWienAcademy-master'
2023-09-14 13:12:08 +02:00
91f3197c24
- added link option
...
- styling
2023-09-14 11:56:26 +02:00
e8c7ecf1ee
Besuch der LV kann nun 3 Semester in Vergangenheit liegen für Prüfungsanmeldung
2023-09-14 10:50:04 +02:00
2a77fb361a
raise version number of API to 0.6
2023-09-14 10:32:09 +02:00
96f8ee33a9
Merge branch 'feature-29835/UHSTAT1_Erfassung_der_UHSTAT1_Daten_ueber_das_Bewerbungstool'
2023-09-12 11:05:37 +02:00
2c92ec3e60
added overlaypanel and datatable
2023-09-07 22:29:29 +02:00
38da37980d
Fehlerhaftes Escaping korrigiert damit inserts mit
...
standard_conforming_strings funktioniert
2023-09-07 15:34:55 +02:00
6fba58c113
Merge branch 'master' into feature-29835/UHSTAT1_Erfassung_der_UHSTAT1_Daten_ueber_das_Bewerbungstool
2023-09-07 14:56:18 +02:00
0e1f4148f5
- anpassungen fuer bewerberautofill
2023-09-07 14:34:20 +02:00
4175ecc209
UHSTAT1 form: added firstname and lastname of student
2023-09-05 16:49:19 +02:00
3e7abf9a45
Merge branch 'master' into feature-18571/EntwicklungsteamBisMeldung
2023-09-05 14:33:31 +02:00
bd92777b96
improvements 2
2023-09-04 16:52:46 +02:00
07deb7b6c5
- textanpassung
2023-09-04 13:34:42 +02:00
7f0d716bd8
Finale Finalisierung Emailvariablen
2023-08-31 09:25:17 +02:00
60246100e6
Bugfix: missing phrases
2023-08-31 09:24:43 +02:00
f81c9939f7
config default wert korrigiert
2023-08-31 08:39:21 +02:00
1b1f45e690
bugfix Studiengang
2023-08-31 08:33:17 +02:00
1009f73109
improvements
2023-08-31 08:26:16 +02:00
fc4915a6ee
Merge branch 'feature-32834/infocenter_zusammenfuehren'
2023-08-31 08:11:22 +02:00
ca79bb1f82
Merge branch 'TechnikumWienAcademy-master'
2023-08-30 16:22:04 +02:00
2fe9bda46b
längeres Gültigkeitsdatum hinzugefügt
2023-08-30 14:40:52 +02:00
20aaefffb1
Finalisierung Emailvariablen
2023-08-29 16:50:02 +02:00
86aac2388d
Als Admin wird nun die Buchungsnummer im Konto Karteireiter im FAS
...
angezeigt damit diese einfach kopiert werden kann
2023-08-25 11:04:06 +02:00
f3453670b3
Problem behoben wodurch der Plausicheck abgebrochen hat wenn
...
Studiengänge für den GebDatum Check exkludiert wurden.
2023-08-25 09:50:37 +02:00
b23eaa2967
Merge remote-tracking branch 'origin/master'
2023-08-24 14:28:58 +02:00
6e2c5acc6f
Eintrag Archiv für AbschlussdokumentLehrgaenge
2023-08-24 14:28:46 +02:00
f8bbdf4b35
Merge remote-tracking branch 'origin/feature-28746/reihungstestjob_fallweise_wird_anzahlung_f_studienbeitrag_buchung_nicht_angelegt' into infocenter_2023_08_24
2023-08-24 11:00:34 +02:00
a2a645b7c7
Merge remote-tracking branch 'origin/feature-29529/infocenter_anpassungen' into infocenter_2023_08_24
...
# Conflicts:
# system/dbupdate_3.4.php
2023-08-24 11:00:16 +02:00
2dbbadea2e
Merge remote-tracking branch 'origin/feature-30956/auswertung_reihungstest_excel_problem' into infocenter_2023_08_24
2023-08-24 10:59:16 +02:00
0f5c261528
Merge remote-tracking branch 'origin/feature-30693/infocenter_aufgenommen_filter' into infocenter_2023_08_24
2023-08-24 10:56:18 +02:00
b93cfbfa9e
Merge remote-tracking branch 'origin/feature-27691/sammeltask_aenderung_bewerberdefinition' into infocenter_2023_08_24
2023-08-24 10:56:04 +02:00
7609554a74
Merge remote-tracking branch 'origin/feature-26667/reihungstestanmeldung_fuer_master_interessentinnen_ueber_online_bewerbungstool' into infocenter_2023_08_24
2023-08-24 10:55:47 +02:00
26e63160ba
- bug fix, bescheibung
2023-08-24 10:38:46 +02:00
7c365cea81
- title aenderung
2023-08-24 08:01:36 +02:00
db96dd1388
- bug fix
2023-08-24 07:56:49 +02:00
13f71502e6
1st draft
2023-08-23 10:28:55 +02:00
c440711145
Teilgebiete-Übersicht mit Spalten mehrsprachig und Offset
2023-08-22 15:53:19 +02:00
16366d976d
Merge branch 'bug-32636/maillib_email_number_per_time_range'
2023-08-22 15:51:39 +02:00
ac945ab540
studiensemester_kurzbz in GET-Parameter eingefügt
2023-08-22 15:51:17 +02:00
0b51239f8c
Fixed SQL Error when sending Anrechnungen Recommendation Reminder
2023-08-22 15:24:12 +02:00
45816c0352
Merge branch 'feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende'
2023-08-22 14:50:32 +02:00
73a9d34fba
Merge branch 'feature-29838/Anrechnungen-Sammelmail-fuer-LV-Leitung' into feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende
2023-08-22 14:42:52 +02:00
ac10473b08
Merge branch 'master' into feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende
2023-08-22 14:40:56 +02:00
571ae5f6e5
Merge branch 'master' into feature-29838/Anrechnungen-Sammelmail-fuer-LV-Leitung
2023-08-22 14:40:23 +02:00
057b003977
Merge remote-tracking branch 'origin/feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende' into feature-30181/Anrechnungen_Erweiterte-Angaben-fuer-Studierende
...
# Conflicts:
# system/phrasesupdate.php
2023-08-22 13:42:32 +02:00
34c84d00da
Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-30660/FHC4_StudierendenGUI_Prototyp
2023-08-22 13:31:50 +02:00
e6be6e19d1
Abmeldung PDF-Vorlage: Studiensemester added
2023-08-22 11:30:54 +02:00
754ed07621
anzeige Lehrverband nach setUnterrbrecher im Fas
2023-08-22 11:18:47 +02:00
bf6fc52fcf
Studierendenseite: Reihenfolge WH, Unterbrechung, Abmeldung; wording von du du auf indirekt
2023-08-22 11:18:35 +02:00
294bfeb2e4
Sancho Mail Antrag_W_Student
...
Aufnahme der angerechneten bzw. neu zu absolvierenden LVs
2023-08-22 11:18:05 +02:00
b9bf2487c2
Stg-Ansicht: Status styled as link
...
Stg-Ansicht: Status styled as link
2023-08-22 11:13:56 +02:00
8da161120f
Abmeldung (Stg): Suche auch nach student_uid
2023-08-22 11:11:38 +02:00
f9f0e238c6
- bug fix
2023-08-22 10:58:23 +02:00
b468f01d0e
Lv-zuweisung Breite vergrössert, Prestudent Status Unterbrechungssemester vor Vorrückung
2023-08-18 11:34:38 +02:00
799911b948
added method to fetch DV by ID
2023-08-17 16:14:53 +02:00
376ce0e440
WH: nur positive Noten bei intern angerechnet zulassen
2023-08-17 14:13:30 +02:00
4a505631de
Kein Verzicht bei Wiederholung
2023-08-17 13:54:34 +02:00
1d938ea33d
Anzeige following Studiensemester Wiedereinstieg
2023-08-17 13:46:58 +02:00
70aa0a9c9c
neue Mail an Assistenz: AbbrecherStgl
2023-08-17 13:18:06 +02:00
743ba83148
Anzeige Studiensemester Abmeldung
2023-08-17 11:18:51 +02:00
c7d2608cce
Adaptierung Buttons: Zurückziehen Stgl und Ausblenden Anträge STGL nicht genehmigt Studentview
2023-08-17 11:10:09 +02:00
672ee59ba5
neuer Hinweistext mit Einspruchsfrist für Abmeldung Stgl
2023-08-17 10:34:28 +02:00
95e8859896
Bug Hotfix
2023-08-17 09:50:33 +02:00
9aa5f701f7
phrasenupdate
2023-08-17 09:24:15 +02:00
fcd3733f3c
AbmeldungStgl GrundDropdown
2023-08-17 09:12:30 +02:00
fab1022c49
tbl_uhstat1daten: added primary key, removed abgeschicktamum (instead: own sync table)
2023-08-16 17:40:00 +02:00
b8aadab509
UHSTAT1 form: add insertamum and insertvon when inserting data
2023-08-16 11:12:09 +02:00
08f79b69cb
Merge branch 'feature-25003/NotenimportFuerNachpruefung'
2023-08-16 08:11:10 +02:00
7bc1e8cdd9
Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung
2023-08-16 07:57:56 +02:00
e784400943
uhstat1 data save: added uid
2023-08-16 01:21:05 +02:00
8122ab0292
simplified error message for invalid status dates
2023-08-15 19:27:39 +02:00
c62198b4b5
UHSTAT form: added delete button for employees with permission, edit and delete buttons are only shown if user has permission
2023-08-15 18:27:30 +02:00
d200fc1961
bis tbl_uhstat1daten: added insertamum, insertvon, updateamum, updatevon and abgeschicktamum
2023-08-15 17:19:12 +02:00
c4377010b1
- pv21 stundensaetze hinzugefuegt
2023-08-14 14:14:37 +02:00
913f45fcda
- auswertung_fhtw um studiengang typ erweitert
2023-08-14 11:53:36 +02:00
3ea74ab23c
Bismeldestichtage GUI: improved datepicker, correct Studiensemester sort, insertamum is set when inserting
2023-08-10 23:15:44 +02:00
e1c23fc6fa
Added Filter ImageVerwaltung
2023-08-10 11:34:54 +02:00
353e2deaf7
AbortController
2023-08-10 11:02:45 +02:00
597e074bbd
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-08-09 11:13:02 +02:00
b7a3d2dcb4
Removed column 'actions' from filtersupdate
2023-08-09 10:57:06 +02:00
49e4aa78e9
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2023-08-09 10:43:57 +02:00
f9be090bbf
Studierendenansicht: nur STGs anzeigen bei denen ein Status "Student" vorhanden ist.
2023-08-08 16:59:42 +02:00
b77e715bdb
Font Awesome + Buttons in Studierendenansicht korrigiert
2023-08-08 16:26:15 +02:00
c9e947831e
PDF Unterbrechung: Auch in status EmailVersandt abrufbar
2023-08-08 16:16:09 +02:00
44141ce8d8
PDF Download "Abmeldung durch Stgl"
2023-08-08 16:08:15 +02:00
9dc36af7fc
Umlaute & Genehmigt => Bestätigt
2023-08-08 15:37:20 +02:00
5c018e204e
Lv Popup optische Verbesserungen
2023-08-08 15:12:23 +02:00
61c6245e1a
Phrasen: Antrag => Bekanntgabe
2023-08-08 14:39:05 +02:00
da0dc0e053
Missing Phrase Category in Controller
2023-08-07 13:05:13 +02:00
4a2cdaf52a
added primevue autocomplete
2023-08-04 14:46:53 +02:00
d0d42a6a15
Unterbrecher - Wiedereintrittssemester Dropdown
2023-08-04 14:11:03 +02:00
9550457b24
Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu
2023-08-03 18:20:05 +02:00
d1eaebba33
Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu
2023-08-03 18:18:43 +02:00
56230e3752
Changed button-color of Tabulators Header-'ADD Button' to primary color
2023-08-03 09:45:45 +02:00
4e17be39f6
Added column 'actions' to filtersupdate
2023-08-03 09:44:28 +02:00
2f001987f3
Filter.js additional columns: additional columns are displayed based on field name, not title
2023-08-02 19:14:58 +02:00
d689e8fb2f
Tablesorter, Datepicker und Spalte mit Lehrform in ueberbuchung.php
2023-08-02 18:24:11 +02:00
553f2feaa4
filter component: enabled nested tabulator
2023-08-02 16:22:10 +02:00
b70011436e
Added column 'softwarestatus_kurzbz' to filtersupdate
2023-08-02 13:39:47 +02:00
d50ba773fe
UHSTAT 1 form: correct authentification (from bewerbungstool or with permission), beautified success and error messages, added Rechtsbelehrung, simplified parameter checking
2023-08-01 19:26:36 +02:00
392112977c
Merge remote-tracking branch 'origin/master'
2023-08-01 18:24:44 +02:00
f5703a2438
Kleine Anpassungen Testtool-Auswertung
...
- %-Spalte in Auswertung Detail
- Vorschlag-Nummer in Auswertung_detail_frage
2023-08-01 18:23:24 +02:00
8eeb0d9ca7
gehaltsbestandteillib set uid to pgsql
2023-08-01 14:37:07 +02:00
c8703d3215
write current uid to pgsql settings variable
2023-08-01 13:03:05 +02:00
b5a81b540f
Added Begruendung ECTS and Begruendung LV Inhalt to STGL- and Lectors Detail-Views
2023-07-31 13:53:24 +02:00
4c75f908b9
Added card 'ECTS Berechnung Referenzbeispiele' to Infobox
2023-07-31 12:50:06 +02:00
83bf874156
Removed link 'ECTS Berechnung Referenzbeispiele'
2023-07-31 12:48:56 +02:00
043a2538b7
Updated
2023-07-31 12:12:59 +02:00
dd392caef7
Adapted max/min length for Begruendung ECTS and Begruendung LVinhalt
2023-07-31 11:44:19 +02:00
096b436d54
Added phrases for Begruendung ECTS and Begruendung LVinhalt
2023-07-31 11:43:24 +02:00
44182af5fa
Formatted Tabulator Header: Abstaende vergroessert
...
Abstand Titel zu Actionbuttons und zwischen Actionbuttons untereinander vergroessert
2023-07-31 09:30:45 +02:00
af24ef1517
Bug: neue Unterbrechung
2023-07-31 09:08:33 +02:00
cfb034bc69
uhstat form: disabled input fields if uhstat entry already saved
2023-07-28 22:39:50 +02:00
349e9b9442
UHSTAT1 form: removed geburtsstaat from database table, data is shown if uhstat entry already exists
2023-07-28 22:15:26 +02:00
1e082ed225
UHSTAT1 form: removed geburtsnation as it is saved in person table anyways, started to display existing uhstat data on form load
2023-07-27 17:13:31 +02:00
7dee77a6af
Code Quality
2023-07-27 11:42:03 +02:00
ace3bd6736
Verbesserungen
2023-07-27 10:57:53 +02:00
459f068765
bismeldestichtag gui: added icon to delete button, added id field
2023-07-26 20:59:05 +02:00
270c9e1741
remove hasSequence again to avoid error, check vbs basedata and specialdata if not empty before update
2023-07-26 19:23:31 +02:00
3eaefc88bd
set hasSequence correct
2023-07-26 18:40:37 +02:00
bbe1fe2d49
refactor markDirty check
2023-07-26 17:41:23 +02:00
18e82225ce
handle vertragsbestandteil_kurzbz different for insert and update
2023-07-26 17:28:37 +02:00
ac5d6071cd
extend VerttragsbestandteilLib to keep track on modified columns and only update dv, vbs and gbs when they differ from the status in the db
2023-07-26 16:27:34 +02:00
91f79b2021
- aufgenommen filter infocenter fuer lehrgaenge
2023-07-26 13:27:51 +02:00
cfe7c5b0da
Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' into feature-25999/C4
2023-07-25 14:07:17 +02:00
02b64ad6a7
Assistenz kann eigene Abmeldungen Zurückziehen
2023-07-25 13:59:18 +02:00
7239113847
Optionaler Grund bei Einspruch ablehnen
2023-07-25 13:42:38 +02:00
8c98cea114
semicolon
2023-07-25 13:37:03 +02:00
764628d5fb
Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' into feature-25999/C4
2023-07-25 10:40:38 +02:00
2046b6c2a8
Menu Entry: Studierendenantrag
2023-07-25 10:38:48 +02:00
6eaa8c4c01
Codesniffer and MassDetector
2023-07-24 16:04:46 +02:00
f5ace15f7b
added phrases to UHSTAT1 form
2023-07-24 14:15:22 +02:00
74b1ca0614
Added phrases for Begruendung ECTS and Begruendung LVinhalt
2023-07-24 10:24:21 +02:00
5d97abc6ac
Mails
2023-07-20 16:55:09 +02:00
b4370ece82
Comment added
2023-07-20 15:07:46 +02:00
8923a099cc
Sammelmail Stgl & Calltoactions in Student view
2023-07-20 15:04:49 +02:00
5670bac3f6
Don't allow canceling of Stg Abmeldungen
2023-07-20 15:04:18 +02:00
35d01b042e
Bug canCancel in abmeldung->edit missing
2023-07-20 15:00:42 +02:00
110d6bace3
Adapted backend logic to save/retrieve begruendung_ects and begruendung_lvinhalt
2023-07-20 13:42:53 +02:00
54d819e1ea
Adapted GUI to display and save begruendung_ects and begruendung_lvinhalt
2023-07-20 13:38:52 +02:00
8bb3b6d53c
DB Update: added 2 attributes to tbl_anrechnung
...
- begruendung_ects (text)
- begruendung_lvinhalt (text)
2023-07-20 10:48:03 +02:00
550df4fbd8
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-07-19 15:56:49 +02:00
8901791911
Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' into feature-25999/C4
2023-07-19 14:37:59 +02:00
ffd12e8ddf
Access Rights
2023-07-19 11:17:17 +02:00
044695183f
Merge branch 'feature-24647/Konfigurierbare_Dashboards' into feature-25999/C4
2023-07-19 11:15:40 +02:00
0beabe0f4a
spaces to tabs
2023-07-19 11:11:52 +02:00
0fd53dc3ac
spaces to tabs
2023-07-19 11:10:01 +02:00
72169b26c3
separate class attribute and property for easier readability
2023-07-19 11:06:01 +02:00
7b96f99929
Access Rights Api Controller
2023-07-19 10:59:39 +02:00
72d0517701
Merge branch 'master' into feature-25999/C4
2023-07-19 10:55:35 +02:00
1aae75312e
Merge remote-tracking branch 'origin/feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2023-07-19 10:30:31 +02:00
d88ff104a3
filter component: added property tabulatorAdditionalColumns for displaying additional columns not in filter
2023-07-18 19:11:10 +02:00
6a7903ef05
- Changed the controller components/SearchBar.php constructor to _not_ start the authentication when the AuthLib is loaded and to check if the user is logged
...
- Added constant ERROR_NOT_AUTH to libraries/SearchBarLib.php
2023-07-18 16:01:03 +02:00
c2962f51e1
Bismeldestichtag gui: added vue date picker
2023-07-17 21:03:51 +02:00
5e6262da56
Config für Datum Start Digitalisierung, finish handleWiederholerDeadline, start Sammelmail an Stgl
2023-07-17 16:29:03 +02:00
5f096b58b7
- STG beim nicht vorhanden Master RT anzeigen
2023-07-17 13:52:06 +02:00
c6fee48c8c
bismeldestichtage GUI: correct date format on row click
2023-07-17 12:31:45 +02:00
88b01075c4
Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten
2023-07-17 12:13:45 +02:00
7ab5d3add6
Bismeldestichtage Management GUI: added row delete button
2023-07-17 12:11:15 +02:00
75fb0f2d4a
- include/filter.class.php -> loadValues now calls the superclass protected method replaceSQLDecryptionPassword to replace password variables with their values
...
- include/statistik.class.php -> loadData now calls the superclass protected method replaceSQLDecryptionPassword to replace password variables with their values
- Added new functions hasSQLDecryption and isSQLDecryptionValid to include/functions.inc.php
- Script vilesci/statistik/filter_details.php and vilesci/stammdaten/statistik_details.php now do not allow to store SQL strings that contain PostgreSQL decryption functions using a clear password
2023-07-17 12:06:37 +02:00
2cc0283d25
Added new protected method replaceSQLDecryptionPassword to include/basis_db.class.php
2023-07-17 12:04:26 +02:00
68fbc13a69
added first version of uhstat1 form, added unique constraint for person_id in uhstat1daten table, added permissions for uhstat1daten sequence
2023-07-15 19:57:51 +02:00
073cd6cb23
neue Tags für Anzeige Semester in Anrechnungen
2023-07-14 14:17:05 +02:00
dc21662fc9
Add missing SQL Rights for web
2023-07-14 13:01:01 +02:00
b0c9231d14
Hmvc: Safer Code
2023-07-14 09:02:25 +02:00
a96d99bcd1
Sammelmails: draft
2023-07-13 16:51:54 +02:00
a53ca81784
Wording Änderung bei Studierendenansicht Wiederholung
2023-07-13 16:51:14 +02:00
b04aefc105
Unterbrechung nur für das Aktuelle und kommende Semester
2023-07-13 16:13:40 +02:00
2b4a4d12a9
handle empty teilzeittyp_kurzbz
2023-07-13 15:08:51 +02:00
9d0801676d
Bug: Studierenden-Ansicht: Abmeldung bearbeiten bei mehrfachen Abmeldungen
2023-07-13 14:44:51 +02:00
c8fc6c747f
Table height & Bug: Allowed/Shown Stgs in Component
2023-07-13 13:57:17 +02:00
f8da119ad7
Abmeldung: Einspruch Abgelehnt handling
2023-07-13 11:48:25 +02:00
545b9cb0de
modify searchbar add category for employess without kst and oe assignment
2023-07-13 11:35:42 +02:00
c5db083a84
Correct paths
2023-07-12 15:32:52 +02:00
3192a1b3f2
- job hinzugefuegt um bewerber status automatisch zu setzen
...
- fas filter hinzugefugt
2023-07-12 09:47:01 +02:00
5f3e393ed1
Default menu: correct paths
2023-07-12 09:12:03 +02:00
6f1eed6696
Abbrecher 2dos: Änderungen Wordings, neue Statusgründe preabbrecher, durchStgl, durchStud, update setAbbrecher
2023-07-11 17:01:22 +02:00
1416e91af7
Issues: Behebung parameter are included in identification of an issue
2023-07-11 15:58:48 +02:00
533291bf33
- bug fix
...
- neue sortierung
- neue spalte
- sqls abfragen angepasst
2023-07-11 14:17:51 +02:00
f438d240f9
Update Wording Antrag -> Verwaltung, Genehmigen-> Bestätigen, Überspringen Button Ausblenden
2023-07-11 13:07:54 +02:00
1aa78386f4
erledigte TODOs entfernt
2023-07-11 08:33:05 +02:00
02291a51e9
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-07-10 17:21:48 +02:00
f4c8f00c8f
Added AuthLib to Searchbar Component
2023-07-10 17:18:30 +02:00
2213fed5b2
Phrasen
2023-07-10 16:39:20 +02:00
477da65817
Laden der Organisationseinheiten bei Berechtigungszuordnung behoben
2023-07-10 15:17:09 +02:00
cb1c4d01e0
phrasen: dokumente
2023-07-10 14:45:31 +02:00
3219f43e6d
Fehlerhafte Anzeige bei Download von Anträgen
2023-07-10 14:36:54 +02:00
25258f7d87
E-Mail Reminder für Wiederholer sollen an die FH Adresse des Studierenden geschickt werden
2023-07-10 14:27:50 +02:00
15786dd772
CIS URLs in Sancho mails
2023-07-10 14:03:03 +02:00
e6a1ea621e
Bug: Semester in PDFs
2023-07-10 13:52:29 +02:00
eee3aa08e4
Zugriffsrechte für Abbrecher & Unterbrecher
2023-07-10 13:52:05 +02:00
0d690b60b6
Merge remote-tracking branch 'origin/feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2023-07-10 11:28:31 +02:00
1006132451
Infomail
2023-07-10 11:19:21 +02:00
3fce448451
Abmeldung durch Stgl: status => typ
2023-07-10 10:19:06 +02:00
5eca034911
clean up
2023-07-10 09:29:00 +02:00
761af30a75
speed up student selection
2023-07-10 09:21:12 +02:00
573a8d8e33
composer lock
2023-07-10 09:09:46 +02:00
3e4703408b
directories from variables
2023-07-10 08:42:48 +02:00
1bca1a8dc3
Merge branch 'benutzerberechtigungGUIneu'
2023-07-07 12:48:07 +02:00
94ff4b717d
Versehentlich gelöschte Zeile wieder ergänzt
2023-07-07 12:46:06 +02:00
b7a1add2f3
bismeldestichtage gui: removed filters, now just simple tabulator
2023-07-07 02:12:14 +02:00
8a1de56dc2
Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-29144/Prestudent_status_nach_Bismeldung_sperren
2023-07-06 22:54:48 +02:00
5e88ccb5d7
Merge branch 'master' into benutzerberechtigungGUIneu
2023-07-06 18:09:45 +02:00
9651903200
Diverse Titel und Textkorrekturen bei Rechte-Skripten
2023-07-06 18:08:06 +02:00
af9418d456
Anmerkung und Insertdaten bei Rolleberechtigung
...
+ Vergleichsskript für Rechte in einzelnen Rollen
2023-07-06 18:05:24 +02:00
f35f41a049
Merge branch 'feature-29794/Lehrauftraege_Spalte-Stundensatz-fuer-STGL-und-KFL'
2023-07-06 15:44:16 +02:00
398b9f9d8f
Merge branch 'feature-30393/Remove_check_tbl_benutzer.aktiv_in_AuthLib'
2023-07-06 14:14:47 +02:00
cb4ce6dab6
Anzeige Lehre Saldo in der Zeitaufzeichnung deaktiviert
2023-07-06 13:30:43 +02:00
539efcb6ec
added Modal.js to Bootstrap components
2023-07-06 12:03:38 +02:00
d4450e1ae1
Removed check of the tbl_benutzer.aktiv field in the AuthLib
2023-07-05 15:07:05 +02:00
f7dac04dae
Merge branch 'feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen'
2023-07-05 13:36:23 +02:00
1e0e93dfa3
Autocomplete Add-Button Finish
2023-07-05 13:20:46 +02:00
61856473ea
Leitungsansicht Autocomplete 1st draft
2023-07-05 08:30:33 +02:00
c81404b210
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-07-04 18:12:23 +02:00
800b490c62
added function to get chart data
2023-07-04 18:10:00 +02:00
3ca80904ea
Verbesserungen Unterbrecher bestätigen
2023-07-04 15:59:43 +02:00
ddf72af139
Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2023-07-04 14:43:28 +02:00
3798720ee0
+emit: click:new
2023-07-04 14:38:20 +02:00
06b929381d
Merge remote-tracking branch 'origin/feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
...
# Conflicts:
# system/filtersupdate.php
2023-07-04 13:48:21 +02:00
7eed07a682
LV zuweisung & anzeige: handle semester above max_semester & anmerkung bug
2023-07-04 13:37:54 +02:00
fc147f577a
filter.js: fix for nested tabulator: set columns before set data, filtersupdate: renamed columns
2023-07-04 12:17:15 +02:00
388400338e
Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2023-07-04 12:16:06 +02:00
ff93cb26fe
Bug: status
2023-07-04 11:10:26 +02:00
b39fa7667e
Remove TODO
2023-07-04 11:09:55 +02:00
16356d8a5c
reverse order setColumns & setData
2023-07-04 10:42:06 +02:00
64ce3d1f6a
Cleaned up commit from 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung'
2023-07-04 10:34:14 +02:00
51d8a18565
MigrateSalary Problem behoben wodurch das Ende eines Gehaltsbestandteils
...
nicht korrekt gesetzt wurde wenn mehrere DVs vorhanden sind
2023-07-04 10:30:59 +02:00
ee7fe0251d
- Script fuer den einmaligen Import der Gehaelter hinzugefuegt
...
- Migration der Vertraege angepasst damit alle Mitarbeiter auf einmal
migriert werden koennen. Anpassung zur Unterscheidung der Zuordnung zum
Unternehmen
2023-07-03 18:32:34 +02:00
71e86cfcde
filter.js bugfixes: saving customfilter, and set columns before data (necessary e.g. for nested tabulator)
2023-07-03 11:45:15 +02:00
d5d7797eb7
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-07-03 09:58:54 +02:00
7356b17688
Added SW-ID column to SW-Table
2023-07-03 09:37:32 +02:00
f6661fabea
bismeldestichtage GUI: added delete button again (for now...)
2023-06-30 13:33:52 +02:00
74814db900
Bismeldestichtag Management: improved GUI layout, studiensemester is optional for "bismeldestichtag reached" check
2023-06-29 19:19:00 +02:00
18d25069f3
tbl_bismeldestichtag: removed edit permissions for web user
2023-06-29 19:17:38 +02:00
f49771ec7f
- berechtigungen fuer die sequence hinzugefuegt
2023-06-29 12:10:50 +02:00
097010290d
Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren
2023-06-29 11:47:56 +02:00
2a3eba6441
Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung
2023-06-28 16:26:54 +02:00
0a961d8e95
UHSTAT1 bis.tbl_abschluss: added default values for in_oesterreich boolean
2023-06-27 11:00:13 +02:00
5213ab44ff
Merge branch 'TechnikumWienAcademy-master'
2023-06-27 09:34:07 +02:00
c89f375015
Removed ServicePing Config for Second LDAP
2023-06-27 09:33:23 +02:00
d6cce60b8f
add LDAP service ping configuration to second LDAP server
2023-06-27 08:25:14 +02:00
a54c7a3492
UHSTAT1 data: added tables
2023-06-26 19:15:27 +02:00
efdd81ac0d
Problem behoben wodurch keine Fotoliste erstellt werden konnte wenn eine
...
Person kein Foto hochgeladen hat
2023-06-26 13:45:10 +02:00
635494b303
Merge branch 'TechnikumWienAcademy-master'
2023-06-26 11:22:18 +02:00
e200cd4455
add LDAP service ping configuration
2023-06-26 10:46:45 +02:00
fb8172eda1
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-06-22 12:54:48 +02:00
a81ceb51b8
- rt sperre vor dem login moeglich
2023-06-22 10:23:00 +02:00
24a29ca565
add validation, use correct function names, add vertragsbestandteil_id to stdclass
2023-06-21 16:47:51 +02:00
1ffab39f05
match naming of properties and db columns
2023-06-21 15:21:42 +02:00
ee011ef201
OE-Suche verbessert
2023-06-21 11:03:33 +02:00
fb84fb62f7
Merge branch 'TechnikumWienAcademy-ku-prod'
2023-06-21 08:27:21 +02:00
c85bf159ff
Merge branch 'ku-prod' of https://github.com/TechnikumWienAcademy/FHC-Core-Academy into TechnikumWienAcademy-ku-prod
2023-06-21 08:26:20 +02:00
55fe358d9b
Merge branch 'master' into benutzerberechtigungGUIneu
2023-06-20 13:53:10 +02:00
17c2004a39
Adapted: Check for config 'fbl' in Job to send Sammelmail only to LV-Leitung (no fallback to other lectors)
2023-06-20 13:36:42 +02:00
82019bb77f
Deactivated: einzelne Empehlungsanfrage-Mails an Lektoren deaktiviert
2023-06-20 10:54:40 +02:00
4e22b1ac1c
Added: New Job sendMailRecommendationRequests
...
Send Sancho mail to LV-Leitung (fallback Lectors) that were requested for recommendation yesterday.
2023-06-19 15:03:38 +02:00
f29d5a7b50
Bismeldestichtage management: added menu entry, changed size of filter widget table to auto
2023-06-17 21:00:52 +02:00
f0d0c0837a
added Filter for Software Management
2023-06-17 20:51:33 +02:00
d9eb0f5704
- kennzeichen beim zusammenlegen uebernehmen
2023-06-16 11:30:03 +02:00
050a4214f9
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-06-14 13:45:34 +02:00
f865d09033
manage Bismeldestichtage: added possibility to delete a report target date
2023-06-13 16:14:38 +02:00
fb3247c91e
performance optimizations
2023-06-13 14:44:01 +02:00
da4ab6bf49
performance optimizations
2023-06-13 14:06:57 +02:00
7bc8e22906
plausichecks: removed empty lines and unnecessary comments
2023-06-12 22:40:09 +02:00
ab5dc7b1ac
plausichecks: removed plausicheck lib, instead, methods are directly in the library for the fehler
2023-06-12 22:32:09 +02:00
e26ba1d219
- spalte gesamtstunden erteilt hinzugefuegt
2023-06-12 09:22:32 +02:00
fe9bf1dc8a
Bismeldestichtag: prestudentstatus is displayed as inaktive in FAS list if Stichtag is reached, fixed comments
2023-06-11 11:07:28 +02:00
e6b47266b9
Added GUI for adding Bismeldestichtag
2023-06-10 21:40:28 +02:00
f95c5ec7cf
added overview for editing Bismeldestichtage
2023-06-07 19:25:23 +02:00
df64ad30eb
Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren
2023-06-07 18:48:38 +02:00
dd98434522
added new right for editing bismelden property, disabled bismelden checkbox in FAS if no right
2023-06-07 13:33:43 +02:00
c490aa0040
Revert "hide bismelden checkbox if no keine_studstatuspruefung right"
...
This reverts commit ae1817fc7b
2023-06-07 13:31:30 +02:00
b33f890c62
fix freitext anmerkung, add validation to vbfreitext
2023-06-07 07:59:12 +02:00
3d2dd25755
add condition for ending vbs and gbs
2023-06-06 17:21:05 +02:00
bcdf29f57f
added method to display rudimentary chart data
2023-06-06 16:25:04 +02:00
ff6ddf8c46
add methods to end dv
2023-06-06 16:24:49 +02:00
c9c6955198
issue configuration: enabled deletion of single configuration values, updated fehlermonitoring phrases
2023-06-05 19:29:27 +02:00
ae1817fc7b
hide bismelden checkbox if no keine_studstatuspruefung right
2023-06-05 16:36:01 +02:00
42a6dd7508
current composer.lock
2023-06-05 16:18:29 +02:00
bce7e6ce7f
Merge branch 'feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen'
2023-06-05 11:03:09 +02:00
88039c2327
Merge branch 'werner/vertragsbestandteile_delete' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-06-05 10:58:39 +02:00
5b7a78e6d8
delete DV; improved GBT query
2023-06-05 10:42:59 +02:00
dd0ef74fe0
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-06-05 10:42:52 +02:00
42197c39ed
FAS prestudents status: check is Meldestichtag is reached and disable input if it is, bismeldestichtag table: added sequence primary key
2023-06-03 15:18:06 +02:00
f5ee097b72
- doppelte benutzer bug fix
2023-06-02 12:01:31 +02:00
9e883a48a0
Adaptierungen Icalfiles Coole
2023-06-02 09:02:47 +02:00
0994b2cc8f
Added: Added column 'Stundensatz' in 'Lehrauftrag erteilen'
2023-06-01 12:18:14 +02:00
7c2d235960
Adapted: Show column 'Stundensatz' in 'Lehrauftrag bestellen'
2023-06-01 12:17:21 +02:00
73774b0c5d
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-06-01 11:16:06 +02:00
afebd44b78
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten
2023-06-01 10:21:26 +02:00
9f13f876ef
- swd.php entfernt
2023-06-01 07:39:56 +02:00
bf344df8d6
- abgabetool anpassungen
2023-06-01 07:12:40 +02:00
b9325875a1
Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung
2023-05-31 16:43:16 +02:00
a9666a5f55
Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung
2023-05-31 16:41:53 +02:00
1d63f7aa53
Merge branch 'feature-25003/NotenimportFuerNachpruefung_bhmod' into feature-25003/NotenimportFuerNachpruefung
2023-05-31 16:32:37 +02:00
ec000fbf83
changes for aenderung and korrektur
2023-05-30 19:13:27 +02:00
a5110893ea
Dateien die größer als 30MB sind werden nicht automatisch geprüft ob
...
diese eine Signatur enthalten da dies Dokumente sind die manuell
hochgeladen wurden um das UploadLimit der Arbeit zu umgehen.
2023-05-30 11:59:46 +02:00
1ea45269bd
Merge branch 'master' into benutzerberechtigungGUIneu
2023-05-25 17:07:08 +02:00
de4fe258fd
Merge remote-tracking branch 'origin/master'
2023-05-25 17:06:22 +02:00
b5d0cc9626
Klasse "form-control" bei Typ Datepicker ergänzt
2023-05-25 17:06:16 +02:00
0a179c963f
bismeldestichtag: added meldestichtag_id to table, created bismeldestichtag class, improved comment for prestudentstatuschecks in studentDBML
2023-05-25 16:35:44 +02:00
a47a746940
add require for vertragsbestandteil_karenz
2023-05-25 15:53:40 +02:00
92672aaacf
adapt overlapping DVs Check to not consider current DV if edited, but consider karenzen
2023-05-25 15:47:16 +02:00
4f6c60af3a
Merge remote-tracking branch 'origin/feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-25 12:18:48 +02:00
e7571dffab
Minor Adaptation: Suche statt Search, Settings button Layout korrigiert
2023-05-25 12:17:06 +02:00
f08072133c
Fixed: Suchcontainer nicht mehr verschoben
...
Groesse und Alignment an Suchfeld gebunden.
2023-05-25 12:15:24 +02:00
542b6cc985
Adapted: Image-Thumbnails entfernt
...
Stattdessen class 'rounded'. Passt besser zu FHC CD.
2023-05-25 12:13:40 +02:00
b9e9399ca2
Adapted: Icon-Layout in Vertical Split
...
. etwas vergroessert um besser mit der Maus zu greifen
. Icon und Icon-Farbe geaendert
2023-05-25 12:12:37 +02:00
fce192cd3c
remover popper from composer.lock
2023-05-25 11:08:37 +02:00
80d194cfc0
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
...
- remove popper from composer introduced in branch feature-25562, but master included bootstrap.bundle in the meanwhile to have popper available
2023-05-25 11:04:20 +02:00
38509d530a
prepare list of vbs with gbs
2023-05-24 17:54:04 +02:00
34715712f3
App für Personalverwaltung hinzugefügt
2023-05-24 16:26:53 +02:00
be331d6200
Styles
2023-05-24 12:05:36 +02:00
f6f2defc8c
Bismeldestichtag: added table
2023-05-23 18:48:18 +02:00
5f198114f7
added popperjs because bootstrap5 requires it
2023-05-23 17:03:13 +02:00
4b2e3c2f6b
Merge branch 'master' into feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen
2023-05-23 16:22:05 +02:00
09bc985431
Notenumrechnung beim Punkteimport, Fehlermeldung wenn Note oder Punkte fehlen.
2023-05-23 16:08:50 +02:00
94a15093ac
New Button
2023-05-23 15:26:49 +02:00
9124422635
Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' of https://github.com/FH-Complete/FHC-Core into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-23 15:17:14 +02:00
d10a229b59
Slot for action buttons
2023-05-23 14:56:31 +02:00
de43e69ccf
plausichecks GUI: added fehlercode to recognise fehler in fehler monitoring issues
2023-05-23 14:29:38 +02:00
f993780ec3
- texte und anzeige angepasst
2023-05-23 13:17:27 +02:00
b624d91119
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-05-23 12:20:57 +02:00
7a005a9141
Merge branch 'feature-10001/tempus_kurzbz_bei_reservierungen_anzeigen'
2023-05-22 15:50:37 +02:00
cc8be23f7e
Merge branch 'master' into feature-10001/tempus_kurzbz_bei_reservierungen_anzeigen
2023-05-22 15:47:57 +02:00
86e032b27f
Fehler Monitoring: added fehler kurzbz to be displayeed
2023-05-22 14:31:40 +02:00
429c595e04
Reload Button
2023-05-22 11:59:26 +02:00
0d6ad6aab0
issue konfiguration: added phrases, bugfix displaying correct configuration for correct app
2023-05-22 00:20:01 +02:00
186412144d
Merge branch 'master' into feature-29133/einzelne_studiengaenge_aus_issues_check_ausnehmen
2023-05-21 17:38:49 +02:00
696849062f
Issues konfiguration: added GUI for assigning konfiguration to fehler
2023-05-21 17:34:11 +02:00
4154df1704
Property to Enable/disable the download button
2023-05-19 14:47:05 +02:00
5001713d16
Erzwingen von Reload nach jeder Freigabe
2023-05-19 07:51:25 +02:00
311d235fda
- abgewiesene gesperrt von spalte
2023-05-17 16:35:22 +02:00
2f573263ba
- abfrage ob der pruefling bereits gesperrt ist
2023-05-17 16:00:34 +02:00
54de577eee
- ausblenden des warnings
2023-05-17 15:08:52 +02:00
8584be651b
- sperren von rts bearbeitet
2023-05-17 15:06:39 +02:00
08c594148b
- details bei abgewiesenen
2023-05-17 08:41:04 +02:00
24bf2f95a2
update vertragsbestandteile
2023-05-16 17:05:49 +02:00
a198a740f4
fix json_serialize
2023-05-16 17:04:37 +02:00
76fd425027
assert valid nw-new-entry listener if side-menu is enabled
2023-05-16 14:12:46 +02:00
38f2bb89a4
readability
2023-05-16 10:40:58 +02:00
1568e619a5
Split the component to improve the quality, readability and maintainability
2023-05-16 10:33:31 +02:00
2b363119c5
Split the component to improve the quality, readability and maintainability
2023-05-16 10:33:05 +02:00
3940912830
fix attribute name valorisieren to valorisierung
2023-05-16 10:04:56 +02:00
cd66397740
add current date to DV selection query
2023-05-16 10:03:50 +02:00
da5494ad35
Merge branch 'feature-24913/TabelleRaumtypNeuesAttributAktiv'
2023-05-15 16:44:38 +02:00
d3be5a7805
Merge branch 'feature-29051/DokumentvorlageAufSonderzeichenUeberpruefen'
2023-05-15 16:32:22 +02:00
06f62b19b4
Merge branch 'feature-27043/cis_lvinfo_cis_private_lehre_ects_preview_fehlt'
2023-05-15 16:06:55 +02:00
4844da317f
Merge branch 'feature-25917/studienbeastigung_in_englischer_sprache'
2023-05-15 15:42:06 +02:00
00f555b141
Vorlage umbenannt
2023-05-15 15:34:32 +02:00
d3ec6cad1d
Merge branch 'master' into feature-25917/studienbeastigung_in_englischer_sprache
2023-05-15 15:13:47 +02:00
a64fafb6ad
Merge branch 'feature-28402/popper_in_bootstrap5'
2023-05-15 14:58:02 +02:00
9180244e0d
Merge branch 'feature-27362/fas_filter_status_bestaetigt_reihungstestanmeldung'
2023-05-15 14:52:36 +02:00
5c79951f00
Merge branch 'feature-27107/Vilesci_Erfassung_Abwesenheiten_Reinigung'
2023-05-15 14:07:41 +02:00
388a265db7
Neues Template "contentmittitel_filterwidget" in Suche ergänzt
2023-05-15 12:11:01 +02:00
d4653bc89f
Neue Rechte anlegen und bestehende bearbeiten
2023-05-15 12:10:25 +02:00
1ec52e710a
Plausichecks: enabled Fehlerkonfiguration for excluding certain Studiengänge from checks, changed comments
2023-05-14 21:19:39 +02:00
fd7c193894
added tables and model for issue Fehlerkonfiguration
2023-05-11 18:54:35 +02:00
040cd09691
Merge branch 'master' into benutzerberechtigungGUIneu
2023-05-11 18:26:24 +02:00
c5e1674264
FAS-Studentensuche verbessert, um Personen ohne Vorname zu findenwerden
2023-05-11 18:14:24 +02:00
e96a3506a8
Coodle ics für Terminzusagen jetzt mit verschlüsseltem Token
...
Details zur Umfrage in den Kalenderdaten
2023-05-11 18:02:17 +02:00
01046637fa
merge master into feature-18571/Entwicklungsteam
2023-05-11 09:18:32 +02:00
fe6746e6bc
Ergänzung DB-update um Berechtigung stgv/edit Entwicklungsteam
2023-05-11 09:14:42 +02:00
28baa49f6d
Validierung Sonderzeichen Dokumentvorlagen
2023-05-10 08:18:05 +02:00
96172c67fd
PlausicheckProducerLib: corrected method description comment
2023-05-09 23:16:24 +02:00
4786ff503a
added organisation to current contract info
2023-05-09 17:24:18 +02:00
7045827450
bufix Urlaubsanspruch
2023-05-09 16:14:01 +02:00
81e51c2b92
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-05-09 11:58:43 +02:00
e97d2d89d6
Added Config to Enable/Disable Signature Check in Abgabetool
2023-05-08 16:54:46 +02:00
2cb4ee9879
Merge branch 'feature-19172/Abgabetool_digitale_signatur_pruefen'
2023-05-08 15:50:59 +02:00
4c5241dd95
Bei fehlender Signatur in Enduploads wird ein Mail an den Studiengang
...
geschickt
2023-05-08 15:37:30 +02:00
c086eddfae
update Abfrage, delete testfiles
2023-05-08 14:18:07 +02:00
d54868070f
29006: Dashboard verbesserungen
2023-05-08 12:39:25 +02:00
33e313a633
update Abfrage
2023-05-08 12:12:42 +02:00
c6fe7a3d6a
Merge branch 'master' into feature-28089/plausichecks_in_extension_hinzufuegen
2023-05-06 02:03:07 +02:00
94a126f64e
plausichecks: made some core plausichecks warnings instead of errors
2023-05-05 17:29:30 +02:00
1b57df7a52
Korrektur der Ermittlung des Sommersemesters wenn die Personalmeldung
...
für vergangene Semester erstellt wird.
2023-05-05 17:19:35 +02:00
451a21e84e
Zugriffsberechtigungen korrigiert damit der Zugriff auf die eigenen
...
Zeitsperren nicht möglich ist ohne Berechtigung
2023-05-05 16:57:22 +02:00
d361c4eb26
use img-thumbnail css class instead of rounded circle
2023-05-05 15:47:23 +02:00
2780ec5636
Dashboard Admin Demo
2023-05-05 14:27:33 +02:00
d131212d22
composer update
2023-05-05 14:20:07 +02:00
de4c236817
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-05 13:11:16 +02:00
2c0e815fe8
add validations
2023-05-05 11:43:02 +02:00
f7ec0c4ce0
Merge branch 'feature-27946/infocenter_zusaetzliche_spalte_fuer_kaution'
2023-05-05 08:53:17 +02:00
42ff682700
add validations
2023-05-05 08:20:29 +02:00
6c1a47955f
Merge branch 'feature-27949/infocenter_evaluieren_des_zurueckstellens_mit_einem_grund_zb_fuer_drittstaaten'
2023-05-05 07:48:53 +02:00
f84a75af4e
Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-04 15:41:44 +02:00
defe4e2f93
Added new interface application/core/IEncryption.php
2023-05-04 15:33:08 +02:00
1c0129466a
Bugfix: added a check to DB_Model->_addEncrypt method on the parameter encryptedColumns
2023-05-04 15:23:51 +02:00
e713cdac64
Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-04 15:03:13 +02:00
2f07590461
Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten
2023-05-04 14:59:12 +02:00
7fb0c14555
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-05-04 14:58:29 +02:00
4f03b61c6e
- stunden bestandteil bei karenz mit 0 stunden verlaengern
2023-05-04 13:43:54 +02:00
3b1d913006
Merge branch 'TechnikumWienAcademy-ku-prod-hotfix-221118'
2023-05-04 09:46:02 +02:00
d2b6aab881
Changed: AZG-relvant an neue Vertragsstruktur angepasst
2023-05-04 09:42:30 +02:00
8e73638931
Changed: Check homeoffice an neue Vertragsstruktur angepasst
2023-05-04 09:41:50 +02:00
dbee8d9689
Changed: Check homeoffice an neue Vertragsstruktur angepasst
2023-05-04 09:39:12 +02:00
b43b7fe95d
Added new Vertragsbestandteil Class and few methods
...
. load()
. isZAPflichtig() -- Check ob im übergebenen Monat ZApflichtig.
. getZAPflichtig() -- Holt alle Vertragsbestandteile, die ZApflichtig sind
. isAllin() -- Check, ob im übergebenen Monat Vertragsbestandteil AllIn hat.
2023-05-04 09:38:18 +02:00
33c1cc80b2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-05-04 09:26:44 +02:00
58bae0953f
dbupdate
2023-05-03 07:57:48 +02:00
eb7b73fee9
cleanup according to current vertragsbestandteil db tables
2023-05-02 16:00:13 +02:00
fdc3265e97
Merge branch 'ku-prod-hotfix-221118' of https://github.com/TechnikumWienAcademy/FHC-Core-Academy into TechnikumWienAcademy-ku-prod-hotfix-221118
2023-05-02 11:28:15 +02:00
e3ec4cd5aa
fix method names, handle insertamum updateamum insertvon updatevon in libs
2023-05-01 20:50:07 +02:00
8efe601826
plausichecks gui bugfix: filter by Studiensemester and Studiengang possible again, removed unnecessary resolver params variable
2023-05-01 16:28:42 +02:00
96d115e808
issues: added new filter for Personalverwaltung issues
2023-05-01 16:23:49 +02:00
8b74420e4f
- limit beim selecten
2023-04-30 21:28:47 +02:00
f2479c6f36
dbupdate für neue Zeitsperre
2023-04-28 08:05:30 +02:00
9a4c61d1c3
Fixed Abgabetool Lecturer View
2023-04-27 17:50:03 +02:00
a528018761
Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen
2023-04-27 09:57:40 +02:00
eefffa8a0e
- kaution spalte
...
- fas abgeschickt am timestamp automatisch ausfuellen
- zgvuberpruefung zeigt abgewiesene nicht an
2023-04-27 09:08:26 +02:00
5bdfd447ac
Berechtigungspruefung mittels mitarbeiter/zeitsperre:begrenzt, Update Berechtigung für Anzeige in Vilesci-Menue, Einbau Redirect
2023-04-26 16:17:23 +02:00
b4e4f91b22
more validation
2023-04-25 20:20:02 +02:00
10fb68a532
Dienstverhaeltnis Class updated, VertragsbestandteilLib can save Dienstverhaeltnis
2023-04-25 17:23:57 +02:00
08de013c23
Fixes: code quality checks
2023-04-25 16:07:42 +02:00
7a4f55bb0c
require interface IValidation
2023-04-25 09:27:40 +02:00
2163ddcdf5
add Interface IValidation, implement validate stub in all Vertragsbestandteile and Gehaltsbestandteil and DV
2023-04-25 09:22:03 +02:00
da484fbbb0
- die letzten 5 tage werden geprueft anstatt nur der vortag
...
- neue bewerbungen nach dem aufgenommen status werden nich automatisch abgewiesen
2023-04-25 08:45:16 +02:00
39137d1348
Load a model in the filter component controller to have the DB functionalities ready
2023-04-24 17:07:40 +02:00
5519f6af57
Merge branch 'merged_Anrechnungen_26625_27388_28278_28557'
2023-04-24 14:49:29 +02:00
d16a670726
Merge branch 'sonstiges-28665/Tabulator-PersistenceID-einbauen' into merged_Anrechnungen_26625_27388_28278_28557
2023-04-24 14:42:21 +02:00
54864da770
Merge branch 'bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen' into merged_Anrechnungen_26625_27388_28278_28557
2023-04-24 12:12:05 +02:00
64aa3c1250
Merge branch 'feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung' into merged_Anrechnungen_26625_27388_28278_28557
2023-04-24 11:31:39 +02:00
a663fa9436
Merge branch 'feature-27388/Anrechnungen_Zeitfenster-pflegen' into merged_Anrechnungen_26625_27388_28278_28557
2023-04-24 11:30:32 +02:00
aa572e8a22
Merge branch 'feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige' into merged_Anrechnungen_26625_27388_28278_28557
2023-04-24 11:26:45 +02:00
48798e8309
Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen
2023-04-24 11:20:53 +02:00
01ca8f6fb9
Merge branch 'master' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige
2023-04-24 11:18:40 +02:00
80eb64e418
Merge branch 'master' into feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung
2023-04-24 10:36:32 +02:00
ea79b92beb
Merge branch 'master' into bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen
2023-04-24 10:35:22 +02:00
42d6ea9bed
Merge branch 'feature-28426/DiplomaSupplementMinimalVersionSS2023'
2023-04-24 08:31:15 +02:00
b726f2ca5e
Vertragsstunden mit 0.00 werden wie NULL behandelt
2023-04-24 07:14:42 +02:00
0a8432514c
issues: added comment to getLanguageIndex method
2023-04-22 23:35:39 +02:00
3122825b73
student issues list issueData: language index comes from tbl_sprache, limit results only to dvuh and core issues
2023-04-22 15:41:20 +02:00
bc8709f842
added filter for Personalverwaltung issue list
2023-04-21 17:59:24 +02:00
f54351c7a3
- added missing model
2023-04-20 16:38:56 +02:00
f39fb46b25
Merge branch 'feature-28886/Filter_Component_vs_Table_Component' into feature-28089/plausichecks_in_extension_hinzufuegen
2023-04-20 13:19:16 +02:00
48172216cc
Zeilenzähler bei Statistik
2023-04-19 15:43:18 +02:00
1fa215103c
Insert- und Update-Daten bei Prestudentstatus im FAS
2023-04-19 15:42:51 +02:00
138cfd662d
added return
2023-04-18 13:50:07 +02:00
535578c399
validation
2023-04-18 13:30:56 +02:00
c90da4b50e
start to implement validation
2023-04-18 13:26:08 +02:00
88c8b13208
Anzeige Urlaubsverwaltung Vilesci ausschließlich für user mit Oes mit Leitungsfunktionen
2023-04-18 08:10:42 +02:00
8eb423414a
Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen
2023-04-17 10:21:09 +02:00
29485a090b
removed remaining unit test for GUI
2023-04-14 15:51:58 +02:00
5d668791f9
Projektphase in der Zeiterfassung werden temporär 7 Monate in die Vergangenheit anzgezeigt um die Erfassung von alten Einträgen zu ermöglichen
2023-04-14 14:37:52 +02:00
4f43b79ed5
default controller
2023-04-14 12:50:07 +02:00
d766e2fd01
console.warn => alert
2023-04-14 08:22:36 +02:00
e462a71b6d
call parent constructor
2023-04-12 16:50:00 +02:00
9e6d78dd1d
set Dienstverhaeltnis_id and Vertragsbestandteil_id on child Gehaltsbestandteile when added or changed
2023-04-12 16:26:55 +02:00
c2e956f7f3
use GehaltsbestandteilLib in VertragsbestandteilLib
2023-04-12 15:32:22 +02:00
0061cf255c
add GehaltsbestandteilLib
2023-04-12 15:22:10 +02:00
2b03fcc930
removed GUI handling and renamed Gehaltsbestandteil to make it independend from Vertragsbestandteil
2023-04-12 09:41:07 +02:00
f1402c439c
Adaptierungen Rahmenvertrag FHG
2023-04-12 08:15:55 +02:00
fe6a8d5625
fixed wrong JSON-Mapping for GUIOptions
2023-04-11 17:07:20 +02:00
e7f23643d4
fix data property name
2023-04-11 17:05:20 +02:00
c929fa8702
add freitext require, adapt freitext to current db
2023-04-11 16:59:21 +02:00
92e23ea585
add requires for vbs zeitaufzeichnung and kuendigungsfrist
2023-04-11 16:47:44 +02:00
3ff024fc69
fix date format
2023-04-11 15:51:23 +02:00
234820490c
variable names
2023-04-11 15:44:34 +02:00
12c712c1b4
changed property names to match gui input
2023-04-11 15:22:40 +02:00
b50ca57907
extend VertragsbestandteilFunktion to be able to create a Benutzerfunktion entry before being persited
2023-04-11 15:10:24 +02:00
9c801d2723
Merge branch 'benutzerberechtigungGUIneu'
2023-04-11 13:24:56 +02:00
dce81d614e
Merge branch 'master' into benutzerberechtigungGUIneu
2023-04-11 13:23:09 +02:00
ed2aa6620e
vuedatepicker added
2023-04-11 12:53:56 +02:00
025b58dee3
throw Exception when storeVertragsbestandteil is rolled back to handle rollback in possible outer transaction
2023-04-11 11:05:15 +02:00
a63a79ab91
add param tableOnly & save for multiple components on one page
2023-04-07 14:10:30 +02:00
19d369c3c7
- im kalender mitarbeiter kurzbz statt uid anzeigen
2023-04-06 10:17:15 +02:00
fca341ccf4
Migration von Verträgen speichert nun die Eintäge auch in der DB
...
Tippfehler in Models behoben
Berechtigungen für DV und VBS Sequence hinzugefügt
2023-04-06 07:34:26 +02:00
f325daab43
Merge branch 'bug-28917/AnwesenheitenLadezeiten'
2023-04-05 16:30:55 +02:00
326b53544a
Übernahme Optimierung der Anwesenheitsabfrage von BFI
2023-04-05 16:28:19 +02:00
1a3d651759
Merge branch 'feature-27403/DVUH_Plausicheck_fuer_Personen_ohne_Konto_Buchungen'
2023-04-05 15:33:36 +02:00
e46d5a2433
application/views/templates/FHC-Footer.php now includes the bootstrap5 bundle JS
2023-04-05 15:22:49 +02:00
995b3ecb18
Merge branch 'feature-28539/Projektarbeitsbeurteilung_Anpassungen'
2023-04-05 15:10:54 +02:00
43f613b0bc
Änderung FHStG auf FHG
2023-04-05 13:32:32 +02:00
783cb289cd
added Unit-Tests; changed IDs of organisationseinheit in VertragsGUI
2023-04-04 18:51:06 +02:00
5226da2652
Neues Template Content mit Titel und Filterwidget
2023-04-04 17:37:47 +02:00
15049640c6
Input-styling
2023-04-04 17:37:01 +02:00
0d5a7aee35
Aktive als Default
2023-04-04 17:36:36 +02:00
cfa71c852c
Styleanpassung inaktive
2023-04-04 17:36:18 +02:00
a1a9b10ee1
plausicheck issues: enabled generic passing of different parameters, not just core plausicheck specific. moved studiensemester param to specific PlausiIssueProducer controller
2023-04-04 16:17:18 +02:00
fb57ea5838
- splitten von reihungstest uebersichten
2023-04-04 15:57:33 +02:00
d93c19913b
- spalte fuer kaution hinzugefuegt
2023-04-04 15:07:23 +02:00
80d5d09ed5
fix styling of textarea in import popup
2023-04-04 08:07:03 +02:00
c613c6dc43
small fix to prevent error when $encryptedColumns is null
2023-04-03 13:37:12 +02:00
95458c193c
CIS4 Entry & View titles
2023-03-31 14:50:56 +02:00
2a59fad2fc
CMS loading speedup
2023-03-31 09:21:52 +02:00
e2cf663f88
Default Menu
2023-03-31 09:21:09 +02:00
9e4489093c
Adapted & updated Tabulator default options (PersistenceID now changeable / Updates for options in Tabulator 4.9)
...
. Adapted
.. PersistenceID now changeable
.. check: only set default option if not set in tabulator
. Updates in version 4.9:
.. persistentLayout => persistence
.. getVisibility() => isVisible()
2023-03-29 10:29:06 +02:00
c52cd05436
Merge branch 'feature-25562/PV21_Vertraege_Encryption_Merge'
2023-03-28 20:12:40 +02:00
772e60c944
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-03-28 13:52:23 +02:00
9527fd006f
Rechte-Detailansicht
2023-03-27 17:08:22 +02:00
bbd5962fd4
Deleted deprecated FBL-files
2023-03-27 11:19:34 +02:00
47fba23a5e
Enhanced queries
2023-03-27 11:11:03 +02:00
75aff023d3
Corrected Mehrsprachigkeits-variable
2023-03-27 11:08:07 +02:00
8183144251
Corrected query to retrieve Leitung
2023-03-27 11:06:22 +02:00
1e00f2683e
Corrected check 'isEmpfehlungsberechtigt'
...
Fachbereichsleiter are always empfehlungsberechtigt.
2023-03-27 11:05:03 +02:00
d8fc724b10
Changed: Now passing config-variable to views
...
...instead of loading config into view.
2023-03-27 11:02:24 +02:00
8feec18ff7
Changed query to get Leitung of Lehrveranstaltung-Organisationseinheit (instead of 'Fachbereich')
2023-03-27 10:58:59 +02:00
cff3cab075
Merge branch 'master' into benutzerberechtigungGUIneu
2023-03-27 10:55:58 +02:00
55e47d8b62
Merge remote-tracking branch 'origin/master'
2023-03-27 10:53:23 +02:00
f72da812d7
Ganzer SQL Filterbar
2023-03-27 10:53:18 +02:00
17adaf79b0
Nur verplanbare LV-Teile werden gezählt; Studiengangsfilter
2023-03-27 10:52:35 +02:00
84b1f1c81a
Multi-Endedatum setzen, Jquery Checkboxes adaptiert
2023-03-27 10:50:00 +02:00
76c4c4a0e9
Termin 3 als pruefungstyp in lehre.tbl_pruefungstyp in dbupdate hinterlegt
2023-03-27 08:15:29 +02:00
3e056ebf3d
Notenimport Nachprüfung und 3.Termin: Ergänzung um nicht numerische Noten
2023-03-24 15:21:01 +01:00
7e518c3978
Documents
2023-03-24 11:26:16 +01:00
903f3d2f37
generateESI Job bugfixes (correct models, Ids in error logs), added insertvon
2023-03-23 17:50:32 +01:00
25313a8f52
Code quality check fixes
2023-03-23 14:34:37 +01:00
fbcf9d9778
Fixed: Now flagging correctly ALL Studiengänge with Schreibberechtigung
...
Before Schreibberechtigung was not set correctly true/false and displayed wrong in table.
Therefore fixed query.
2023-03-23 09:10:04 +01:00
cd6443d9c0
-added scheduler for generating and saving ESI -first version of generateESI job
2023-03-22 17:41:15 +01:00
1b53b17b48
Merge branch 'master' into feature-16354/TinyMCE_move_to_new_version
2023-03-22 16:43:56 +01:00
b7661b200e
Removed unnecessary code
2023-03-22 15:45:06 +01:00
26ed20b1f5
Changed 'Schreibberechtigt'-column for STGL: Now showing ALL by default
2023-03-22 15:44:00 +01:00
f94274ae1c
Optimized Mehrsprachigkeit-query
...
Removed unnessecary type conversions
2023-03-22 14:08:46 +01:00
a78b4507da
Added missing phrasen
2023-03-22 09:42:04 +01:00
651bd9e37a
- nicht notwendige permission fuer funktion geloescht
2023-03-21 16:57:33 +01:00
7336525021
- rueckstelldatum default zwei wochen
2023-03-21 16:56:35 +01:00
230ebcaf9a
added table public.tbl_kennzeichen and kennzeichentyp for managing person Ids
2023-03-20 17:01:58 +01:00
8035176e8b
Fixed: Old Anrechnungen sometimes failed to open
...
...this is fixed now
2023-03-20 13:48:23 +01:00
e4fca1b823
Merge branch 'master' into feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung
2023-03-20 11:32:14 +01:00
b59b00dbe4
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-03-20 11:31:33 +01:00
455d7e9aa2
Restored general Ablehnungstext in Lector & STGL Overview with explenation
2023-03-20 11:30:05 +01:00
ca502488b7
Small text adaption of phrases
2023-03-20 11:20:37 +01:00
7f99b26e48
Added new phrases
...
.genehmigungNegativKenntnisseNichtGleichwertigWeilHinweis
.empfehlungNegativKenntnisseNichtGleichwertigWeilHinweis
2023-03-20 11:05:57 +01:00
b827d8cbea
Projektarbeit Abgabetool: Text is displayed for student instead of note if Projektarbeit Benotung is saved, but not abgeschickt (sent)
2023-03-17 17:33:18 +01:00
279ddddfc8
Wochenstunden auf numeric korrigiert, Diverse NOT NULL Constraints
...
hinzugefügt
2023-03-17 09:53:41 +01:00
8f37d24693
Fixed Typo in Column Dienstverhaeltnis
2023-03-17 08:29:21 +01:00
598f6b4b09
- nur zukuenftige eintraege markieren
2023-03-16 17:16:31 +01:00
2c4dc542b6
- parken und zustellen anzeige in eine spalte zsmgefasst
2023-03-16 17:09:00 +01:00
4787159071
Merge branch 'feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token'
2023-03-16 15:13:07 +01:00
c365896865
- log eintrag hinzugefuegt, beim setzen auf park...
2023-03-16 13:57:17 +01:00
71e8742cc8
Merge branch 'TechnikumWienAcademy-master'
2023-03-16 11:25:57 +01:00
813cca99e2
improved plausicheck getOrgformStgUngleichOrgformPrestudent, so it checks orgform for current prestudent, is valid only for mischform, includes more prestudent statuses
2023-03-16 10:15:40 +01:00
de1ae7e46c
correct file path for pictures
2023-03-16 09:40:16 +01:00
d606418072
Set focus on all Begruendungs-textareas
...
This makes it easier to directly add and complete Begruendungen.
Changed in STGL and Lecotors Overview and Detailview
2023-03-16 09:05:49 +01:00
d69788e8d2
Added 'Andere Begründung' to STGL and Lector Detailview
2023-03-16 09:02:43 +01:00
4a009f3cef
Set ZGV-column visible
2023-03-16 09:01:24 +01:00
9c1d58c447
Merge branch 'master' into feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token
2023-03-15 21:47:33 +01:00
b2a6db9ed3
Added NOTNULL Constrait to tbl_gehaltsabrechnung.gehaltsbestandteil_id
2023-03-15 17:26:04 +01:00
792d1980fe
Removed general Ablehnungstext in Lector & STGL Overview
...
Ablehnungstext was changed in former commit in order to make sure to add personal reason.
This is done in Detail sites.
Therefore the generally written Ablehnungstext is now removed from Overview sites.
2023-03-15 14:49:34 +01:00
9d8adaba26
Ermittlung des Projektbetreuer Stundensatz an Config angepasst
2023-03-14 13:05:10 +01:00
1165f4407e
Merge branch 'master' into feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen
2023-03-14 12:53:08 +01:00
a413064d80
Erstversion für Vertragsmigration
2023-03-14 11:46:07 +01:00
9e11dfb668
code quality
2023-03-14 11:00:36 +01:00
22cd1e075a
- rueckstellgruende umbenannt
...
- sort in der tabelle hinzugefuegt
- anzeige angepasst
2023-03-14 10:19:07 +01:00
e67e7309cb
Merge branch 'feature-3878/temput_ganztaegige_zeitsperren_erzeugen_keine_kollision'
2023-03-13 16:24:45 +01:00
6e1c602658
Merge branch 'feature-6329/NotenfreigabeMailAufNoReplyAendern'
2023-03-13 15:55:15 +01:00
d8ab7036a6
noreply auf no-reply geändert
2023-03-13 15:54:48 +01:00
4899c62863
Merge branch 'master' into feature-6329/NotenfreigabeMailAufNoReplyAendern
2023-03-13 15:50:38 +01:00
6b6392deb4
Missing ;
2023-03-13 09:02:46 +01:00
2238b872c6
Documents Self Service
2023-03-13 09:01:45 +01:00
c85d98f681
Neues HR Schema und Vertragstabellen
2023-03-10 17:44:15 +01:00
4f764b9dfa
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2023-03-10 14:13:28 +01:00
7a554b0d0c
Adaptierung Berechnung ECTS
2023-03-10 12:49:34 +01:00
83c0413815
code quality
2023-03-10 10:29:54 +01:00
91e43bbc07
Documents first draft
2023-03-10 09:28:57 +01:00
f9975eb530
Code Quality
2023-03-10 09:28:04 +01:00
cca82d2961
problem with switching presets and problem with vanishing gehaltsbestandteile solved
2023-03-10 08:21:59 +01:00
c62d89d25c
add default settings for childs, add option to hide fields
2023-03-09 16:46:15 +01:00
1da8881905
Added new Ablehnungstext and checks to Lector Detail View
...
. Changed Ablehnungstext
. Trim text and focus on textarea to fasten editing
. Check if forgot to add own Begründungstext
2023-03-09 16:11:37 +01:00
3e092bf375
Added new Ablehnungstext and checks to STGL Detail View
...
. Changed Ablehnungstext
. Trim text and focus on textarea to fasten editing
. Check if forgot to add own Begründungstext
2023-03-09 16:11:04 +01:00
8a7bcab2c6
Added new phrases to reject Empfehlung / Anrechnung
2023-03-09 16:05:27 +01:00
6a65468bb0
refactored to allow grouping elements in tabs, while maintaining json structure
2023-03-09 14:59:07 +01:00
6644564738
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-03-09 09:31:53 +01:00
31b6ff9954
Removed unnecessary code and added phrase
...
Unnecessary since implementation of tabulator
2023-03-09 09:27:16 +01:00
345cc6cf83
Adaptierung Attribut studPlan
2023-03-09 08:19:05 +01:00
81f279964c
Tooltip für Anmerkung
2023-03-08 15:03:31 +01:00
9830025853
Merge branch 'master' into benutzerberechtigungGUIneu
2023-03-08 14:58:46 +01:00
18d760886a
Update-Details bei Reservierungen im Tempus anzeigen
2023-03-08 14:54:51 +01:00
265244c5af
Offsetpunkte in Fragenübersicht anzeigen
2023-03-08 14:54:29 +01:00
4ceaffa617
Kopierfunktion für Räume
2023-03-08 14:54:13 +01:00
84ca798dad
add format to set text as format for date columns and highlight them
2023-03-08 13:50:33 +01:00
bae6675efe
Removed config vars start and end of Application period
...
Removed
.'submit_application_start'
.'submit_application_ende'
2023-03-08 13:02:08 +01:00
ef32586d86
Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen
2023-03-08 13:00:03 +01:00
4a5e83fece
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-03-08 12:58:29 +01:00
ba0e084311
Integrated into FH Complete Navigation
2023-03-07 18:40:54 +01:00
a7f02548b0
Formatted date (of Anrechnungszeitraum Start and -Ende)
2023-03-07 17:57:39 +01:00
9882065b20
Removed tablesorter script
...
Not used.
2023-03-07 17:56:26 +01:00
eee4faa241
Adaptierungen Matr_nr als zusätzliches Feld, LVS statt ALVS, Herausfiltern von nicht studienplanrelevanten LVs
2023-03-07 17:47:40 +01:00
058d01b6be
Added Berechtigung lehre/anrechnungszeitfenster
2023-03-07 17:37:50 +01:00
68a6554d19
Removed loading config Anrechnung
...
Not needed anymore. Using tbl_anrechnungszeitfenster now.
2023-03-07 17:20:20 +01:00
f8349a2a9b
Changed Bootstrap 5 -> Bootstrap 3
...
Tablewidget is not working fine with Bootstrap 5 by now.
2023-03-07 17:18:21 +01:00
08fffa5009
Merge branch 'feature-15029/Docsbox'
2023-03-07 16:27:16 +01:00
d06efc15a6
Removed Config because its in the global Config
2023-03-07 16:22:35 +01:00
58c3fba33a
Added Missing Config to enable Docsbox Conversion
2023-03-07 16:20:02 +01:00
bf6d0aca38
Merge branch 'master' into feature-15029/Docsbox
2023-03-07 15:57:14 +01:00
c78e715c3e
Added phrases 'bearbeitetVon', 'bearbeitetAm'
2023-03-07 14:07:14 +01:00
ba31a0b5b0
Changed HTML table to Tablewidget
2023-03-07 14:06:00 +01:00
c411b826d9
Merge branch 'feature-25518/bewerbungstool_messages_direkt_an_permesser'
2023-03-06 16:54:43 +01:00
479feea8aa
Changed way of checkíng Anrechnungszeitraum
...
Changed function isExpired to check Anrechnungszeitraeume of tbl_anrechnungszeitraum instead of using config entries.
2023-03-06 15:26:12 +01:00
043f09892a
Deleted hidden testing field
2023-03-06 15:22:56 +01:00
83896113d8
Anpassungen rdf diplomasupplement
2023-03-06 15:02:44 +01:00
9e15668c37
Created page-header class
...
page-header class was dropped since Bootstrap 4.
Therefore added to css style
2023-03-06 13:25:14 +01:00
9c85877d3d
Added new phrases
...
.anrechnungenVerwalten
.anrechnungszeitraumFestlegen
.anrechnungszeitraumHinzufuegen
.anrechnungszeitraumSpeichern
.anrechnungszeitraumStart
.anrechnungszeitraumEnde
.errorStartdatumNichtInStudiensemester
.errorEndedatumNichtInStudiensemester
.errorStartdatumNachEndedatum
.frageSicherLoeschen
2023-03-06 13:24:03 +01:00
f8fb59e806
Created js to handle Anrechnungszeitraum
...
Handle:
. modals to add / update Anrechnungszeitraume
. AJAX calls to add / update / delete
2023-03-06 13:21:37 +01:00
d3f88597d9
Created Model Anrechnungszeitraum_model
...
Inserts / Updates / Deletes Anrechnungszeitraum
2023-03-06 13:19:15 +01:00
727d0b5876
Created GUI to admin Anrechnungszeitraume
...
Add / Update / Delete Anrechnungszeitraume
2023-03-06 13:18:23 +01:00
87a1b3647d
Created Controller AdminAnrechnung to admin Anrechnungszeitraume
...
Add / Update / Delete Anrechnungszeitraume
2023-03-06 13:16:27 +01:00
35c68d98a1
Created lehre.tbl_anrechnungszeitraum
2023-03-06 13:15:16 +01:00
7bb340a415
- checksystem auf 3.4 umgebaut
...
- vilesci raumtypen inaktive raumtypen werden markiert
- tempus karteireiter ort zeigt nur aktive raumtypen an
- raumsuche auf aktive raumtypen eingeschraenkt
2023-03-01 10:44:47 +01:00
90a518a70d
Merge branch 'bug-27845/rt_zeit_hinzufuegen_bug'
2023-02-28 15:45:48 +01:00
37364d9775
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-24913/TabelleRaumtypNeuesAttributAktiv
2023-02-28 13:55:08 +01:00
220617f14f
enhance guioptions to be able to disable selected fields and hide gehaltsbestandteile add link
2023-02-28 10:50:40 +01:00
3076753a19
- preview.php verlinkung entfernt
...
- lvincoming.php entfernt
2023-02-28 08:59:30 +01:00
22fbe098ec
- studienbestaetigung fuer abbrecher angepasst
2023-02-27 15:01:18 +01:00
012e7b9691
- kollision bei ganztaetigen zeitsperren
2023-02-27 11:35:04 +01:00
6d1d4cb74b
- uebernahme von zurueckgestellten und geparkten personen hinzugefuegt
2023-02-27 11:32:55 +01:00
601eae1e95
extension plausicheck bugfix: extension name is correctly passed to plausicheckproducerlib
2023-02-24 17:43:36 +01:00
a667ddaf5e
Plausichecks: removed/changed comments
2023-02-24 13:32:37 +01:00
555b8f4e6b
access rights
2023-02-24 11:59:27 +01:00
280890a00d
Stundenplan Widget
2023-02-24 11:57:54 +01:00
4f2ca62d05
Issues: enabled extensions to produce own plausichecks, IssueResolver: moved directory names to constants, deleted unused IIssueExistsChecker
2023-02-23 19:27:45 +01:00
62550423a3
- geparkt und onhold von der log tabelle in eine eigene tabelle verschoben
...
- nicht mehr benoetigte funktionen entfernt
- infocentertool angepasst
- bewerbungstool angepasst
- phrasen hinzugefuegt
2023-02-23 16:07:52 +01:00
7ae41ac965
pass config to gueltigkeit in formheader
2023-02-22 10:27:39 +01:00
fe7cd05d57
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-02-22 10:10:10 +01:00
2672ebc61c
sharedstate for gueltigkeit, mode to set gueltigkeits reflect or ignore or set shared gueltigkeit, add vertragsbestandteil kuendigungsfrist
2023-02-22 09:36:45 +01:00
fd39312de6
Merge branch 'feature-28084/DVUH_issue_resolvers_different_folder'
2023-02-21 17:12:29 +01:00
01a020d196
IssueResolver: renamed issue resolvers folder constant
2023-02-21 17:04:26 +01:00
2b9af86955
- Added examples to application/config/db_crypt.php
...
- core/DB_Model->_addDecryptLoad fixed when checking the condition if the used operator is made of two characters
2023-02-21 16:11:49 +01:00
844f72d3d4
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-02-21 16:05:06 +01:00
90ada0aaf8
Merge branch 'TechnikumWienAcademy-master'
2023-02-21 08:44:57 +01:00
dee4af2fb8
add parameters to generateUID()
2023-02-21 08:02:15 +01:00
785b824d6f
add missing extension .js
2023-02-20 16:25:19 +01:00
88dee31289
added Plausicheck CORE_STUDENTSTATUS_0015 for finding persons without Konto Buchungen (charges), Plausichecks GUI: generic plausicheck error text is displayed if not defined erroroccured, instead of success message
2023-02-20 11:40:55 +01:00
2729b60b39
- Added new constants SESSION_ENCRYPTED_COLUMNS and ENCRYPTED_COLUMNS to libraries/TableWidgetLib
...
- Changed libraries/TableWidgetLib->getDataset to accept the new parameter encryptedColumns
- Added new private method _encryptedColumns to widgets/TableWidget
- widgets/TableWidget now calls tablewidgetlib->getDataset now giving the encryptedColumns parameter
- widgets/TableWidget stores in the session the encryptedColumns parameter
2023-02-20 11:31:19 +01:00
0413528798
cleanup form, add preset functionality for structure and data, use same JSON for preset and formoutput - prepare for save and restore before persisting to db
2023-02-17 16:05:35 +01:00
9b8a1ba096
- Added new constants SESSION_ENCRYPTED_COLUMNS and ENCRYPTED_COLUMNS to libraries/FilterCmptLib
...
- Added new private property _encryptedColumns to libraries/FilterCmptLib
- libraries/FilterCmptLib: execReadOnlyQuery is now called providing the parameter _encryptedColumns to read database encrypted columns
2023-02-17 14:01:09 +01:00
f80ecd9aa2
fix missing extension
2023-02-17 10:41:35 +01:00
facee3076d
first guess vue vertragsbestandteil und gehaltsbestandteil components
2023-02-15 15:55:37 +01:00
4d85d42a79
- gebiet zeit hinzufuegen fixed
...
- stammdaten abbrechen button fixed
2023-02-15 14:50:12 +01:00
accccbd362
Projektarbeitsbeurteilung abgabe_lektor_details: added explanatory text below when "grade" (benoten) button is disabled
2023-02-13 17:04:21 +01:00
de81a5abbd
Merge remote-tracking branch 'origin/master'
2023-02-13 13:27:22 +01:00
0fdf943085
Textanpassung an 30MB Uploadgrenze
2023-02-13 13:27:16 +01:00
feb14a9f39
Anpassung Speicherbutton, Tooltips, Alertmessages
2023-02-13 11:27:54 +01:00
ab5e656069
Anrechnungen: Link zu Dokumenten in der Übersicht korrigiert
2023-02-13 10:21:12 +01:00
8d3a9d86f3
DBUpdate Gegenchecks erweitert
2023-02-09 18:47:42 +01:00
3f5c6c4ee5
Merge branch 'bug-16636/Lv_Termine_im_FAS_falsch_ermittelt'
2023-02-09 17:11:21 +01:00
97023c547c
Merge branch 'feature-17512/Issues_Plausibilitaetspruefungen'
2023-02-09 16:14:49 +01:00
3d1908982a
Merge branch 'feature-24647/Konfigurierbare_Dashboards' into feature-25999/C4
2023-02-09 16:12:36 +01:00
947cc3beff
Datenbankändungen von 3.3 nach 3.4 verschoben
2023-02-09 16:09:37 +01:00
151e9d2ca3
Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen
2023-02-09 16:04:33 +01:00
381db6a93f
Merge branch 'feature-25561/Quellkursverknüpfung_und_wiederherstellung_f_LehrgangsLVs_der_Academy'
2023-02-09 11:20:07 +01:00
7f97a58baa
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2023-02-09 10:55:41 +01:00
8ef07fd9b2
Fixed LogsViewer: check if request id is not null before using it to set the row color
2023-02-09 10:54:56 +01:00
569c8c929e
Merge branch 'feature-25177/ZeiterfassungMergedBrancheDeploy1'
2023-02-09 10:27:25 +01:00
c831355012
- FilterWidget: now it is possible to provide the encryptedColumns parameter to specify which columns of a database table are encrypted, how to cast them and which password to use to decrypt them
...
- Added new constants PGSQL_BYTEA_TYPE, CRYPT_CONF_PASSWORDS, CRYPT_CAST, CRYPT_PASSWORD_NAME, CRYPT_SELECT_TEMPLATE, CRYPT_WHERE_TEMPLATE and CRYPT_WRITE_TEMPLATE to application/core/DB_Model.php
- Added new optional parameter encryptedColumns to application/core/DB_Model insert, update, load, loadWhere, execQuery, execReadOnlyQuery and _toPhp
- Added new private methods _addEncrypt, _addDecryptQuery and _addDecryptLoad to application/core/DB_Model.php
- core/DB_Model: now it is possible to provide the encryptedColumns parameter to specify which columns of a database table are encrypted, how to cast them and which password to use to decrypt them
- Adapted application/models/system/PersonLog_model.php
2023-02-08 13:33:40 +01:00
ba76ced168
Merge branch 'master' into feature-25561/Quellkursverknüpfung_und_wiederherstellung_f_LehrgangsLVs_der_Academy
2023-02-08 10:28:43 +01:00
0347ad9b10
Stunden werden auf NULL gesetzt wenn eine Zeitsperre bearbeitet wird die
...
keine Stunden zulässt
2023-02-07 18:48:22 +01:00
990bffeb2c
Merge branch 'feature-16899/Anwesenheitsliste_um_Geschlecht_erweitern'
2023-02-07 16:36:42 +01:00
78a66bfc74
Merge branch 'feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern'
2023-02-07 14:51:20 +01:00
9c349d9f1b
Merge branch 'master' into feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern
2023-02-07 14:46:24 +01:00
51b5cb8620
Merge branch 'bug-26015/OutgoingAufAnwesenheitslisteAnzeigenBeiMehrerenDatensaetzen'
2023-02-07 14:29:48 +01:00
366aca2b1c
Merge branch 'bug-26740/FAS_Reiter_Anwesenheit'
2023-02-07 14:21:24 +01:00
de5b701532
Problem beim CSV Import behoben wodurch der Import ohne
...
Projekt-Zuordnung nicht möglich war
2023-02-07 09:01:29 +01:00
b17c6e29e5
Merge branch 'master' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2023-02-06 16:23:48 +01:00
fd0eed8558
Merge branch 'feature-27665/infocenter_zgv_uebernehmen'
2023-02-06 15:49:18 +01:00
e6269b121b
- fixed zgv uebernehmen
2023-02-06 13:04:32 +01:00
9f72206796
Stundenplan Widget Basic
2023-02-06 11:44:36 +01:00
13b898179e
Widget classes
2023-02-06 09:46:32 +01:00
7e2d63e3fe
Css cleanup
2023-02-06 08:53:32 +01:00
0f60ab2a54
Stundenplan & Calendar
2023-02-06 08:43:43 +01:00
d1f69d4696
MyLV Verbesserungen & cleanup
2023-02-06 08:42:42 +01:00
5441024c75
Merge branch 'feature-27363/infocenter_alte_dokumente_aus_dem_archiv_sichtbar'
2023-02-02 12:20:42 +01:00
f46ff9c97a
Merge branch 'feature-11058/fas_unterrichtsnummer_ungleich_lehreinheit_id'
2023-02-02 12:12:12 +01:00
0cfcb58a58
Merge branch 'feature-25900/krankenstaende_abteilung_und_unternehmen_hinzufuegen'
2023-02-02 12:05:46 +01:00
92fb2f40cd
Merge branch 'feature-26298/unr_problem_im_tempus_fas'
2023-02-02 11:50:40 +01:00
858ab16bc7
Merge branch 'feature-26104/standort_kurzbz_im_fas_anzeigen'
2023-02-02 11:45:50 +01:00
b2e148d330
Bugfix Standort
2023-02-02 11:45:03 +01:00
463c6bd97a
Merge branch 'feature-25431/zgv_master_eingabe_sperren'
2023-02-02 11:27:25 +01:00
2fdd136aa9
Merge branch 'feature-24683/reihungstest_zeit_für_gebiete_zuruecksetzen_nach_dem_entsperren_eines_teilnehmers'
2023-02-02 11:20:48 +01:00
6643fae82c
Merge branch 'feature-24682/reihungstest_zugangscode_fuer_login'
2023-02-02 11:06:42 +01:00
94854592fb
Merge branch 'feature-26425/konto_buchung_vorhanden_warning_namen_anzeigen'
2023-02-02 10:38:14 +01:00
b60e0b712f
Merge branch 'feature-25430/stammdaten_im_infocentertool_editierbar'
2023-02-02 10:32:36 +01:00
2b3842df29
Merge branch 'feature-27513/infocenter_fit_anpassung'
2023-01-31 12:29:56 +01:00
e019faabe4
Merge branch 'feature-27480/international_skills_text_anpassungen'
2023-01-30 14:57:22 +01:00
3293a75a79
- berechtigungsabfragen angepasst
...
- fit programme aus der config holen
2023-01-30 11:51:15 +01:00
c8df6633af
- text anpassungen
2023-01-27 08:56:47 +01:00
c136a0afdb
phrasesupdate: added phrase for projektarbeitsbeurteilung weightening notice, changed phrases for total points for correct upper case
2023-01-26 18:55:41 +01:00
7eda91d0a2
Merge branch 'master' into feature-24880/Sprachaenderung_in_Projektarbeitsbeurteilung_mit_Token
2023-01-26 17:38:34 +01:00
44bfe52529
- fas filter hinzugefuegt
2023-01-26 11:35:22 +01:00
50070bd2ad
- Dokumente aus dem Archiv im Infocenter-Tool nicht anzeigen
2023-01-26 10:41:44 +01:00
a9e235678c
Filter Widget in Tabellen
2023-01-24 21:13:36 +01:00
0401821422
Merge branch 'master' into feature-15029/Docsbox
2023-01-23 13:32:51 +01:00
f7d315d4cc
model classes for contract parts (Vertragsbestandteile)
2023-01-21 13:51:59 +01:00
fd5ce62b0e
added timeline widget
2023-01-21 13:50:45 +01:00
c8fb2080da
Studiengangsfilter bei Fragenübersicht
2023-01-20 10:46:22 +01:00
d59b3736a2
Test personalmeldung xml
2023-01-18 13:15:56 +01:00
73dc39b9d8
added phrases for Projektarbeitsbeurteilung language dropdown
2023-01-17 20:45:05 +01:00
194d141539
Merge branch 'VorrueckungLetztesSemester'
2023-01-17 16:01:54 +01:00
04584fdec9
Merge branch 'master' into VorrueckungLetztesSemester
2023-01-17 15:59:12 +01:00
f0b1c14ea4
Contents unchanged
2023-01-17 15:57:01 +01:00
3fb20cf61e
Merge branch 'bug-27193/Pause_fehlt_-_Falsche_Anzeige'
2023-01-16 16:10:54 +01:00
5872612d86
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2023-01-16 13:10:33 +01:00
4fa1193948
- Added new CI config file application/config/db_crypt.php, it is loaded by core/DB_Model
...
- Added new constant ENCRYPTION_PASSWORDS to application/core/DB_Model.php
- Added new protected properties passwordName and encryptedColumns to core/DB_Model
- Added new private methods _isCryptoEnabledAndValid, _getCipher, _encrypt and _decrypt to core/DB_Model
- core/DB_Model properties insert and update now are making use of _encrypt()
- core/DB_Model properties loadWhere and loadTree now are making use of _decrypt()
2023-01-16 12:10:49 +01:00
034bed6580
cleanup
2023-01-16 11:40:40 +01:00
2e126692f2
MyLv: Permissions & notFound fallback
2023-01-16 11:38:24 +01:00
559e4d2bc0
cleanup
2023-01-16 11:22:53 +01:00
2f2f19306b
MyLv
2023-01-16 10:32:24 +01:00
ebc7b5a3d9
Login/Logout
2023-01-16 10:31:02 +01:00
f15e89c451
ignore DienstreiseMT entries when calculating Pausenfehler
2023-01-16 10:24:09 +01:00
f52c9ed3c2
Anpassung der Errormessage
2023-01-13 15:29:59 +01:00
8bd007b6ea
Merged Fachbereichsleitungs-files into core files
...
. approveAnrechnungUebersichtData_fbl.php into approveAnrechnungUebersichtData.php
. reviewAnrechnungUebersichtData_fbl.php into reviewAnrechnungUebersichtData.php
2023-01-12 09:38:41 +01:00
f2231fcba2
Disabled recommendation buttons if Lector is not empfehlungsberechtigt
...
If lector should see Anrechnung but not give a recommendation (because is not the LV-Leitung),
then recommendation buttons are disabled.
2023-01-11 18:13:14 +01:00
3f4efbcd16
Added function isEmpfehlungsberechtigt to AnrechnungLib
...
Checks if user is allowed to recommend Anrechnung.
2023-01-11 18:05:49 +01:00
fb4f9981f0
Corrected: Anzeige aller LV-Leitungen, an die Empfehlung gesendet wurde
...
In der STGL Anrechnungs-Detailsicht wurde bisher nur die erste LV-Leitung
aus dem Ergebnisarray ausgelesen. Nun werden alle angezeigt.
2023-01-11 13:52:44 +01:00
d1319a23ad
Added: STGLs sehen jetzt nur Anrechnungen von STGs, für die sie eine Berechtigung haben
...
Es gibt eine neue Spalte 'schreibberechtigt' in der Anrechnungentabelle.
Defaultmäßig werden nur 'schreibberechtigte' Anrechnungen angezeigt, wo STGL
die Berechtigung auf die OE hat.
Über den Filter können aber auch alle angezeigt werden.
2023-01-11 13:47:23 +01:00
29f1760a7c
Added: LektorInnen sehen jetzt nur Anrechnungen, für die sie eine Empfehlung abgeben dürfen
...
Es gibt eine neue Spalte 'empfehlungsberechtigt' in der Anrechnungentabelle.
Defaultmäßig werden nur 'empfehlungsberechtigt' Anrechnungen angezeigt, wo LektorIn:
- LV Leitung der LV ist ODER
- die LV keine LV-Leitung hat
Über den Filter können aber auch alle angezeigt werden.
2023-01-11 13:45:18 +01:00
ed99325bb9
- anpassungen fuer master bewerbungen
2023-01-10 09:04:53 +01:00
c1b40608c1
Merge branch 'master' into VorrueckungLetztesSemester
2023-01-09 16:38:49 +01:00
2ca9f29c0d
Englischen Bachelor-Leitfaden entfernt
2023-01-09 15:52:12 +01:00
9c40452562
fas lv list: improved speed of query getting the lv by relocating studienplan exists check
2023-01-05 18:25:15 +01:00
030b459b0a
make Vertragbestandteil JsonSerializable (because json_encode would otherwise output null)
2022-12-30 18:36:10 +01:00
6d05df876b
lehrstunde.class.php: added with clause to getStundenplanData for speedup, removed brackets, added comments
2022-12-23 20:18:19 +01:00
b8e973c313
lehrstunde get Stundenplan data: removed var_dump
2022-12-23 02:45:48 +01:00
514205c171
lehrstunde get Stundenplan: changed how data for students is retrieved, so that correct gruppen, lektoren etc can be displayed
2022-12-23 02:44:22 +01:00
19ebe3cfa8
lehrstunde getstudienplan method: added studiensemester to "special groups" test for students
2022-12-21 17:43:42 +01:00
103b93a2b8
getStundenplandata method: student lehreinheiten are taken from Studienplan, not view vw_studentlehrverband
2022-12-20 22:22:36 +01:00
9070a81f25
Änderung der From-Adresse auf noreply
2022-12-19 14:09:40 +01:00
c5b996f35e
use vue for cms for link correction
2022-12-16 13:41:16 +01:00
08ebcf591a
Adaptierung Legende Fotoliste
2022-12-16 11:50:14 +01:00
00c52e4880
cleanup
2022-12-16 11:43:35 +01:00
4335c2da80
add Dashboard to HMVC
2022-12-16 11:36:33 +01:00
085ed750ca
using cis.php and routing news
2022-12-16 11:34:39 +01:00
00446cdb33
Erweiterung Anwesenheitsliste um Geschlecht
2022-12-16 08:37:04 +01:00
c56b774d1d
3 Versions
2022-12-15 09:42:28 +01:00
d9098179a2
- ermoeglicht es master bewerber sich ueber das bewerbungstool anzumelden
2022-12-14 12:40:38 +01:00
48ee451a38
changed method projektarbeitIsCurrent to adapt to changes for master (weightening of points), kept old check as projektarbeitIsCurrentBeforeWeightening method
2022-12-13 17:25:42 +01:00
3818d5221c
first guess vertragsbestandteil library
2022-12-13 10:49:35 +01:00
db53de363c
Merge branch 'master' into benutzerberechtigungGUIneu
2022-12-12 10:07:03 +01:00
603abd5458
Merge remote-tracking branch 'origin/master'
2022-12-12 09:41:07 +01:00
cb9eaa7694
Last Status Abgewiesener ergänzt, Felder BPK und Matrikelnummer ergänzt
2022-12-12 09:40:02 +01:00
7c17ac4ea7
Erweiterung Abfrage in Klasse Anwesenheit um wahlname
2022-12-12 08:32:51 +01:00
ad19e0ed75
- im fas die unr hinzugefuegt
2022-12-12 07:55:36 +01:00
46f7fc2883
Merge branch 'feature-19154/Beurteilungsformulare_Pruefungssenat' into feature-26516/Beurteilungsformulare_Gewichtung_bei_Master_Beurteilungen
2022-12-07 17:51:04 +01:00
77361fc5f1
Projektarbeitsbeurteilungen: added phrass "gewichtet"
2022-12-07 17:40:20 +01:00
8d221be050
Adapt view to use Fachbereichsleitung-DataView
2022-12-06 15:53:15 +01:00
40c7e1c9f0
Created new Approve Anrechnung Uebersicht for Fachbereichsleitung
2022-12-06 15:52:30 +01:00
32bdeec02e
Added date check for Fachbereichsleitung in Tabulator query
2022-12-06 15:49:04 +01:00
91a2bf4f21
Merge branch 'bugfix/STGL-kann-alte-Anrechnungen-nicht-sehen' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige
2022-12-06 14:15:15 +01:00
c3e3d8e9d7
Added Fachbereichsleitung permission check to read Anrechnung and download Document
2022-12-06 14:05:42 +01:00
8735318545
Enhanced code readability
2022-12-06 14:03:22 +01:00
21060b31dc
Bugfixed error message when LV has no lectors and only one recommendation is requested
2022-12-06 14:01:24 +01:00
e148d8c2f4
Added function to get Fachbereich as mail receivers
2022-12-06 13:54:56 +01:00
d3a1ed222c
Adapted to send mails only if config['mail'] is TRUE
2022-12-06 13:43:11 +01:00
0197e5b175
Adapted STGL Views to display Fachbereichsleitung (as 'Empfaenger') after recommendation
2022-12-06 13:33:28 +01:00
fe2601b29a
Adapt view to use Fachbereichsleitungs-DataView
2022-12-06 13:25:25 +01:00
4a87fb49e9
Created new Review Anrechnung Uebersicht Tabulator for Fachbereichsleitung
2022-12-06 13:22:48 +01:00
88246c443a
Added function getFachbereichleitung to AnrechnungLib
...
...plus adaptation to getEmpfehlungData to use this function.
2022-12-06 10:53:21 +01:00
10ed780b6c
Added method getFachbereichsleitungByLv to Lehrveranstaltung_model
...
Gets all fachbereichsleiter of a Lehrveranstaltung
2022-12-06 10:50:08 +01:00
cee15a68ba
Added config['fbl'] and config['send_mail'] to anrechnungen
...
. config['fbl'] enables Fachbereichsleitung instead of LektorInnen
. config['send_mail'] enables sending Info Mails
2022-12-06 10:48:52 +01:00
579eda8680
Merge branch 'master' into feature-19154/Beurteilungsformulare_Pruefungssenat
2022-12-02 19:57:28 +01:00
911035d5ad
added method getBetreuerart to Projektbetreuer model
2022-12-02 19:48:23 +01:00
1aada9694e
Anzeige EW-Team: nur aktuelle Eintraege oder Eintraege ohne Zeitraum
2022-12-02 12:44:53 +01:00
41eaee41af
getIncomingOrGsFoerderrelevant: studiensemester is checked only for prestudent status
2022-12-01 17:18:18 +01:00
d24bc36bf7
- freischaltcode beim RT hinzugefuegt
2022-12-01 11:07:47 +01:00
6215786565
- zeit staffelung hinzugefuegt
2022-12-01 10:20:10 +01:00
7d1267732f
IncomingOrGsFoerderrelevant plausicheck: added first version of issue resolver, renamed from IncomingAndGsFoerderrelevant
2022-11-30 17:53:36 +01:00
d1ac2e0424
added plausicheck "getIncomingUndGsFoerderrelevant"
2022-11-30 17:26:50 +01:00
1c0e74e828
Testvarianten zur Anzeige von EW-Team in Personalmeldung
2022-11-30 10:38:40 +01:00
ca217f1869
Fixed: Downloadlink erzeugt nach Page Reload keine Fehlermeldung mehr
2022-11-29 18:10:39 +01:00
8baa5b74dd
Revert "personalmeldung.php mit masterstand überschrieben, um letztes commit rückgängig zu machen"
...
This reverts commit 39572452a0
2022-11-29 10:39:20 +01:00
39572452a0
personalmeldung.php mit masterstand überschrieben, um letztes commit rückgängig zu machen
2022-11-29 10:26:31 +01:00
381fa2ed7e
- bei der warnung buchung vorhanden, name hinzugefuegt
2022-11-29 10:17:32 +01:00
266ba7523f
s&d
2022-11-29 08:48:50 +01:00
d1a8ec7490
Erweiterung und OrderBy der Abfragen um Dauer Auslandsaufenthalt
2022-11-29 08:15:22 +01:00
7cdb7688c4
Fixed: Vergangene Anrechnungen können jetzt eingesehen werden
...
Manche vergangene Anrechnungen konnten nicht eingesehen werden, weil
die Zuordnung der Studenten zu den Lehrveranstaltungen aufgelöst bzw. geändert werden.
Gefixt, indem nun bei einer bestehenden Anrechnung die bei der Anrechnung hinterlegten Lehrveranstaltung
herangezogen wird.
2022-11-28 17:27:39 +01:00
561e4ea21a
Erweiterung von Studiengangs_kz_Array um Start und Ende Entwicklungsteam
2022-11-28 10:56:20 +01:00
72c0f97218
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-11-28 10:28:01 +01:00
546e55ed96
Merge branch 'feature-24647/Konfigurierbare_Dashboards' into feature-25999/C4
2022-11-24 15:36:38 +01:00
4120f5a566
Merge remote-tracking branch 'origin/feature-24647/Konfigurierbare_Dashboards' into feature-24647/Konfigurierbare_Dashboards
2022-11-24 11:53:06 +01:00
4758fcb413
access rights
2022-11-24 11:52:09 +01:00
3e0aa849d4
bugfixes & "+" background
2022-11-24 11:52:01 +01:00
3e17892831
fixed path to news placeholder image
2022-11-24 11:50:09 +01:00
d51a95a8a0
test controller & views
2022-11-24 11:48:46 +01:00
a2f65373cd
- fixed bug
2022-11-24 06:57:56 +01:00
33eb1cb6af
removed comment in Plausichecks.php controller
2022-11-23 16:21:05 +01:00
37cbe5e8f7
- le details disablen bis der rebuild fertig ist
2022-11-23 07:24:48 +01:00
d7c2362a0e
double widgets bug
2022-11-22 14:39:33 +01:00
a88e5cbdc2
Ergänzung Prüftabelle um entwicklungsteam_id
2022-11-22 12:22:48 +01:00
f9d5a6a6a5
Adaptierungen fuer CheckSystem, dbupdate3.4
2022-11-22 12:14:54 +01:00
37ec8d84e5
Merge branch 'Monika70-studentenexpoertextended'
2022-11-22 11:18:50 +01:00
817d2842cc
Changed Escaping of Parameter
2022-11-22 11:17:57 +01:00
9d43279089
Update studentenexportextended.xls.php
...
mit Anmerkung erweitern
2022-11-22 10:03:40 +01:00
60a651c220
Merge branch 'feature-25183/lv_evaluierung_uebersichtsseite_langsam'
2022-11-21 16:36:50 +01:00
462e77d27d
Merge branch 'feature-24768/fas_zgv_bezeichnung'
2022-11-21 16:17:28 +01:00
920fcc0e42
Merge branch 'feature-246/notizen_bei_lehrveranstaltungen_werden_nicht_korrekt'
2022-11-21 16:11:21 +01:00
01ad28021f
Fix mergeErrors mitarbeiter.class und dbupdate3.3
2022-11-21 16:10:19 +01:00
9f8d9f1df6
Merge branch 'bug-25904/studentenmeldung_xml_standort_code_Ambiguitaet'
2022-11-21 15:53:58 +01:00
7cd4eaf5a2
Merge branch 'bug-26144/Bewerberdaten_BIS_Export_XL_Error'
2022-11-21 15:47:51 +01:00
5e1ed8fa14
Bugfix für Statistiken mit Array Parametern
2022-11-21 15:39:32 +01:00
3c99d627e1
Merge branch 'feature-19835/BewerbungstoolKeineZGVAbbrecher'
2022-11-21 15:27:36 +01:00
fec45f7b75
separated Bewerbermeldung from Studierenden BIS Meldung, bugfix: correct Bewerber numbers for correct Studiengänge are displayed, renamed ZugangMaCode Element to ZugangMaStgCode
2022-11-18 18:41:02 +01:00
7ef7b86d30
Studierende können sich frühestens 2 Monate vor Prüfung anmelden
2022-11-18 11:11:35 +01:00
1ec742b8fe
typo
2022-11-18 10:05:38 +01:00
01107e361f
Studierende können sich frühestens 2 Monate vor Prüfung anmelden
2022-11-18 10:01:39 +01:00
82b9f595c3
Merge remote-tracking branch 'origin/master'
2022-11-17 13:57:54 +01:00
d84f53e5c3
GS-Button zum Kopieren bestehender Einträge
2022-11-17 13:57:52 +01:00
deeb1cdb5e
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-11-17 10:42:13 +01:00
763b0bb756
renamed betreuerart of secondary examiner of bachelor thesis with Vorsitz from Senatspruefer to Senatsmitglied
2022-11-16 17:19:13 +01:00
ac370197e1
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25430/stammdaten_im_infocentertool_editierbar
2022-11-15 15:29:15 +01:00
ab95544f9f
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25518/bewerbungstool_messages_direkt_an_permesser
2022-11-15 15:18:59 +01:00
6e6406fb2b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25431/zgv_master_eingabe_sperren
2022-11-15 15:17:55 +01:00
00fb8366b3
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25183/lv_evaluierung_uebersichtsseite_langsam
2022-11-15 15:16:21 +01:00
8e72b83448
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-24768/fas_zgv_bezeichnung
2022-11-15 15:14:53 +01:00
98ec75dc94
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-24683/reihungstest_zeit_für_gebiete_zuruecksetzen_nach_dem_entsperren_eines_teilnehmers
2022-11-15 15:14:04 +01:00
9601ac5116
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-246/notizen_bei_lehrveranstaltungen_werden_nicht_korrekt
2022-11-15 15:13:25 +01:00
406e1bebfe
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-20037/reihungstestjob_neue_studienplaene_werden_nicht_korrekt_zugeordnet
2022-11-15 15:11:44 +01:00
75f8c4e909
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten
2022-11-15 15:09:29 +01:00
d70c0dcae3
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-11836/reihungstest_starten_von_fremden_gebieten_verhindern
2022-11-15 15:08:01 +01:00
540fc4bede
26198 Notenimport ausschliesslich bei vorhandener Note
2022-11-15 11:22:47 +01:00
8bbbd8cb8d
studentenmeldung bugfix: Erhalter Kz is correctly exported
2022-11-14 18:13:49 +01:00
048c164394
studentenmeldung.php: correct order - Studenten first, then Bewerber
2022-11-14 17:57:20 +01:00
6c918be121
Merge branch 'bug-26144/Bewerberdaten_BIS_Export_XL_Error'
2022-11-14 10:50:18 +01:00
2c743cb37b
studentenmeldung.php: Export of Bewerberdaten works for allBaMa and Studiengaenge
2022-11-11 23:41:12 +01:00
471242cb97
Added Index for tbl_webservicelog.execute_time to increase performance
2022-11-11 15:03:48 +01:00
7df9576481
add tabulator header filters to logsviewer
2022-11-11 15:02:39 +01:00
a412db7356
Attribut raumtyp_aktiv als boolean parsen
2022-11-11 14:27:06 +01:00
ac1df7691a
- Added new view application/views/system/messages/FAShtmlWriteTemplate.php to be used with FAS/SeaMonkey and TinyMCE3
...
- Replaced TinyMCE V4 with V5
- Dropped TinyMCE V4
- Added new JS public/js/messaging/fasMessageWrite.js to be included by application/views/system/messages/FAShtmlWriteTemplate.php
2022-11-11 13:54:25 +01:00
ddfb3cdb4e
Formatierungen Urlaubstool
2022-11-11 11:25:42 +01:00
119a521913
- standort kurzbz im fas anzeigen, wenn die bezeichnung null ist
2022-11-11 10:56:36 +01:00
b69e79685d
Merge branch 'master' into feature-24768/fas_zgv_bezeichnung
2022-11-11 09:53:23 +01:00
7558614145
Merge branch 'feature-25557/inaktive_lektorinnen_im_lehrauftrags_dropdown_kennzeichnen'
2022-11-11 09:41:18 +01:00
f0b36610b7
Projektarbeitsbeurteilung: added phrases, updated filter for uebersicht-page
2022-11-10 19:38:16 +01:00
f72afe473c
26112 Vilesci-Kein Löschen von Zeitsperren bei abgeschickter Monatsliste möglich
2022-11-10 15:02:13 +01:00
f766f36095
26113 Änderung Mails Zeitsaldo
2022-11-10 11:43:27 +01:00
74fb245757
26114 Änderung Mailtext Urlaub neu
2022-11-10 11:20:36 +01:00
4e3e425491
Mailversand bei Urlaubstool korrigiert
2022-11-09 11:58:31 +01:00
29809b6bf1
moved Beurteilungsformulare Pruefungssenat changes to dbupdate_3.4
2022-11-08 16:15:16 +01:00
83b38b999d
Merge branch 'master' into feature-19154/Beurteilungsformulare_Pruefungssenat
2022-11-08 15:35:08 +01:00
a5749a5ea2
bug: wrong check for empty fields when adding new widgets (coordinates are based on 0,0 not 1,1)
2022-11-08 14:47:44 +01:00
0e7343acfb
bug: uncaught promise on widget-picker abort
2022-11-08 14:46:44 +01:00
8df802b74a
- die Abteilung und das Unternehmen werden im CSV angezeigt
2022-11-08 14:45:02 +01:00
9c0d70fe89
Removed version 4 of tinymce
2022-11-08 12:01:05 +01:00
a9d065044d
- Inaktive LektorInnen im Lehrauftrags-Dropdown kennzeichnen
2022-11-07 12:17:09 +01:00
c3ff32a9d6
- unterschiedliche farbmarkierungen hinzugefuegt
2022-11-07 11:16:27 +01:00
50bf478f0b
If the title is not provided to the FilterComponent then the title div is not rendered
2022-11-04 14:06:50 +01:00
317a1f87fa
Added colors to the LogsViewer app
2022-11-04 13:56:54 +01:00
592fd7ac10
Merge remote-tracking branch 'origin/master' into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten
2022-11-04 10:49:27 +01:00
180e24b916
- studienbestaetigung in englischer sprache hinzugefuegt
...
- odt files angepasst im core
2022-11-04 10:37:38 +01:00
ebb3a6de1f
plausichecks view: adapted to vue update - set correct cs and css includes, removed body
2022-11-03 15:33:05 +01:00
4dd983c105
Phrases
2022-11-03 12:52:31 +01:00
35b23bcba4
Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen
2022-11-03 12:07:51 +01:00
71c953bac7
studentenmeldung: standort_code is retrieved and set in xml correctly (first prestudent, then studiengang)
2022-11-03 12:04:46 +01:00
0d65ae5b85
widget icons absolute path
2022-11-03 11:37:13 +01:00
55959ccd41
modal size
2022-11-03 11:33:52 +01:00
935881dce2
icon & cursor
2022-11-03 11:28:25 +01:00
3764df6102
Add widget to preset bugfix
2022-11-03 11:24:29 +01:00
e1addbfe04
Merge branch 'master' into feature-24647/Konfigurierbare_Dashboards_api
...
- mv dbchanges from system/dbupdate_3.3.php to system/dbupdate_3.4.php
- mv dbchanges include file from system/dashboard/ to system/dbupdate_3.4/ and prevent direct script access
2022-11-03 10:41:56 +01:00
677f74781b
Merge branch 'feature-24647/Konfigurierbare_Dashboards_widgets' into feature-24647/Konfigurierbare_Dashboards_api
2022-11-03 10:31:36 +01:00
c78c731388
renamed Dashboard Controller to DashboardDemo and used view to dashboard_demo
2022-11-03 10:27:39 +01:00
ffec6a5422
- stammdaten editierbar
2022-11-03 09:55:38 +01:00
9b79a2f446
Merge branch 'master' into feature-25003/NotenimportFuerNachpruefung
2022-11-03 08:48:05 +01:00
314e71a2d0
Merge branch 'master' into feature-24913/TabelleRaumtypNeuesAttributAktiv
2022-11-03 08:46:05 +01:00
a8f6ca1670
Merge remote-tracking branch 'origin/master' into feature-25430/stammdaten_im_infocentertool_editierbar
...
# Conflicts:
# application/views/system/infocenter/infocenterDetails.php
2022-11-03 08:29:10 +01:00
651a4a97e7
- stammdaten editierbar
2022-11-02 16:50:53 +01:00
d7897d7129
Merge branch 'master' into feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen
2022-11-02 16:18:23 +01:00
5d847ccd38
Merge branch 'master' into feature-19835/BewerbungstoolKeineZGVAbbrecher
2022-11-02 15:56:04 +01:00
c47d2c93fe
Merge branch 'master' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-11-02 15:05:25 +01:00
7b5e5562b5
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-11-02 10:56:55 +01:00
1c0b21cb74
JS Includes Korrigiert für Prüfungsprotokolle und UDFs
2022-10-31 16:30:41 +01:00
15b2c469e2
Restricted Access
2022-10-31 15:31:50 +01:00
771395cbbf
Versionsnummer auf 3.4 erhöht. Extension installer Prüft auf
...
Minimalversion vom Core. Neue Ordnerstruktur für Checksystem
2022-10-31 15:16:30 +01:00
f0fd071e31
- notizen ausblenden
2022-10-31 13:44:17 +01:00
989a7b8720
Neuen Config für BASE_LOCATION hinzugefügt
2022-10-31 13:23:03 +01:00
556e58e78e
Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets'
2022-10-31 11:29:51 +01:00
8fd61edaab
Admin Components
2022-10-28 12:41:25 +02:00
92ec7f44ef
Update Dashboard Endpoints for Admin GUI
2022-10-28 12:40:57 +02:00
be6ad8ce2a
cleanup
2022-10-28 12:39:19 +02:00
f7bd49b408
- master messages an studiengang, wenn bereits bestaetigt
...
- lehrgang messages direkt an lehrgang
2022-10-28 10:56:02 +02:00
c9aba38803
change name of column StdKst to Standardkostenstelle
2022-10-28 07:01:39 +02:00
c7f477555c
Adaptierungen DB und Dropdowns Fas Lehrveranstaltungen
2022-10-27 15:17:29 +02:00
630c1bc2bc
Changed to display 4 Ampeln in Widget
2022-10-25 14:35:38 +02:00
a1ccd392f5
Added News Widget
2022-10-25 14:28:25 +02:00
bc723b22f4
Added getAll() to News Model
2022-10-25 14:28:14 +02:00
71699f6e74
Added Ampel Widget
2022-10-25 14:17:52 +02:00
1d6c5b4257
Added Url Widget
2022-10-25 14:17:32 +02:00
7f1cc966f0
Added API Controller to perform API calls
2022-10-25 13:00:43 +02:00
aaf64a759b
Added Widgets to Widget Controller
2022-10-25 12:59:03 +02:00
ae05b34cbf
Removed test function
2022-10-25 12:58:14 +02:00
fdc52ae47d
Added Offcanvas Component
2022-10-25 12:57:27 +02:00
c5d3f47457
Merged Modal Component, adapted body padding there
2022-10-25 12:55:49 +02:00
699b76f4cb
Added general used methods and computed property to Abstract Mixin Component
...
. apiurl: returns app root and ci router from FHC_JS_DATA_OBJECT
. formatDateTime: returns human readable date time
. getDate: returns human readable date
2022-10-25 12:54:35 +02:00
1043714767
adminMode in Sections
2022-10-25 09:51:20 +02:00
4518eab1a8
- stammdaten include
2022-10-25 07:14:47 +02:00
9192befce1
- stammdaten include
2022-10-25 07:08:29 +02:00
572e53f554
- addon angepassst fuer die stammdaten
2022-10-25 07:02:13 +02:00
a65d297997
use FHC_JS_DATA_STORAGE_OBJECT for apiurl
2022-10-24 16:01:02 +02:00
a3722273e9
use Bootstrap modals
2022-10-24 15:44:12 +02:00
b3ce06cb90
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-10-24 15:21:11 +02:00
4aa7b9854a
setConfig is an emit not a prop
2022-10-24 15:08:10 +02:00
73dd6e6dc1
Autocomplete in Berechtigungrolle
2022-10-24 14:27:54 +02:00
5e9b5b2ce5
Direktlink auf Rolle
2022-10-24 14:27:34 +02:00
bf8aa6c4ac
Student im Max-Semester nicht vorrücken
2022-10-24 12:23:03 +02:00
409ccd7640
BugFix DISTINCT in getOrganisationunitsByPersonId
2022-10-24 12:21:40 +02:00
b89494f80a
Merge remote-tracking branch 'origin/master'
2022-10-24 12:18:31 +02:00
b6308d1ff5
Merge remote-tracking branch 'origin/feature-24647/Konfigurierbare_Dashboards_api' into feature-24647/Konfigurierbare_Dashboards_widgets
2022-10-24 11:04:31 +02:00
50ab6ae5e9
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-10-24 11:02:52 +02:00
8983a0e821
Bootstrap Modal (+ Alert,Confirm,Prompt)
2022-10-24 11:01:27 +02:00
7a1f36cb5e
issuesData Fehlermonitoring: changed order for issue display, first by error type, then by status
2022-10-23 18:02:59 +02:00
53dc6b3c63
- tag closed
2022-10-21 11:07:52 +02:00
1609543a31
- lv evaluierung ubersichtsseite optimiert
2022-10-20 14:01:31 +02:00
aadd6b0d92
Anzahl Rechte zählen
2022-10-18 16:48:27 +02:00
0bd7d6f7c6
- editieren von stammdaten im infocentertool
2022-10-18 11:00:57 +02:00
47d3ab33e7
Adaptierung Vorlage Notenliste.xls um Nachprüfung und Termin3
2022-10-18 09:17:07 +02:00
336f32bee0
issues: removed unnecessary unique constraint on fehlercode and fehler_kurzbz, added NOT NULL constraint on fehler_kurzbz together with fehlercode_extern
2022-10-17 18:12:34 +02:00
c96baac859
Merge branch 'master' into feature-17512/Issues_Plausibilitaetspruefungen
2022-10-17 17:11:17 +02:00
8754c46575
Refactor Import Termin2 und Termin3
2022-10-17 14:34:11 +02:00
67f1094a97
Added Modal Component
2022-10-17 13:40:18 +02:00
065dd1d081
Added FHTW illustration image
2022-10-17 13:38:07 +02:00
ecbc6d8e3d
Added Dashboard Controller & View
2022-10-17 13:37:08 +02:00
235f15e9f7
removed primeflex.mini.css
2022-10-17 12:36:08 +02:00
4480b6ce57
removed 'Bottom Panel' text from verticalSplitter because it is shown on empty pages
2022-10-17 12:36:08 +02:00
23b228c085
added primeflex css classes
2022-10-17 12:36:08 +02:00
4f71a274e2
Update Überprüfungen ZGV mit get_rolle_prestudent()
2022-10-17 08:36:36 +02:00
458117fced
Funktion existsZGV: prestudents mit Last Status Abbrecher werden nicht berücksichtigt
2022-10-14 16:24:45 +02:00
382da823e4
Erweiterung Funktion existsZGV um LastStatusPrestudent
2022-10-14 16:12:41 +02:00
bfb24320d7
- editieren der ZGV Master nur noch mit eigenen Recht moeglich
2022-10-14 11:11:25 +02:00
ce3cea5515
Validierungen Format Datum, Matrikelnr, StudentId, Note
2022-10-13 15:36:08 +02:00
0bd6af8da1
Merge remote-tracking branch 'origin/feature-24647/Konfigurierbare_Dashboards_api' into feature-24647/Konfigurierbare_Dashboards_widgets
2022-10-13 15:14:29 +02:00
680787d881
Don't move out of bounds on Drag&Drop
2022-10-13 14:44:33 +02:00
a71ead0a85
Ajax update: better data consistency
2022-10-13 14:38:03 +02:00
29fc5181bf
Importfunktion Termin3
2022-10-13 10:16:26 +02:00
fd2aa8a1bb
Cleanup & uid from AuthLib
2022-10-13 08:43:08 +02:00
035d196ae5
Logik Matrikelnummer StudentenId
2022-10-13 08:04:10 +02:00
6570c958b3
Bug: DataTransfer in Chrome
2022-10-12 15:50:40 +02:00
b4053c45fd
Merge remote-tracking branch 'origin/feature-24647/Konfigurierbare_Dashboards_api' into feature-24647/Konfigurierbare_Dashboards_widgets
2022-10-12 15:17:47 +02:00
54411f4de7
Benotungstool: Importfunktion Termin2
2022-10-12 15:06:07 +02:00
2504c91cd9
AusbildungssemPrestudentUngleichAusbildungssemStatus Plausicheck: added student_uid to fehlertext, changed order of ausbildungssemester in fehlertext
2022-10-12 12:36:34 +02:00
c7c0bbfb49
Merge branch 'feature-17512/Issues_Plausibilitaetspruefungen' of github.com:FH-Complete/FHC-Core into feature-17512/Issues_Plausibilitaetspruefungen
2022-10-12 11:56:02 +02:00
492562efdf
- zeit hinzufuegen fuer den pruefling
2022-10-12 11:46:03 +02:00
65c6466465
PlausicheckLib: -run check InaktiverStatusAktiverStatus always for current semester -removed unused result variables, todo comment
2022-10-12 11:23:51 +02:00
a2c2eddf0d
- sql angepasst
2022-10-12 11:18:05 +02:00
dd4d71bd7d
Bug: Deepmerge on update
2022-10-12 10:29:52 +02:00
c7c8913833
Adapted Dashboard DB Update: Berechtigungen ergänzt / Typspezifikation entfernt.
...
. Berechtigungen ergänzt:
- dashboard/benutzer
- dashboard/admin
. Typspezifikation entfernt in Create Sequence
- war nicht mit PHPSQL 9.6.2 kompatibel.
2022-10-12 09:19:54 +02:00
a468338ead
Configurable CSS classes to Default Widget
2022-10-12 09:08:24 +02:00
39bbcac217
Widget controller & model & table
2022-10-12 08:58:48 +02:00
a3ad8eb337
dashboard.tbl_widget new fields
2022-10-11 15:41:43 +02:00
82cbc63096
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-10-11 09:51:45 +02:00
30fbeda1ba
Merge branch 'master' into feature-15029/Docsbox
2022-10-11 09:32:24 +02:00
1b49ea2a20
- rt job angepasst
2022-10-11 08:23:49 +02:00
08a58b919a
Added the operations equal and not equal for strings in the FilterComponent
2022-10-10 14:55:49 +02:00
ba5fb29d13
Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets
2022-10-10 14:44:31 +02:00
6a2f570ffa
Merge branch 'feature-20088/BIS_Studiengangsmeldung_Anpassungen'
2022-10-10 14:42:43 +02:00
aead693675
- Removed not used methods sortSelectedFields, removeSelectedField and addSelectedField from controllers/components/Filter
...
- Removed not used methods sortSelectedFields, addSelectedField and removeSelectedField from libraries/FilterCmptLib
- CSS fixes for FilterComponent and NavigationComponent
- Removed not used API calls from public/js/components/filter/API.js
- Added second level menu entries to the NavigationComponent
- Added new property side-menu to the FilterComponent to render the filters selection via the NavigationComponent or directly from the FilterComponent
- FilterComponent:
- Column positioning is now managed by tabulator
- Splitted the column selection from the filter options
- Added the rendering of the filters selection via an optional dropdown
- Changed the usability and the look of the filter options
- German translation
2022-10-10 14:38:02 +02:00
617fa1c450
Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen
2022-10-10 14:27:39 +02:00
f2f960fd43
Plausichecks: added comments, fixed bug for studiengang parameter in GbDatumWeitZurueck check
2022-10-08 01:40:14 +02:00
fb5656833a
added plausichecks to navigation menu, improved plausichecks GUI responsiveness, made it centered
2022-10-07 18:22:06 +02:00
b067c97beb
Plausichecks: changed texts of some Plausichecks for better understanding, AbschlussstatusFehlt check: Studiensemester not necessary for resolving, checking for melderelevant for fehler StgPrestudentUngleichStgStudienplan
2022-10-07 18:05:25 +02:00
18cdbb8f6d
Merge branch 'feature-19041/ZeitausgleichSanchoMail' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-10-07 09:09:54 +02:00
7d3a12fd1c
Merge feature-16658/NeueVertragsartAllIn into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-10-07 09:03:20 +02:00
36b4964d53
Merge branch 'feature-16655/StundensaldoAllin' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-10-07 08:51:00 +02:00
11a208de55
Merge branch 'feature-15943/VilesciLoeschenVonUrlaubenBeiAbgeschicktenMonatslistenVerhindern' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-10-07 08:49:17 +02:00
2f5e9d80da
Merge branch 'feature-17071MonatslisteVorzeitigAbschickenEndeDV' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-10-07 08:45:48 +02:00
ae42051f15
Merge branch 'bug-24113/ZeiterfassungBerücksichtigungVonAttributProjektZeitaufzeichnung' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-10-07 08:44:35 +02:00
32493c1b9d
Merge branch 'bug-19038/AnzeigeOffenerMonatslistenBeiNichtZeitaufzeichnungspflichtig' into feature-25177/ZeiterfassungMergedBrancheDeploy1
2022-10-07 08:40:43 +02:00
22613af9fe
Merge branch 'feature-25002/Sonstiges-Sprint-192'
2022-10-06 15:12:33 +02:00
03d6955ec4
issueDataset.js: code formatting
2022-10-06 10:34:32 +02:00
21d3d40171
issueDatase.js: added comment for changeIssueStatus method
2022-10-06 10:30:55 +02:00
9b3b571bd9
Erweiterung Phrasen
2022-10-06 08:55:11 +02:00
02445ceff4
Zeitaufzeichnung - Zeit verlängert für die Anzeigen von "allen"
...
Zeitaufzeichnungen auf 360 Tage
2022-10-06 06:51:14 +02:00
8fe346f6be
plausichceks: changed phrasing of check AusbildungssemPrestudentUngleichAusbildungssemStatus
2022-10-06 03:47:28 +02:00
fb70ba3da5
issueDataset.js: enabled sending many issue ids for status change by splitting up
2022-10-06 03:25:57 +02:00
6d457fd573
added codex/Mobilitaet_model for bis.tbl_mobilitaet
2022-10-06 00:32:53 +02:00
5f8a530857
Merge branch 'master' into benutzerberechtigungGUIneu
2022-10-05 17:51:27 +02:00
7fb8c02cd6
Merge remote-tracking branch 'origin/master'
2022-10-05 17:43:57 +02:00
dfc19f56cb
Spalten LAS, ALVS und Anzahl Studierende ergänzt
2022-10-05 17:43:50 +02:00
d82426cd91
Autocomplete für Kostenstelle
2022-10-05 17:42:45 +02:00
b293673ee9
Updateamum nur bei geänderten Datensätzen
...
Kostenstelle Autocomplete
Counter für Anzahl Zeilen
Anmerkungsfeld verbreitert
2022-10-05 17:42:24 +02:00
c27534c93c
Corrected: Mail wird nun an alle STGL versendet, wenn mehrere vorhanden sind
...
Bei der Abgabe von Anrechnungsempfehlungen wurde bisher nur dem ersten STGL
aus potentiell mehreren STGLeitungen ein mail zugeschickt. Nun werden alle addressiert.
2022-10-05 16:27:17 +02:00
c1180c0879
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-10-05 16:19:03 +02:00
edd310351b
plausichecks fehlertext: check number of parameters before calling vsprintf
2022-10-05 14:07:29 +02:00
c31ab4874d
moved "plausicheck start" button in GUI to the right
2022-10-05 14:04:59 +02:00
4f3e8dcb3c
Basic VUE Components & Test WidgetController
2022-10-05 10:43:43 +02:00
2a060ace25
-added issue resolvers for plausichecks - renamed fehler PrestudentStgUngleichStgStudienplan to StgPrestudentUngleichStgStudienplan -fixed some parameters passed for resolving -plausicheck getDatumStudiensemesterFalscheReiheinfolge: performed directly in SQL for speedup -plausicheck GUI: fixed comment, minor text changes
2022-10-04 19:17:03 +02:00
90e006feb5
allow widgets array for add operations
2022-10-04 08:22:27 +02:00
5670f931ef
Plausichecks: beautified GUI output
2022-10-04 03:17:41 +02:00
b28e780aa6
plausichecks issues fehlerupdate.php: added brackets to OrgformStgUngleichOrgformPrestudent
2022-10-04 03:11:59 +02:00
aee25c5252
moved issue resolvers to #own resolvers folder, created first resolver CORE_INOUT_0007 for plausichecks
2022-10-03 19:25:32 +02:00
fded192a98
Merge branch 'feature-21609/LVVerwaltungDefaultwertFuerNeueLvs'
2022-10-03 16:47:54 +02:00
7cfc6369b6
Optionalen Eintrag beibehalten bei der Anlage von LVs da sonst alte
...
Einträge ohne Lehrmodus falsch dargestellt werden
2022-10-03 16:46:49 +02:00
7b6314dc96
Merge branch 'master' into feature-21609/LVVerwaltungDefaultwertFuerNeueLvs
2022-10-03 16:32:33 +02:00
3bc1654b76
Merge branch 'feature-25001/warning_beim_zuweisen_von_variablen_zu_personen'
2022-10-03 16:12:47 +02:00
49124f3100
Added JQueryUI css
2022-10-03 15:22:32 +02:00
ae26c4d1ee
plausichecks.js: reformatted file, display error as message
2022-10-03 13:40:33 +02:00
d14608ed28
level funktion_kurzbz added to presets and overrides
2022-10-03 07:59:11 +02:00
f8d3337481
added Plausicheck gui to start plausichecks manually
2022-10-03 02:32:28 +02:00
5b46722913
-PlausicheckLib: melderelevant and bismelden fields are checked only if applicable, speed up by including conditions in SQL instead of PHP functions -added more info to some fehler texts by params
2022-10-03 02:28:48 +02:00
854e0a422f
Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen
2022-09-30 18:16:46 +02:00
c00b9006b5
Merge branch 'master' into feature-20088/BIS_Studiengangsmeldung_Anpassungen
2022-09-30 18:14:33 +02:00
9d3d84e7ea
Pfad zu Bootstrap angepasst
2022-09-30 15:11:01 +02:00
ae4bf1feb1
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-09-30 14:54:07 +02:00
f7b3a3ccaf
Merge branch 'feature-19556/Templates_Detailansicht'
2022-09-30 13:50:12 +02:00
3967494775
- typo gefixed
2022-09-30 12:52:47 +02:00
b4d86744f2
- fas zgv statt kurzbz auf bezeichnung
2022-09-30 12:50:33 +02:00
889f8370e1
bugfix checkIfArbeitspakektZuWaehlen
2022-09-30 12:04:59 +02:00
b9b7af0e1d
Merge branch 'origin/feature-24110/weiterentwicklung_internationalisierungsmassnahmen'
2022-09-30 09:07:34 +02:00
0d605158a5
changed text of AktiverStudentOhneStatus plausicheck
2022-09-29 19:43:40 +02:00
eee43fe921
AktiverStudentOhneStatus check: check for status already in SQL instead of getLastStatus function, future status with 4 months buffer
2022-09-29 19:41:30 +02:00
9e32330a6c
Paragraph für Plagiatscheck angepasst bei Beurteilungsformularen
2022-09-29 10:35:21 +02:00
7c02f21582
added plausichecks to PlausicheckProducerLib, bugfixes in PlausicheckLib and plausicheck libraries and fehlerupdate, mainly concerning passed parameters
2022-09-29 03:16:05 +02:00
23ec0d6344
Plausicheck AbschlusstatusFehlt: existence of status in previous Semester is checked as well when passing a Studiensemester
2022-09-28 17:26:36 +02:00
ad369bbe44
add dashboard schema and tables create script
2022-09-28 16:53:48 +02:00
252abeafcb
dummy config changed to test function level in config
2022-09-28 15:26:45 +02:00
8533454ad7
Defaulteintrag in Dropdown Lehrmodus gemäß Configeintrag bei Anlegen neuer LV
2022-09-28 12:13:13 +02:00
1241a05ed3
-Plausichecks: added correct fehlertext and resolution params -replaced Plausichecker Interface with abstract class, which gets ci instance and loads plausicheck lib -write issue info only if issue really newly inserted
2022-09-27 18:32:15 +02:00
17ad37ac8e
Merge branch 'feature-24767/infocenter_zgv_pruefungen_und_lehre_error'
2022-09-26 16:45:06 +02:00
4f044fb724
Merge branch 'feature-20696/pausenfehler_wird_nicht_angezeigt'
2022-09-26 16:28:22 +02:00
a238a9f550
studentenmeldung.php: previous first Unterbrechungsdatum is used when there are multiple Unterbrecher status after each other
2022-09-26 11:45:48 +02:00
2ab548fc87
- absagegrund wird nun mitgespeichert
...
- neue filter
- studiengangsleitung kann bestaetigung nur noch ablehnen und nicht loeschen
- neue cronjobs
- neue formatierung
- neue phrasen
2022-09-26 09:46:16 +02:00
9bae6bb0a4
added params to plausicheck libraries, added PlausicheckProducerLib to enable execution of plausichecks for GUI as well, removed old IssueProducer_Controller
2022-09-26 00:41:48 +02:00
2c475f8bde
fehlerupdate: renamed NationNichtOesterreichAberGemeinde Plausicheck, PlausicheckLib: added comments
2022-09-22 19:54:18 +02:00
cb5c11a6ab
Zeiterfassung config DEFAULT_ALLIN_DIENSTVERTRAG für Anzeige Saldo AllIn
2022-09-22 13:50:43 +02:00
e4590909e2
use alias if available instead of uid for email address
2022-09-22 13:20:12 +02:00
f9e33a1779
Zeiterfassung: Config ECHTER_DIENSTVERTRAG
2022-09-22 11:32:49 +02:00
c1df686edc
Zeiterfassung: Projektvalidierung in Klassen refactored
2022-09-22 10:30:15 +02:00
921b1d337d
fix typo
2022-09-22 10:21:24 +02:00
bf216e6505
search also in stdkst and oe unit
2022-09-22 10:00:23 +02:00
225b3b7c6e
only show current stdkst in searchresult
2022-09-22 09:39:05 +02:00
edb69498e5
added PlausicheckLib for checking plausi issues
2022-09-21 19:55:37 +02:00
5d1e99a222
Plausichecks: enabled passing of params to plausi issue checkers, created first checker StgPrestudentUngleichStgStudent
2022-09-21 19:54:20 +02:00
0643b99e86
added Plausicheck fehler (for issues) to database
2022-09-21 19:50:30 +02:00
85338b8477
add PersonalFilters to sideMenu, refresh sideMenu in the session after a custom filter was saved
2022-09-21 15:56:42 +02:00
de667990a3
add Standard-Kostenstelle to search result for employees
2022-09-21 15:23:45 +02:00
3570b2c04d
BT: Adaptierung Prüfung auf Abbrecher auf aktuellen Prestudentstatus
2022-09-21 12:54:41 +02:00
aa217a42d4
Fixed handlerApplyFilterFields of the components/filter/Filter
2022-09-21 12:47:07 +02:00
fb7f445e22
progress on api endpoints to add and remove presets and overrides
2022-09-21 11:38:16 +02:00
a27ad33e0e
Merge branch 'master' into benutzerberechtigungGUIneu
2022-09-21 11:09:27 +02:00
ec07c4154d
Problem behoben wodurch die Anrechnungen im FAS nicht angezeigt werden wenn diese ohne Anrechnungstool im FAS erfasst werden
2022-09-20 14:31:51 +02:00
4d44bbb79c
Anzeige Aktueller Urlaubssaldo in Sanchomail
2022-09-20 12:39:20 +02:00
07a1d7ecb2
- Added CSS for the navigation component and the filter component
...
- Changed layout of the filter component
2022-09-19 16:31:55 +02:00
0c9d535941
Merge branch 'feature-20221/PHP_7.1_Kompatibilitäte_Excel_Lib'
2022-09-19 16:26:51 +02:00
4976804f8d
Merge branch 'feature-18874/CISMoodleGradeImportMitUID'
2022-09-19 16:02:17 +02:00
253b1352f9
Merge branch 'bug-20124/FilterWidget_query_executed_before_changes_are_applied_bug'
2022-09-19 15:55:51 +02:00
4f35d6bf0a
Merge branch 'feature-19547/CoodleZeitsperrenAnzeigen'
2022-09-19 15:44:40 +02:00
0f6836385f
Added Column Wahlname to campus.vw_mitarbeiter
2022-09-19 15:31:31 +02:00
66b9576e15
Merge branch 'bug-24165/Message_reply_token_allow_to_write_to_anybody'
2022-09-19 15:11:51 +02:00
cac01a50ec
Added Column Wahlname to campus.vw_student and campus.vw_benutzer
2022-09-19 15:08:50 +02:00
6ae6751aa4
Merge branch 'feature-19171/Wahlname'
2022-09-19 14:48:05 +02:00
79fbb4b7b2
Merge remote-tracking branch 'origin/master'
2022-09-19 14:05:19 +02:00
1e85aeb8da
Studiensemester save empty string as null
2022-09-19 14:05:12 +02:00
2a43793982
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze'
2022-09-19 10:26:44 +02:00
926180f5da
system/checkStudenten: corrected typo in Studierenden Orgform Plausicheck text output
2022-09-18 23:11:43 +02:00
40d8edebef
Plausichecks: added run method to IssueProducer_Controller for producing plausicheck issues
2022-09-18 23:02:55 +02:00
83ef4be673
Bugfix Limit 10 entfernt
2022-09-16 14:54:11 +02:00
ec87bd0c80
UID in Dropdown anzeigen und inaktive Mitarbeiter kennzeichnen
2022-09-16 14:47:59 +02:00
f65ae01dd0
Suche nach LV-Kurzbz, Bugfix Checksubmit
2022-09-16 14:47:06 +02:00
5c9c4b7e2d
store configs as json in database and merge them
2022-09-16 10:46:29 +02:00
d5eff7d615
issue plausichecks: added issue producer files, code formatting
2022-09-15 18:56:18 +02:00
e34d9afefe
BIS Lehrgangsmeldung: correctly placed Orgformcode Tag, indent formatting
2022-09-15 17:22:33 +02:00
9fb077afdc
studentenmeldung bis: renamed Studienkennunguni, master ZGV elements, correct placement of duales studium, correct checkof duales studium
2022-09-15 14:59:04 +02:00
d366c672b9
Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
2022-09-15 10:18:11 +02:00
3690984682
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-09-15 10:17:33 +02:00
941bbaaa79
Fixed falschen ECTS Höchstgrenze Hinweis in STGL Detailansicht
...
Es wird nun bei der Berechnung der ECTS Höchstgrenze auch auf den
Anrechnungsgrund geschaut.
2022-09-15 10:17:02 +02:00
ff93c957cd
dashboard config api first steps
2022-09-14 19:05:29 +02:00
00ac201596
Text-Inputs in eckigen Klammern werden als Array interpretiert
2022-09-14 15:56:01 +02:00
450b0b6433
Initial commit
2022-09-14 15:55:07 +02:00
c2024ada3a
Merge remote-tracking branch 'origin/master'
2022-09-14 15:50:35 +02:00
f0cec85d8f
style anpassungen und funktionen geloescht
2022-09-14 11:57:23 +02:00
91f867c0d6
Merge branch 'master' into feature-19171/Wahlname
2022-09-14 11:55:02 +02:00
4e68989c06
Merge branch 'feature-24817/infocenter_doc_loeschen_error'
2022-09-14 10:36:45 +02:00
4cae13d2ee
zgv und nation dropdowns gefixed
2022-09-14 08:55:54 +02:00
0d03689f57
added IIssueExistsChecker and Issue<producer_Controller for detection of issues
2022-09-14 02:48:43 +02:00
f7fa97499c
error von loeschen der doc gefixed
2022-09-13 18:01:09 +02:00
85a6fa5600
Merge branch 'feature-19538/Gruppenadministratoren'
2022-09-12 18:08:17 +02:00
1d93652b0c
Merge branch 'master' into feature-19538/Gruppenadministratoren
2022-09-12 18:07:13 +02:00
c4fbaaaa9d
Logging for Students implemented
2022-09-12 17:53:51 +02:00
b526f4ee3a
Merge branch 'bug-15317/BTAusbildungsvertragNichtAkzeptierenBeiAbgewiesenen'
2022-09-12 16:29:23 +02:00
dd671bf583
Merge branch 'feature-24767/infocenter_zgv_pruefungen_und_lehre_error'
2022-09-12 14:43:48 +02:00
030f1c9c4e
zgvpruefung fehler behoben und studienartberechtigung
2022-09-12 14:30:12 +02:00
d6a35603e1
Merge branch 'feature-23977/ZGVNeueKodextabellen'
2022-09-12 13:06:07 +02:00
9afd03d630
Merge branch 'feature-18984/infocenter_tool_fuer_lehrgaenge_anpassen'
2022-09-12 12:50:43 +02:00
22088b82ba
Merge branch 'feature-19487/infocenter_letzter_bearbeiter_wenn_student'
2022-09-12 12:43:17 +02:00
75e8c35dcc
Merge branch 'feature-19484/infocenter_reihungstest_freigegeben_liste_zeigt_immer_nur_einen_an'
2022-09-12 12:41:41 +02:00
6855e6ff2e
Merge branch 'feature-18940/infocenter_loeschen_von_dokumenten'
2022-09-12 12:36:19 +02:00
9c85c7cd97
Merge remote-tracking branch 'origin/master' into feature-19487/infocenter_letzter_bearbeiter_wenn_student
2022-09-12 10:17:52 +02:00
f571fef11b
Merge remote-tracking branch 'origin/master' into feature-19484/infocenter_reihungstest_freigegeben_liste_zeigt_immer_nur_einen_an
2022-09-12 10:17:15 +02:00
33b35286d3
Merge remote-tracking branch 'origin/master' into feature-18984/infocenter_tool_fuer_lehrgaenge_anpassen
2022-09-12 10:15:50 +02:00
98cf234f6f
Merge remote-tracking branch 'origin/master' into feature-18940/infocenter_loeschen_von_dokumenten
2022-09-12 09:52:19 +02:00
7252bc1e6f
add config.file
2022-09-09 13:20:50 +02:00
26236bc989
issues fix: error text is correctly passed when invalid issues status passed from GUI
2022-09-08 15:14:09 +02:00
1867807cdd
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze'
2022-09-08 14:29:44 +02:00
3a595dda58
Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
...
# Conflicts:
# application/controllers/lehre/anrechnung/RequestAnrechnung.php
2022-09-08 14:15:49 +02:00
617dcc0646
Changed application dates for testing reason
2022-09-08 14:09:37 +02:00
15121ced6d
Fixed missing disabled formular and wrong status-test when student emits Anrechnung with Begruendung Hochschule
2022-09-08 14:08:46 +02:00
d13cc789ad
Fix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen
...
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
2022-09-08 12:53:44 +02:00
604592cdd1
Bewerbungstool: neue Funktion isPastAbbrecher()
2022-09-07 15:27:47 +02:00
625b3c74c4
Bewerbungstool: keine ZGV bei Abbrechern, Berücksichtigung studentstatus für Dokumenthandling
2022-09-07 09:22:06 +02:00
7ea9b6a741
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-09-07 09:06:03 +02:00
393eaea91d
Removed Dashboard Testfiles
2022-09-07 09:00:00 +02:00
00f1eb38d1
Added missing index files
2022-09-07 08:27:31 +02:00
fd649c49c8
Fixed PHP 8.1 compatibilities problems for include/Excel/*
2022-09-06 15:38:42 +02:00
522e341d3d
Dashboard Test V1
2022-09-06 15:29:42 +02:00
c88061463f
Hotfix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen
...
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
2022-09-06 14:21:54 +02:00
7f64f5c29f
Merge branch 'feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen'
2022-09-06 12:38:21 +02:00
262b5b869a
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-09-06 12:15:46 +02:00
14c5bdcf3d
BugFix Personen zusammenlegen
2022-09-06 11:47:35 +02:00
729aec00b3
Admins sehen PreStudent ID und Person ID zum rauskopieren
2022-09-06 11:41:28 +02:00
bb4bf02aa8
Merge branch 'master' into feature-20696/pausenfehler_wird_nicht_angezeigt
2022-09-06 09:20:57 +02:00
4f7dd73535
Merge branch 'master' into feature-19484/infocenter_reihungstest_freigegeben_liste_zeigt_immer_nur_einen_an
2022-09-06 09:18:58 +02:00
52fe5a78e1
Merge branch 'master' into feature-18940/infocenter_loeschen_von_dokumenten
2022-09-06 09:17:39 +02:00
259dbe9bdc
Fixed Error on File Download from Student View
2022-09-05 18:46:13 +02:00
985a430888
Merge branch 'master' into feature-19547/CoodleZeitsperrenAnzeigen
2022-09-05 15:23:03 +02:00
259f9d29d5
Merge branch 'master' into feature-19041/ZeitausgleichSanchoMail
2022-09-05 15:20:44 +02:00
b53f3a1170
Merge branch 'master' into feature-17071MonatslisteVorzeitigAbschickenEndeDV
2022-09-05 13:54:44 +02:00
b8d1c61b83
Merge branch 'master' into feature-16658/NeueVertragsartAllIn
2022-09-05 13:53:59 +02:00
619924eff8
Merge branch 'master' into feature-16655/StundensaldoAllin
2022-09-05 13:52:59 +02:00
477a7dd588
Merge branch 'master' into feature-15943/VilesciLoeschenVonUrlaubenBeiAbgeschicktenMonatslistenVerhindern
2022-09-05 13:51:45 +02:00
6bdbe91dd9
Merge branch 'master' into bug-19038/AnzeigeOffenerMonatslistenBeiNichtZeitaufzeichnungspflichtig
2022-09-05 13:36:10 +02:00
8670ab18f8
Zeitaufzeichnung: Berücksichtigung von Attribut Zeitaufzeichnung bei Projekt und Projektphase
2022-09-05 11:27:33 +02:00
d109747cfc
Merge branch 'master' into feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen
2022-09-01 15:34:12 +02:00
cc33502ab3
adapted "resend token for Begutachter" mail to Projektarbeitsbeurteilung controller split
2022-09-01 02:23:32 +02:00
537ce0940c
Code quality check improvements
2022-08-31 15:48:35 +02:00
824a148b92
adapted core to Projektarbeitsbeurteilung Zweitbegutachter/Erstbegutacher Controller split
2022-08-31 13:38:38 +02:00
1ddd5b7f14
Merge branch 'feature-20226/erfassung_internationalisierungsmassnahmen_bekanntgabe'
2022-08-31 13:36:18 +02:00
74331d5e6c
dms kategoerie hinzugefuegt
2022-08-31 11:56:19 +02:00
c215b2cb5f
Merge branch 'feature-24103/kartenverlaengerung_gueltig_bis_zu_gueltig_fuer'
2022-08-31 11:42:34 +02:00
162858721c
Merge branch 'feature-24184/infocenter_messages_bei_statuswechsel'
2022-08-31 11:34:38 +02:00
90a13e445c
fix damit messages wieder geschickt werden
2022-08-31 11:33:29 +02:00
8e0734ca8c
Added check in CL/Messages_model->sendReply to check that $receiver_id, $relationmessage_id and $token match in the database to avoid to be able to write to anyone using a token
2022-08-30 17:31:04 +02:00
ed9f6e0c9b
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-30 14:44:13 +02:00
a2bacae6d7
Merge branch 'feature-19001/VUE_ROUTER' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-30 14:43:10 +02:00
03535b7589
text aenderung und holen alle studienbeitraege
2022-08-30 14:08:00 +02:00
d1bb1b9666
Infocenter: Adaptierungen ZGV-Master und ZGVmasternation Dropdown
2022-08-30 13:10:47 +02:00
67f1c9a707
Infocenter: Umbau von disabled auf Zusatz bei Dropdowns ZGV und ZGVNation
2022-08-30 11:28:16 +02:00
8fd69ccd26
Infocenter: Anzeige gesperrte Nationen als disabled im Dropdown ZGVNation
2022-08-30 09:41:45 +02:00
81a33654a4
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze'
2022-08-30 09:10:40 +02:00
68d6e3c549
Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
2022-08-29 16:23:20 +02:00
54a1c486c5
Infocenter: Anzeige inaktive ZGVs als disabled im Dropdown ZGV
2022-08-29 15:12:06 +02:00
49647c8ded
Textänderungen "KVP" entfernen
2022-08-29 14:05:15 +02:00
079137f497
renamed "dual" checkbox to "duales Studium"
2022-08-29 13:28:26 +02:00
ca9281dbf9
Textänderung KVP
2022-08-29 09:08:27 +02:00
8dd7f72e37
added Studienkennung Uni to table in gsprogramm vilesci gui
2022-08-27 01:44:37 +02:00
92762c5dc2
Projektarbeitsbeurteilung:
...
- getZweitbegutachterWithToken: returns Zweitbegutachter (Senatspruefer)
from Senatspruefungen as well
- added phrase
2022-08-27 01:34:03 +02:00
da85c69f36
Problem behoben wodurch die Anrechnungen im FAS nicht angezeigt werden
...
wenn diese ohne Anrechnungstool im FAS erfasst werden
2022-08-25 14:34:40 +02:00
962ec56b3f
Merge branch 'feature-20665/kartenautomat_anpassungen'
2022-08-25 12:48:47 +02:00
a13c010cd5
textaenderungen und getzutrittskarte by uid
2022-08-25 10:43:26 +02:00
566f2f6399
prueft beim loeschen des dok noch auf person_id
2022-08-25 09:54:33 +02:00
2ff067193d
added Senatsvorsitz to betreuerart kurzbz in pdfExport
2022-08-24 19:39:59 +02:00
1d408b9d65
added comment to getZweitbegutachterWithToken method in projektbetreuer class
2022-08-24 19:39:31 +02:00
60d675f22b
added parbeitDownload phrases for Projektarbeitsbeurteilung
2022-08-24 18:09:53 +02:00
2125fdc219
sending of zweitbetreuer mail with token: correct subject depending on projekttyp
2022-08-24 18:09:30 +02:00
1d5d5e4a84
added getEndabgabe method to Paabgabe model
2022-08-24 18:07:34 +02:00
a1622d8b74
made betreuert SenatsprueferIn gender neutral
2022-08-24 17:05:30 +02:00
df3f7565e7
Merge branch 'feature-20665/kartenautomat_anpassungen'
2022-08-24 13:39:01 +02:00
8292e00aaf
neues Feld aktiv in den ZGV-Tabellen, Ansicht als durchgestrichen der inaktiven ZGV-Einträge in FAS
2022-08-24 12:52:49 +02:00
82d7891f3c
Projektarbeitsbeurteilung possible for Prüfungssenat. Mails are sent to Senat members, Senat members are displayed with correct labels, external Prüfer can get login token
2022-08-23 17:45:12 +02:00
c234843bfd
Satzungsteil Paragrahen korrigiert
2022-08-23 16:20:19 +02:00
282b46d54e
Added betreuerart Senatsvorsitz and Senatsprüfer
2022-08-23 15:26:13 +02:00
f2fcdf2cbf
app per dbupdate hinzufuegen
2022-08-22 14:40:39 +02:00
06e62cac11
phrasen angepasst
2022-08-22 14:35:05 +02:00
238810b5a8
workaround issue with resizable columns
2022-08-19 12:38:29 +02:00
b0ffbea9a5
Composer changes
2022-08-19 12:21:04 +02:00
5af4f7a405
Merge remote-tracking branch 'origin/feature-19473/VUE_Filter_Navigation_Widgets' into feature-19001/VUE_ROUTER
2022-08-18 21:31:54 +02:00
3138ac3e25
add columns Aktiv and StdKst to MA Uebersicht Filterx
2022-08-18 16:38:28 +02:00
582cb20b72
rename Handler functions to do not have a data and methods property error
2022-08-18 15:27:02 +02:00
c9eb60aade
Removed tabulator property from Filter component
2022-08-18 14:52:50 +02:00
a0e2d7e37d
Filter component: changed columns handling for the tabulator
2022-08-18 11:53:54 +02:00
7b95ca4b92
Merge remote-tracking branch 'origin/feature-19473/VUE_Filter_Navigation_Widgets' into feature-19001/VUE_ROUTER
2022-08-17 22:13:29 +02:00
a3c9d75617
added model for adressentyp
2022-08-16 13:10:20 +02:00
7dd48b2350
Fixed meta includes
2022-08-16 10:57:32 +02:00
492014db3a
Changed variable names for includes
2022-08-16 10:28:13 +02:00
dd38765237
Merge branch 'feature-19538/Gruppenadministratoren' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-16 10:25:46 +02:00
dd6383c57b
Merge branch 'master' into feature-19538/Gruppenadministratoren
2022-08-16 07:54:43 +02:00
5ea46ece47
added VueRouter to composer; integrate router.php from extensions
2022-08-15 20:25:42 +02:00
2e00f30e71
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-11 16:07:39 +02:00
083c360338
remove duplicate body tags
2022-08-11 16:05:15 +02:00
73c516cbed
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-11 14:59:39 +02:00
08b1047b09
Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of https://github.com/FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-11 14:59:06 +02:00
1103bb7aa1
Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-11 14:47:31 +02:00
d95cbb39e3
Reverted bootstrap and jquery include order
2022-08-11 14:46:28 +02:00
d7fb91371e
added missing includes for infocenter
2022-08-11 14:34:32 +02:00
979f8d96bc
ermoeglicht das sperren der zutrittskarten
2022-08-11 14:29:56 +02:00
f19e13ffd8
ermoeglicht das planen, akzeptieren und erstellen der massnahmen
2022-08-11 14:11:59 +02:00
6f1ca8e374
Removed unnecessary HTML body tags and added FHC_Footer
...
Body tags are set in FHC_Header and FHC_Footer.
2022-08-11 14:00:20 +02:00
f85dd2fd2e
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-10 18:21:01 +02:00
a5f6ffa237
Changed content in Student view as requested by QM
...
. changed tooltip text and help text regarding Maximale ECTS and Berufliche Praxis.
2022-08-10 18:19:50 +02:00
c6aa3c7d9b
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-10 16:28:08 +02:00
4f435fbc20
Removed date limitation for testing
2022-08-10 16:26:36 +02:00
fabdb70d72
Merge branch 'feature-18224/Anrechnungen_ECTS-Grenze' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-10 16:08:54 +02:00
bfa9c2c8a7
Merge remote-tracking branch 'origin/feature-18224/Anrechnungen_ECTS-Grenze' into feature-18224/Anrechnungen_ECTS-Grenze
2022-08-10 16:01:42 +02:00
1d728336a2
Hided colums 'ECTS Schule bisher'/'ECTS Beruf bisher'
...
Hide by default colums 'ECTS Schule bisher'/'ECTS Beruf bisher',
as dynamic ECTS column is providing those informations.
2022-08-10 15:59:11 +02:00
debfbf7827
Created AnrechnungJob sendMailRemindRecommendation
...
...to remind lecturers to provide their recommendation if not done until
one week after request.
2022-08-10 15:58:13 +02:00
e39bb1ea8a
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-09 18:43:06 +02:00
7499a7f90a
navigation component add option to pass css classes for left menu, verticalsplit add isCollapsed function, searchbar remove search button and prevent page reload on pressing enter
2022-08-09 17:12:47 +02:00
c0ce8997ba
Optimized Usability: Column 'Details' now on very left side of table
...
User needs to open details link very often, but needed to scroll until end of table to open link.
Now the link is set as first column to provide direct access.
2022-08-09 16:52:23 +02:00
e56237038d
Optimized 'Ablehnen'-/'Nicht empfehlen'-panels for better usability
...
- Copy-icons are now right aligned and bigger
- Less in-between-text, instead short explanation text into textarea placeholder
2022-08-09 16:40:43 +02:00
844bfe9150
Fixed wrong 'Bisher angerechnete ECTS' calculation when approving and withdrawing in one go
2022-08-09 11:10:16 +02:00
e63d34132c
merged current master
2022-08-08 13:29:44 +02:00
6d81e36e68
Merge branch 'master' into feature-19473/VUE_Filter_Navigation_Widgets
2022-08-08 12:11:08 +02:00
b912ca9a06
Navigation and Filter components code improvements
2022-08-08 10:31:30 +02:00
602bd375c4
BugFix PHP 7.4 Milak
2022-08-04 17:32:03 +02:00
7b0de6b3e1
BugFix PHP 4 Milak
2022-08-04 14:41:34 +02:00
6fd50d3c8d
letzter bearbeiter online satt studentenname
2022-08-04 13:26:15 +02:00
fc94ea4b49
Fixed: Maximale Dokument Uploadgröße
2022-08-03 16:43:34 +02:00
fac257a2b1
Corrected: Falsche ECTS Summenberechnung, wenn Genehmigung zurückgenommen wurde, korrigiert.
...
Zurückgenommene Anrechnungen haben noch einen Eintrag "angerechnet" in der Zeugnisnotentabelle, weshalb
sie in der ECTS Summenberechnung mitgerechnet wurden. Das ist nun behoben.
2022-08-03 16:40:58 +02:00
bb8a2a97a5
Fixed: Unclickable URLs after approving Anrechnung are clickable now
2022-08-02 15:25:06 +02:00
e9c2bcd690
Merge remote-tracking branch 'origin/master'
2022-08-01 14:09:10 +02:00
62700194dd
Bugfix aktuelles Studiensemester
2022-08-01 14:09:00 +02:00
1a6b645693
pausefehlt bei 6.5 stunden hinzugefuegt
2022-08-01 10:49:17 +02:00
80e15b9448
studentenmeldung.php: added field "dualesstudium"
2022-07-27 18:51:59 +02:00
bf3ed6e48e
Corrected ECTS Summen Display in Detail View when Withdrawing
...
If STGL withdraws a former rejection, there is no need to substract the ECTS in "Bisher angerechnete ECTS".
This is needed only if STGL withdraws a former approvement.
2022-07-27 16:22:17 +02:00
952d5e51b2
Refactoring der Dynamischen Max-ECTS-Berechnungsspalte, Berechnungen stimmen nun auch nach einem Genehmigungs-Update
2022-07-27 16:03:24 +02:00
aafdc41af2
core BPKWartung: corrected comments, removed uid property
2022-07-27 14:26:26 +02:00
937236933e
zeigt alle RTs an
2022-07-27 10:52:46 +02:00
0055243a64
DmsLib: replaced _writeFile function with _copyFile to copy all file in one go (php copy method) instead of reading blocks and writing them
2022-07-27 01:52:08 +02:00
94644b4403
Adapted: Hochschulqualifikation werden bei Berechnung der max ECTS Überschreitung ausgenommen
...
Anrechnung aufgrund von Hochschulqualifikationen sind ungeschränkt möglich.
2022-07-26 18:22:51 +02:00
7b9fd39bbc
Added: Hochschul-Qualifikation + ECTS Anzeige in Student View
...
Checkbox zur Angabe von Hochschulqualifikation
Anzeige, wenn ECTS Grenzen überschritten werden.
2022-07-26 18:18:08 +02:00
6a43928322
Added: Display (Qualifikations-)Begruendung in STGL Anrechnungen Detail View
2022-07-26 18:14:23 +02:00
8da4bbd14b
studentenmeldung.php: removed TODO comment
2022-07-22 18:40:55 +02:00
1ee0e8eeb9
verhindert das starten von fremden gebieten
2022-07-22 12:33:47 +02:00
1b457bda83
check that getting last status of previous semester is successfull before setting Wiedereintrittsdatum and Unterbrechungsdatum
2022-07-20 18:47:31 +02:00
86d7f8a35e
Code refactoring of Dynamic ECTS Summen
...
. now build with tabulators column formatter.
. rows are reinitialized instead of using the updateData.
. format of cell background-color has moved out from row formatter to cell formatter
2022-07-20 11:25:35 +02:00
503fbd5bde
bis studentenmeldung: Unterbrechungsdatum und Wiedereintrittsdatum gesetzt
2022-07-20 01:01:58 +02:00
760e5758ce
Optimized performance of all 'Alle auswählen'-buttons defined via tableWidgetHook
...
...by passing an array of rows to be selected, instead of selecting each row one by one.
Further triggered functions, e.g. rowSelectionChanged, are now called once only, not for each row.
2022-07-19 17:50:37 +02:00
4ba1f2cef5
Changed: Dynamic ECTS Summen (LV ECTS Sum by Prestudent + former ECTS) now build with tabulators mutator and rowFormatter
2022-07-18 17:38:20 +02:00
1544653fa3
Added Begründungstext 'Max ECTS überschritten' als Ablehnungsgrund
2022-07-18 17:33:50 +02:00
3b1d0f3aaa
Merged DB Model Int/Float conversion
...
+ query type cast adaptation
2022-07-18 17:33:20 +02:00
53a3417c8e
Erweiterung lehreinheiten_vorrueckung.php um Config DEFAULT_ECHTER_DIENSTVERTRAG
2022-07-18 16:22:30 +02:00
d81b205c05
Adaptierung checkbisverwendung.php und lehrveranstaltungDBDML.php um Config DEFAULT_ECHTER_DIENSTVERTRAG
2022-07-18 14:03:07 +02:00
1c457f7ab7
studentenmeldung:
...
- added fields MeldeStatus
- added field HerkunftslandCode for IO Container
- splitted Ausstellungsstaat in ZugangAusstellungsstaat and
ZugangMaAusstellungsstaat
2022-07-18 00:39:37 +02:00
055f52a0bd
lehrgangsmeldung:
...
- added field orgform_kurzbz, meldestatus and GS-Block
- splitted Ausstellungsstaat into ZugangAusstellungsstaat and
ZugangMaAusstellungsstaat
2022-07-18 00:37:27 +02:00
043f444bb6
added tbl_bisio.herkunftsland_code in db and made it editable as IO data in FAS
2022-07-14 19:50:50 +02:00
a463fc0dbf
Merge branch 'feature-18236/Standardisierung_Extension_OP-KVP'
2022-07-14 15:58:58 +02:00
6b4b3bad6a
Fixed application/libraries/FilterCmptLib->applyFilterFields, from arrays to objects
2022-07-14 11:47:28 +02:00
267f5b2972
- Added new directory public/js/apps/LogsViewer/
...
- Moved public/js/apps/LogsViewer.js to public/js/apps/LogsViewer/
- Added new JS file public/js/apps/LogsViewer/TabulatorSetup.js to setup the tabulator in the LogsViewer app
- Added new property tabulatorEvents to the FilterCmpt to subscribe events for the tabulator
2022-07-14 11:28:06 +02:00
9fa2f56c89
Grant SELECT to bis.tbl_gsprogramm for web-user
2022-07-14 10:37:25 +02:00
d569384e66
Merge remote-tracking branch 'origin/master'
2022-07-14 10:34:51 +02:00
c851cf9da2
Testkorrektur HR Services
2022-07-14 10:34:24 +02:00
de07d1f340
Switched FilterCmpt to tabulator
2022-07-13 18:57:55 +02:00
e433affcc3
- Fixed disappearing side menu when additional menu entries are provided by another component
...
- Fixed wrong parameter for removeFilterField call
2022-07-13 15:44:00 +02:00
8a813e0a2c
added "StudienkennungUni" to BIS XML studentenmeldung
2022-07-13 11:27:10 +02:00
141986ca67
Zeitsperren als fixe Termine
2022-07-13 11:11:22 +02:00
4dab69cb15
Reverted changes in application/models/person/Benutzer_model.php, pk => array
2022-07-13 09:45:58 +02:00
12bff57e0b
Erweiterung Coodle und Freebusy um Zeitsperren
2022-07-13 09:24:37 +02:00
f72c165fe6
added codex/Gsprogramm_model
2022-07-12 19:41:08 +02:00
013def84e3
bis.tbl_gsprogramm: studienkennung_uni can be added and edited in vilesci
2022-07-12 18:16:09 +02:00
17493a6e40
dbupdate: added bis.tbl_gsprogramm studienkennung_uni to check array
2022-07-12 16:37:18 +02:00
8b8515ee03
Fixed typo in system/filtersupdate.php
2022-07-12 14:51:39 +02:00
137af3ef71
Fixed typo
2022-07-12 14:10:47 +02:00
ae70dbcb64
Fixed includes of filter type in FilterCmptLib when it is declared in an extension
2022-07-12 14:09:17 +02:00
f7e057d7db
Fixed identation public/js/components/filter/Filter.js
2022-07-12 13:02:16 +02:00
c400641754
Includes fixes twbs/bootstrap to twbs/bootstrap3
2022-07-12 12:46:19 +02:00
6ce7068ead
Includes fixes tinymce/tinymce to tinymce/tinymce4
2022-07-12 12:39:48 +02:00
790f2bb130
Includes fixes jsoneditor to josdejong/jsoneditor
2022-07-12 12:34:30 +02:00
3f07aa172c
Includes fixes json-forms to brutusin/json-forms
2022-07-12 12:29:11 +02:00
76db7bd53a
Includes fixes jquery/jqueryV2 to jquery/jquery2
2022-07-12 12:18:35 +02:00
a780338367
Includes fixes components/font-awesome to fortawesome/font-awesome4
2022-07-12 12:16:48 +02:00
946ccc33d5
Include fixes alvaro-prieto/colResizable to alvaro-prieto/colresizable
2022-07-12 12:11:09 +02:00
eb2b738133
Includes fixes: jquery/jqueryV1 to jquery/jquery1
2022-07-12 11:59:52 +02:00
abcb575ef0
Added swith to turn on/off the top menu of the navigation component
2022-07-12 11:02:56 +02:00
8c8623ce4f
change primary key to string instead of array
...
because it is not a composite key and the load method gets confused otherwise
2022-07-11 17:31:37 +02:00
17322283f5
use searchresult property photo_url
2022-07-11 16:15:48 +02:00
5896a75a44
Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets
2022-07-11 16:11:53 +02:00
26eb77f030
change orgunit renderer to expect array of of objects for leaders
2022-07-11 16:10:28 +02:00
b53add9e67
libraries/SearchBarLib->_organisationunit removes from the leaders array those elements with uid and name == null
2022-07-11 16:10:24 +02:00
198c6baf3d
- Added new protected method getPostJSON to FHC_Controller to get POSTed JSON
...
- application/controllers/components/Filter.php now makes use of getPostJSON from the FHC_Controller
- RESTClient now POST a JSON request
- public/js/components/filter/Filter.js improvements
2022-07-11 14:54:14 +02:00
91447d7218
Adapted Query getEctsSummeSchulisch: exclude Anrechnung aufgrund universitärer Qualifikation.
...
Anrechnungen mit universiäterer Qualifikation sind unbegrenzt möglich.
2022-07-11 11:29:42 +02:00
a8f329e501
Added new Anrechnungbegruendung: Hochschulzeugnis
2022-07-11 10:46:53 +02:00
cfe7c6b9a4
Fixed typo in application/libraries/FilterCmptLib.php, renamed __getDatasetQueryCondition to _getDatasetQueryCondition
2022-07-11 10:27:49 +02:00
aac21c9fda
Updated composer.lock
2022-07-08 12:33:11 +02:00
9d6d759fd0
current composer.lock for axios zip from github
2022-07-08 12:17:52 +02:00
b2eb035613
Merge branch 'feature-20265/infocenter_check_duplicate_user'
2022-07-08 11:24:10 +02:00
21650a8782
Merge branch 'feature-19486/infocenter_nationengruppe_anzeigen'
2022-07-08 11:20:59 +02:00
b3caa4c0ac
Bugfix: FilterWidget: query executed before changes are applied
2022-07-08 11:15:52 +02:00
cd7fed2b43
Added studienkennung_uni field to bis.tbl_gsprogramm
2022-07-08 00:33:44 +02:00
8ab83a0baa
Added directory "components" to the extension installation
2022-07-07 17:26:49 +02:00
4e201f1002
Added slot in the header of the navigation component
2022-07-07 17:24:18 +02:00
2f1d5f157f
- Added new constant PHOTO_IMG_URL to application/libraries/SearchBarLib.php
...
- phone and photo_url are now return from SearchBarLib->_mitarbeiter
- SearchBarLib->_organisationunit fixed correct number of employees per organisation unit
- SearchBarLib->_organisationunit now returns the mailgroup
- SearchBarLib->_organisationunit returns an array of leaders, each element of this array is an object having the properties uid and name
2022-07-07 16:56:43 +02:00
1434deeca1
zeigt die nation gruppe an
2022-07-07 11:29:38 +02:00
377cb8ab7f
ermoeglicht das loeschen der dokumente ueber das infocenter
2022-07-07 11:25:54 +02:00
b2715bb408
Fixed: Added missing Summe ECTS Schulisch to AntragData.
2022-07-07 10:27:50 +02:00
ade55c9d1f
Added ECTS Summen to Anrechnung Detail View
2022-07-07 10:26:56 +02:00
b40db6abbd
Added ECTS Summen columns to Anrechnung Übersichtstable
2022-07-07 10:26:13 +02:00
4d05f54b54
Added ECTS Summen top AnrechnungData in the AnrechnungLib
2022-07-07 10:25:19 +02:00
2fb4118e69
Added to DB Update: Create functions to get total ECTS Summe by berufliche and schulische Qualifikation
2022-07-07 10:23:33 +02:00
1dc49ec494
Added methods to sum total ECTS, to be displayed on Anrechnung Details and Uebersicht
2022-07-07 10:21:23 +02:00
9d7589ddc4
Added DB methods to get ECTS Summen by schulische/berufliche Qualifikation
2022-07-07 10:18:40 +02:00
647b2a9f45
added rudimentary filter for employee search
2022-07-06 18:02:31 +02:00
39520d32fd
added selectRecord event to filter component
2022-07-06 18:02:10 +02:00
f5df010884
added application/components/extensions/ to .gitignore
2022-07-06 17:52:13 +02:00
f7c394547e
* fixed missing $primevue3 var in FHC-Common.php
2022-07-06 17:52:13 +02:00
19273003ee
* changed composer.json
...
* primvue is now included with help of https://asset-packagist.org/
* https://asset-packagist.org/ makes including npm packages with composer easy
2022-07-06 17:52:13 +02:00
6c618c9a20
* changed some { to [ for PHP 7.4 compatibility
...
* added some PrimeVUE 3 components to composer (currently used in organization chart of PV21 extension)
2022-07-06 17:52:13 +02:00
74b0fc5662
- Added new directory public/js/components/filter/
...
- Moved component public/js/components/Filter.js to public/js/components/filter/
- Moved API calls from public/js/components/filter/Filter.js to public/js/components/filter/API.js
- public/js/components/filter/Filter.js now imports public/js/components/filter/API.js
2022-07-06 16:59:33 +02:00
fe6a6c5da3
neue Funktion getVorgesetzteMonatTimesheet()
2022-07-06 15:24:28 +02:00
44a3231d55
Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
...
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
2022-07-06 12:00:09 +02:00
72428d0587
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-07-06 11:54:48 +02:00
acffebf515
check doppelte benutzer auch mit unterschiedlicher groß und kleinschreibung
2022-07-06 10:56:24 +02:00
ce9aa4c388
- Removed inlcudes of RESTClient from PHP (FHC-Common, FHC-Footer and views/system/logs/logsViewer)
...
- Changed RESTClient to be a JS module
- Now RESTClient is included via JS in the app LogsViewer and in component Navigation
- Added new directory public/js/components/navigation
- Moved component Navigation to public/js/components/navigation
- Moved API calls of the Navigation component to public/js/components/navigation/API.js
- Navigation component now imports public/js/components/navigation/API.js
2022-07-06 09:48:15 +02:00
759a2b4c8a
Merge remote-tracking branch 'origin/master'
2022-07-05 15:33:22 +02:00
e7587a9f00
Rechtecheck im Skript studienplan_vorrueckung auf lehre/studienplan
2022-07-05 15:33:17 +02:00
afb9bec9ba
Zugangscode ausblenden, wenn Bewerbungstool-Addon nicht aktiv
2022-07-05 15:32:29 +02:00
2927682dae
Merge branch 'feature-19473/VUE_Filter_Navigation_Widgets' of github.com:FH-Complete/FHC-Core into feature-19473/VUE_Filter_Navigation_Widgets
2022-07-04 19:30:18 +02:00
60b3be3d64
- Added new JS public/js/RESTClient.js as axios wrapper
...
- composer.json: added axios from github
- Added new directory application/components/extensions/
- Added new utility function findResource to application/helpers/hlp_common_helper.php
- Now the library libraries/FilterCmptLib loads the component definition php files from the extensions
- views/system/logs/logsViewer now includes axios and restclient, removed the includes for ajaxlib and jQueryUI
- Added includes for the RESTClient and axios to views/templates/FHC-Common and views/templates/FHC-Footer
- Improved component js/components/Fetch
- Components public/js/components/Filter.js and public/js/components/Navigation.js now they are making use of the Fetch component or/and the RESTClient
2022-07-04 19:25:16 +02:00
1d980274fe
Merge branch 'feature-19651/OEH_Beitragsliste'
2022-07-04 16:27:26 +02:00
5c94e33f24
render array properties correct, resize result on window resize, hide result on loosing focus
2022-07-02 13:26:18 +02:00
ac231722f1
Problem behoben wodruch Fehlermeldungen nicht korrekt angezeigt wurden
...
in der Zeitaufzeichnung
2022-07-01 14:31:39 +02:00
1641a879af
PHP Version Compatibility fixed
2022-07-01 09:04:52 +02:00
6341246550
Gruppenmanagement vilesci:
...
- changed description of manager input field
- error messsages are displayed in red color
2022-06-30 15:48:32 +02:00
2e4085c8de
Validierung bei Löschen zeitaufzeichnungsrelevanter Zeitsperren und bereits abgeschickter Monatsliste
2022-06-30 14:22:29 +02:00
9262dc6197
added Gruppenmanagement navigation menu entry to Persons category
2022-06-30 14:22:12 +02:00
dd66e9d119
Merge branch 'feature-19766/Issues_Studiengang_der_Person_anzeigen'
2022-06-30 12:35:22 +02:00
35426251cb
Delete Testausgabe
2022-06-30 11:42:14 +02:00
f74e036ec8
moved Berechtigung "extension/dvuh_gui_ekz_anfordern" to DVUH extension SQL
2022-06-30 11:27:24 +02:00
cf7ad022a7
Sancho Mail im Urlaubstool, neue Funktion checkActiveAddon
2022-06-30 10:51:02 +02:00
1c3acc6366
issue overview: added column "Zugehörigkeit"(Belonging) to show study programs of concerning person and wether it is an employee
2022-06-29 17:59:57 +02:00
60cbb8bd8c
Einfügen Spalte Status Monatsliste, Verhindern bei Löschen von ZA wenn Monatsliste abgeschickt
2022-06-29 15:01:16 +02:00
32daed2ad2
first draft data fetch component
2022-06-29 13:17:57 +02:00
f85225cc4e
Addex axios to the views/templates/ includes
2022-06-29 10:58:33 +02:00
091307680b
- Sorted composer packages in composer.json
...
- New composer.lock generated
- Added new package axios
2022-06-29 10:57:08 +02:00
796c09999f
Changed FilterCmptLib public methods to private where they were not used outside the library itself
2022-06-29 10:55:30 +02:00
ad30cc862e
Neue Spalte Status Monatsliste
2022-06-29 10:53:45 +02:00
797cabccb9
neue Mailvorlagen Sancho fuer Zeitausgleich und Urlaub
2022-06-29 08:46:01 +02:00
500bbec2c1
added "hasSequence" = false to crm/Dokumentprestudent_model to avoid "lastval not found" error
2022-06-28 19:07:09 +02:00
eeba5c7bd5
Merge branch 'feature-18887/Datenverbund_Clearing_und_Community_Changes'
2022-06-28 14:28:04 +02:00
bcaa560a46
Bugfix: query executed before changes are applied
2022-06-28 10:29:44 +02:00
2a298dc6d1
- Added JSON post parameter check in controllers/components/SearchBar->search
...
- Expanded search capabilities for organization units and employees
2022-06-27 16:22:40 +02:00
2692accbdf
Merge branch 'master' into feature-18887/Datenverbund_Clearing_und_Community_Changes
2022-06-27 14:48:11 +02:00
47f7c03075
virtualsplit and searchbar vue component, TestSearch Controller and View for Demonstration, minor change to SearchBar Controller to work with posted json
2022-06-24 19:26:37 +02:00
147ab92bae
- Added new library libraries/SearchBarLib
...
- Added new controller components/SearchBar
- Removed not anymore used view application/views/system/logs/logsViewerData.php
2022-06-24 17:59:01 +02:00
24b78454d3
- Added new function generateJSModulesInclude to application/helpers/hlp_header_helper.php
...
- Added entry "customJSModules" to the application/views/templates/FHC-Footer.php to be passed to the generateJSModulesInclude function to generate JS modules tags
- The new VUE components are making use of the JS import and export functionalities
2022-06-24 15:07:50 +02:00
9e48ba09d8
- Moved GUI options from application/components/filters/LogsViewer.php to application/views/system/logs/logsViewer.php
...
- Changed controller components/Filter to work with the new FilterComponent
- Removed unused code from library libraries/FilterCmptLib
- Changed library libraries/FilterCmptLib to work with the new changes in the controller components/Filter
- Added new CSSs for the new FilterComponent and NavigationComponent
2022-06-24 14:55:04 +02:00
f0df99c46a
Merge remote-tracking branch 'origin/master'
2022-06-24 14:29:35 +02:00
fcf829d03b
Button "Liste ausräumen" ergänzt
...
Löscht leere (unbenutzte) Prüflinge
2022-06-24 14:29:08 +02:00
c87aee0ddf
Zeitsperre Umbau Mail auf Sanchomail, Anzeige Zeitsaldo in Sanchomail, Adpatierungen Urlaub
2022-06-24 08:10:51 +02:00
5f5031e8d1
Added ECTS Summe to Anrechnung Detail View.
2022-06-22 10:54:17 +02:00
7bba155bb5
Adapted function getPreviousFrom to return more than 1 previous semester if needed
2022-06-22 10:52:51 +02:00
b52a3c9397
Added DB queries to calculate ECTS Summe in Lehrveranstaltung_model.php
2022-06-22 10:51:39 +02:00
12c9afbd3d
Added function getFirstStatus to Prestudentstatus_model.php
...
Funktion liefert den Ersten Status eines Prestudenten mit der übergebenen Statuskurzbezeichnung.
2022-06-22 10:48:48 +02:00
42fb7a4fc8
Added ECTS Summe functions to AnrechnungLib
...
Added functions to calculate total ECTS Summe of
. angerechnete Studiensemester of Quereinsteiger
. bisher angerechnete schulische Kenntnisse
. bisher angerechente berufliche Kenntisse
2022-06-22 10:47:29 +02:00
65ba946321
Rework Studienplan->getStudienplanLehrveranstaltung for Templates & use it in Vilesci "Lehrveranstaltung"
2022-06-22 09:39:53 +02:00
ca667feb0d
Added document type "Grant Agreement" for syncing of documents with Mobility Online
2022-06-20 18:55:29 +02:00
40efdf4acf
Merge branch 'feature-19538/Gruppenadministratoren' of github.com:FH-Complete/FHC-Core into feature-19538/Gruppenadministratoren
2022-06-20 18:42:35 +02:00
accef23cb8
Gruppenmanagent: correct table cell size when adding/deleting managers and when there are no managers
2022-06-20 18:38:49 +02:00
cfea30162c
Merge branch 'feature-19839/rt_freigegeben_liste_uhrzeit_des_rts_anzeigen'
2022-06-20 12:32:41 +02:00
95f1d87878
melde_studienang_kz can be edited in vilesci
2022-06-15 23:15:23 +02:00
f631cda7a5
Gruppenmanagement: added uid as insertvon when adding Gruppe
2022-06-15 22:53:37 +02:00
dc45427143
gruppenmanagement: renamed variable gruppemanager_class into gruppemanager_hlp
2022-06-15 22:52:37 +02:00
c771cbc644
Gruppenmanagement: added phrases
2022-06-14 18:24:10 +02:00
de08bfd0fc
Gruppenmanagement:
...
- renamed gruppenadministration to gruppenmanagement
- added additional columns to gruppenmanagement filterwidget
- improved comments
- write public.tbl_log every time user is added or deleted from a group
2022-06-14 17:30:07 +02:00
5c65b78a62
Merge branch 'bug-19556/Wrong_LV_Id_on_Template_copy'
2022-06-14 16:27:05 +02:00
1066dff8e0
Gruppenmanager:
...
- set on update cascade for gruppe_kurzbz foreign key
- Notice + disabling add of group managers when group is "generiert"
2022-06-14 14:08:27 +02:00
5731a98127
uhrzeit bei der rt freigegeben uebersicht hinzugefuegt
2022-06-14 10:29:20 +02:00
e83b1a6ee9
Bugfix: Wrong LV Id on Template copy
2022-06-14 09:11:04 +02:00
2e728462ca
Gruppenmanager:
...
- Berechtigung "lehre/gruppemanager" needed for managing groups
- added column "aktiv" to benutzeroverview
- group manager are deleted together with their group
- check: generated groups cannot have manager
2022-06-13 19:59:30 +02:00
aa8452682d
fix error undefined variable
2022-06-13 15:31:40 +02:00
2a95aa3abd
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2022-06-13 15:08:56 +02:00
8304808127
Beim Zusammenlegen von Personen wird in der Anmerkung "von" ergänzt
2022-06-13 14:18:20 +02:00
0f236b1da8
Merge remote-tracking branch 'origin/master'
2022-06-13 12:50:37 +02:00
42275f2af1
Bugfix LV-Teile kopieren. Vertrag_id wird nicht mehr kopiert
2022-06-13 12:50:32 +02:00
f57123e100
Gruppenadministration Benutzergruppen:
...
- changed phrases
- show error dialog when json error returned
- zebra table
- hide filter header for non-filtered columns
- empty input field after adding Benutzer
2022-06-13 12:01:00 +02:00
c90fd7d120
Merge branch 'feature-18233-18234/Standardisierung'
2022-06-13 10:27:12 +02:00
47843423d0
add column lehrveranstaltung_template_id to gegenpruefung
2022-06-13 10:19:26 +02:00
ec19d2e045
Merge master
2022-06-13 09:57:51 +02:00
5bc57767d1
Gruppenadministration: - added delete functionality - Benutzer per group are retrieved via javascript and refreshed when group added/delted - moved gruppenadministration files to person folder from organisation - handle error when benutzer was already assigned to a group
2022-06-10 22:01:48 +02:00
83351e7329
Manager Gruppenadministration:
...
first version of adding Benutzer to Gruppe
2022-06-09 20:05:46 +02:00
d2fea1ac6f
Merge branch 'master' into feature-19538/Gruppenadministratoren
2022-06-09 17:27:07 +02:00
a21ad7bbc7
Merge branch 'feature-19020/Checks_bei_Statusaenderungen'
2022-06-09 14:56:27 +02:00
2faa649cf3
Löschen von Statuseinträgen auch mit Berechtigung
...
student/keine_studstatuspruefung ermöglicht
2022-06-09 14:55:15 +02:00
457ab9dc3e
Gruppenadministration: first version of list with Gruppen of a manager.
2022-06-08 19:49:30 +02:00
9d769bbc16
Merge branch 'feature-18473/UrlaubstoolKeinEintragBeiVorhandenerZeitaufzeichnung'
2022-06-08 14:51:17 +02:00
25ee7f76cb
Merge branch 'feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten'
2022-06-08 14:10:28 +02:00
90e760a9ff
Merge branch 'feature-19351/infocenter_vorhandene_benutzer'
2022-06-08 14:03:45 +02:00
ab408958b7
Merge branch 'Sprint-186/Sonstiges'
2022-06-08 13:34:20 +02:00
c7df848d9d
consider OE when generating document
2022-06-08 13:16:46 +02:00
9a1d4bf54d
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2022-06-08 13:10:30 +02:00
71fa8cb355
Merge branch 'bug-19149/Reihungstest_Sprache_Prio'
2022-06-08 13:09:38 +02:00
734fa31111
consider OE when generating document
2022-06-08 13:08:20 +02:00
2c932f3d86
Bugfix
2022-06-08 10:30:07 +02:00
0ee1f3723b
Räume mit Raumtyp Gesperrt werden am Infoterminal als besetzt/gesperrt
...
angezeigt
2022-06-08 08:39:53 +02:00
e89a55b73f
Removed unused WYSIWYG Editor
2022-06-08 07:09:04 +02:00
c547fd86a7
replaced Berechtigung dvuh_gui_begrenz with dvuh_gui_ekz_anfordern for requesting ekz only
2022-06-07 18:31:43 +02:00
549396148d
Gruppenmanager can be added and deleted in vilesci gui
2022-06-07 17:54:05 +02:00
618a62425b
Adapted composer.json and includes to be compatible to composer version 2
2022-06-07 14:56:33 +02:00
e2b3dbda7b
Suche Cis: Wahlname vor Vorname, kein Hinweis auf Wahlname
2022-06-02 14:07:58 +02:00
37af8ea331
Gesamtzeilenanzahl wird im FAS immer angezeigt X/Y
2022-06-02 12:55:25 +02:00
f2defe2c22
BugFix FAS-Filter Anzahl Reihungstest nicht angemedet
...
Ergänzung um Studiensemester
2022-06-02 12:31:23 +02:00
f3fe3aa099
New changes for the Navigation and Filter components
2022-06-02 10:34:45 +02:00
29002124cc
- Added new controller components/Filter.php
...
- Added new library FilterCmptLib
- Fixed includes paths in FHC-Footer and FHC-Header
- Moved the LogsViewer tool to VUE+BS5
2022-06-02 10:32:26 +02:00
3803c72a97
Merge remote-tracking branch 'origin/master'
2022-05-31 18:03:16 +02:00
20c71e1788
Logo statt Fehlermeldung am Informationsbildschirm
2022-05-31 18:03:12 +02:00
ed08dde5a6
Projektarbeit ID anzeigen um leichter rauskopieren zu können
2022-05-31 18:02:29 +02:00
1019d42c73
SQL-Korrektur
2022-05-31 17:54:42 +02:00
bde469f4b8
Abfrage Brandschutzbeauftragte geändert. FHTW Übergangslösung entfernt
2022-05-31 17:54:23 +02:00
0cb303c242
added table public.tbl_gruppe_manager for adding managers to groups
2022-05-31 14:59:05 +02:00
956e3804bc
Merge branch 'feature-19171/Wahlname' of github.com:FH-Complete/FHC-Core into feature-19171/Wahlname
2022-05-31 09:31:57 +02:00
3f17c51834
Wahlname bei Suche in Spalte Vorname
2022-05-31 09:31:29 +02:00
f4988f8211
Zeitwuensche Update Mail wird temporär nicht an Studiengänge geschickt
2022-05-30 17:09:11 +02:00
84ff29ffd2
Merge branch 'feature-16370/AkteLib_create_new_CI_library_to_handle_akte'
2022-05-30 16:08:54 +02:00
6aa4d4d719
added extension/dvuh_gui_begrenzt Berechtigung for limited functionality access in DVUH GUI
2022-05-30 11:37:59 +02:00
974791e19b
Ausbildungssemester Limitiert damit bei Wiederholern die anzeige
...
funktioniert
2022-05-27 14:23:24 +02:00
ac91d8ccbc
Merge branch 'master' into feature-16370/AkteLib_create_new_CI_library_to_handle_akte
2022-05-27 14:18:30 +02:00
df321c4047
Merge branch 'master' into feature-19171/Wahlname
2022-05-27 13:30:19 +02:00
0c33ad4a7a
Warning bei Fotoliste behoben wenn kein Lektor zugeteilt ist
2022-05-27 13:20:56 +02:00
95d43753c2
Merge branch 'feature-18486/reihungstest_stoppen_fuer_einzelne_personen'
2022-05-27 11:33:13 +02:00
99db3ab9f6
Merge branch 'master' into feature-18486/reihungstest_stoppen_fuer_einzelne_personen
2022-05-27 11:01:30 +02:00
dc47a2ffc9
added permission student/keine_studstatuspruefung to enable non-admins to bypass studstatus checks
2022-05-24 18:38:44 +02:00
3d3f4d5453
erste version infocenter lehrgaenge
2022-05-24 13:51:39 +02:00
8880e07bf2
include/dokument_export.class.php now checks the new signature server response structure
2022-05-24 12:22:30 +02:00
7f2025c414
Added signature config entries to config/cis.config-default.inc.php
2022-05-24 11:27:24 +02:00
c354c69e21
Fixed Zwischenabgabe file upload
2022-05-24 11:23:48 +02:00
061780a0d2
- Added new VUE based JS public/js/components/Filter.js, public/js/components/Navigation.js and public/js/apps/LogsViewer.js
...
- Fixed bootstrap includes in FHC-Footer and FHC-Header
- Moved Job Logs Viewer to VUE
2022-05-24 09:45:31 +02:00
d7708e2f6c
Statusänderungen check studentDBDML.php: improved way of checking status by saving status in array first
2022-05-23 18:53:16 +02:00
a603081544
- Changed composer.json and updated composer.lock
...
- Added new PostgreSQL types in application/core/DB_Model.php
- Updated the includes in application/views/*
- Added new view template application/views/templates/FHC-Common.php
- Moved JS includes in application/views/templates/FHC-Footer.php
- Updated JS and CSS includes in application/views/templates/FHC-Footer.php and application/views/templates/FHC-Header.php
- Updated public/js/bootstrapper.js
- Changed global variable names in application/views/templates/FHC-Common.php to include the version of the included source
2022-05-23 18:45:29 +02:00
a73d2a06e8
Merge branch 'bug-19281/Bewerbungen01011970'
2022-05-23 17:54:15 +02:00
69c30ab39d
Merge branch 'bug-19529/Projektarbeituebersicht'
2022-05-23 17:17:03 +02:00
0a8c7aa032
Problem behoben wodurch die Prüfung auf doppelte Zahlungen bei Personen
...
nicht funktionierte die noch keine Studierenden sind
2022-05-23 17:01:15 +02:00
94a1534c14
- Warning Wrap on small Screens in Leturer side
...
- Perform Signatur Check only on Files from Type Endupload
2022-05-23 14:42:59 +02:00
3b1aba63b0
Neue Berechtigung für Verwaltung eigener Variablen hinzugefügt, Filter
...
für Projektabgabeuebersicht angepasst
2022-05-21 12:10:42 +02:00
9a57b263d1
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-05-17 16:33:07 +02:00
3d0bdcf95a
Changed composer.json and updated composer.lock
2022-05-17 16:05:02 +02:00
ba8543716c
Erweiterung Gesamtnotenimport um student_uid
2022-05-17 13:24:49 +02:00
2d23836396
Translated german phrase
2022-05-16 16:23:15 +02:00
22bba685ff
Added new style to the warning
2022-05-16 16:15:48 +02:00
8b061eab74
Adaptierungen FAS für Ergänzung Wahlname + Hinzufügen Zeitstempel kontakt.xul.php für Mitarbeiter
2022-05-16 09:17:31 +02:00
d4042228d9
- Better code and comments in application/libraries/SignatureLib->list
...
- cis/private/lehre/abgabe_lektor_details.php and cis/private/lehre/abgabe_student_details.php check if the uploaded document contains digital signares and display a phrase
- Added new phrase to locale/de-AT/abgabetool.php and locale/en-US/abgabetool.php
2022-05-13 20:11:31 +02:00
2a8b61c07f
- Added new library application/libraries/SignatureLib.php
...
- Changed configs for the signature server in config/vilesci.config-default.inc.php
- Changed include/dokument_export.class.php to make use of the new configs
2022-05-11 18:29:10 +02:00
71848c5bfc
Merge remote-tracking branch 'origin/master'
2022-05-11 16:41:34 +02:00
4b3163b67d
Anpassung der Breite der Inputfelder
2022-05-11 16:41:31 +02:00
a9ca16dddc
Beim Zusammenlegen von Personen werden beide Anmerkungen erhalten
...
Außerdem wird eine Info über das Zusammenlegen in der Anmerkung ergänzt
2022-05-11 16:41:14 +02:00
fdce499f37
prueft auf doppelte benutzer
2022-05-11 11:31:52 +02:00
84bc73f948
Anzeige Wahlname statt Vorname in Noten-,Anwesenheits und Fotoliste, Berücksichtigung in Cis-Suche
2022-05-11 11:18:01 +02:00
704b32c76c
Fixed constant values in application/libraries/DocsboxLib.php
2022-05-11 11:06:53 +02:00
f2e337b179
FAS prestudent status: added checks when adding or modifiying status, including status and status date checks
2022-05-11 04:36:23 +02:00
a654cbe583
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-05-10 10:34:07 +02:00
90c5ec53bf
Lehrauftragsmail an KF-Leitung: Bei Berechtigungsabfrage wird nun auch Lese-/Schreibrecht berücksichtigt
2022-05-10 10:33:00 +02:00
8111031dea
Merge branch 'feature-18779/FASUidGenerierungslogikAnpassen'
2022-05-10 10:28:33 +02:00
455dd4b8ff
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-05-09 10:38:54 +02:00
d2e0f34d9e
Reset Defaulstundensatz bei Neuanlage Projektbetreuer
2022-05-07 12:02:51 +02:00
58d252b5b7
Added 3rd parameter to Docsbox::convert call were missing
2022-05-06 09:57:55 +02:00
315d1d2171
Merge branch 'feature-19223/projektarbeitsbeurteilung_uebersichtsseite_bachelor'
2022-05-06 09:43:04 +02:00
9496cba137
Fixed composer.lock
2022-05-04 10:53:22 +02:00
d7e4d7ebde
Moved config entries from application/config/docsbox.php to config/cis.config-default.inc.php and config/vilesci.config-default.inc.php
2022-05-03 10:58:46 +02:00
491f025364
Merge branch 'feature-15970/kartenterminal'
2022-05-03 10:18:40 +02:00
707c8a3a6a
dbupdate_3.3.php: field melde_studiengang_kz in tbl_studiengang is prefilled correctly
2022-05-02 18:12:29 +02:00
5901b4b49c
Anzeige OE-Typ in FAS
2022-05-02 12:43:54 +02:00
bdee476a74
Adaptierungen Stundensatz: Aktualisierung Anzeige Defaultstundensatz, Zuordnung externe Betreuer
2022-05-02 11:53:14 +02:00
826d479761
limit hinzugefuegt
2022-05-02 11:33:33 +02:00
f14496ef5a
checkstudienbeitrag hinzugefuegt
2022-05-02 11:31:23 +02:00
fddc0068e4
Fixed wrong RegEx on Date Check
2022-04-29 12:49:16 +02:00
d89fba33e8
Merge branch 'feature-18234/Standardisierung_Studiengangsverwaltungstool_Template_verwenden' into feature-18233-18234/Standardisierung
2022-04-29 11:06:54 +02:00
a493ddd68e
merge feature 18233
2022-04-29 11:04:32 +02:00
a055a695e3
Merge branch 'master' into feature-18473/UrlaubstoolKeinEintragBeiVorhandenerZeitaufzeichnung
2022-04-29 10:58:06 +02:00
b7b6cd5399
Merge branch 'master' into feature-18188/Issues_GUI_zum_Pflegen_der_Fehlerzustaendigkeiten
2022-04-28 18:26:18 +02:00
05c9500b3b
Merge branch 'feature-683/UmbenennungLehreinheit'
2022-04-28 17:01:49 +02:00
325821f2a3
Merge branch 'master' into feature-683/UmbenennungLehreinheit
2022-04-28 16:53:38 +02:00
6df0982514
Anpassung DMS-Links
2022-04-28 16:48:48 +02:00
a38e53198f
Merge branch 'feature-245/LvTeilKopieren'
2022-04-28 16:16:51 +02:00
09ae63baa7
Merge branch 'master' into feature-245/LvTeilKopieren
2022-04-28 16:13:31 +02:00
658ef8a2a9
Merge remote-tracking branch 'origin/master'
2022-04-28 16:13:13 +02:00
07e4e489d3
Studentenmeldung Fehlendes Sponsionsdatum nicht BIS-Relevant
2022-04-28 16:13:09 +02:00
6e16f7cb0e
Merge branch 'master' into feature-245/LvTeilKopieren
2022-04-28 16:04:01 +02:00
562e0f29e9
Datumsbereich Studiensemester im Tooltip
2022-04-28 16:03:30 +02:00
968fcecc7c
Merge branch 'feature-19208/infocenter_accesscodesent_personaldata_saved_filter'
2022-04-28 15:06:03 +02:00
7d9c43fe30
Merge branch 'bug-19132/zgv_ueberpruefung_notizen_nicht_sichtbar'
2022-04-28 15:01:59 +02:00
2f54a436ac
Merge branch 'bug-18938/PersonenZusammenlegenAnzeigeproblemAdressen'
2022-04-28 14:59:40 +02:00
b6cc084799
Adaptierung Funktion getLastBisZAPflicht()
2022-04-28 11:46:45 +02:00
9e094f38d5
Erweiterung der Validierung um ganztägige Zeitsperren
2022-04-28 11:08:39 +02:00
63142f58d5
admin templates - & error phrases
2022-04-28 08:56:38 +02:00
9bf20dd7a4
neue Funktion: getLastVerwendungZapflicht
2022-04-28 07:54:43 +02:00
886d84e8af
ermoeglicht nun auch bachelor projektbeurteilungen herunterzuladen
2022-04-27 14:26:45 +02:00
398c04d0ac
sperrt alle prestudents von der person
2022-04-27 08:13:56 +02:00
9dbf59d1a1
Adaptierungen Codesniffer
2022-04-26 12:27:58 +02:00
a4378b4592
Add Default Stundensatz
2022-04-26 09:48:22 +02:00
3544acc60a
filter angepasst
2022-04-26 08:38:51 +02:00
7ff1a25abb
Merge branch 'feature-16214/beaurteilungsformulare_ba_ma_arbeit'
2022-04-25 15:46:08 +02:00
96a739f261
Merge branch 'master' into feature-16214/beaurteilungsformulare_ba_ma_arbeit
2022-04-25 15:15:15 +02:00
17a4ce1234
Aufruf kontakt.xul mit Timestamp
2022-04-22 08:34:23 +02:00
899e2e18df
18775 - Admin GUI f. Tabelle extension.tbl_opkvp_organisationseinheit_opprj
2022-04-21 15:29:16 +02:00
ad0aac398b
Merge branch 'FHBGLD-FHBGLD---BIS_lehrgangsmeldung'
2022-04-21 08:17:06 +02:00
b474043c9f
Update lehrgangsmeldung.php
2022-04-20 15:53:35 +02:00
cd8b13df1e
Update vilesci.config-default.inc.php
2022-04-20 15:53:30 +02:00
ebb87d6296
berechtigungen angepasst
2022-04-20 11:21:49 +02:00
349ad451f8
lehreinheiten_vorrueckung: Langbezeichnung in DropDown
2022-04-19 19:33:44 +02:00
c6b851eff2
Merge branch 'master' into feature-683/UmbenennungLehreinheit
2022-04-19 19:08:38 +02:00
900866ee24
Button für "Aktuelles Studiensemester" in Statusleiste
2022-04-19 19:03:59 +02:00
2bc3083fa9
Merge branch 'master' into feature-245/LvTeilKopieren
2022-04-19 18:50:23 +02:00
322d1b6db7
Merge remote-tracking branch 'origin/master'
2022-04-19 18:47:23 +02:00
1a2287c47f
Bugfix Ausbildungsvertrag Name vom Studiengang
2022-04-19 18:45:58 +02:00
10aa88e262
Merge branch 'feature-15391/Positive_Zeitsperre'
2022-04-19 13:46:38 +02:00
5522d97afe
issuesZustaendigkeiten.js: fixed comments
2022-04-15 23:47:16 +02:00
3f40622af3
bugfixes issues Zuständigkeiten GUI:
...
- all needed oe kurzbz are shown at any time for assignment
- funktion can only be entered after oe
2022-04-15 21:15:19 +02:00
087006a7a5
bugfixes issues Zuständigkeiten GUI:
...
- all needed oe kurzbz are shown at any time for assignment
- only functions not already assigned are shown
- funktion can only be entered after oe
2022-04-15 21:14:42 +02:00
a4759ed5a7
Sortierung der Studiensemester geändert auf absteigend
2022-04-15 17:51:41 +02:00
9b6b7c6c7f
LV-Teile kopieren
2022-04-15 17:50:15 +02:00
9ca6c99746
Umbenennung "Lehreinheit" auf "LV-Teil"
2022-04-15 17:46:13 +02:00
cdb403c38a
Korrektur Nachname<->Vorname für Studentenmeldung
2022-04-15 17:42:20 +02:00
bd35bce49a
Select für Lehrgänge
2022-04-15 17:41:49 +02:00
48333f62f0
autocomplete redesign & template field placement
2022-04-14 15:07:44 +02:00
5a00ae5a5e
Removed not use constant DEFAULT_USER from libraries/AkteLib.php
2022-04-14 10:21:17 +02:00
4fe562cbe2
Fehlerzuständigkeiten and issues GUI improvements:
...
- menu link opens in new tab
- controller id set for easier refresh
- added person and oe Zuständigkeiten to issues list
-
2022-04-13 20:08:08 +02:00
d1b487e91a
- Removed authentication functions from AkteLib and DmsLib
...
- Added new optional parameter who to write in the database who added the new document
- PHPMD optimizations
2022-04-13 13:22:16 +02:00
6a51e841ab
Merge branch 'feature-15887/BTMessagesBeiMasterAnInfocenter'
2022-04-13 12:17:50 +02:00
eb61991c0b
Merge branch 'feature-15886/ZahlungenSichtbarNurBeiErreichtemBuchungsdatum'
2022-04-13 12:01:33 +02:00
745692911f
Merge branch 'feature-18875/AnzeigeTageBeiDienstverhinderungen'
2022-04-13 11:55:42 +02:00
d820079f0c
Merge branch 'feature-17785/infocenter_kurzbezeichnung_des_studiengangs_von_studienordnung_holen'
2022-04-13 11:49:32 +02:00
7c6adaabeb
rt stoppen fuer einzelene personen
2022-04-13 11:43:25 +02:00
13b77d5300
Merge branch 'feature-18063/NotenlisteInternAngerechnet'
2022-04-13 11:35:39 +02:00
29c0fc54e5
Nicht Überschreibbare Noten werden generisch auf der Notenliste
...
angedruckt statt hartcodiert
2022-04-13 11:35:02 +02:00
c26fed90e2
Merge branch 'feature-18472/KurzzeitmobilitaetenNichtAnzeigen'
2022-04-13 11:01:05 +02:00
b8861043b4
Neuer Config für Spezialzeugnisnoten die nicht aufs Zeugnis/DS kommen
2022-04-13 09:19:01 +02:00
4ff4c88fdf
Merge branch 'feature-17908/intern_angerechnet_nicht_am_zeugnis'
2022-04-13 09:15:56 +02:00
59df862b3f
Merge branch 'bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument'
2022-04-13 08:55:06 +02:00
2b32f534f5
Merge branch 'bug-18663/fas_filter_zgv_erfuellt_zeigt_keine_daten_an'
2022-04-13 08:51:48 +02:00
d8ab58c8d6
Merge branch 'feature-12166/check_im_fas_ob_anzahlung_schon_gebucht_wurde'
2022-04-13 08:44:41 +02:00
5686ef612b
Neuer Config Eintrag für Check auf doppelte Buchungen
2022-04-13 08:44:09 +02:00
fe65627f71
Merge branch 'feature-18939/formal_geprueft_caching_problem_beim_aendern_der_eintraege'
2022-04-13 08:28:15 +02:00
3804cce361
studentenmeldung.php: export for all Studiengänge: ausserordentliche Studierende are also included if their Studiengang is melderelevant
2022-04-12 18:34:06 +02:00
8159f563ba
Updated composer.lock
2022-04-12 17:21:06 +02:00
8bad536818
Merge branch 'feature-17671/Automated_checks_project_quality'
2022-04-12 17:16:00 +02:00
45124fac01
Merge branch 'master' into feature-17671/Automated_checks_project_quality
2022-04-12 17:15:09 +02:00
d5225da80c
Kein Eintrag Urlaubstool bei vorhandener Zeitaufzeichnung
2022-04-12 16:48:22 +02:00
c8b23dbe12
Generierung UID in Addon FHTW ausgelagert
2022-04-12 12:15:17 +02:00
1f13c352a6
Issues.php: moved variable declaration out of if clause (phpcs issue)
2022-04-12 12:04:13 +02:00
d3c30af9f7
Merge branch 'master' into feature-15029/Docsbox
2022-04-11 20:14:26 +02:00
68e81d1eb6
Merge branch 'master' into bug-18663/fas_filter_zgv_erfuellt_zeigt_keine_daten_an
2022-04-11 18:40:32 +02:00
1ae4ceb4ee
Merge branch 'master' into bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument
2022-04-11 16:58:43 +02:00
9000cf0943
Merge branch 'bug-17359/BewerbungstoolAdpatierungAbfrageZGVInhouse'
2022-04-11 16:47:16 +02:00
e526f4fa2c
Merge branch 'master' into bug-17359/BewerbungstoolAdpatierungAbfrageZGVInhouse
2022-04-11 16:34:04 +02:00
40e3a3d901
Merge branch 'bug-17990/personendetails_homeoffice_adresse'
2022-04-11 16:27:56 +02:00
fe29fd0149
Merge branch 'master' into bug-17990/personendetails_homeoffice_adresse
2022-04-11 16:09:32 +02:00
0344904631
AkteLib.php, DmsLib.php coding style fixes:
...
- splitted too long parameter lines
- method call closing parenthesis on new line
2022-04-11 10:57:08 +02:00
9e8e8c98c8
checksystem: added column melde_studiengang_kz for tbl_studiengang
2022-04-11 10:23:45 +02:00
6a403a7fc3
Logik Generierung MA-Nummer im Fas geändert
2022-04-11 08:40:57 +02:00
b6d61c510d
checksystem: added columns insertamum and insertvon to system.tbl_fehler_zustaendigkeiten check array
2022-04-09 19:11:42 +02:00
f2ec48682b
Fehler Zuständigkeiten assignment page improvements:
...
- added the page to navigation
- added organisationseinheiten type to oe dropdown
- correct order of oe and funktion dropdown entries
- bugfix: delete button was not shown when german language
- mitarbeiter autocomplete search also works for "vorname nachname" form
2022-04-09 18:32:47 +02:00
268bf474df
Infomail bei Zeitwunschänderungen - Inaktive Abteilungsleitungen werden nicht informiert, Ermittlung der geänderten
...
Zeitwünsche angepasst
2022-04-08 16:29:47 +02:00
a788459d54
Zeitverfügbarkeiten werden nur aus dem aktuellen und kommenden Semester
...
angezeigt, vergangene Einträge werden ausgeblendet
2022-04-08 14:46:59 +02:00
9785cc62a4
Zeitwunsch prüft das VON Datum anstatt das Insert Datum beim Erstellen
...
neuer Gültigkeiten
2022-04-08 14:44:49 +02:00
c1335e3628
Merge branch 'feature-15390/Zeitwuensche_pro_Semester' into feature-15391/Positive_Zeitsperre
2022-04-08 14:00:37 +02:00
860bed4bda
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-04-08 12:31:09 +02:00
e51b79c33d
Merge branch 'feature-18887/Datenverbund_Clearing_und_Community_Changes'
2022-04-07 15:19:11 +02:00
df3cab593c
fehlerzustaendigkeit phrase "zuweisen" was incorrectly defined
2022-04-07 12:40:46 +02:00
79bfba2da5
anezeige fehler beim formal geprueft gefixt
2022-04-06 10:32:55 +02:00
02330db5ec
zgv erfuellt wird nur abgefragt wenn die config gesetzt ist
2022-04-05 14:02:53 +02:00
1733f314f7
added last_status and bismelden columns to Datenverbund Storno Übersicht Filter
2022-04-04 18:27:40 +02:00
c7ac4954ed
Anzeige Anzahl Tage bei Dienstverhinderung
2022-04-04 14:15:36 +02:00
5e64204354
Merge branch 'FHBGLD-FHBGLD-BIS_studentenmeldung'
2022-04-04 11:14:12 +02:00
753b679a84
Merge branch 'FHBGLD-BIS_studentenmeldung' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-BIS_studentenmeldung
2022-04-04 11:05:45 +02:00
9d9a47ee0a
Merge branch 'Monika70-lvnoten_verband'
2022-04-04 11:01:40 +02:00
d3615dfe69
Merge branch 'lvnoten_verband' of https://github.com/Monika70/FHC-Core into Monika70-lvnoten_verband
2022-04-04 10:59:59 +02:00
f94e9a3a15
Update Löschen alter Primary Key pk_tbl_entwicklungsteam_mitarbeiter_uid, studiengang_kz
2022-04-04 09:37:50 +02:00
c324386e47
Betreuerstunden bei Projektbetreuungen werden nicht mehr nach der
...
1. Nachkommastelle abgeschnitten sondern können bis zu 4
Nachkommastellen haben
2022-04-01 17:21:41 +02:00
dcf00b04ce
Fehler Zuständigkeiten GUI: removed double row for fehlertyp in fehler info modal
2022-03-31 17:47:20 +02:00
77bde75b6e
Merge remote-tracking branch 'origin/master'
2022-03-31 16:41:47 +02:00
31335b4ee4
Namenssuche mit Sonderzeichen CIS und FAS
2022-03-31 16:41:43 +02:00
4676a0a7c1
Fix Bug: Übernahme Werte ins Detailfeld
2022-03-31 15:03:35 +02:00
f0c40bf449
Adaptierungen Entwicklungsteam UID für FAS
2022-03-31 12:44:45 +02:00
427a75b74b
added GUI for managing Issues Zuständigkeiten
2022-03-31 12:41:18 +02:00
3d2c8dd1f9
Merge branch 'feature-18823/Covid_Zutrittskontrolle_deaktivieren'
2022-03-31 10:41:01 +02:00
3342a9018c
add config to deaktivate covid status
2022-03-31 10:27:10 +02:00
ad77c233e4
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-03-31 10:00:18 +02:00
bc4f352229
Merge remote-tracking branch 'origin/master'
2022-03-30 19:08:11 +02:00
f471d38e35
Logging von Statistiken über Vilesci
2022-03-30 19:08:07 +02:00
86f09c5bce
BigFix Load Studienplan Class
2022-03-30 19:07:09 +02:00
0dc508cf1f
Corrected code order
2022-03-30 17:13:26 +02:00
2897598aa3
Merge branch 'feature-2936/leistungsstipendien'
2022-03-30 16:08:35 +02:00
9f8b6056a4
leistungsstipendium filter hinzugefuegt
2022-03-30 15:59:42 +02:00
814ce1c78b
Added: Löschen von Zeitverfügbarkeiten mitloggen
...
Das Löschen von Zeitverfügbarkeiten wird nun in der Log-Tabelle
festgehalten.
2022-03-30 10:42:10 +02:00
c3f9fda0cd
Adapted: Negative Zeitsperre overrult positive Zeitsperre 'ZVerfueg'
...
Wenn zur gleichen Zeit eine negative und eine positive Zeitsperre besteht
dann wird die Zeit in der LV Planung als negativ (rot) markiert.
(Bsp: LektorIn hatte verfuegbare Zeit eingetragen [pos Zsp], ist wegen eines Krankenstands
dann doch nicht verfuegbar [neg Zsp] --> wird als nicht verfuegbar angezeigt)
2022-03-29 15:03:26 +02:00
6d1c926ec0
Anzeige AllinSaldo in Zeitaufzeichnung
2022-03-29 13:56:00 +02:00
1445876955
Copy Template on save 'tbl_studienplan_lehrveranstaltung'
2022-03-28 16:32:52 +02:00
3698837937
Update studentenmeldung.php
2022-03-28 13:03:45 +02:00
bb44bd05b6
Merge branch 'FH-Complete:master' into FHBGLD-BIS_studentenmeldung
2022-03-28 13:00:55 +02:00
fce72b1f91
fix merge conflicts after merging master
2022-03-28 11:59:26 +02:00
fe52b7e352
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-03-28 11:58:00 +02:00
d84ed369b1
fix merge conflicts after merging master
2022-03-28 11:36:47 +02:00
56079a3674
phrasesupdate
2022-03-28 11:32:32 +02:00
a8008d6233
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
...
# Conflicts:
# system/dbupdate_3.3.php
2022-03-28 09:50:02 +02:00
25a3bbbb85
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-03-28 09:33:43 +02:00
74ff9d7c8e
Kein Andruck von Kurzzeitmobilitäten auf Fotoliste
2022-03-25 10:27:07 +01:00
cf2587827b
nur Aufenthalte >= 30 Tage werden als Outgoings in listen angezeigt
2022-03-25 09:56:43 +01:00
56d3d33cd6
Verbesserte Abfrage beim Erstellen/Adaptieren von Tabellen tbl_zeitwunsch_gueltigkeit und tbl_zeitwunsch
2022-03-24 14:40:54 +01:00
4decfaa848
Added: Zeitverfuegbarkeit-Notizfeld ist nun verpflichtend in Assistenzsicht
2022-03-24 11:04:03 +01:00
86e15f2435
Added vorlagestudiengang_id to function getAktuelleVorlage
2022-03-23 17:39:55 +01:00
8db3aeb10f
Add index beschreibung to system.tbl_webservicelog
2022-03-23 17:34:04 +01:00
e0425b3288
Merge remote-tracking branch 'origin/master'
2022-03-23 17:33:19 +01:00
c54f261e16
Logging von Suchanfragen zur Verbesserung der UX
2022-03-23 17:33:01 +01:00
061c7b238e
Login für Admin mittels uid als GET-Param
2022-03-23 17:31:57 +01:00
70a2db3648
Login für Admin mittels uid als GET-Param
2022-03-23 17:31:34 +01:00
f87671ac4f
fix typo
2022-03-23 16:34:25 +01:00
37f6a0caaa
Merge branch 'master' into feature-15391/Positive_Zeitsperre
...
# Conflicts:
# system/dbupdate_3.3.php
2022-03-23 16:29:10 +01:00
d5d6432f14
modified model added db entry for lehrtyp added db col for template modified vilesci and added webservicerights for autocomplete
2022-03-23 15:54:44 +01:00
11373480bb
Fixed: Erneute Sperre beim Kopieren von ZW aufgehoben
...
Problem beim Kopieren von ZW behoben, wo nach Aufhebung einer Sperre die Sperre wieder aktiviert war.
2022-03-23 15:36:44 +01:00
fec8361897
Query zum Einholen der ZWGs vereinfacht
2022-03-23 15:33:11 +01:00
52f2241b4d
Initiales Anlegen der Zeitwunschgueltigkeit vereinfacht
...
Statt der doppelten Anlage von ZWG wird nur mehr einmal angelegt (Aktuelles Semester, Ende offen)
2022-03-23 15:32:06 +01:00
d37a773ec2
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
...
# Conflicts:
# system/dbupdate_3.3.php
2022-03-22 15:57:19 +01:00
29f7363343
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-03-22 15:52:55 +01:00
37c29455ef
intern angerechnet für Notenliste hinzugefügt
2022-03-21 10:52:19 +01:00
f29d838b7c
Adaptierungen für checksystem entwicklungteam_id
2022-03-18 13:45:33 +01:00
40392d3cb9
Planner: Laden der Projektphasen optimiert, Personentage werden in der
...
Übersicht angezeigt
2022-03-18 12:59:03 +01:00
64f8df780d
Merge branch 'feature-12053/pruefungsaktivitaeten_loeschen'
2022-03-17 17:00:24 +01:00
1197f051a2
kvp phrases
2022-03-17 16:20:54 +01:00
681385946a
Adaptierungen Tabelle bis.tbl_entwicklungsteam aufgrund Erweiterung um entwicklungsteam_id
2022-03-17 12:24:18 +01:00
693832c1cd
Changed chriskacerguis/codeigniter-restserver to be used only with version 3.0.3
2022-03-17 11:57:44 +01:00
ccc8bf8279
Merge branch 'task-18508/Zeitaufzeichnung_-_Pausenfehler'
2022-03-17 10:14:08 +01:00
04ecd3aa3a
fix calculation of pausesumme to sum up all pausen
2022-03-17 10:12:23 +01:00
253fdf1414
Planner - Anzeigeproblem bei Projektressourcen für Firmen und Studenten
...
behoben
2022-03-17 09:23:46 +01:00
8def68ad4f
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2022-03-16 18:29:01 +01:00
d83e0cf52c
BugFix ressource.rdf.php
2022-03-16 18:28:31 +01:00
b758275b58
added Projektarbeitsbeurteilung phrases
2022-03-16 17:12:55 +01:00
a08c8d7a76
Filter für Lehrende in FAS und Tempus
2022-03-16 16:13:47 +01:00
334460a230
Spalte "Anzahl Dokumente" bei BPK-Übersicht
2022-03-16 16:04:58 +01:00
a70dd49654
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2022-03-16 13:42:03 +01:00
67c9c79113
Änderung Klasse Entwicklungsteam auf neuen Key entwicklungsteam_id
2022-03-16 13:02:52 +01:00
6fb0fd3828
Icon fuer Services im Planner
2022-03-16 12:04:10 +01:00
04b896ac13
Update projektphasedetail.overlay.xul.php
...
Services Added
2022-03-16 09:38:38 +01:00
28fa931f2c
Update studentenmeldung.php
2022-03-16 08:10:10 +01:00
33d296512f
Merge branch 'feature-18115/unr_problem'
2022-03-15 13:02:35 +01:00
9c1b6bcd44
Entwicklungsteam: Adpatierungen für Sorierung und Anzeige Mitarbeiter Grid
2022-03-15 09:43:46 +01:00
e4be931704
Merge branch 'feature-17517/AdaptierungenZeiterfassungenSprint177'
2022-03-14 16:03:07 +01:00
e0a2f0490b
Laden der Untergebenen optimiert bei vielen Einträgen
2022-03-14 15:58:13 +01:00
e756ec4211
interne angerechnet und nicht zugelassen wird nicht angezeigt
2022-03-14 08:20:18 +01:00
a8e36f2f3e
added studiengangskennzahl phrase
2022-03-11 02:12:20 +01:00
afd03e414f
Datenverbund filter: added new filter for bpk overview in extension and added storno uebersicht filter to dvuh app, and remaned dataset
2022-03-10 13:39:53 +01:00
2b2b211470
Änderung Abfrage
2022-03-10 11:45:05 +01:00
2adfa8a09c
Fixed check in hlp_header_helper->printRefreshMeta function
2022-03-08 14:52:44 +01:00
78a5f65025
- Added new parameter refresh to the view /views/templates/FHC-Header.php
...
- /views/templates/FHC-Header.php calls the helper function printRefreshMeta
- Added new function printRefreshMeta to application/helpers/hlp_header_helper.php
2022-03-08 14:46:38 +01:00
9460fd19d8
kurzbz in absage dropdown und abgewiesene uebersicht angepasst
2022-03-08 11:43:34 +01:00
b3dff60ba6
views angepasst, kurzbz von studienordnung statt studienplan
2022-03-08 11:28:41 +01:00
4bd98fd10a
Merge branch 'feature_17252/sammelzeugnis_waff'
2022-03-08 08:18:22 +01:00
0b679bc9e4
Projektarbeitsbeurteilung: added english phrases, renamed kommissionsmitglieder to Prüfungssenatmitglieder
2022-03-08 03:12:03 +01:00
7aaeccdd42
Excluded application/phrases/ from been checked for line length with PHPCS
2022-03-07 12:34:11 +01:00
db694b9989
nach dem Speichern werden die Felder disabled
2022-03-07 10:30:41 +01:00
5838e1caa5
neue Funktion getAll für Entwicklungsteam STGV
2022-03-05 12:51:06 +01:00
e50cc27a89
Fixed exec second parameter value
2022-03-04 20:13:03 +01:00
9f28db36b8
- Added new sniffs for codesniffer to be compliant with the FHComplete coding style
...
- Commented tests/codesniffer/FHComplete/ruleset.xml
- Removed redundant PHPCS checks already performed by PHPMD
- Added/removed checks from PHPCS to be compliant with the FHComplete coding style
- PHPMD: Removed the ElseExpression rule from the rulesets/cleancode.xml
2022-03-04 19:59:57 +01:00
db49f2b1e7
- libraries/DocsboxLib:
...
- Added new constant DEFAULT_FORMAT
- ERROR and SUCCESS constant values are the same of EXIT_ERROR
and EXIT_SUCCESS
- public method convert parameter format does not have a default
value anymore
- Added use import of ZipArchive
- libraries/DocumentLib: removed unused variables
2022-03-04 19:47:32 +01:00
ea98fd7e18
Merge branch 'feature-12053/pruefungsaktivitaeten_loeschen'
2022-03-04 15:10:51 +01:00
418f2aee7b
Merge branch 'master' into feature-17517/AdaptierungenZeiterfassungenSprint177
2022-03-04 15:03:03 +01:00
6e6ed893e4
Zeitaufzeichnung Problem behoben wodurch nach dem Löschen in den edit Modus gewechselt
...
wird statt in den neu Modus
2022-03-04 14:50:42 +01:00
fd209efe55
CSV Import Error Handling
...
- Leerzeilen ignorieren
- Prüfung der Pflichtfelder
Zeitsperre
- Nicht Zeitaufzeichnungsrelevante Zeitsperren parallell zu
Zeitaufzeichnungen möglich
2022-03-04 14:45:44 +01:00
acf32ffc39
Removed Legacy File
2022-03-04 11:23:08 +01:00
4619bb56f2
Removed Legacy File
2022-03-04 11:21:09 +01:00
091fd3487f
refactoring: zeitaufzeichnung_import & zeitaufzeichnung_import_csv & zeitaufzeichnung_import_post
2022-03-03 15:59:16 +01:00
5a34835a20
Mitarbeiteranlage erlaubt jetzt Vornamen und Nachnamen mit nur 2 Zeichen
2022-03-03 13:58:55 +01:00
c3b2533ae9
Comment & Warnings
2022-03-03 08:37:42 +01:00
4066a7a228
zeitaufzeichnung_csv_import.class
2022-03-02 16:38:23 +01:00
85107afb63
education/Zeugnisnote_model: Noten can be filtered by zeugnis flag
2022-03-02 12:19:37 +01:00
d53f14eeea
blockierende Zeitsperren auch serverseitig prüfen, clientseitige Prüfung geringfügig angepasst
2022-02-28 14:02:16 +01:00
4f8834a8b2
Merge branch 'feature-16190/Issues_automatisches_Beheben'
2022-02-28 13:23:09 +01:00
d7ad3d80f3
Merge branch 'master' into feature-16190/Issues_automatisches_Beheben
2022-02-28 13:07:06 +01:00
8471d3c8cd
added public access modifier to interface (yes, this is actually necessary because mess detector is complaining...)
2022-02-28 12:57:10 +01:00
1cf216b5ee
added DVUH storno filter
2022-02-28 12:55:47 +01:00
38f34763b1
Merge branch 'feature-12647/reihungstest_anmeldeproblem_bei_zwei_reihungtests'
2022-02-28 11:45:02 +01:00
fed29449e8
Merge branch 'feature-15313/reihungstest_danke_popup_beim_logout'
2022-02-28 11:41:45 +01:00
d84562e830
Merge branch 'feature-17001/infocenter_bewerber_vorhanden'
2022-02-28 11:25:49 +01:00
766950cc16
Merge branch 'feature-17783/infocenter_zgv_pruefung_sancho_mail_sollte_namen_enthalten'
2022-02-28 11:13:21 +01:00
2b4ecf3a3d
Merge branch 'feature-16922/infocenter_detailansicht_name_statt_uid'
2022-02-28 11:07:38 +01:00
0168d78207
Merge branch 'feature-17782/infocenter_identitätsdokument_bei_reihungstest_freigegeben'
2022-02-28 11:03:06 +01:00
934631f4e3
Berechtigungsprüfung auf Untergebene erweitert beim Laden der
...
Projektphasen
2022-02-25 15:23:48 +01:00
bbc8c0e052
CheckPausenError aus Funktion verwendet
2022-02-25 14:26:40 +01:00
3c74ff5780
Merge branch 'feature-17728/featureCheckPausenfehlerBeiVorzeitigemAbschicken' into feature-17517/AdaptierungenZeiterfassungenSprint177
2022-02-25 13:44:01 +01:00
35bf7b4c32
Merge branch 'master' into feature-17517/AdaptierungenZeiterfassungenSprint177
2022-02-25 13:11:43 +01:00
1cd5a943c4
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2022-02-25 12:23:25 +01:00
8ee2dbbe66
Merge branch 'feature-17644/Anrechnung_Ansicht-fuer-Assistenz'
2022-02-25 12:11:00 +01:00
18731ede47
Laden von Studiengangsleitungen angepasst, Error Handling bei fehenden
...
Studiengangsleitungen
2022-02-25 11:59:38 +01:00
68971c7146
Merge remote-tracking branch 'origin/bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument' into bugfix-Sprint183/Anrechnung_FalschmeldungBeiGrossemDokument
...
# Conflicts:
# public/js/lehre/anrechnung/requestAnrechnung.js
2022-02-24 14:12:37 +01:00
c8f93cae07
Adapted system feedback when uploading too large documents
...
. Added clientside check to avoid uploads > max upload size on serverside
. Adapted message returned by server, when max upload size is exceeded
2022-02-24 14:11:11 +01:00
4a509fa9d0
Aktueller Status wird aus den übergebenen Studiensemester ermittelt
2022-02-23 16:29:46 +01:00
e402c8cdf9
Filter Widget in Tablesorter und Row-Count
2022-02-23 16:22:30 +01:00
f47f952b0a
Get-Param norefresh für Informationsbildschirm unterdrückt refresh
2022-02-23 16:20:29 +01:00
c3cef1c5f1
adressentyp class hinzugefuegt
...
dynamische anzeige der adressentypen
2022-02-23 16:17:29 +01:00
b3d9c00d3c
Merge remote-tracking branch 'origin/master'
2022-02-23 16:17:27 +01:00
95c7f083d4
CSV-Export aus dem Reporting mit Komma statt Punkt
2022-02-23 16:17:13 +01:00
a4c80b7969
reihenfolge der spalten angepasst
2022-02-23 15:00:14 +01:00
2d683390ae
Adapted system feedback when uploading too large documents
...
. Added clientside check to avoid uploads > 8MB size
. Adapted message returned by server, when max upload size is exceeded
2022-02-23 12:57:58 +01:00
09954c479c
Changed: Now checking by permission and not by benutzerfunktion
...
Before, permission for page access and download was checked by benutzerfunktion.
This did not allow access by user with corresponding permissions, like admins.
Therfore changed to check by permission only.
2022-02-23 09:45:45 +01:00
339f82291c
Disabled edit elements / create Anrechnung in GUI if user has readonly access / no permission to create Anrechnung
2022-02-22 16:36:11 +01:00
22b0e9f941
name in die mails hinzugefuegt
2022-02-22 12:25:39 +01:00
841247aa06
download von identitaetsnachweis hinzugefuegt
...
onholddate als default spalte hinzugefuegt
2022-02-22 12:23:12 +01:00
9abc018e08
Removed db->escape when using getLeitung/getAssistance method
...
...it throws an error since query was adapted to accept array and anyway, is
not necessary anymore.
2022-02-21 17:19:02 +01:00
b1f171aee2
Changed permission function to allow stgl assistance download on Uebersicht- and Detailseite
2022-02-21 16:53:30 +01:00
d2055f759e
Added method getAssistance in Studiengang Model
2022-02-21 16:52:13 +01:00
d57a62dbe3
Adapted method getLeitung in Studiengang Model to accept studiengang array
2022-02-21 16:51:17 +01:00
a2a307aade
Changed permission to allow stgl assistance reading Uebersicht- and Detailseite
2022-02-21 16:45:01 +01:00
35c351f045
Added phrases to View
2022-02-21 12:02:18 +01:00
78d863a383
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-02-21 11:42:37 +01:00
6ebb298233
Added required fields check on client side
2022-02-21 11:20:17 +01:00
d5dc4484d5
Fixed display of double datepicker
...
HTML input "date" format was used to avoid displaying text list when using
the optional input "text" format. Problem was then: display of two datepickers
- HTML and jquery ui datepicker. This is fixed now by using prevent default
on HTMl datepicker.
2022-02-21 11:19:43 +01:00
273ff6a3df
Merge branch 'master' into feature-16190/Issues_automatisches_Beheben
...
# Conflicts:
# system/dbupdate_3.3.php
2022-02-19 02:45:49 +01:00
af9ab29c5c
variablename in dbupdate eingetragen
2022-02-18 14:05:44 +01:00
45f789ebf9
IssueResolver_Controller.php: job does not stop after error or no issues found.
2022-02-18 11:01:45 +01:00
ae15c922b8
buchung kann nun trotz vorhandener buchung gebucht werden
2022-02-18 10:30:40 +01:00
142c4ca37d
Verband als Detailinfo
...
Verband als Detailinfo bei den Lehrveranstaltungsnoten einblenden
2022-02-18 09:22:02 +01:00
944cf9c0b3
Merge remote-tracking branch 'origin/feature-15391/Positive_Zeitsperre' into feature-15391/Positive_Zeitsperre
2022-02-17 16:55:37 +01:00
df4d2df9f2
Added tooltip to delete button
2022-02-17 16:54:47 +01:00
b8cfa58446
waff zeugnis angepasst
2022-02-17 15:06:22 +01:00
d17c221867
Fixed: Lektor-Dropdown not disabled anymore after Deleting Zeitverfuegung
2022-02-17 15:04:17 +01:00
61d7b68a79
Added validation checks on post data
...
Checking date restrictions and other mandatory post params.
Deleted client side validations, now they are performed
only on server side.
2022-02-17 14:48:19 +01:00
558ad7beee
Fixed wrong column name 'ZeitsperreID' to correct name 'UID'
2022-02-17 12:57:35 +01:00
b8b3b1b07d
Embedded menu item Zeitverfuegbarkeit to FH Complete Menu
2022-02-17 12:36:31 +01:00
e06301a2de
Added phrase 'Geloescht' / 'Deleted'
2022-02-17 12:34:44 +01:00
ca51fef7f8
Added method to get actual Studiensemester to Studiensemester Model
2022-02-17 12:33:38 +01:00
5c82a4d821
Added insert/update/delete methods to Zeitsperre Model
2022-02-17 12:33:01 +01:00
9872ab9be3
Added JS file to administrate Zeitverfuegbarkeiten
2022-02-17 12:31:33 +01:00
2d44675d90
Added permission to administrate Zeitverfuegbarkeiten
...
Permission: lehre/zeitverfuegbarkeit
2022-02-17 12:30:54 +01:00
0d0351d265
Added Views to administrate Zeitverfuegbarkeiten
2022-02-17 12:29:40 +01:00
d9c66d95d0
Added Controller to administrate Zeitverfuegbarkeiten
2022-02-17 12:23:48 +01:00
23e10d8fbf
Merge branch 'feature-17391/Kostenstellennummer_6_Zeichen_BFI'
2022-02-16 18:39:08 +01:00
f2ebf9e0fa
Infotext bei DB-Update korrigiert
2022-02-16 18:38:38 +01:00
ebf683aac2
Merge branch 'feature-17780/fix_sql_query_for_personalmeldung'
2022-02-16 18:27:05 +01:00
2b974b7729
Bugfix for Personalmeldung
2022-02-16 14:55:17 +01:00
dd97818ebe
Merge branch 'hotfix-17758/SAPByD_payments_fix_KontoModel_setPaid'
2022-02-15 16:53:54 +01:00
f6de822ea0
Fixed Konto_model->setPaid method
2022-02-15 16:49:46 +01:00
d4d1320503
Removed test files for PHPMD
2022-02-15 12:56:19 +01:00
071b361959
verhinderte buchungen, die bereits vorhanden sind
...
+ neue configeintrag
2022-02-15 12:47:42 +01:00
5427a5aff3
Checking test for PHPMD
2022-02-15 12:43:50 +01:00
cc6f59662a
Added test file to check PHPMD
2022-02-15 12:35:25 +01:00
282972f441
Added new PHPMD ruleset rulesets-dev-only.xml
2022-02-15 12:28:33 +01:00
8037067b44
Changed the size of wawi.tbl_kostenstelle.kostenstelle_nr from character varying(4) to character varying(6)
2022-02-15 09:23:45 +01:00
9eb3659d03
archivieren beim waff sammelzeugnis hinzugefuegt
2022-02-15 09:23:30 +01:00
51b1f2cfa9
Funktion checkPausenErrors() in zeitaufzeichnung.class.php
2022-02-14 16:26:13 +01:00
67700a47d8
Merge branch 'feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate'
2022-02-14 11:02:19 +01:00
7fc9fcfedd
Merge branch 'master' into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate
2022-02-14 10:57:23 +01:00
6e9ecb23b2
Removed lint test file
2022-02-11 12:55:30 +01:00
598575a194
Added excludes to PHPMD and PHPCS rule sets
2022-02-11 11:01:44 +01:00
37fe8a9968
Merge branch 'Monika70-lvgesamtnoteverwalten'
2022-02-11 09:46:51 +01:00
5db2ebb260
Merge branch 'lvgesamtnoteverwalten' of https://github.com/Monika70/FHC-Core into Monika70-lvgesamtnoteverwalten
2022-02-11 08:48:35 +01:00
5cea93d284
Unterstützung für das erstellen von signierten Zertifikaten und LVZeugnissen im
...
Lehrveranstaltungskarteireiter für mehrere Personen auf einmal
hinzugefügt
2022-02-10 19:01:32 +01:00
6b163ef786
Merge branch 'master' into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate
2022-02-10 17:43:29 +01:00
a2f9276bcb
Fehler behoben wodurch Noten beim Bearbeiten in der
...
Lehrveranstaltungssicht nicht geladen wurden
2022-02-10 17:40:30 +01:00
92b2e7a64b
lv zeugnisse und zertifikate mit signatur unter lehrveranstaltungen hinzugefuegt, selfservice auf true geaendert und vorlagen angepasst
2022-02-10 16:35:05 +01:00
3b8da2d7d0
moved check if projektarbeit is current to projektarbeit.class.php to projektarbeitIsCurrent method
2022-02-10 15:42:19 +01:00
c8e31dffa8
Adaptierung Phrasen und Authentifizierung
2022-02-10 15:02:43 +01:00
6066da470e
- Added excluded directories to PHPMD and PHPCS rule sets
...
- Added testing file for Lint
2022-02-10 15:00:00 +01:00
f5ae4f8679
Defaultwert für Homeoffice gesetzt
2022-02-10 14:52:35 +01:00
c84dcd900b
- Added new composer dev packages: squizlabs/php_codesniffer phpmd/phpmd phpmetrics/phpmetrics sebastian/phpcpd
...
- Updated composer.json and composer.lock
2022-02-10 11:54:18 +01:00
d9aa24cced
- Removed phpci.yml file
...
- Removed tests/codeception/ directory
- Changed tests/codesniffer/FHComplete/ruleset.xml
- Removed tests/codesniffer/FHComplete/Sniffs
- Removed tests/codesniffer/FHComplete/tests
- Added tests/phpmd/rulesets.xml
2022-02-10 11:42:39 +01:00
297172113d
neue Funktion getAll() für Anzeige Entwicklungsteams
2022-02-10 11:04:31 +01:00
642ba32e0b
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-02-10 10:51:08 +01:00
d0e683a514
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-02-10 10:50:11 +01:00
5641d10cc1
Link zum Schlagwortdienst korrigiert
2022-02-09 14:33:25 +01:00
6b5df6d6ca
fixed login for testtool
2022-02-09 13:48:54 +01:00
5d2adedd37
Kommission in der uebersicht hinzugefuegt
2022-02-09 10:35:39 +01:00
b0212627ce
Changed: Zeitverfuegbarkeit bei Zeitsperren im CIS nicht lösch-/editierbar machen
2022-02-09 09:56:19 +01:00
6d62019447
Changed: Zeitverfuegbarkeit bei Zeitsperren im CIS nicht anzeigen
2022-02-09 09:55:39 +01:00
a6771df4dd
issues auto-resolve: added checks if library forissue exists and has method for resolving
2022-02-08 21:47:33 +01:00
8a848f7169
Added: Anzeige in Tempus über Zeitverfuegbarkeit
...
Wenn ein Lektor eine positive Zeitsperre hinterlegt hat, wird diese
im Tempus nun angezeigt.
2022-02-08 17:53:22 +01:00
0f871dc89f
Added: Methode getVonBis() in Zeitsperre Class
...
Liefert die Zeitsperren eines Users innerhalb einer bestimmten Zeitspanne.
Einschränkung nach Zeitsperrentyp möglich.
2022-02-08 17:51:58 +01:00
a715a78858
phrase maxtagebeschreibung for eucovidqr added
2022-02-08 16:54:55 +01:00
fc47391392
Fix Bug Fehlermeldung, Ergänzung Zeittypen Covid, Ergänzung Dropdown um OE-Auswahl Leitung
2022-02-07 17:09:05 +01:00
615a55eccc
Adaptierungen Zeiterfassungen von Sprint177
2022-02-03 14:49:29 +01:00
08c35c6500
Fixed Error 'Class 'Studiensemester' not found' in MA Zeitwuensche (VILESCI)
2022-02-03 09:16:56 +01:00
cd982f9ece
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate
2022-02-03 08:59:40 +01:00
d8fd0400cb
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15887/BTMessagesBeiMasterAnInfocenter
2022-02-03 08:57:25 +01:00
13c720e230
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-16922/infocenter_detailansicht_name_statt_uid
2022-02-03 08:56:50 +01:00
53ab1073ec
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-17001/infocenter_bewerber_vorhanden
2022-02-03 08:56:11 +01:00
5897057581
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-15313/reihungstest_danke_popup_beim_logout
2022-02-03 08:54:38 +01:00
2bb04cac50
Merge remote-tracking branch 'origin/master' into feature-12647/reihungstest_anmeldeproblem_bei_zwei_reihungtests
2022-02-03 08:53:50 +01:00
4ae4be7eed
Fixed Error 'Class 'Studiensemester' not found' in MA Zeitwuensche (VILESCI)
2022-02-02 16:13:41 +01:00
130c8e271f
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-02-02 13:41:29 +01:00
18d06c6e0c
Added commento to an echo in the application/core/FHC_Controller.php
...
because it is not possible to replace the echo
2022-02-02 11:52:08 +01:00
8de4625b50
Update lvgesamtnoteverwalten.php
...
Definition der Variable $ueberschreibbar außerhalb des If Statement, da auf die Variable in weiteren Stellen außerhalb des If Statement geprüft wird.
2022-02-02 11:01:15 +01:00
f1fc9b467d
Update lvgesamtnoteverwalten.php
...
Definition der Variable $ueberschreibbar außerhalb des If Statement, da auf die Variable in weiteren Stellen geprüft wird.
2022-02-02 10:02:13 +01:00
7b17c9c265
Update lvgesamtnoteverwalten.php
...
Die Definition der Variable $ueberschreibbar außerhalb des If Statement.
2022-02-02 08:44:55 +01:00
67a86d0705
online assessment or projektarbeit only after SS2022: also added check when sending mails to Begutachter
2022-02-01 22:56:20 +01:00
1e56743187
added projektarbeitsbeurteilung phrases
2022-02-01 22:44:58 +01:00
6d806a52d9
Merge branch 'feature-17457/notenliste'
2022-02-01 17:25:54 +01:00
8d1f8875e8
Merge branch 'feature-17433/cis_profil_adressen'
2022-02-01 17:17:34 +01:00
4ccc659dd9
Anzeige für Hauptberuf korrigiert
2022-02-01 17:13:16 +01:00
37cd868a44
uebersichtseite angepasst und mail beim updaten entfernt
2022-02-01 09:15:22 +01:00
06408ba66e
Variable entfernt
2022-01-28 15:52:06 +01:00
6809dbdb1f
Debug Output entfernt
2022-01-28 15:23:04 +01:00
1468c875d5
Merge branch 'master' into features-Zeiterfassung/Sprint177
2022-01-28 15:17:06 +01:00
d9c056e7c2
bfi aenderungen notenlsite
2022-01-27 11:02:56 +01:00
3136cf354a
alle eingetragenen adressen nur beim mitarbeiter anzeigen
2022-01-27 11:00:26 +01:00
f8d01b0866
rt login fixed bei zwei rts
2022-01-27 10:41:41 +01:00
1b71f59dcd
Merge remote-tracking branch 'origin/master'
2022-01-25 15:06:41 +01:00
9ca053ccb2
Anpassung Studienblatt für AbsolventInnen
2022-01-25 15:06:00 +01:00
1a8b267a89
Projektbetreuer_model.php: getBetreuerOfProjektarbeit returns only one row for each person
2022-01-25 14:55:01 +01:00
ce38127618
- FAS hide Projektarbeit Punkte
2022-01-25 12:55:29 +01:00
f9b93f55e4
- Projektbetreuer model getBetreuerOfProjektarbeit: added full name and projekttyp_kurzbz are also
...
returned
- abgabe_lektor_details.php: grading only possible after end upload of thesis, and only beginning with SS2022
- added projektbeurteilung phrases to core locale and phrasesupdate.php
2022-01-25 12:40:41 +01:00
bda323ba05
Adaptierung Abfrage für ZGV Master
2022-01-21 10:26:31 +01:00
cf7cfd7cd2
sorted results of geBetreuerOfProjektarbeit method of Projektbetreuer_model.php and added mitarbeiter data to the result
2022-01-21 05:15:36 +01:00
37c19aafc2
Added Betreuerart "Kommission" to lehre.tbl_betreuerart
2022-01-21 02:50:39 +01:00
094f75ef61
- Projektbetreuer_model.php: method getBetreuerOfProjektarbeit for getting Betreuer by betreuerart
...
- phrasesupdate.php: added Projektarbeitsbeurteilung phrases
2022-01-21 00:41:13 +01:00
b145e341b8
IssueResolver.php: added comment
2022-01-20 15:11:46 +01:00
4981b681e0
bufix: issue resolver does not stop after finding error
2022-01-20 12:58:32 +01:00
291ea166db
removed comment
2022-01-20 12:57:11 +01:00
76783b0826
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-01-20 11:23:58 +01:00
f5fd5c3838
dokument_kurzbz auf varchar 32 geandert
2022-01-19 18:40:36 +01:00
b8ac076bdb
projektbeurteilungs uebersicht hinzugefuegt
2022-01-19 17:56:30 +01:00
e687471a37
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2022-01-19 14:52:50 +01:00
9480e79ec0
Zeitsperren für Zeitaufzeichnung ergänzt
2022-01-19 14:52:30 +01:00
81b74a7b7c
Merge remote-tracking branch 'origin/master'
2022-01-18 20:18:57 +01:00
b6131283d9
Ampelsystem: Attribut Buttonbeschriftung berücksichtigen
2022-01-18 20:18:53 +01:00
08322920bc
Problem behoben beim Abfragen von Zeitwünschen mit NULL Gültigkeit
...
Anzeige korrigiert wenn Zweitwünsche unter der Woche korrigiert werden
2022-01-18 18:06:22 +01:00
cf27a0d782
Fehler beim Laden der Lehrveranstaltungen im Prüfungskarteireiter
...
behoben
2022-01-18 17:10:17 +01:00
29b19af432
automatic issue resolving: added info text when starting and ending job
2022-01-17 21:53:54 +01:00
de60770e74
automatic issue resolving:
...
- removed comments
- automatically added issue_id to params, output the id in error messages
2022-01-17 21:46:19 +01:00
f85e72d91d
Merge branch 'master' into feature-7751/vorlage_fuer_signierte_lv_zeugnisse_und_zertifikate
2022-01-17 17:43:09 +01:00
25bbe25e48
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2022-01-17 16:05:09 +01:00
c5efb76014
Merge remote-tracking branch 'origin/master'
2022-01-17 16:04:13 +01:00
e83e9eed96
Phrasenkorrektur Testtool
2022-01-17 16:04:03 +01:00
88f8a2130e
Merge branch 'feature-279/FAS_AliasgenerierungMitSonderzeichen'
2022-01-17 16:01:09 +01:00
75a14ec850
Fehler behoben wodurch keine Personen mit Doppelnamen mit Leerzeichen angelegt werden
...
können
2022-01-17 16:00:25 +01:00
6aae50fec9
Merge branch 'master' into feature-279/FAS_AliasgenerierungMitSonderzeichen
2022-01-17 15:51:44 +01:00
cfd61ded23
Merge branch 'feature-17002/lehrveranstaltung_projektarbeiten_anzeigen_von_lvs'
2022-01-17 14:35:15 +01:00
c38435f176
Phrasenkorrektur Testtool nach Kopie vom Livesystem
2022-01-17 14:24:46 +01:00
00f8f5f125
Merge remote-tracking branch 'origin/master'
2022-01-17 14:17:19 +01:00
1b753f8070
Phrasenkorrekturen Testtool
2022-01-17 14:17:10 +01:00
1afcd5d4fe
DD Markierung korrigiert
2022-01-17 12:19:45 +01:00
26010e2347
Warning bei DD behoben
2022-01-17 12:12:09 +01:00
935a1e35d9
Merge branch 'bug-17069/AnwesenheitslisteAnzeigeDDnurAktuellesSemester'
2022-01-17 12:03:23 +01:00
62197e9868
Merge branch 'Sonstiges-Sprint-176/Anrechnungen_Bugfixes'
2022-01-17 11:11:23 +01:00
79972c0f1a
Phrase korrigiert
2022-01-17 11:07:00 +01:00
82dbe27112
removed, added comments
2022-01-17 10:41:29 +01:00
0d53b72583
Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes
2022-01-17 10:32:37 +01:00
4bcea5348d
removed old akte lib
2022-01-17 10:09:34 +01:00
765b26a439
- added issue resolution job and libraries for defining how to resolve issues
...
- added issue inserts (fehlerupdate.php), included them in checksystem
- added getAufenthaltsdauer method to Bisio_model.php
- Add column parameterFuerBehebung to system.tbl_issue
2022-01-17 10:07:37 +01:00
09ec853f2d
issue filters bugfix: Statuscode was not correctly filtered if used other language than german
2022-01-17 09:56:26 +01:00
6080750495
Merge branch 'FHBGLD-FHBGLD-betriebmittel_anpassungen'
2022-01-14 13:25:05 +01:00
7e6d036679
Update betriebsmittel.class.php
2022-01-14 11:57:29 +01:00
1549c8d112
betriebsmittel-textbox-nummer2
...
Länge des Feldes betriebsmittel-textbox-nummer2 auf 32 Zeichen
2022-01-14 08:26:58 +01:00
ef43b2c1bc
transform_kartennummer
...
transform_kartennummer mit variabler länge
2022-01-14 08:22:44 +01:00
c36d0358a9
check duplicate auch studiengang wird nun beruecksichtigt
2022-01-13 15:16:34 +01:00
12034b7637
#16842 Legende in Notenliste um iar ergänzt
2022-01-12 12:22:36 +01:00
685ac404fb
Anzeige dd nur für das betreffende Studiensemester in Noten-, Anwesenheits- und Gesamtliste umgesetzt
2022-01-12 12:05:36 +01:00
18827290b3
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-01-12 11:10:31 +01:00
39fb1515a6
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-01-12 11:09:23 +01:00
43f75e772a
Problem behoben wodurch Reihungstestanmeldungen nicht gespeichert werden
...
können wenn das Config FAS_REIHUNGSTEST_EXCLUDE_GEBIETE leer gesetzt
wurde
2022-01-11 19:05:12 +01:00
841d6f9e89
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-01-10 14:28:23 +01:00
f87a3f63b6
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2022-01-10 14:25:08 +01:00
ffd529408a
Config Einträge für ZGV Doktor hinzugefügt
2022-01-07 11:52:29 +01:00
d29e33b307
Merge branch 'FHBGLD-ZGV_Doktor_und_zgv_erfuellt'
2022-01-07 11:43:52 +01:00
f9915e2627
ZGV Doktor Nation zeigt Nationsperre an
2022-01-07 11:42:22 +01:00
c5c798111b
Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt
2022-01-07 11:27:41 +01:00
83bdd085b1
Merge branch 'feature-16106/NationensperreImFas'
2022-01-05 15:21:12 +01:00
df9dfa1843
Nationen DropDown Sperre auf Rule geändert
2022-01-05 15:15:56 +01:00
c88b9a8297
Adapted TEMPUS Kollisionencheck for positive Zeitsperre 'Zeitverfuegbarkeit'
...
Positive Zeitsperre 'Zeitverfuegbarkeit' will not appear as collision.
2022-01-04 17:00:16 +01:00
8dc178fb00
Adapted Tempus Wochenplan GUI to display positive Zeitsperre 'Zeitverfügbarkeit'
2022-01-04 16:47:10 +01:00
3202ce877f
Added new Zeitsperretyp 'Zeitverfügbarkeit' (Positive Zeitsperre)
2022-01-04 15:48:53 +01:00
fe41a3d830
Nationensperre im Dropdown für Staatsbuergerschaft, Geburtsnation, ZGVNation und ZGVMasternation umgesetzt
2022-01-03 15:23:11 +01:00
c64183a7cf
Merge branch 'feature-14811/neuer_adresstyp_fuer_homeoffice'
2022-01-03 13:49:41 +01:00
7753ca8cf2
Merge branch 'master' into feature-14811/neuer_adresstyp_fuer_homeoffice
2022-01-03 13:45:34 +01:00
4c3fe39df7
zeigt nun noch die lvs des studiengangs an
2022-01-03 13:12:01 +01:00
4d223145d9
if angepasst
2021-12-22 16:32:00 +01:00
2d46d80b5f
meldung wird nun auch angezeigt wenn es die selbe person id ist
2021-12-22 16:26:45 +01:00
e0bc6198d0
Name statt uid bei der "wird bearbeitet von" Meldung
2021-12-20 13:04:06 +01:00
f73f26c668
Added STG mail receiver to be addressed, when lector changes Zeitwunsch...
...
...and when lector has already been assigned to a course.
Only addressing Studiengaenge that are concerned by Zeitwunsch change
of lector.
LV must be assigned in the selected Studiensemester, but not in the past
2021-12-20 11:53:03 +01:00
8ab62e4779
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
2021-12-20 10:07:30 +01:00
f73439a184
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-12-20 10:06:35 +01:00
4a2a30ac5e
Added Job mailUpdatedZeitwuensche
...
Job sends Mail to STGL, Kompetenzfeld and LV Planung about todays updated Zeitwuensche.
2021-12-20 09:55:29 +01:00
c2d9afe3b1
Added return value to sendSanchoMail to be able to handle mail error
2021-12-20 09:51:18 +01:00
a4ffe9104b
Fixed query to get Studiensemest correctly when using getByDate method
2021-12-20 09:49:49 +01:00
b2bd8e071b
Added getStudenplanData method to Class Studenplandev_model
2021-12-20 09:47:21 +01:00
d2c87d6a98
Added Class Zeitwunsch_gueltigkeit_model
2021-12-20 09:43:37 +01:00
40493936c3
- AkteLib: added optional params "archiv", "signiert", "stud_selfservice", removed "uid"
...
- AkteLib and DmsLib: added comments, added fallback default user for insertvon
- FS_Model: added TempFS_model.php for writing temp files, added comments
2021-12-17 18:03:34 +01:00
7dd0bb1489
Merge branch 'master' into features-Zeiterfassung/Sprint177
2021-12-17 08:46:05 +01:00
66ba689656
nicht im neuen tab oeffnen
2021-12-16 13:46:09 +01:00
bb29dca846
text angepasst nach dem logout
2021-12-15 15:55:16 +01:00
e12e68c1c2
Merge branch 'feature-16119/personen_zusammenlegen'
2021-12-14 15:10:31 +01:00
8c2af28595
added AkteLib for adding, updating and deleting akte together with DMS documents
2021-12-14 06:26:20 +01:00
bb7922dd3a
Adapted to check only for future verplante LVs
...
Only if LVs are assigend in the future, the lector should be informed
and initially blocked to change their Zeitwunsch.
For past LVs it is not relevant anymore.
2021-12-13 11:40:32 +01:00
cc770e6324
Added param 'nurBevorstehende' to getStundenplanData method in Lehrstunden Class
...
If 'nurBevorstehende' true, only future Studenplandata will be queried.
2021-12-13 11:29:11 +01:00
d6fb714b21
- added methods in dmslib for adding and removing files and file versions
...
- FS_Model: added remove method
2021-12-13 10:04:15 +01:00
df09807bb7
Merge branch 'feature-16425/infocenter_nachname_statt_uid'
2021-12-10 08:56:12 +01:00
6331ed5396
Merge branch 'feature-15889/infocenter_report_ueber_kuerzlich_abgewiesene'
2021-12-10 08:51:42 +01:00
c3588b4eb4
studeingang hinzugefuegt bei der uebersicht
2021-12-09 20:27:08 +01:00
3ef7fbc256
Merge branch 'feature-16111/BPK_Pruefseite'
2021-12-09 11:10:09 +01:00
d033803f47
Sortierung an BIS Vergleich angepasst
2021-12-09 11:09:06 +01:00
13782d3ade
Merge remote-tracking branch 'origin/master'
2021-12-07 21:00:58 +01:00
3301aa87dd
Export für alle Bachelor und Masterstudiengänge. BIS-Datum als GET
2021-12-07 21:00:53 +01:00
5edc56a8f2
Speichern von Insertamum und Updateamum bei Räumen
2021-12-07 20:59:38 +01:00
684363aaea
Anpassungen bpk und Gebustsdatum
2021-12-07 20:58:47 +01:00
e501681ff8
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
...
# Conflicts:
# system/dbupdate_3.3.php
2021-12-07 18:36:17 +01:00
976d8d333e
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-12-07 18:31:33 +01:00
6855686c66
Changed text and removed link mailto LV Planung
2021-12-07 18:25:55 +01:00
e9cc04783e
Refactored query to load a single Zeitwunschgueltigkeit
...
Instead of limiting returning rows by using ende of next Studiensemester,
it is limited by ordering and limiting query now.
2021-12-07 17:24:07 +01:00
40871c73a0
Added link to Vilesci Zeitwuensche in TEMPUS
...
Now, when rightclicking on 'Zeitwuensche einsehen' on a lector in Tempus,
the Vilesci Zeitwuensche of that lector is opened.
2021-12-07 17:16:15 +01:00
9c0da32841
Adapted TEMPUS queries to get correct Zeitwunsch (of given Zeitwunschgueltigkeit)
...
Now correct Zeitwunsch is displayed for
- Wochenplan and Semesterplan of a lector
- Wochenplan, when a LV is added, to which more lectors are assigned:
Now query checks to get correct Zeitwunsch of each lector
2021-12-06 15:51:45 +01:00
dd8876a375
Automatische Pause für einzelne typen hinzugefügt
2021-12-06 10:16:19 +01:00
9b1182405e
- core/FHC_Controller->outputFile cleaned
...
- Adapted controllers/lehre/anrechnung/* to make use of the changed core/FHC_Controller->outputFile
- Changed application/core/FS_Model:
- It's not abstract anymore
- Added new constants READ_MODE, READ_WRITE_MODE, READ_APPEND_MODE, BLOCK_SIZE, META_URI
- Constructor accept a mandatory parameter
- Does not load the FilesystemLib anymore
- Renamed all the public methods with the suffix Base64
- Added new public methods openRead, openReadWrite, openReadAppend, close, readBlock and write
- Added new private methods _checkPath and _open
- Removed the libraries/FilesystemLib
- Adapted model content/DmsFS_model to make use of the changed core/FS_Model
- Changed libraries/DmsLib:
- Does not extend the FHC_Controller anymore
- removed private propery UPLOAD_PATH
- Cleaned code, make use of the standards
- Adapted to use the Base64 suffixed methods from core/FS_Model
- Deprecated old methods
- Refactored public methods download and getFileInfo
2021-12-03 15:56:39 +01:00
376aaadecc
bug fixed
2021-12-03 15:21:38 +01:00
4923c5fc2d
personen zusammenlegen mit udf
2021-12-03 14:31:04 +01:00
0192835275
Merge branch 'feature-7423/infocenter_udf_schule_job'
2021-12-03 13:46:11 +01:00
88ad75295d
Merge branch 'master' into feature-7423/infocenter_udf_schule_job
2021-12-03 13:41:40 +01:00
78876fa807
Merge branch 'feature-16624/infocenter_firefox_anzeigefehler_dokumente'
2021-12-03 11:41:13 +01:00
84500652ef
Merge branch 'feature-16191/inofcenter_bachelor_die_megssage_an_die_studiengaenge_deaktivieren'
2021-12-03 11:38:01 +01:00
efa348456a
Merge branch 'feature-15889/infocenter_report_ueber_kuerzlich_abgewiesene'
2021-12-03 11:27:48 +01:00
25b890a25a
Merge branch 'feature-15888/infocenter_datum_fuer_parken'
2021-12-03 11:25:36 +01:00
b61a5a6f34
Merge branch 'feature-13735/message_ohne_gefundener_sprache'
2021-12-03 11:04:20 +01:00
554a27cc01
anzeigefehler fixed dokpruefung
2021-12-02 21:06:56 +01:00
61c1399f01
Improved Performance of dbupdate
2021-12-02 16:50:08 +01:00
419988aaf9
DB-Index für campus.tbl_zeitaufzeichnung.uid hinzugefügt
2021-12-02 16:17:24 +01:00
17dd939044
Moved to Addon
2021-12-02 15:24:27 +01:00
d697e189eb
Changed: Now function getByUID of ZWG class retrieves correct amount of ZWG
2021-12-02 09:43:06 +01:00
e3ecfbe782
Corrected constructor of Zeitwunsch_gueltigkeit Class
2021-12-02 09:39:00 +01:00
1613a9837b
Merge branch 'master' into feature-279/FAS_AliasgenerierungMitSonderzeichen
2021-12-02 09:37:41 +01:00
a4cb455e3e
Added creating/editing/viewing Zeitwunschgueltigkeiten in VILESCI
...
Admins can see and work on Zeitwunschgueltigkeiten of lector.
Added logic to save/update/display Zeitwuensche by
Zeitwunschgueltigkeiten.
2021-12-02 09:35:20 +01:00
410772b230
Aliasgenerierung: Adaptierung Wording Validierung und Löschen Kommentar
2021-12-02 07:19:51 +01:00
b2d46af0d6
wording und datum angepasst
2021-12-01 19:31:31 +01:00
b4eb2d426a
Lehrauftragsverwaltung - Anzeige von Nachname und Vorname bei Betreuungen vertauscht
2021-12-01 17:00:28 +01:00
3ee409f06c
Merge branch 'feature-15907/lvs_vom_studierenden_anzeigen_fas'
2021-12-01 15:01:55 +01:00
8d1886039a
Projektarbeiten DropDown angepasst damit nach dem Laden die selben
...
LVEintträge angezeigt werden wie bei der Neuanlage
2021-12-01 15:00:02 +01:00
46962d5064
Merge branch 'master' into feature-15907/lvs_vom_studierenden_anzeigen_fas
2021-12-01 14:41:51 +01:00
525b8a04d3
Merge branch 'master' into feature-14811/neuer_adresstyp_fuer_homeoffice
2021-12-01 14:31:08 +01:00
d657378cba
Merge branch 'Monika70-db_update_tbl_studiengangstyp'
2021-12-01 14:28:47 +01:00
5c84196f96
Fixed Code Intentation
2021-12-01 14:28:17 +01:00
be4beaff95
Update dbupdate_3.3.php
...
Erweiterung der Studiengangstypen
2021-11-30 13:37:50 +01:00
5fa605a75f
bpk overview filter: added mitarbeiter column to default filter
2021-11-30 04:19:43 +01:00
76ca170678
Changed: when splitting Zeitwunschgueltigkeit, set ende of last ZWG to 'yesterday'
...
Before it was set to now(). But new ZWG starts with now, therefore last ZWG
should end with day before.
2021-11-29 19:08:56 +01:00
93d9108db7
Added functionality to select Zeitwunschgueltigkeiten in VILESCI
...
. added Dropdown with all Zeitwunschgueltigkeiten
. adpated Table to display selected Zeitwunschgueltigkeit
2021-11-29 17:51:08 +01:00
70c9489ef3
Corrected to retrieve latest Zeitwunschgueltigkeit correctly in getByUID function
...
...by changing query order
2021-11-29 17:38:16 +01:00
eb923cab9b
Changed: Now using textphrases
2021-11-29 11:31:03 +01:00
ea0035613a
FAS: Neue MA anlegen: Check auf Sonderzeichen in Vor- und Nachnamen nach Umwandlung Problemchars
2021-11-29 10:14:33 +01:00
6800c42b90
nachname statt der uid anzeigen
2021-11-26 14:52:39 +01:00
ef675226e4
Corrected: Now Lehrstunde Class has property 'result'
...
. Errormessages were thrown without result property. Fixed now.
. Also added errormsg, when getStundenplanData query fails.
2021-11-25 14:36:03 +01:00
2e9bfc049b
Corrected: Now retrieving correct data for 'isVerplant'
...
. Correction in function isVerplant()
. Also changed var name to isVerplant
2021-11-25 14:33:23 +01:00
aa183a0a08
Added 'Alle Werte auf 1 setzen' and 'Aenderungen zuruecknehmen'
2021-11-25 10:56:50 +01:00
e761211425
Merge branch 'FHBGLD-FHBGLD-vilesci/bis/studentenmeldung'
2021-11-24 18:04:47 +01:00
02ec36d40c
Merge branch 'FHBGLD-vilesci/bis/studentenmeldung' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-vilesci/bis/studentenmeldung
2021-11-24 18:03:50 +01:00
6db2748163
Added Zeitwunsch Edit lock of if LV had already been assigned
...
- Message is shown and form buttons for changing / copying Zeitwunsch
are disabled if LV had already been assigned to lector.
- Lector can unlock by clicking on link.
2021-11-24 17:47:01 +01:00
bd71650ac5
Colored Legende for Zeitwunsch-Tabelle
2021-11-24 16:26:22 +01:00
8d3c54fafc
Minor change: Removed default now() for updateamum, Changed code order
...
...for better maintainance
2021-11-24 11:48:57 +01:00
beb850ebe3
Adapted Zeitwunsch zu geteilte Dienste to Bootstrap Style
2021-11-24 09:33:25 +01:00
7c65e2ff53
Adapted Zeitwunsch GUI to use Zeitwunschgueltigkeit and save by Studiensemester
...
Major adaptation in GUI:
- Added Dropdown to select actual / next Studiensemester to edit Zeitwunsch
- Added Radiobuttons to allow changing or copying from earlier Studiensemester
- By selecting an earlier Studiensemester, the earlier Zeitwunsch is displayed in
the table and is ready to edit or just to save.
2021-11-23 15:56:07 +01:00
976e79447a
Added / Adapted methods of Zeitwunsch Class to use Zeitwunschgueltigkeit
...
Added:
- loadByZWG: Zeitwunsch einer Person zu bestimmter Zeitwunschgueltigkeit laden.
Adapted:
- loadPerson
- save
- exists
2021-11-23 15:48:53 +01:00
e485257458
Created Zeitwunsch_gueltigkeit Class
...
Methods:
- load: Ladet eine Zeitwunschgueltigkeit.
- save: Speichert eine Zeitwunschgueltigkeit (insert/update)
- getByUID: Ladet Zeitwunschgueltigkeiten einer UID mitsamt
den zugehoerigen Studiensemestern.
- getByStudiensemester: Ladet Zeitwunschgueltigkeiten einer UID und
eines bestimmten Semesters
2021-11-23 15:39:52 +01:00
d996e3ad31
Added new database dump system/FHComplete-3.3.sql
2021-11-23 10:54:17 +01:00
46eda3c14d
- Removed old database dump system/fhcomplete3.0.sql
...
- Added new database dump system/FHComplete-3.3.sql
2021-11-23 10:53:28 +01:00
f1bfbf66e8
Merge branch 'feature-16166/lvb_gruppen_sonderzeichen'
2021-11-23 10:44:29 +01:00
f1bf3bb4be
Updated composer.lock
2021-11-23 09:54:56 +01:00
c8ebcdf5a1
Updated composer.json
2021-11-23 09:53:24 +01:00
70f3cebd36
Changed DB default entry to NOW() for insertamum / updateaumum in tbl_zeitwunschgueltigkeit
2021-11-22 18:51:28 +01:00
fb8512bcbc
Merge branch 'feature-14585/Zeitaufzeichnung_aktivitaeten'
2021-11-22 17:38:52 +01:00
b669bb1ead
Merge remote-tracking branch 'origin/master'
2021-11-19 20:17:17 +01:00
e1edd515bd
Check beim speichern einer Funktion, ob OE inaktiv
2021-11-19 20:17:06 +01:00
b53fc39a35
Namenssuche optimiert um Leerzeichen besser abzufangen
2021-11-19 20:16:18 +01:00
bfd6889d19
Check, dass es mindestens 1 Aufenthaltszweck geben muss
2021-11-19 20:14:26 +01:00
f3600a79ec
Disabled Output on Connection error
2021-11-18 13:40:27 +01:00
ced19ecb2d
remove misplaced echo
2021-11-17 12:50:17 +01:00
e62b250515
beim editieren von lvb gruppen auf umlaute und sonderzeichen ueberpruefen
2021-11-17 08:51:32 +01:00
fbe4862a21
Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree'
2021-11-15 16:40:48 +01:00
20fb38ba8f
change labels
2021-11-15 16:34:42 +01:00
6f877acd7b
Mail an Studiengang nur bei "Freigabe an Studiengang" - Button - Bachelor
2021-11-15 12:40:53 +01:00
641fb256e1
Merge remote-tracking branch 'origin/master'
2021-11-12 17:46:27 +01:00
49951d788e
Check in BIS-Meldung, ob Student Abbrecher VOR der ersten Meldung ist
2021-11-12 17:46:24 +01:00
ea0174fa57
Increased size of BPK-Textbox
2021-11-12 17:45:51 +01:00
cf1b34769c
api & anpassungen fuer das kartenterminal
2021-11-12 12:16:35 +01:00
0e54dd397e
Merge branch 'feature-16081/CovidMeldeformularMAOhneZuordnung'
2021-11-12 08:52:44 +01:00
ab8d1b4863
fix indentation
2021-11-11 17:41:22 +01:00
c4da43aa65
do not return errormsg
2021-11-11 17:37:09 +01:00
15176e7ce6
eigenen filter fuer abgewiesene studenten hinzugefuegt
2021-11-11 15:52:39 +01:00
6596a442ad
eine logout seite hinzugefuegt - reihungstest
2021-11-11 12:10:35 +01:00
0f40e1b80c
Funktion getLastVorgesetzter für Covid-Meldeformular
2021-11-11 09:03:38 +01:00
70c24899d0
Verhalten MessageAnOEs für Master angepasst
2021-11-09 09:32:05 +01:00
5107d0ddd5
do not distinguish between unknown and invalid consider both invalid
2021-11-08 11:06:26 +01:00
c80b623a04
Update Fehlermeldung, erlaubte Sonderzeichen
2021-11-05 10:35:13 +01:00
63105951a0
Added Check if BPK Parameter exists
2021-11-04 17:16:39 +01:00
439d2dd999
Merge branch 'feature-15910/BPK_soll_mit_Berechtigung_im_FAS_sichtbar_editierbar_sein'
2021-11-04 17:09:04 +01:00
da4d749cb7
Merge remote-tracking branch 'origin/master'
2021-11-04 16:56:05 +01:00
8df77c104c
BPK in Lehrgangsmeldung einkommentiert.
...
Lehrgänge aus DropDown in Studentenmeldung.php entfernt
2021-11-04 16:56:01 +01:00
dc95a9b0b0
increased size of BPK field for students in FAS
2021-11-04 16:42:15 +01:00
cfaeaef8bd
Erweiterung erlaubter Sonderzeichen bei Änderung Alias
2021-11-04 16:21:57 +01:00
a455505be7
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2021-11-04 16:02:30 +01:00
0a9511b0c7
BPK einkommentiert, SVNR <-> Geburtsdatum nur mehr als Hinweis
...
Wenn die SVNR das Geburtsdatum nicht enthält (was in Ausnahmefällen sein kann) wird nur mehr ein Hinweis angezeigt, die Person aber trotzdem ins XML übernommen.
2021-11-04 15:57:49 +01:00
6d69d572ee
Merge branch 'feature-15795/DVUH_Mehrsprachigkeit'
2021-11-04 15:56:26 +01:00
0c6f43f36e
Check Alias auf Sonderzeichen bei Änderung Alias
2021-11-04 15:43:05 +01:00
c84c2772be
Merge branch 'feature-5056/PHP7_Problems_old_Libraries'
2021-11-04 15:17:46 +01:00
ef7d3aa313
Added Missing Phrase matrikelnummer
2021-11-04 15:10:27 +01:00
01907c4901
Merge branch 'feature-3774/FilterWidget_change_Filter_settings_GUI'
2021-11-04 14:55:28 +01:00
46e3f91a6e
Zeitaufzeichnungsspalten zu Gegencheck hinzugefügt
2021-11-04 14:42:20 +01:00
6fd5065431
Merge branch 'feature-12510/Planner_ZeitaufzeichnungsCheckbox'
2021-11-04 14:38:17 +01:00
38aa578528
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-11-04 14:32:59 +01:00
1844140e6d
BIS - studentenmeldung
...
neuer Standort für FHB und die bpk wurde wieder hinzugefügt
2021-11-04 12:55:45 +01:00
fce92f78d4
Merge branch 'master' into feature-15795/DVUH_Mehrsprachigkeit
2021-11-04 12:05:32 +01:00
d6e063dd0c
check empty uids array
2021-11-04 11:14:17 +01:00
8cb8c4da64
Erweiterung Funktion checkKontostand()
2021-11-04 10:27:21 +01:00
b4f450b073
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
2021-11-03 11:16:13 +01:00
2a1a068ee2
datum fuers parken nun auf semesterende + 3 monate
2021-11-03 10:51:40 +01:00
6342aa3f14
Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree' of https://github.com/FH-Complete/FHC-Core into feature-14001/KennzeichnungStudentDoubleDegree
2021-11-03 09:27:41 +01:00
c0fd4f70b9
Ermittlung Prestudent_id mit load()
2021-11-03 09:26:48 +01:00
8d4a79f9b9
only show messages if covid udf is defined
2021-11-02 18:00:41 +01:00
811b59ef1b
styling
2021-11-02 17:56:33 +01:00
4d1994ca63
menulayout, coding styles
2021-11-02 17:50:20 +01:00
b549fc1edd
Update Funktion getPrestudentIdFromBenutzerId
2021-11-02 15:14:00 +01:00
f37161dcc2
Vereinfachung Funktion getPrestudentFromBenutzer
2021-11-02 14:49:13 +01:00
341944d38b
Merge branch 'feature-15810/task-15839_Covidstatusliste_pro_LV_LE_depends_on_feature-14001' into feature-14001/KennzeichnungStudentDoubleDegree
2021-11-02 14:19:21 +01:00
a02e470970
displaying and editing BPK field in FAS with permission student/bpk
2021-11-02 11:28:10 +01:00
776d448fba
Erweiterung Gesamtnotenliste um Double Degree Program
2021-11-02 10:41:41 +01:00
12f7f43e65
fix copy paste error
2021-11-01 15:52:52 +01:00
487da82e33
pass studiengang to lehrelisthelper
2021-11-01 15:51:20 +01:00
8c100ba993
moved db logic to lehrelisthelper class
2021-11-01 15:25:24 +01:00
98ffe525b3
first working version to add covid status to lvlists
2021-11-01 13:12:55 +01:00
d339713d0b
Issue Zuständigkeiten bugfix: zuständig = "Ja" if Zuständigkeit defined, even if there are other Zuständigkeiten defined
2021-10-30 09:45:46 +02:00
69613d35c7
Filter Widget für Services und Spalte "Content ID" eingeblendet
2021-10-29 17:06:29 +02:00
080a7acdee
Removed the directories cis/private/lehre/ects and include/safehtml
2021-10-29 16:59:31 +02:00
f5bc354199
ÖH-Beitragsverwaltung: changed phrase Öhbeitragsverwaltung to correct ÖH-Beitragsverwaltung (in menu and GUI)
2021-10-29 16:06:38 +02:00
c243f121f2
Merge branch 'feature-10515/zeiterfassung_automatische_pause_runden'
2021-10-29 15:40:37 +02:00
95d5e715b2
Merge branch 'feature-15781/zeitaufzeichnung_projektuebersicht_export'
2021-10-29 15:34:46 +02:00
794b3695c3
Merge branch 'master' into feature-15781/zeitaufzeichnung_projektuebersicht_export
2021-10-29 15:30:15 +02:00
0d4c041688
Organisationseinheiten im FAS werden nach der Bezeichnung sortiert statt nach
...
der Kurzbezeichnung
2021-10-29 15:26:45 +02:00
38cdcef38e
Notenliste und Anwesenheitsliste um Mobilität DegreeProgram erweitert
2021-10-29 10:35:12 +02:00
8068fb1c7c
Issues list: added Hauptzuständig column to filter out issues assigned to other persons/oes than logged in user
2021-10-28 18:10:13 +02:00
ef93736891
eucovidqr phrases modified
2021-10-28 12:31:48 +02:00
e6a11d0dc2
abfrage ob die tbl vorhanden ist hinzugefuegt
2021-10-28 12:30:10 +02:00
139dac67a7
Merge remote-tracking branch 'origin/master'
2021-10-28 12:27:34 +02:00
9292570684
Log für Löschen von LV-Plan einträgen
2021-10-28 12:26:30 +02:00
36731de919
Anpassung Breite Höhe der Textareas
2021-10-28 12:20:09 +02:00
203397b135
fas adressen anzeige nicht mehr hartcodiert
2021-10-28 08:01:04 +02:00
a31d33bcf9
in eigenes model
2021-10-27 17:59:52 +02:00
04f85937ae
Merge branch 'feature-15270/zeiterfasung_projextexport_fehler_mit_at'
2021-10-27 17:12:57 +02:00
7c2bf0e291
Merge branch 'feature-14198/LVLeitungBeiLVInfoAnzeigen'
2021-10-27 17:06:50 +02:00
530ede77ad
Merge branch 'master' into feature-14198/LVLeitungBeiLVInfoAnzeigen
2021-10-27 17:06:14 +02:00
671cf9e102
Merge branch 'feature-15103/Bismeldung_erweitern_Ectsrundung_Emailbe'
2021-10-27 16:45:48 +02:00
2b9d688ff7
Adaptierung ZE:Fix Bug Eingabe größer 24:00
2021-10-27 13:07:21 +02:00
6d4e5238fd
merge feature-11468/ZeitsperrenBeruecksichtigen into featuresZeiterfassung/Sprint177
2021-10-27 11:19:59 +02:00
c3771b9cd0
merge feature-11468/ZeitsperrenBeruecksichtigen into featuresZeiterfassung/Sprint177
2021-10-27 10:47:21 +02:00
63949faef6
Phrasenupdate Zeitsperre
2021-10-27 09:29:37 +02:00
8cc5be2c40
Issues GUI: added phrases
2021-10-25 19:14:59 +02:00
b0b49f7a41
moved errormonitoring menu entry to person category
2021-10-25 16:48:47 +02:00
9c193442ae
archivieren von lv zeugnissen und zertifikaten
2021-10-25 14:54:45 +02:00
40ea04364e
Aktivität nicht mehr optional
2021-10-25 14:45:45 +02:00
d269fd003d
added new log to logdataname
2021-10-25 14:03:30 +02:00
15ba3602f7
job fixed
2021-10-25 13:22:44 +02:00
70781d966d
Merge branch 'feature/infocenter_anpassungen'
2021-10-25 10:50:09 +02:00
54f6d88901
Merge branch 'feature-7423/infocenter_udf_schule_job' into feature/infocenter_anpassungen
2021-10-25 10:37:14 +02:00
a111503e04
Merge branch 'feature-15091/personen_zusammenlegen_fehlende_berechtigung'
2021-10-25 10:36:17 +02:00
29ae48bc48
udflib fixed fuer den infocenter udf schule uebernehmen job
2021-10-25 09:51:06 +02:00
4e9eb12a71
Detailsicht: Parameteruebergabe uid für Projekt- und Projektübersichtexport
2021-10-23 10:40:05 +02:00
875fc5c632
Maximale laufzeit für Auswertungen erhöht
2021-10-22 16:07:41 +02:00
e6ba6f9bea
dropdown im fas angepasst
2021-10-22 10:44:54 +02:00
4fb4b72b26
Hinweis- und Warnsymbol für Pause fehlt ergänzt
2021-10-22 10:39:48 +02:00
52272932ed
another euvocid phrase
2021-10-22 10:31:02 +02:00
b74247a7f2
Merge remote-tracking branch 'origin/feature-15314/infocenter_abgewiesen_von_nicht_abgeschickten' into feature/infocenter_anpassungen
2021-10-22 07:13:22 +02:00
d7364d08dd
Merge remote-tracking branch 'origin/feature-15389/infocenter_automatische_abfrage_ob_bewerberin_vorhanden' into feature/infocenter_anpassungen
2021-10-22 07:13:06 +02:00
3f003f8fc3
Merge remote-tracking branch 'origin/feature-15572/infocenter_zurueckgestellt_nicht_immer_erste_stelle' into feature/infocenter_anpassungen
2021-10-22 07:12:53 +02:00
1b1f6788ab
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2021-10-21 18:31:59 +02:00
7de012c930
more phrases for eucovidqr
2021-10-21 18:31:48 +02:00
d73dd4769a
Stipendien-Schnittstelle berücksichtigt auch Anzahlung und Restzahlung
2021-10-21 17:44:45 +02:00
bc2ed35aa4
Merge remote-tracking branch 'origin/master'
2021-10-21 17:16:58 +02:00
a72f6597b3
BugFix 9. und 10. Semester bei Lehrauftragsverwaltung
...
Manche Studiengänge haben ein 9. oder 10. Semester. Dieses muss auch bei der Lehrauftragsverwaltung aufscheinen.
2021-10-21 17:16:20 +02:00
8033c12665
Added / Adapted tables for Zeitwunsch Gueltigkeit pro Studiensemester
...
- Added table campus.tbl_zeitwunsch_gueltigkeit and migrated initial data
- Added column zeitwunsch_id (as new primary key) and zeitwunsch_gueltigkeit_id to campus.tbl_zeitwunsch
- Initially copied all Zeitwunsch entries
-- The basic entries are joined with Zeitwunsch Gueltigkeit for actual Studiensemester
-- The copied entries are joined with Zeitwunsch Gueltigkeit for next Studiensemester
This is necessary because the actual Zeitwunschplan represent for some lectors the plan for the actual semester, and for some - who have already planned forward - for the next semester.
2021-10-21 13:03:16 +02:00
e754608a64
Merge branch 'feature-15763/ZeiterfassungPauseBeiAllIn' into features-Zeiterfassung/Sprint177
2021-10-21 12:53:54 +02:00
b0571e0a26
additional phrases for eucovidqr
2021-10-21 08:18:04 +02:00
2a8d91119a
Öhbeitrag Management GUI: using phrases
2021-10-21 05:48:18 +02:00
860ca5df53
Spalte Wunschlektor umbenannt
2021-10-20 18:49:39 +02:00
44c1e65011
getBetriebsmittel add parameter to only retrieve aktive users
2021-10-20 15:48:34 +02:00
3aa251dc4b
projektexport fixed, wenn es mit at startet
2021-10-20 15:11:00 +02:00
a87178a0e7
automatische pausen werden nun gerundet
2021-10-20 15:05:57 +02:00
c92aff5073
Removed console.log and added few comments
2021-10-20 12:57:43 +02:00
6dfabf31fb
- When the apply button is click it is checked that the conditions are
...
not empty, in case the filter is not applied and the empty conditions
are marked
- Added new type bpchar to the conditions
2021-10-20 12:54:00 +02:00
458cd6ae0c
- Added new phrase for the filter widget and fixed GUI tranlations
...
- Fixed error logs in public/js/FilterWidget.js
- Changed the behavior of the Apply and Save buttons for the FilterWidget
- Changed the GUI aesthetic of the FilterWidget settings
- Added new option reloadPage to the AjaxLib, to reload the page after the complete callback
- Added new classes to the public/css/FilterWidget.css
- Changed FilterWidgetLib->loadDefinition: added a new fallback to find a filter in the database for the currend FilterWidget
- Changed FilterWidgetLib->removeCustomFilter: when a custom filter is removed from the database then it is removed even from the session
- Added new private method _dropFromSessionFilterWidgetById to application/libraries/FilterWidgetLib.php
2021-10-19 15:37:44 +02:00
3f90efaed2
Hinweis: Pause fehlt bei AllIn eingetragen
2021-10-19 14:54:39 +02:00
7dcddb9d49
Removed wrong comment
2021-10-19 13:52:00 +02:00
6025887bb6
Merge branch 'bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler' into feature-11952/ZeiterfassungDetailsichtFuerVorgesetzte
2021-10-18 11:50:14 +02:00
af89f444aa
Merge branch 'master' into bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler
2021-10-18 11:45:52 +02:00
b6b347ff8b
Merge Detailsicht Vorgesetzte
2021-10-18 11:10:13 +02:00
55dcd730a5
merge master into 11952/DetailansichtVorgesetzte
2021-10-18 10:49:12 +02:00
8801b84fd3
Merge branch 'master' into FHBGLD-ZGV_Doktor_und_zgv_erfuellt
2021-10-15 18:30:28 +02:00
9dcf948e7e
Merge branch 'FHBGLD-set_gemeinde_skript'
2021-10-15 17:21:46 +02:00
7c81f5a64c
Gemeinde Update Infotext ergänzt
2021-10-15 17:21:05 +02:00
4c62b003df
Merge branch 'master' into FHBGLD-set_gemeinde_skript
2021-10-15 17:18:20 +02:00
048d2764cf
Merge branch 'FHBGLD-FHBGLD-studentDBML-generateMatrikelnummer'
2021-10-15 17:11:10 +02:00
2bcf422d7a
Fixed Coding Guidelines
2021-10-15 16:01:52 +02:00
1c7bd4986a
Fehler beim Anlegen von neuen Studiengängen behoben
2021-10-15 15:12:23 +02:00
38edfbac51
Merge branch 'FHBGLD-studentDBML-generateMatrikelnummer' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-studentDBML-generateMatrikelnummer
2021-10-15 14:12:00 +02:00
ef14336b0b
Zusätzliche Aktivitätenfilter für Zeitaufzeichnung hinzugefügt
2021-10-15 14:04:20 +02:00
7413e20888
Merge branch 'feature-15608/anpassung_excel_export_fas'
2021-10-15 13:01:50 +02:00
4101929cd5
stammkostenstelle anzeigen bei fixangestellten / fallback falls keine eingetragen ist
2021-10-15 12:57:18 +02:00
7805784214
sap projektnummer im export hinzugefuegt
2021-10-15 12:54:24 +02:00
aa3a52f201
Aufnahme PhasenReset für neue Validierung Zeitabgrenzung 00:00:00
2021-10-15 11:36:15 +02:00
163caccc88
Merge branch 'bug-14102021/ZeiterfassungZeiteingabeMitternacht' into bug-15417/Zeiterfassung/AnzeigeProjektphasenNachFehler
2021-10-15 11:25:00 +02:00
269f3542d7
Zeiterfassung: keine Bis-Buchungen 00:00:00 bzw. 24:00:00 erlaubt
2021-10-14 15:39:17 +02:00
9d08d00676
tbl_adresse typ von char auf varchar geaendert
2021-10-14 15:37:15 +02:00
19548bf5f9
Update studentDBDML.php
2021-10-14 14:36:58 +02:00
0e5e686669
Änderungen bezüglich generateMatrikelnummer
...
Hallo liebes Technikum Team,
wie besprochen die Änderungen bezüglich generateMatrikelnummer.
Als erstes die Erweiterung der Unterscheidung von Lehrgang und Studiengang.
Weiters die Aufteilung von unseren AO Studiengängen zwischen 90010 bis 90019.
Hoffe das dies für alle FH's so passt.
Bitte um check ob dieser Code so übernommen werden kann.
Danke und liebe Grüße
Thomas und Michael
2021-10-14 14:33:55 +02:00
6f14b5cec5
- Changed DocsboxLib->convert, not it accepts a new optional parameter called format
...
- Integrated the DocsboxLib into the application/libraries/DocumentLib.php
2021-10-14 14:25:35 +02:00
2fb4be0e55
- Added new config entry DOCSBOX_ENABLED to config/global.config-default.inc.php
...
- Added new library application/libraries/DocsboxLib.php to manage document conversion using docsbox
- Added new config file application/config/docsbox.php
- Integrated DocsboxLib into include/dokument_export.class.php
2021-10-14 11:34:27 +02:00
2bb357ccbd
remove 3G from phrases
2021-10-13 15:14:13 +02:00
e5ecbd9488
Merge branch 'feature-10450/DVUH_requestMatrikelnummer'
2021-10-13 14:18:06 +02:00
bd3ed4952b
add phrases for eucovidqr errormsgs
2021-10-13 12:26:03 +02:00
f82315cfe7
ermoeglicht das einloggen wenn 2 Reihungstests am selben Tag sind
2021-10-13 10:46:05 +02:00
4777c0414f
dbupdate_3.3.php: fixed line break
2021-10-13 09:15:58 +02:00
901f9ba7fa
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-10-13 09:05:05 +02:00
45bb288127
error monitoring (issues): renamded variables, improved comments
2021-10-13 08:53:12 +02:00
ae2e425b7d
Merge remote-tracking branch 'origin/master'
2021-10-12 17:01:18 +02:00
6c98829e4e
Mimetype editierbar
2021-10-12 17:00:57 +02:00
7e0223b42a
Tablesorter Filter-Widget aktiviert
2021-10-12 17:00:37 +02:00
902ed7d22d
Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes
2021-10-12 16:18:20 +02:00
e5f9b52c8e
Stipendienanfragen angepasst wenn eine Person mehrere Studien besucht
...
oder nach einem Abbruch das selbe Studium erneut besucht
2021-10-12 14:02:00 +02:00
3e00e4b3a1
infocenter warning falls bewerberIn bereits vorhanden ist
2021-10-12 13:08:17 +02:00
8677cbf6dc
Fixed requesting Anrechnungsantrag although grade is a blocking grade
...
Blocking grades (eg angerechnet), that should not allow
the student to request for Anrechnung, were not fully blocking.
This is fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-10-12 12:11:06 +02:00
35cdac0438
Small Code Enhencement
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-10-12 10:51:10 +02:00
4f0b34137b
replacement of hatschek letters added in hlp_common_helper.php to be the same as in function.inc.php
2021-10-11 18:48:25 +02:00
7f00f506ea
add viewport meta tag
2021-10-11 13:06:28 +02:00
4c74176d64
Merge remote-tracking branch 'origin/feature-14635/UDF_move_permissions_to_JSON_definition'
2021-10-11 12:55:24 +02:00
1ebae59292
- Adapted controllers/widgets/UDF->saveUDFs to call UDFLib->saveUDFs without the udfUniqueId parameter
...
- UDFLib->saveUDFs changed, the udfUniqueId parameter is retrieved from the session
- UDFLib->saveUDFs changed, the check of the permission is performed by
the method prepare prepareUDFsWrite called by the DB_Model
- Changed UDFLib->_validateUDFs and public/js/UDFWidget.js to have a
better error handling and better message errors
2021-10-11 10:08:58 +02:00
c325046e8e
- Renamed public method DB_Model->hasUDF to udfsExistAndDefined
...
- Adapted controllers/system/FAS_UDF and models/crm/Prestudent_model
- Added new private method _getUDFsNoPerms to DB_Model
- Changed private method DB_model->_prepareUDFsWrite to use _getUDFsNoPerms
2021-10-08 17:30:28 +02:00
4ef7f49bdb
add missing phrase
2021-10-08 15:12:06 +02:00
066e2fe936
Merge branch 'feature-15049/COVID-19_Zertifikate_automatisiert_ueberpruefen'
2021-10-08 14:28:38 +02:00
11952fe063
Merge branch 'feature-14635/UDF_move_permissions_to_JSON_definition'
2021-10-08 14:02:17 +02:00
524a3dfd95
phrases for eucovidqr
2021-10-08 11:25:55 +02:00
5954237851
update rechte tbl_person_lock fuer benutzer vilesci
2021-10-08 10:51:13 +02:00
20f583f7e2
excel report angepasst
2021-10-08 10:44:27 +02:00
a8327a20ab
excel report angepasst
2021-10-08 10:40:10 +02:00
3ff3353aae
Aufnahme von hacek-Sonderzeichen in Funktion covertProblemChars
2021-10-08 10:24:46 +02:00
45fab928ad
- Renamed private method _manageUDFs to _prepareUDFsWrite in application/core/DB_Model.php
...
- Changed private method _toPhp in application/core/DB_Model.php to check permissions on UDFs
- Adapted code to fit the changes in application/libraries/UDFLib.php
- Renamed public method manageUDFs to prepareUDFsWrite in application/libraries/UDFLib.php
- Added new public method prepareUDFsRead to application/libraries/UDFLib.php
- Fixed bugs, comments & code style
2021-10-07 17:32:49 +02:00
d7a33df898
When exporting in MS Excel format from FAS it is checked that the logged user
...
has the permissions to export UDFs.
If the logged user has no permissions on a UDF then the UDF is discarted
and it will not present into the MS Excel file
2021-10-06 10:58:58 +02:00
ab59c265d4
First commit
2021-10-04 14:05:10 +02:00
9c4f8eb0eb
bei logdata 'new application' entfernt
...
org_name hinzugefuegt
order by log_id statt zeitpunkt
2021-10-04 13:26:40 +02:00
175d75c70d
FAS studentdetailoverlay.xul.php bisstandort and foerderrelevant fields:
...
- added label tags (for hiding also the labels)
- changed column width for better look
2021-10-04 12:57:18 +02:00
4a4c95aa08
auswahl fuer bewerbung abgeschickt ja/nein hinzugefuegt
2021-10-04 12:37:50 +02:00
23f335e6a5
BT: Ausbildungsvertrag wird bei Abgewiesenen bei nicht vorhandener offener Bewerbung nicht mehr angezeigt
2021-10-04 12:00:51 +02:00
79d7f91794
deleted ;
2021-10-04 09:57:51 +02:00
e939eded65
neuer adresstyp fuer homeoffice und dynmaischen adressentyp im FAS
2021-10-04 09:55:21 +02:00
4c156f7f39
Beginn- und Enddatum bei der Funktion Rektor beruecksichtigen
...
Wenn bei Studierendensuche kein Ergebnis gefunden wird, Zeile mit "Keine Resultate" ausgeben
2021-10-02 00:18:39 +02:00
8ecb0ece6c
Merge remote-tracking branch 'origin/master'
2021-10-01 23:26:57 +02:00
97818781b1
Admins können Maximalstunden überschreiben
...
Phrasenkorrektur Lektoren auf Lehrende
2021-10-01 23:26:25 +02:00
226a674e7b
Projektzeitenexport ohne Projekte im Zeitraum zeigt nun eine
...
entsprechende Fehlermeldung statt PHP Error
2021-10-01 15:43:40 +02:00
dfc55a8f95
Time Limit für Statistiken erhöht
2021-10-01 14:20:15 +02:00
7da74c65d9
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2021-10-01 09:45:08 +02:00
1b07cbde72
Fixed generation of Diplomasupplement if Outgoing University includes
...
Special chars
2021-10-01 09:42:59 +02:00
cb25efceca
added NOT NULL constraint to fehlercode field of tbl_fehler_zustaendigkeiten
2021-09-29 21:11:52 +02:00
80491e4f55
Export für mehrere Studiengänge möglich
2021-09-29 19:05:10 +02:00
ae357be538
Minor BugFix variables not defined
2021-09-29 18:56:44 +02:00
bfa85f9caf
Wenn Stg nicht gesetzt, wird der Ablauf ignoriert
2021-09-29 18:55:46 +02:00
196f604e05
Merge remote-tracking branch 'origin/master'
2021-09-29 18:36:23 +02:00
0ead8b4c3f
Button um Personendaten zu laden
2021-09-29 18:36:16 +02:00
3b5936239e
Projekttiel in Funktion getProjectphaseForMitarbeiter
2021-09-29 18:33:55 +02:00
9786247222
Projekttitel statt Projektkurzbz in Projektexport anzeigen
2021-09-29 18:33:10 +02:00
cb3f3723ae
issues table dataset:
...
- made more readable for assistance (added vorname, nachname, removed some fields)
- added default filters (all new, last 7 days...)
- issues displayed for children oes of permitted arrays as well
- query: more exact check for prestudents future status by using studiensemester start date
- typo fixes
2021-09-28 15:57:27 +02:00
76f3afdda5
Person_model.php getPersonStammdaten method:
...
- added sorting order for contacts (by insertamum descending)
- rewrote old ->retval to new isError, hasData etc. functions
2021-09-28 15:52:17 +02:00
4274a92854
Merge git://github.com/Monika70/FHC-Core into FHBGLD-ZGV_Doktor_und_zgv_erfuellt
2021-09-28 10:51:21 +02:00
825a440ef3
Merge remote-tracking branch 'origin/master'
2021-09-28 01:15:55 +02:00
e1961df70f
Attribute ergänzt
...
Attribute ects_gesamt_studienplan und ects_pro_semester_studienplan ergänzt, da die ects der Studienordnungen nicht mehr relevant sind
2021-09-28 01:14:29 +02:00
ddfee4499a
correct typo
2021-09-27 13:35:13 +02:00
072d1437e6
Bugfix: nun werden nach jedem Fehler die Projektphasen neu geladen
2021-09-27 13:31:01 +02:00
c3c33c1578
Merge branch 'feature-14199/HomeofficeProMitarbeiter'
2021-09-27 10:22:03 +02:00
7073db5ebe
Added Permission check on Loading of Zeitaufzeichnung
2021-09-27 09:40:26 +02:00
307ba9ce83
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-27 08:12:00 +02:00
daa78aa190
Mehrfaches zurückziehen der Anrechnungen löscht keine anderen Stati mehr
2021-09-27 08:05:34 +02:00
4f4f88eca3
Merge remote-tracking branch 'origin/Sonstiges-Sprint-176/Anrechnungen_Bugfixes' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes
2021-09-23 12:48:16 +02:00
72868f4207
Fixed: Now downloading documents is possible for ALL STGLs of the concerning STG
...
Before it was possible only for first in array. Now sending to all.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-09-23 12:47:05 +02:00
bd90876277
Fixed: Now sending mails to ALL STGLs of the concerning STG
...
Before it was sending only to first in array. Now sending to all.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-09-23 12:34:58 +02:00
38e9031cce
Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes
2021-09-23 11:51:51 +02:00
818567b355
Anmeldungen bei stornierten Prüfungen werden nicht mehr berücksichtigt
2021-09-22 12:02:54 +02:00
6cb8987fb4
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
...
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 11:41:03 +02:00
9493d6a99b
Revert "change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)"
...
This reverts commit 3acf5ba45e
2021-09-22 11:35:17 +02:00
d704e09e82
Revert "Update dbupdate_3.3.php"
...
This reverts commit a20d947b37
2021-09-22 11:29:36 +02:00
a20d947b37
Update dbupdate_3.3.php
2021-09-22 11:19:48 +02:00
3acf5ba45e
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
...
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 11:03:25 +02:00
ad95088abd
Update dbupdate_3.3.php
2021-09-22 10:53:51 +02:00
bfa0f722ae
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
...
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 10:46:28 +02:00
9d59fcbfbf
change of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
...
change Datatype of lehre.tbl_note.bezeichnung from varchar(32) to varchar(64)
2021-09-22 10:34:06 +02:00
c563f614bb
adapted BISmeldung (studentenmeldung.php, lehrgangsmeldung.php) to new changes:
...
- added eMailAdresseBE for university adress
- ECTS erworben and angerechnet are rounded (kaufmännisch, .5 up)
- only svnr reported if there is svnr and ekz
2021-09-21 19:08:22 +02:00
13a040737a
Fehler behoben wodurch die LV-Leitung von Lehrveranstaltungen nicht
...
immer korrekt ermittelt wurde
2021-09-21 17:17:28 +02:00
7358adc069
Merge branch 'feature-12808/LVNeuesAttributLehrmodus'
2021-09-21 07:50:26 +02:00
61044e9a3d
Merge branch 'master' into feature-12808/LVNeuesAttributLehrmodus
2021-09-21 07:39:08 +02:00
45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
4c21d5364c
- added issue management functionality - adding, and displaying issues with filter widget.
2021-09-21 00:58:29 +02:00
d336c8ce10
Merge branch 'feature-15274/infocenter_zgv_ueberperpruefung_rechte'
2021-09-20 09:16:47 +02:00
ddfe41de2a
fixed rechte, damit die assistenz zugriff drauf hat
2021-09-20 09:12:47 +02:00
d7a2fda698
Merge remote-tracking branch 'origin/master'
2021-09-17 15:33:52 +02:00
13b067e9ca
Berücksichtigung der Orgform in LV-Planung XLS-Export
2021-09-17 15:33:47 +02:00
81b2a678b6
UID in Mitarbeiterexport XLS
2021-09-17 15:32:52 +02:00
ddc7e0ef90
Fixed typo in statistik class
2021-09-17 15:32:26 +02:00
15045df546
BugFix Datum sortierung, Kopierfunktion für Zeitsperren
2021-09-17 15:31:41 +02:00
c3b02bf741
Als ZGV Studiengangskuerzel wird das 3-Stellige Kuerzel verwendet
...
anstatt der Kurzbzlang
2021-09-17 10:55:46 +02:00
01cce41a33
Merge branch 'feature-15231/infocenter_anmerkung_zur_bewerbung_falsches_datum'
2021-09-17 10:40:46 +02:00
32dc9e1a2d
Index für AnrechnungID in tbl_anrechnung_anrechnungstatus hinzugefügt
2021-09-17 10:38:19 +02:00
52127ade60
fixed datumanzeige
2021-09-17 10:27:55 +02:00
cdd82fe48b
Merge branch 'master' into Sonstiges-Sprint-176/Anrechnungen_Bugfixes
2021-09-15 18:25:36 +02:00
ab4c7ee194
Limit beim Prüfen der Spaltenverfügbarkeit hinzugefügt
2021-09-15 18:24:42 +02:00
f5f3c38c5f
Homeoffice wird nun beim Anlegen von neuen Datensätzen korrekt
...
gespeichert
2021-09-15 18:20:05 +02:00
bdc61410de
Fehlermeldung beim Import von Homeoffice auf Orange geändert da die Daten gespeichert
...
werden nur ohne Homeoffice Flag
2021-09-15 18:06:44 +02:00
8075ba3a84
Menueeintrag hinzugefügt für Gemeinde
2021-09-15 15:57:15 +02:00
99c5544dbe
Merge branch 'feature-15157/infocenter_anzeige_nicht_abgeschickt'
2021-09-15 13:50:31 +02:00
30dc436442
Berechtigung für basis/gemeinde hinzugefügt
...
Pfade korrigiert
2021-09-15 13:49:20 +02:00
8a417e5cb8
fixed uebersicht nicht abgeschickt
2021-09-15 13:45:43 +02:00
1d37fa28dd
Merge branch 'master' into FHBGLD-set_gemeinde_skript
2021-09-15 12:13:15 +02:00
6927b668e3
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-15 12:10:59 +02:00
17c580c184
Removed Legacy Script
2021-09-15 12:06:23 +02:00
a77756a0d6
Merge branch 'hotfix-15106/Logs_Viewer_shows_Filters_from_other_People'
2021-09-15 11:20:32 +02:00
4fcb799731
Merge branch 'feature-14779/infocenter_getrennte_vorlagen'
2021-09-15 10:51:45 +02:00
e412125dd0
Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864'
2021-09-15 10:34:06 +02:00
fd2485cdb3
Zusätzlicher Eintrag bei Statuswechsel wenn Statusgründe für Studenten
...
vorhanden sind
2021-09-15 10:31:19 +02:00
848cc52cfa
- Renamed public method system/Filters_model->getFiltersByAppDatasetName to getFiltersByAppDatasetNamePersonId
...
- Added new parameter person_id to method getFiltersByAppDatasetNamePersonId
- Changed query inside getFiltersByAppDatasetNamePersonId to get global
and personal filters
- Adapted FilterWidgetLib to use the new method getFiltersByAppDatasetNamePersonId
2021-09-14 12:44:33 +02:00
87ba21cf95
Entfernen von Buttons und Links in der Vorgesetzten- und Adminview
2021-09-09 10:08:41 +02:00
2159e81888
Bugfix Anrechnung Rejected Mails
2021-09-09 08:34:36 +02:00
b9c1a10f39
Merge remote-tracking branch 'origin/master'
2021-09-08 19:16:49 +02:00
602eb5873a
Kopierbutton für Funktionen
2021-09-08 19:16:39 +02:00
0cf782601c
Dropdown für MA-Ansicht
2021-09-08 15:40:17 +02:00
b6ae992c3c
getrennte msg bei freigabe qualikurs und einstieg anderes semester
2021-09-08 11:41:45 +02:00
c5b017511e
Merge remote-tracking branch 'origin/master'
2021-09-08 09:27:38 +02:00
6cd81ac96e
Warnung im FAS, wenn inaktive BenutzerInnen gespeichert werden
2021-09-08 09:27:32 +02:00
4e7da23bf5
Option auch Prüfling zu löschen in RT-Administration
2021-09-08 09:24:18 +02:00
d4a05c91e3
Vorrückung der Studienpläne auch fürs SS
2021-09-08 09:23:33 +02:00
ebb7af1e59
Bei Abgewiesenen 0 als Prio anzeigen
2021-09-07 15:11:12 +02:00
fedc8dbd59
Merge remote-tracking branch 'origin/master'
2021-09-07 15:07:07 +02:00
261e4066c8
Beginn- und Enddatum bei der Funktion Rektor beruecksichtigen
2021-09-07 15:05:35 +02:00
9f5a8e4eb9
Updateaktiv-Datum ergänzt
2021-09-07 15:01:12 +02:00
4cfad06f2d
Fixed: Added check to only add columns if no already present
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-09-07 14:37:39 +02:00
2d755e82b4
Fixed: Added DB-Update Gegenchecks for new tables / columns in DB
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-09-07 14:36:06 +02:00
9c84558f5f
- Added requiredPermissions to the application/config/udfmasterschema.json and set them as mandatory
...
- Removed the private method _isAllowed from application/controllers/widgets/UDF.php
- Removed required permissions from views application/views/system/fas_udf.php and application/views/system/infocenter/zgvpruefungen.php
- Widget views application/views/widgets/checkbox, dropdown, textarea and textfield now they print the attribute disabled
- Added constant DISABLED to application/widgets/html/HTMLWidget.php
- Removed private property _requiredPermissions from application/widgets/udf/UDFWidget.php
- application/widgets/udf/UDFWidget.php does not check permissions anymore and does not store them anymore
- Added constants PERMISSION_TYPE_READ and PERMISSION_TYPE_WRITE to application/libraries/UDFLib.php
- Removed constant PERMISSION_TYPE from application/libraries/UDFLib.php
- Removed public method isAllowed from application/libraries/UDFLib.php
- Added private methods _readAllowed, _writeAllowed, _setRequiredPermissions and _setReadOnly to application/libraries/UDFLib.php
- UDFLib->displayUDFWidget now checks if permissions are declared in the UDF JSON and if the user is allowed to read and write such UDF
- UDFLib->saveUDFs now checks if the user has the permissions to write such UDF
- Now the UDFs are even displayed in read only mode
2021-09-07 12:13:59 +02:00
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
40d686cb21
Merge branch 'feature-13092/Monitoring_Schnittstellen_Dashboard' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# system/dbupdate_3.3.php
2021-09-06 22:33:47 +02:00
4f46476f87
Fixed: Now entitlement checked for all STGL. Also added hasData checks.
...
Before only the first returning STGL was checked for entitlement.
Also added hasData checks to avoid using getData on NULL values.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-09-06 12:56:43 +02:00
b7c22ac56f
Fixed: Now including correctly config start- and enddate
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-09-06 12:25:29 +02:00
89209a0c27
Problem behoben wodurch Messages im FAS nicht korrekt geladen werden
...
konnten
2021-09-06 09:25:38 +02:00
47cb486be3
Merge remote-tracking branch 'origin/master'
2021-09-03 18:03:05 +02:00
1759bd75da
Bei Upload neuer Version Beschreibung und Suche aktualisieren
2021-09-03 18:02:58 +02:00
04261e11e4
Wording für Anrechnungen angepasst
2021-09-03 17:38:52 +02:00
c03e476e3b
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2021-09-03 17:36:19 +02:00
3b89561736
Zutrittskarten löschen und status
...
In kartenruecknahme.php werden nun Statusdetails zum Student oder Mitarbeiter angezeigt und man hat die Möglichkeit, Karten ganz aus dem System zu löschen.
2021-09-03 15:14:54 +02:00
f92307cec0
Merge branch 'feature/Anrechnungen_NEU'
2021-09-03 13:24:35 +02:00
4b94dfbda7
Merge branch 'master' into feature/Anrechnungen_NEU
2021-09-03 11:08:29 +02:00
0099aaadb0
Merge remote-tracking branch 'origin/master'
2021-09-02 14:08:27 +02:00
3999098fd6
Anzeige der abgelaufene Coodle-Umfragen verlängert auf 90 Tage
2021-09-02 14:08:21 +02:00
30c2705b99
fix syntax error system/dbupdate_3.3.php
2021-09-02 11:43:43 +02:00
778b5906f9
Merge Branche Cristina
2021-09-02 11:35:17 +02:00
d3158b8ce0
merge dbupdate_3.3.php
2021-09-02 11:31:58 +02:00
f0c5c3acb4
14774 Zeiterfassung: Homeoffice im CSV Import
2021-09-02 11:24:38 +02:00
62cfa27473
14774 Zeiterfassung: Homeoffice im CSV Import
2021-09-02 09:55:14 +02:00
58ce5a9132
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
2021-09-01 13:58:48 +02:00
286f84825a
Merge branch 'master' of git://github.com/Monika70/FHC-Core into FHBGLD-ZGV_Doktor_und_zgv_erfuellt
2021-08-31 22:00:12 +02:00
6da8dd6865
Merge branch 'FHBGLD-set_gemeinde_skript' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-set_gemeinde_skript
2021-08-31 21:58:34 +02:00
6034da43d8
Fixed loading of current Geschaeftsjahr if it is the last day of the
...
year
2021-08-31 07:56:59 +02:00
6008d97f36
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2021-08-30 20:35:31 +02:00
64555c0ca1
Mahnspanne kann auch leer sein
2021-08-30 20:35:15 +02:00
25cc8c6d49
matr_aktiv field in dbupdate_3.3.php: only set to true if not NULL
2021-08-30 18:11:08 +02:00
64eb9eacf4
Added: Automatic Scrolling when Approving/Rejecting multiple Anrechnungen
...
Also added Scrolling for Recommending/Not Recommending multiple Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-08-30 15:36:50 +02:00
a36909763f
Delete comments
2021-08-30 14:28:30 +02:00
b05fbe5978
Fixed PHP Version incompatibility issue
2021-08-27 19:05:00 +02:00
0a97a028ee
Reihungstestübersicht zeigt nun die Reihungstests der letzten 12 Monate
...
an statt der letzten 5
2021-08-26 20:22:13 +02:00
6eb6f0b2b8
Merge branch 'master' into feature-14198/LVLeitungBeiLVInfoAnzeigen
2021-08-26 11:57:34 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
437feb2fdd
dynamische Anzeige checkbox homeoffice auch bei Ändern
2021-08-24 18:01:15 +02:00
00d7d5c834
neues Ajaxfile zeitaufzeichnung_bisverwendung.php
2021-08-24 11:22:02 +02:00
b9ac73955a
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-08-24 01:19:26 +02:00
98d485b2ba
Merge branch 'feature-13943/SAPByD_purchase_orders_job_queue_worker'
2021-08-23 17:04:09 +02:00
a6b37c452f
Merge branch 'feature-6189/SAP_basic_structure_for_data_synchronization'
2021-08-23 16:43:20 +02:00
a22227bc26
Merge branch 'feature-13090/Bis_Bewerbermeldung_einzeln_erstellen'
2021-08-23 16:26:37 +02:00
ccff26d834
Merge branch 'feature-12333/Change_legacy_jobs_database_log'
2021-08-23 16:19:49 +02:00
f552c6a702
Merge branch 'feature-12894/LDAP_changes_on_CI'
2021-08-23 15:43:55 +02:00
68b5e49f91
Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization
2021-08-22 21:04:53 +02:00
ff715a72c8
Merge branch 'master' into feature-13943/SAPByD_purchase_orders_job_queue_worker
2021-08-22 21:04:32 +02:00
a2fc3fe09b
Merge branch 'master' into feature-12894/LDAP_changes_on_CI
2021-08-22 20:59:01 +02:00
6960a958f7
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-08-22 20:58:38 +02:00
fb00baae00
Merge branch 'master' into feature-12333/Change_legacy_jobs_database_log
2021-08-22 20:58:09 +02:00
a6d83ef321
ZGV Doktor und zgv_erfuellt
2021-08-20 15:39:36 +02:00
624b910edd
ZGV Doktor und zgv_erfuellt
2021-08-20 15:30:37 +02:00
ed43b03e37
ZGV Doktor und zgv_erfuellt
2021-08-20 14:33:03 +02:00
8423b3e30a
ZGV Doktor und zgv_erfuellt
2021-08-20 14:21:10 +02:00
cf0957f8a4
ZGV Doktor und zgv_erfuellt
2021-08-20 14:10:37 +02:00
ced3f0f978
ZGV Doktor und zgv_erfuellt
2021-08-20 14:04:43 +02:00
713374f4d8
ZGV Doktor und zgv_erfuellt
2021-08-20 13:59:16 +02:00
dc5ca70645
Create zgvdoktor.rdf.php
...
ZGV Doktor und zgv_erfuellt
2021-08-20 13:55:13 +02:00
b00337973a
Merge branch 'feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung'
2021-08-20 10:35:32 +02:00
73ce635188
Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung
2021-08-20 10:34:55 +02:00
d091374622
create merged branch with all features on topic Wiederholer - feature 13864
2021-08-19 15:26:20 +02:00
a28f187473
create merged branch with all features on topic Wiederholer - feature 12998
2021-08-19 14:58:21 +02:00
1d9ba9c232
create merged branch with all features on topic Wiederholer - feature 12997
2021-08-19 14:58:00 +02:00
99c8423bf6
create merged branch with all features on topic Wiederholer - feature 12995
2021-08-19 14:57:10 +02:00
24a979f9f1
Zeugnisnote_model.php, method getByPerson: note and note bezeichnung are also selected
2021-08-18 22:16:15 +02:00
4d08dc58db
merge master into feature-12808
2021-08-18 15:38:17 +02:00
97590dbb91
Merge branch 'feature-12646/LVVerwaltungOEundFilterAnpassen' into feature-12808/LVNeuesAttributLehrmodus
2021-08-18 14:45:28 +02:00
9cb9e414fb
Änderungen Übersichtsliste entfernt
2021-08-18 14:44:56 +02:00
ef23c4a89d
Anzeige homeoffice nur wenn in Bisverwendung eingetragen
2021-08-18 14:06:57 +02:00
0ba11652e1
Merge branch 'feature-13218/BewerbungstoolMasterDokumente'
2021-08-18 11:42:08 +02:00
d8804730ba
Merge branch 'master' into feature-13218/BewerbungstoolMasterDokumente
2021-08-18 11:18:33 +02:00
e9b4116bee
Merge branch 'feature-13277/anpassung_infocenter'
2021-08-18 10:45:40 +02:00
6ff8df6ac3
merged master into anpassung_infocenter
2021-08-18 08:45:28 +02:00
c38683edf5
Added "homeoffice" to FAS > BIS-Daten
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-08-10 12:31:39 +02:00
25ee1032e5
Added "homeoffice" to DB and bisverwendung Class
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-08-10 12:30:10 +02:00
a1c4c31332
Update Phrasen und neue Funktion für Anzeige LV-Leitung
2021-08-06 10:46:14 +02:00
367c266e2e
Zeugnisnote_model.php: added method getEctsSumsByPerson
2021-07-29 13:02:24 +02:00
de1c532ca9
dead code and console.logs removed
2021-07-29 09:11:31 +02:00
9180930e64
functions for student.rdf urls to add orgform parameter if needed
2021-07-29 09:09:29 +02:00
b6a373b9d4
Merge branch 'feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig'
2021-07-29 07:59:57 +02:00
cb855e7864
Zeitaufzeichnungspflichtig Prüfung auf Zeitraum erweitert
2021-07-28 19:05:48 +02:00
9eae959b15
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
2021-07-28 12:10:28 +02:00
cfa7ce2c08
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-07-27 10:55:11 +02:00
f918d0e188
Merge branch 'feature-12317/UsabilityAnpassungenBenotungstool2'
2021-07-23 15:19:54 +02:00
c8919f2878
Benotungstool zeigt den Namen statt der UID bei der Anlage von Nachprüfungsterminen
2021-07-23 15:17:43 +02:00
524b954abc
Merge branch 'feature-12075/zeitwuensche_lesezugriff'
2021-07-23 14:35:28 +02:00
8822a589c9
Merge branch 'master' into feature-12075/zeitwuensche_lesezugriff
2021-07-23 14:22:36 +02:00
78322c22f4
Merge branch 'feature-10762/MailAnMitarbeiterBeiUrlaubsfreigabe'
2021-07-23 14:04:35 +02:00
6b4a47c9db
Merge branch 'master' into feature-10762/MailAnMitarbeiterBeiUrlaubsfreigabe
2021-07-23 13:59:49 +02:00
c8cfc49af9
Mailempfänger bei Urlaubsfreigabemail korrigiert
2021-07-23 13:59:21 +02:00
7bd68775e9
statusgrund_kurzbz in dbupdate ergänzt
2021-07-23 13:44:28 +02:00
ccfd038d8a
13938 Vorrückung von bezeichnung_mehrsprachig auf statusgrund_kurzbz umgebaut
2021-07-23 13:32:53 +02:00
d87b667f0a
Merge branch 'feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen'
2021-07-23 13:25:38 +02:00
cf82a6d28a
Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen
2021-07-23 13:18:54 +02:00
023994b12c
PHP Error behoben wenn Lehraufträge für einzelne Studiengänge erstellt werden
2021-07-23 13:07:23 +02:00
6267a1bc37
- Hautpberuf wird im CIS Profil angezeigt für den Mitarbeiter
...
- Fehler behoben wodurch die letzte Verwendung nicht korrekt ermittelt wurde wenn das Ende Datum leer ist
2021-07-23 13:06:15 +02:00
36d0981331
neuer Branch + Korrektur Fehlermeldung bei Änderung Status
2021-07-23 12:57:28 +02:00
c2527e1b13
Updated FHComplete Domain
2021-07-22 15:03:27 +02:00
3bf03a9869
Merge branch 'sonstiges-sprint174/LehrauftraegeErteilen_DoppelteTabellen'
2021-07-21 15:07:16 +02:00
cdc08b88f8
Merge branch 'hotfix-14064/Messaging_System_GUI_to_send_messages_loads_not_active_templeates'
2021-07-21 14:49:46 +02:00
e4aa42ad58
models/CL/Messages_model->getVorlage now filters out the _not_ active
...
templates
2021-07-21 10:39:52 +02:00
ccf4d0e49b
studentenmeldung.php: link for file with bewerberdaten only added, instead of previous way of passing a GET parameter for bewerdaten only export
2021-07-20 20:21:50 +02:00
143053b893
Bewerbungstool: alle Masterbewerbungen mit Status Interessent mit ZGV-Ort überschreiben
2021-07-20 13:53:38 +02:00
18bd6f7aa7
Öhbeitrags GUI:
...
- possible to edit whole Öhbeitragsrow at once
- added comments
2021-07-19 19:26:53 +02:00
68a469bce6
Changed text for Anrechnungen Antragsfrist 15.09. -> to 22.09.
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-19 14:50:12 +02:00
28d7861fe9
Merge branch 'master' into feature/Anrechnungen_NEU
2021-07-19 12:08:46 +02:00
50a7bfe927
Minor text changes in Infobox/Nachweisdokumente
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-19 12:03:55 +02:00
113ac6a2c2
bisMeldung studentenmeldung.php: added parameter "nur_bewerber" which lets export only bewerberdata
2021-07-15 22:23:11 +02:00
e145a3854a
added system.tbl_issues for issue tracking
2021-07-15 16:13:43 +02:00
05a06de109
alle prestudents im Status Interessent mit leerem zgvmatum überschreiben
2021-07-15 09:10:35 +02:00
e3a7fc2f0c
Added CC parameter to sendSanchoMail function
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-14 17:52:22 +02:00
47326fe9fb
- Added new protected method getOldestJobs to core/JQW_Controller
...
- Changed method JQW_Controller->getOldestJob to be a wrapper for getOldestJobs
- Changed method generateJobs to be a wrapper for static method JobsQueueLib::generateJobs
- Removed method JobsQueueLib->getOldestJob
- Added new public method getOldestJobs to JobsQueueLib
- Added new public static method generateJobs to JobsQueueLib
2021-07-14 13:02:08 +02:00
e9705e69e7
ZGV-Felder für alle aktuellen Bewerbungen mit Inhouse-ZGV überschreiben
2021-07-13 14:36:41 +02:00
cba638db9f
Changed: Now grades are retrieved more dynamically in Anwesenheitsliste
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-12 12:06:49 +02:00
f60e923829
Merge branch 'master' into feature-12997/Neue_Noten
2021-07-12 10:38:07 +02:00
bd153921c6
13989 Merge Änderungen Berufstätigkeit master
2021-07-09 11:09:43 +02:00
a10cacaf4b
Anzeige jüngster Eintrag Berufstätigkeit
2021-07-09 08:28:26 +02:00
54593512af
Added Sort for Loading of Notizen in Bewerbungstool
2021-07-08 18:09:04 +02:00
f16ea874db
fragt bei den mails auch nun den studiengangtyp ab
2021-07-08 15:47:31 +02:00
1c0de3ec45
Fixed: Doppelte Tabellenanzeige in SanchoMail korrigiert
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-08 15:05:19 +02:00
cee6156646
- added Bisioaufenthaltfoerderung_model.php
...
- dbupdate_3.3.php: added Buchungstyp "ZuschussIO"
2021-07-07 20:22:53 +02:00
635974fa22
Merge branch 'master' into feature/Anrechnungen_NEU
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-07-07 15:05:31 +02:00
0ee6485ece
Dependecy Update
2021-07-05 18:18:20 +02:00
25124e0354
Reduced amount of LDAP Requests when Loading CIS Menu
2021-07-05 18:13:37 +02:00
3a0066a2b5
- rearranged fas prestudent view row for addtional fields
...
- renamed label standort to bisstandort
2021-07-02 21:00:02 +02:00
5d48b0aad0
BT: neue zu akzeptierende Dokumente, Studiengang als übergebener zgvma_Ort, Styling nicht verpflichtende Dokumente
2021-07-02 13:14:08 +02:00
c6b4be62c0
FAS: Prestudents replaced foerderrelevant checkbox with dropdown ja/nein/Wie Studiengang
2021-07-02 10:10:43 +02:00
6984ffa278
added melderelevant field to studiengang vilesci GUI for edit
2021-07-02 00:05:10 +02:00
752a891c6b
13887 Freigabemail bei \"Alle Anzeigen\"
2021-07-01 15:29:19 +02:00
2bef17d65b
Update Phrasen Englisch und Codesniffer
2021-07-01 15:23:41 +02:00
b1ce67ebd5
Infocenter fixed STG Typ
2021-07-01 14:59:11 +02:00
07cb19ccd1
Merge branch 'feature-13604/Pruefungsprotokolle_Filter_fuer_zukuenftige_Termine'
2021-07-01 14:44:33 +02:00
2a51222e36
Merge branch 'feature-13207/lehrauftraege_passwortmanager_problem'
2021-07-01 14:40:10 +02:00
dc45658684
Merge branch 'feature-8210/status_abgewiesen_fuer_mehrere_personen'
2021-07-01 14:07:39 +02:00
a9c5533959
Merge branch 'master' into feature-8210/status_abgewiesen_fuer_mehrere_personen
2021-07-01 14:00:47 +02:00
3dd67b90b2
Update Phrasen
2021-07-01 08:13:17 +02:00
7fe793bf39
bugfix: added boolean parse for foerderrelevant field in prestudent.class.php
2021-07-01 01:39:30 +02:00
ec5fb791a2
when adding new prestudent in FAS, foerderrelevant is set to false if ausserordentlich
2021-06-30 17:22:03 +02:00
6246312ce5
bei ergaenzungspruefungen immer eine mail rausschicken und unterscheiden zw englisch und deutsch
2021-06-30 15:24:25 +02:00
36d162d2d7
13850 Bestätigungsmail an Mitarbeiter
2021-06-30 14:29:58 +02:00
745ecf4711
zgv pruefung unterscheiden zwischen bachelor und master
2021-06-30 13:29:09 +02:00
36507959ac
dokumentenpruefung im infocenter in eigenes js ausgelagert, reloaden der anzeige beim nachreichen eines doks
2021-06-30 13:09:56 +02:00
67aa887981
anzeige des errors
2021-06-29 14:47:57 +02:00
d4d84a93ba
Nachreichdatum kann nun auch ueber das Infocenter gesetzt werden
2021-06-29 14:43:19 +02:00
02f52f606c
added foerderrelevant and standort dropdown fields in FAS for editing
2021-06-29 10:05:25 +02:00
340f410fa5
- added foerderrelevant and standort_code to prestudent.class.php and studiengang.class.php to all methods
...
- foerderrelevant and standort for Studiengang can be edited in vilesci studiengang_details.php
2021-06-29 04:00:40 +02:00
b5279cf4c6
13845 Reset Projektphasen nach Fehlermeldung
2021-06-28 15:27:06 +02:00
6ed2808a17
prestudent.class.php, interessentenimport.php: when incoming is created, foerderrelevant is set to false
2021-06-28 13:41:43 +02:00
3b5a2ee766
13788 Korrektur Anzeige Phasen in Editmode
2021-06-28 09:42:38 +02:00
7295523af5
add filter for any statusgrund not only wiederholer
2021-06-25 19:08:02 +02:00
b5fcfb7b09
first guess, TODO check statusgrund_id
2021-06-25 14:26:07 +02:00
1ce0045f86
- Prestudent_model.php: added getStandortCode and getFoerderrelevant methods
...
- indent formatting
2021-06-25 13:19:02 +02:00
f4ddbd3084
Added DB-Index for lehre.tbl_pruefung to speed up queries
2021-06-25 11:15:12 +02:00
ecd6cd466d
Korrektur Anzeige Projektphasen in Editview
2021-06-24 16:03:01 +02:00
84950649c4
Adaptierungen ZGV-Master Funktionen
2021-06-24 12:00:49 +02:00
9a24d2d7c7
dbupdate_3.3.php: removed inserts for bis.tbl_bisstandort, FHs should insert their data as needed
2021-06-23 17:57:31 +02:00
72b7e5b1fe
dbupdate_3.3.php: foerderrelevant field of tbl_prestudent: prefill with false where possible
2021-06-23 15:55:51 +02:00
5a42fd8999
Lehrtyp Notice behoben
2021-06-23 15:18:06 +02:00
537ad8ab88
Adaptierungen setZGVMasterFields()
2021-06-23 11:41:38 +02:00
e4d2b67369
Berechtigungsprüfung bei Projektphase korrigiert
2021-06-22 17:26:00 +02:00
7314352e79
absagen nun möglich auch bei studenten die den reihungstest absolviert haben
2021-06-22 16:54:45 +02:00
264ba0e66f
dbupdate_3.3.php:
...
- added bis.tbl_bisstandort
- added LIMIT 1 to melderelevant SELECT
- added columns foerderrelevant and standort to public.tbl_studiengang and public.tbl_prestudent
2021-06-22 16:48:06 +02:00
1eb3f96200
Added STGL-Notizfeld to Lectors Detail View
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-22 12:46:03 +02:00
35366efdad
Bewerbungstool: Korrektur Anzeige vorläufiges Sprachzertifikat
2021-06-22 10:20:56 +02:00
c950047fe7
Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer
2021-06-21 18:20:03 +02:00
ca80d72734
added Öhbeitragsverwaltung to main menu
2021-06-21 17:42:08 +02:00
b2fe9f7b1b
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
2021-06-21 17:18:46 +02:00
bf3c8a344b
Merge branch 'master' into feature/Anrechnungen_NEU
2021-06-21 17:18:07 +02:00
2d6bd0af34
Adjusted 'createAnrechnung'-button to stay inline in smaller devices
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-21 17:17:10 +02:00
e1a6a899f6
- Renamed libraries/LDAPLib.php to libraries/AuthLDAPLib.php
...
- Removed constants LDAP_NO_USER_DN and LDAP_TOO_MANY_USER_DN from config/constants.php
- Added config entry timeout to config/ldap.php
- Changed private method libraries/AuthLib->_checkLDAPAuthentication
to use libraries/AuthLDAPLib->checkUsernamePassword
- Changed AuthLDAPLib to have only one public method called checkUsernamePassword that makes use of the other private methods to check if a username and password are valid on many LDAP servers
2021-06-21 17:03:40 +02:00
46edad620a
Fixed: to NOT send Ablehnungsmail to students multiple times
...
If STGL was rejecting - withdrawing multiple times and entering different
reasons (notizen), the Ablehnungsmail was sent for each of that reasons.
Now the mail is sent only once for most recent reason.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-21 15:50:27 +02:00
3fca876f8d
#13749 MasterZGV Art und Ort setzen
2021-06-21 15:12:33 +02:00
e76dead570
add parantheses although not explicitly needed for correct function
2021-06-18 14:45:05 +02:00
cea673fa82
adjust indentation, changed filter lastWeek to cover last 7 days and not only a week ago today
2021-06-18 12:45:44 +02:00
9961ba1753
13680 Adminansicht korrigiert: neue Variable uidpass
2021-06-18 11:16:26 +02:00
b283125436
13680 Adminansicht korrigiert
2021-06-18 11:03:04 +02:00
a0b86b6207
rename in_the_future to upcoming consistently
2021-06-18 09:21:39 +02:00
e5a6af7eb3
first guess adding filter for upcoming exams
2021-06-18 09:16:02 +02:00
8b3df55719
response bei doktyp änderung
2021-06-17 14:08:49 +02:00
ab799cb54f
abweisen auch wenn bereits freigegeben
2021-06-17 13:47:21 +02:00
948a26beac
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-06-17 09:12:02 +02:00
45e1bfd5e9
Anwesenheitsliste: Kuerzel 'nicht zugelassen ergaenzt'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-16 16:30:50 +02:00
a3adce8776
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2021-06-16 15:11:38 +02:00
6376853734
Planner: Timming Problem beim Speichern von Ressourcen behoben das dazu führte dass die Daten nicht immer gespeichert wurden
2021-06-16 15:10:43 +02:00
aa94110791
13623 Anzeige Projekt und Phasen in Editiersicht
2021-06-16 13:34:31 +02:00
377ad0eeec
Merge remote-tracking branch 'origin/feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen
...
# Conflicts:
# vilesci/stammdaten/personen_wartung.php
2021-06-16 13:16:01 +02:00
584a8cf100
abfrage auf null beim objekt hinzugefuegt
2021-06-16 12:48:32 +02:00
934248aa0e
Merge branch 'feature-12178/message_bei_master_freigabe' into feature-13277/anpassung_infocenter
2021-06-16 09:26:30 +02:00
8fa40a843b
Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter
...
# Conflicts:
# application/controllers/system/infocenter/InfoCenter.php
# application/views/system/infocenter/dokpruefung.php
# application/views/system/infocenter/infocenterData.php
# application/views/system/infocenter/infocenterFreigegebenData.php
# application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
2021-06-16 09:26:03 +02:00
212261a38e
autofill vom username im falschen feld verhindern
2021-06-16 09:18:53 +02:00
6a3fb14ea6
zgv ueberpruefung zwischen master und bachelor unterscheiden
2021-06-16 09:16:15 +02:00
7aa32dff83
status zum studenten aendern auch mit menupopup
2021-06-16 08:18:49 +02:00
b7d5fef30a
nachrichten wegschicken auch wenn die Sprache nicht gefunden wurde
2021-06-16 08:03:54 +02:00
27b0679640
dbupdate_3.3.php: column melderelevant prefill with values, added comment
2021-06-15 19:03:41 +02:00
ed9bfcdf2d
change infoscreen preview url
2021-06-15 11:18:55 +02:00
2682026fec
add column melderelevant to public.tbl_studiengang
2021-06-14 19:13:38 +02:00
3d22412321
added parameters aktiv, lehre, offiziell, positiv to getByPerson method of Zeugnisnote_model.php
2021-06-14 18:39:29 +02:00
2d440585f4
Planner enhancements
...
- Removed Loading of Mantis Tasks
- Dont Load Ressource Overview on Startup
- Set Projects Tab as Default on Startup
2021-06-14 16:40:27 +02:00
eb709e7257
Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen
2021-06-14 16:10:41 +02:00
42ff593cb1
zgvnation spalten umbenannt
2021-06-14 15:44:38 +02:00
c71c5ae126
Merge branch 'feature-12340/StudienblattAnpassungFureAbbrecher'
2021-06-14 15:38:01 +02:00
6d0613e5c8
Merge branch 'master' into feature-12340/StudienblattAnpassungFureAbbrecher
2021-06-14 15:36:56 +02:00
6595df95ad
Studienblatt - Endedatum bei Abbrechern korrigiert
2021-06-14 15:36:17 +02:00
31957b813f
Anwesenheitsliste: Intern angerechnete als 'Angerechnet' markieren (ar)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-14 15:29:26 +02:00
5765be1ab8
Added Note 'nicht zugelassen'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-14 14:57:42 +02:00
fd4740e7e0
Added Note 'intern angerechnet'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-14 14:46:14 +02:00
83a0cbf380
Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen
2021-06-14 13:52:00 +02:00
f0c57c78ae
Merge branch 'BUG-13075/Urlaubstool_Markierung_Folgemonat'
2021-06-14 13:46:56 +02:00
5b80ab2726
Merge branch 'master' into BUG-13075/Urlaubstool_Markierung_Folgemonat
2021-06-14 13:42:17 +02:00
ce07771802
Merge branch 'BUG-12899/Planner_Mitarbeiteransicht_Aufbau'
2021-06-14 13:32:57 +02:00
60d240258c
Merge branch 'master' into BUG-12899/Planner_Mitarbeiteransicht_Aufbau
2021-06-14 13:29:53 +02:00
31f905bc74
Merge branch 'bug-13098/FasVerbandDatentypPruefen'
2021-06-14 13:24:00 +02:00
5e21b5cda8
Merge branch 'bug-294/FasMobilitaetsprogrammMitLangbezeichnungAnzeigen'
2021-06-14 13:20:27 +02:00
043b25c2f7
Merge branch 'BUG-13262/FASUnschoeneFehlerMeldung'
2021-06-14 13:13:44 +02:00
5aacf9f9b2
Datumsprüfung bei Geburtsdatum korrigiert
2021-06-14 13:13:03 +02:00
19d16809d4
Merge branch 'bugfixes-Sprint172/Diverse_Bugfixes'
2021-06-14 13:02:27 +02:00
531174dcb5
#13533 Button Homeoffice: Haken beim Editieren
2021-06-11 09:17:26 +02:00
c9ec4cb674
ist infocentermitarbeiter spalte nachgezogen
2021-06-10 12:19:42 +02:00
3171ec2c42
dokumententypen nach bezeichnung sortiert
2021-06-10 12:01:01 +02:00
ccffdf9b7f
statusgruende sortiert
2021-06-10 12:00:09 +02:00
cdfaf5b90b
dokumententypen nach bezeichnung sortiert
2021-06-10 11:56:07 +02:00
3ba88b43dd
zgvmaster spalte hinzugefuegt
2021-06-10 11:49:48 +02:00
179299443b
Bugfixed: Genehmigungsbuttons now working directly after withdrawing
...
Before buttons were not working, if genehmigungsbuttons were immidiately
used twice. (e.g. approving - withdrawing - rejecting). This is fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-10 10:39:18 +02:00
49363e893b
13218 update Eintragen MasterZGV Nation
2021-06-10 10:30:49 +02:00
5cc98562e3
Added focus on filterbutton, if table starts with stored filter
...
Because tabulators persistentFilter = true, the table is initialized with
the stored filter. Therfore probably less data was shown, but was not
clear, because the corresponding filterbutton was not focused.
Now the button is focused depending on the filter detected.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-10 09:37:16 +02:00
e157945ae9
Auskommentieren Testausgaben
2021-06-09 08:58:17 +02:00
b206c019df
Oehbeitrag GUI: correct decimal format conversion before after update
2021-06-09 01:34:47 +02:00
472803dbec
13412 Refactoring Functions Dokumente ZGV Master
2021-06-07 16:55:39 +02:00
b86844197d
Merge branch 'master' into feature/Anrechnungen_NEU
2021-06-07 14:39:38 +02:00
4a2c90ac60
doktypen in zgv uebersicht nur readonly
2021-06-07 12:28:32 +02:00
8a870fb4c8
reihungstest msg unterscheiden zwischen deutsch, englisch & bachelor & master
2021-06-07 12:07:34 +02:00
a6b53b8fd7
13412 Refactoring Functions for Master Documents
2021-06-07 11:29:39 +02:00
e056dcd3c2
LDAPLib hotfix: in case that is not possible to connect to an LDAP
...
server it is not possible to display a valid error message
2021-06-07 10:36:50 +02:00
5944938052
Oehbeitraege GUI: correct table sorting and refreshing of tablesorter
2021-06-01 15:18:54 +02:00
5330e2b250
beim abweisen das studiensemester hinzugefuegt
2021-06-01 11:13:23 +02:00
9a0df43526
13219 Master Dokumente: Anzeige akzeptierter Dokumente als nicht erforderlich
2021-06-01 09:47:02 +02:00
df8c946bb2
enabled updating of oehbeitrag values
2021-05-31 23:20:56 +02:00
6550fb6301
wording angepasst
2021-05-31 13:29:13 +02:00
36f52cf3cc
dokumententyp kann nun im Infocenter geaendert werden und zgv master wird angezeigt
2021-05-31 13:20:45 +02:00
efbdb02b2c
beim vorruecken wird pre-wiederholer auf wiederholer gesetzt und wird ein semester zurueckgestuft
2021-05-31 12:59:59 +02:00
fc3921ecad
dbupdate_3.3.php: removed "bezeichnung_mehrsprachig" field from bis.tbl_oehbeitrag table check
2021-05-28 02:15:26 +02:00
4b237cbc7f
oehbeitrag versicherung: possible to display and add Oehbeitraege and Versicherungsbeiträge per semester
2021-05-28 02:12:55 +02:00
3dddc97575
dbupdate_3.3.php: removed "bzeichnung_mehrsprachig" feld from bis.tbl_oehbeitrag table check
2021-05-27 16:29:27 +02:00
39668890f2
neue Funktion ZGVMasterNation setzen
2021-05-27 16:22:47 +02:00
b7939f645e
Fixed width exceeding table columns, when containing large text
...
In some cases table columns were exceeding the table width. Fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-26 19:57:23 +02:00
5ac2c1f9a6
Bugfix-13280/Lehrtaetigkeitsbestaetigung: Betreuungen ohne Stundensatz
...
In der Bestaetigung werden nun auch die Projektarbeitsbetreuungs-Stunden
aufgerechnet, bei denen kein Stundensatz hinterlegt ist.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-26 11:51:27 +02:00
135f82a034
13392 Adaptierungen Lehrmodus: Bezeichnung_mehrsprachig
2021-05-26 11:38:28 +02:00
1e013e371d
Bugfix-12064/Keine LV-Anzeige für WS2020
...
Beim Prüfen, ob ein Lehrvertrag für die Lehreinheit vorliegt, muss die
UID übergeben werden, denn diese wird entweder über GET param übergeben oder
mit dem aktuellen user gleichgesetzt.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-25 17:10:06 +02:00
f52d3a455c
add date validation
2021-05-25 16:35:41 +02:00
87a4f9b7c0
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-25 15:07:25 +02:00
cfcf556a6a
Corrected: Status now displaying correct Status (issue when deadline has expired)
...
Before, if application deadline has expired, the status was showing
'Deadline expired', even if the application was already existing and in
process. This is fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-25 13:24:59 +02:00
12e531532b
Changed checking Application Deadline by checking start-/enddate
...
Now checking start-/enddate in the config entries.
If not provided, start-/endedate of Studiensemester will be used.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-25 13:19:40 +02:00
763eed60d9
13292 Änderung Lehrmodus_kurzbz auf Beschreibung_mehrsprachig
2021-05-24 20:39:53 +02:00
ca748d501f
13291 Erweiterung LVEval um Beschreibung Lehrmodus
2021-05-24 19:24:14 +02:00
c1ff4c2d53
Merge branch '9503/csvExportProjektÜbersicht'
2021-05-21 07:51:46 +02:00
91f1c2b5e8
Merge branch 'master' into 9503/csvExportProjektÜbersicht
2021-05-21 07:06:06 +02:00
0b7adba115
Adapted dokumentname to be empty since Nachweisdokumente can be deleted now (Datenschutz)
...
Error was thrown in AnrechnungLib since dms_id can be null and no document
exist after Datenschutz delete. This is fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-20 16:26:02 +02:00
1c780d5aae
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
2021-05-20 16:09:04 +02:00
5c5f389a2d
Corrected: Anrechnungen were not shown in Overview after 'Löschen von Nachweisdokumenten'
...
Left Joining table dms_version fixed this issue.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-20 13:31:02 +02:00
35edf82ca6
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-20 13:27:28 +02:00
f05493d3f3
modal und check hinzugefuegt
2021-05-20 09:33:08 +02:00
9382b2738f
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-20 08:55:00 +02:00
0285e3fc92
Adaptierungen Bewerbungstool Übersichtsseite
2021-05-20 08:54:14 +02:00
2e2fd33c16
Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer
2021-05-20 00:58:44 +02:00
989a1080b4
added codex/Oehbeitrag_model and method getByStudienesemester
2021-05-20 00:56:10 +02:00
1249689813
Speichern bei automatischen Pausen möglich
2021-05-19 19:59:48 +02:00
8f93ab5927
Bugfixed TabelWidget: Ausgewählte Zeilen now displaying amount correctly
...
Added 'typeof' to correctly check against 'undefined'. Before it was
checking against string.
Also corrected all other occurences.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 17:08:26 +02:00
a822f96e88
Changed Create Anrechnung window to open in new tab
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 16:21:55 +02:00
758b9991d5
Added Antragssperre for Noten, when STGL wants to create Anrechnung
...
Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 16:18:04 +02:00
a783b0085b
Splitted Antragsdaten into 2 tables
...
Split to gain more space to see all functionalities/buttons at a glance.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 15:28:06 +02:00
c8309df171
display homeoffice
2021-05-19 14:45:33 +02:00
12a52ee79f
csv import
2021-05-19 14:12:25 +02:00
9180328ab5
save zeitaufzeichnung with homeoffice
2021-05-19 13:59:44 +02:00
db1f0f5316
add homeoffice checkbox
2021-05-19 11:57:27 +02:00
301c836255
add spalte homeoffice to zeitaufzeichnung
2021-05-19 11:48:29 +02:00
847529d5aa
nachname vorname tauschen
2021-05-19 09:03:20 +02:00
2d11701151
Bugfix Filtern Lehrveranstaltung STGVW
2021-05-19 08:47:08 +02:00
8fe1129910
Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer
2021-05-18 23:40:39 +02:00
d476b8cbd6
created bis.tbl_oehbeitrag for storing oehbeitrag and Versicherung amounts
2021-05-18 22:44:31 +02:00
eba394e170
Merge branch 'bug-12339/GeburtsdatumValidieren'
2021-05-18 17:09:31 +02:00
fc9d1ce24b
Merge branch 'feature-12338/Zeitbestätigung'
2021-05-18 16:48:16 +02:00
c220bddadc
Kurzbezeichnung der Zeitbestätigung korrigiert
2021-05-18 16:10:13 +02:00
8fe136a5ae
Merge branch 'master' into feature/Anrechnungen_NEU
...
# Conflicts:
# cis/private/tools/projektabgabe.php
2021-05-18 13:24:49 +02:00
7bbd94bb89
Adapted & Enhanced Withdrawing of Approvement
...
. Added 'genehmigt von'
. Moved out to Model and added db rollback
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-17 12:35:14 +02:00
d016e26e70
Added new AnrechnungJob deleteAnrechnungGrades
...
This job deletes Zeugnisnoten 'angerechnet', when Anrechnung is rejected
afterwards. E.g., when STGL first accepts, then withdraws and finally
rejects the approvement.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-17 12:30:56 +02:00
ce302750f8
Wording im FAS angepasst: Lehreinheit->LV-Teil, Semesterstunden->Lehrauftragsstunden, Planstunden->LV-Plan Stunden
2021-05-12 15:48:05 +02:00
45b150f0d4
Abgabtetool: Fixed broken ZIP Download
2021-05-12 15:46:05 +02:00
0d4bf432e2
deleted console.log
2021-05-12 14:00:45 +02:00
ffa7abdf5a
standardtitel hinzugefuegt
2021-05-12 13:52:19 +02:00
2c6d8937f6
funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv
2021-05-12 12:48:29 +02:00
475f57d10f
Erweiterung um Langbezeichnung
2021-05-12 09:42:24 +02:00
d5a72af39f
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-11 13:48:21 +02:00
4b8bf41837
Plagiatsprüfung Link aktualisiert
2021-05-11 11:07:31 +02:00
f5298ae351
Ergänzung lehrmodus für Gegenprüfung, Entfernen von addon.tbl_lvevaluierung_frage
2021-05-10 15:10:30 +02:00
cefe34a68f
neue Funktion variableChangeValueIfNumber()
2021-05-10 11:28:08 +02:00
5b3871e999
Corrected requiredPermission of tabulator to create Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-10 08:36:30 +02:00
6f885fb924
fixed typo and put the insert on a other position
2021-05-07 22:23:48 +02:00
0681049122
ParbeitsbeurteilungEndupload.txt Vorlage: Paabgabetyp "Abgabe" wenn not endupload, corrected comment
2021-05-07 12:44:23 +02:00
da3396e816
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-05-07 12:21:33 +02:00
4ec3172ccd
Projektarbeitsbeurteilung Zweitbetreuer: Abgabetyp is passed to Vorlage also when token is resend
2021-05-07 12:20:48 +02:00
7a80a1f1cd
Tokenversand Link ist jetzt immer Sichtbar
2021-05-07 11:49:56 +02:00
9121488151
Updated PHPSecLib
2021-05-06 12:57:52 +02:00
d0b76aaac5
Merge branch 'BUG-13075/Urlaubstool_Markierung_Folgemonat'
2021-05-06 12:54:28 +02:00
4f26a831f4
Merge branch 'feature-12881/Titel_Projektexport'
2021-05-06 12:46:26 +02:00
debd6724b3
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-05 17:21:56 +02:00
842651e676
Added button 'Antrag jetzt bearbeiten' to 'Antrag anlegen'
...
The button 'Antrag jetzt bearbeiten' will appear right after creating
a new application, so that the user can directly open the new application
in a new tab.
The button disappears when selecting a new student again.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-05 17:03:42 +02:00
73c2319933
Parbeitsbeurteilung Abgabe:
...
- Mail after Zwischenabgabe for Erstbegutachter has not Beurteilunglink
- added Paabgabetyp for Mail after Abgabe
- Plagiatsprüfung Button links to newer Plagiatschecksite
2021-05-05 16:14:10 +02:00
563c0cea58
Fixed wrong column grid / Small GUI adaptations
...
GUI adaptations:
. Changed 'Antrag anlegen': button instead of link
. Changed success text to: Antrag wurde angelegt
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-05 15:52:25 +02:00
aac4467d8a
Update set_gemeinde.php
2021-05-05 11:52:12 +02:00
d21773bad5
markierung auch im vor und folgemonat
2021-05-05 09:21:32 +02:00
062ff74b03
Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt
2021-05-04 22:09:47 +02:00
69b33a7f92
Bugfix: Now Ampelmail is sending HTML content correctly
...
...so that the eMail client can parse and display HTML content correctly.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-04 16:23:24 +02:00
b22c975355
Create set_gemeinde.php
2021-05-04 14:19:48 +02:00
a8c11d3e13
Update Page LV-Details Vilesci
2021-05-04 09:27:42 +02:00
7a29d27a79
Adapted Deadline check to use config parameter
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 16:18:32 +02:00
a50a666d11
Added Antragssperre for Noten, that are defined in config array
...
. Added new config file
. Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
. Adapted GUI to process data via JS only
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 16:17:23 +02:00
30746e1ee7
update Klasse Lehrmodus und Lehrveranstaltung
2021-05-03 15:28:35 +02:00
d23faa6e96
Usability: Avoided manually scrolling when recommending/approving on Detailsite
...
...for STGL and lectors Detailview.
Before the downsliding panel was sliding above the window screen, so that
user was forced to scroll down the page. Now it scrolls up by itself.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 10:50:52 +02:00
99b1de542d
Improvements to all Detail views for lightweighted look and space at end of pages
...
. Removed 'wrapping' panel
. Removed unnecessary panels and breaks
. Added breaks at the end of site to avoid buttons 'sticking' at the bottom
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 10:40:37 +02:00
e91f3f692e
Merge branch 'feature-12808/LVNeuesAttributLehrmodus' of https://github.com/FH-Complete/FHC-Core into feature-12808/LVNeuesAttributLehrmodus
2021-04-30 14:16:48 +02:00
44be64dcca
add titel also to sheet header
2021-04-30 10:56:16 +02:00
d29d80fc59
Merge pull request #10 from FHBGLD/FHBGLD-patch-include_gemeinde_class
...
Update gemeinde.class.php
2021-04-30 10:36:16 +02:00
3075277ca4
Merge branch 'feature-12881/Titel_Projektexport' of https://github.com/FH-Complete/FHC-Core into feature-12881/Titel_Projektexport
2021-04-29 13:04:40 +02:00
27549c1a70
fix umlaute und max length also for excel
2021-04-29 13:03:19 +02:00
03feb6bd44
Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung
2021-04-29 11:14:04 +02:00
d490eb4323
freigabe nur fuer den bachelor
2021-04-29 11:12:48 +02:00
c0b07ac1d2
fix bug when deleting ressource from projectphasen
2021-04-29 11:12:32 +02:00
898562e742
fix bug when deleting ressource from project
2021-04-29 11:06:51 +02:00
5fff866363
Merge branch 'feature-4836/studiengang_der_anmerkung_ergaenzen' into feature-11001/zgv_ueberpruefung
2021-04-29 10:55:51 +02:00
7c02e0247d
Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung
2021-04-29 10:55:35 +02:00
0b5ae2df9c
Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung
2021-04-29 10:53:00 +02:00
81bd719e39
Added Empfehlungsnotiz in STGL Detailview + minor GUI change
...
Now STGL can save and update notes regarding recommendation.
Therefore minor GUI change by displaying tables within panels instead of
appending directly to panel - in STGL and lectors Detail view. This is
for clearer view and gives space for the notes.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-29 09:54:57 +02:00
935519d1c3
Merge branch 'master' into feature-12881/Titel_Projektexport
2021-04-28 17:38:59 +02:00
77c06516f5
Merge branch 'feature-9612/Casetime_Zeitwarnungen_differenzieren'
2021-04-28 17:29:04 +02:00
05a3f787e4
Merge branch 'master' into feature-9612/Casetime_Zeitwarnungen_differenzieren
2021-04-28 17:21:51 +02:00
d5ef17d66a
Merge branch 'feature-11250/zeitaufzeichnung_stammkostenstelle'
2021-04-28 17:18:40 +02:00
b5be5be59d
Merge branch 'master' into feature-11250/zeitaufzeichnung_stammkostenstelle
2021-04-28 17:17:02 +02:00
5c339ce448
zgv ueberpruefung bug fixes
2021-04-28 16:56:50 +02:00
c9bd10c3d0
zgv ueberpruefung bug fixes
2021-04-28 16:53:43 +02:00
4dc0bc3aec
Merge branch 'feature-98/Feiertage_in_Urlaubstool'
2021-04-28 16:52:09 +02:00
dda82e32f1
Merge branch 'master' into feature-98/Feiertage_in_Urlaubstool
2021-04-28 16:45:28 +02:00
21ce118f0b
Merged master into branch
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-28 15:54:54 +02:00
cafd72e51d
Removed accaptance of FormData object within AjaxLib controllerParameter check
...
Also adapted JS files to this change.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-28 15:53:17 +02:00
35f1b00d7a
display correct mitarbeiter ressources
2021-04-28 12:53:57 +02:00
20e6573d68
Spalte lehrmodus_kurzbz zu addon.tbl_lvevaluierung_frage hinzugefügt
2021-04-28 09:34:58 +02:00
5f7672d9df
Adapted Anrechnungen-files to use AjaxLib for uploading files
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-27 17:39:45 +02:00
5904d7f455
Added FILE UPLOAD functionality to AjaxLib
...
Files can be uploaded now by passing a FormData object or a FileList.
The extra HTTP request option parameters processData and contentType
(important for fileupload) are added and set to false.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-27 17:26:58 +02:00
e4f6496387
Update gemeinde.class.php
2021-04-27 14:37:32 +02:00
14434e8421
auf Stand feature-12646/LVVerwaltungOEundFilterAnpassen vom 26.4. gebracht: Adaptierungen Berechtigungen
2021-04-26 09:40:47 +02:00
4425cf9712
Adaptierungen Codesniffer
2021-04-26 08:40:28 +02:00
5d25298045
Adaptierungen Übersichtsliste Lehrform, Lehrtyp
2021-04-23 15:02:22 +02:00
3a9704563f
Adapted JOB sendMailToSTGL to send mail only if Anrechnung not already processed
...
Job gets all yesterdays Anrechnungen, that did not process further than
first status. (If Anrechnung is new, but STGL already
started the process yesterday, he does not need to be informed about
this new Anrechnung anymore)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-22 15:52:46 +02:00
6ddc912cb3
uncomment uid
2021-04-22 14:23:10 +02:00
197accbb02
Add Titel to Projektexport
2021-04-22 13:47:01 +02:00
12d1dafa9f
Klasse lehrmodus.class.php adaptiert
2021-04-22 12:22:25 +02:00
d6e8b79ce3
Spalte Lehrmodus zu Übersichttabelle hinzufügen
2021-04-22 12:20:46 +02:00
398418515f
neue Tabelle lehre.tbl_lehrmodus, neue Spalte lehrmodus_kurzbz in lehre.tbl_lehrveranstaltung
2021-04-22 09:58:53 +02:00
5fa856c138
add erhalter kz to getByPerson method from Zeugnisnote_model.php
2021-04-22 01:02:32 +02:00
cf58762a6b
Fixed Bestaetigung checkbox in students VIEW to be checked if Anrechnung exists
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-21 19:05:40 +02:00
7b485053d9
Adapted DMSLib upload method to be accept field name from Controller
...
The fieldname represents the HTML uploadfile input name attribute, which
is given by the developer in the VIEW.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-21 18:46:51 +02:00
6dcb5e3a65
Adapted DMSLib download method to be more generic
...
DMSLib now extends FHC Controller to use its new method 'outputFile',
which sets HTTP headers and reads the file.
DMSLib uses now download function to accept params from Controller like
own filename or special disposition.
Loading document and retrieving file info is outsourced into own method
to be reusable.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-21 17:53:42 +02:00
ada7cdfb58
Merge branch 'BUG-1731/Mitarbeiter_Verwendung_Datum'
2021-04-21 15:04:33 +02:00
731c5b9461
Added link 'Neuen Antrag anlegen' in STGL Overview Site
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-21 13:37:43 +02:00
6dca00e4e5
Corrected query to retrieve only prestudentstatus 'students'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 18:45:43 +02:00
dca828650a
Adapted Bestaetigung Moodle link to open in new tab
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:51:18 +02:00
bb0776a808
Added method createAnrechnungsantrag to Anrechnungsmodel + Refactored code
...
Moved code from Controller to Anrechnungmodel.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:41:25 +02:00
356435dbdd
Added JS to create Anrechnungsantrag + Adapted TableWidget.js option
...
Adapted TableWidgets option 'rowSelectionChanged' to be able to directly
define rowSelectionChanged within particular JS file, if needed.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:28:46 +02:00
b7a6cefa36
Added Controller to create Anrechnungsantrag + Model Anrechnungbegruendung_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:00:14 +02:00
a7482425ef
fix inserst typos
2021-04-20 15:57:43 +02:00
5e77e252c7
Added GUI to create Anrechnungsantrag
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 15:54:16 +02:00
f6f31f7efb
Added Berechtigung 'lehre/anrechnung_anlegen' to create Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 15:49:08 +02:00
f657ffe59d
Liste der ganztägige Zeitsperren ohne Stundenangabe erweitert
2021-04-20 14:19:04 +02:00
142ea9a1f4
Merge branch 'FHBGLD-master'
2021-04-20 14:10:22 +02:00
9699de8c33
Removed commented code
2021-04-20 14:09:52 +02:00
61fbb60492
Merge branch 'master' of https://github.com/FHBGLD/FHC-Core into FHBGLD-master
2021-04-20 14:07:07 +02:00
bc7e3c5cc5
zgv ueberpruefung hinzugefuegt
2021-04-20 13:51:41 +02:00
236a2f35d2
Query für lehre/lehrveranstaltung:begrenzt aktualisiert
2021-04-20 08:27:28 +02:00
3281e832ce
Merge branch 'bug-3879/fehler_beim_akzeptieren_von_sonstigen_dokumenten'
2021-04-16 15:34:45 +02:00
f3af4fd783
Merge branch 'feature-12598/Projektabgabe_SortierenNachDatum'
2021-04-16 15:27:43 +02:00
cbf3a696e4
Berechtigungen Lehrform und Lehrtyp für Assistenz
2021-04-16 15:01:14 +02:00
abcbb0d81c
Merge branch 'feature-10963/Beurteilungsformular_datenbankanpassungen'
2021-04-16 13:41:27 +02:00
a1f4c90deb
Merge branch 'master' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-16 13:15:30 +02:00
08237bdb7f
Changed fhcomplete.org Wiki Links to fhcomplete.info
2021-04-15 11:54:50 +02:00
8730f28d91
Merge branch 'master' into feature/Anrechnungen_NEU
2021-04-15 09:53:15 +02:00
5f511eaa3c
codesniffer
2021-04-14 18:30:49 +02:00
5fcb9d2b1e
Erweiterte Suchoptionen
2021-04-14 16:11:50 +02:00
3d574c30b7
Adapted job sendMailtoSTGL: interval '24 hours' instead of '1 day'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-14 11:07:20 +02:00
607f516d75
select und Filter um Organisationseinheit erweitert
2021-04-13 20:44:58 +02:00
ca378ef13b
Added header filter to all hidden table columns
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-13 17:35:55 +02:00
b9955c14a6
Minor code changes for better maintainance
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-13 16:33:53 +02:00
7317623fbf
Added jobs to send mails to students once per day (info approved/rejected)
...
. The jobs will send mails to students, whose Anrechnungen were
approved/rejected the last day.
. Removed former sendMailToStudent functions from Controllers.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-13 16:09:11 +02:00
72b076c785
added repeat.png image for abgabetool
2021-04-13 13:25:42 +02:00
33cf7580c3
Filter ohne FB und mit OE in ÜS
2021-04-13 12:09:04 +02:00
b92260c1d5
Added Moodle-link to Anrechnungen-Prozessinformation
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-13 11:47:13 +02:00
cb5037626b
Minor change: Now using language phrase for 'maxZeichen'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-13 09:45:23 +02:00
a70082f0e5
Usability: Added Pflichtfeld "Lesebestaetigung" to students VIEW
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-12 17:00:03 +02:00
456a4e2057
bugfix for datum validation
2021-04-12 11:52:01 +02:00
1f02506eaf
added phrase for Parbeitaktualität error
2021-04-10 04:09:29 +02:00
b29621354f
- abgabetool: added zweitbetreuer mailto Link incl. icons
...
- Bewertunglink is not sent in Parbeit Enduploadmail if older Semester
- phrasesupdate Projektarbeitsbeurteilung: added female form
2021-04-10 03:55:05 +02:00
07f483f3bf
Ergänzung tablesorter
2021-04-08 19:13:19 +02:00
b8768f997c
Usability: Gendered StudentIn; Changed first table column to bold text - Students VIEW
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-08 14:44:00 +02:00
1008f6b8b3
Fixed DB errormessage in STGL Overview (related to added Ausbildungssemester)
...
The subquery was returning multiple rows. This is fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-08 14:34:16 +02:00
cbf4cd14e5
Added column 'Status' (last Anrechnungstatus) in FAS Anrechnung tab
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-08 13:15:11 +02:00
88dbd77a95
bug gefixed, akzeptieren von mehreren sonstigen dokumenten nun ohne fehlermeldung moeglich
2021-04-08 09:43:36 +02:00
e254dfba54
Merge branch 'feature-10963/Beurteilungsformular_datenbankanpassungen' of https://github.com/FH-Complete/FHC-Core into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-07 18:01:30 +02:00
c2f74b1bba
- mail to Zweitbegutachter after student upload is only sent when it is the endupload
...
- removed comments
2021-04-07 18:00:10 +02:00
094b502862
Usability: Limited chars-length for 'Herkunft der Kenntnisse' / Added chars counter
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 17:17:53 +02:00
587796e374
Usability: Gendered StudentIn; Changed first table column to bold text
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 15:52:06 +02:00
fe4b70ba19
Usability: Added 'Empfehlungsanforderung an/am' to STGL + lectors Detail view
...
. Now more "Empfehlungs"-data shown in a table.
. Better separation of PHP / JS.
. Adapted Controller, View, JS and library to provide data about WHEN and
TO WHOME the requests for recommendation had been sent.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 15:50:05 +02:00
bd2727fa02
Fixed: Now trimming text when copying lectors reason to STGLs reason for rejection
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 11:59:32 +02:00
343b7a3087
Adapted Controller to use library method getLectors()
...
...instead of redundant private method.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 11:59:13 +02:00
b5ba81b26e
Added fixed column width to tables
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 11:49:42 +02:00
96ba02bd69
bst_zeit ins Downloaddokumentenarray übernommen
2021-04-07 09:55:55 +02:00
170b2485d3
Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-06 18:06:30 +02:00
45a78b7700
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2021-04-06 16:56:53 +02:00
f681827e5d
Personalmeldung Formatierung von Dezimalwerten korrigiert
2021-04-06 16:56:19 +02:00
7c875d5f80
Usability: Added 'ZGV' to STGL and lectors Detail site
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-06 14:48:08 +02:00
42d2f45561
bei den anmerkungen studiengang hinzugefuegt
2021-04-06 13:51:27 +02:00
acdfdc028b
zgv beim master nur updaten wenn es sich um einen master handelt
2021-04-06 12:31:46 +02:00
84e7d95e34
changed from select to links
2021-04-06 11:47:14 +02:00
48105425fc
Edit Studienblatt in Englisch für AbbrecherInnen
2021-04-02 15:35:36 +02:00
5bc0f544f9
Neuer Tablesorter
2021-04-02 14:02:01 +02:00
38919da730
Attribut studienplan_regelstudiendauer ergänzt
2021-04-02 13:55:41 +02:00
642561a67d
Merge remote-tracking branch 'origin/master'
2021-04-02 13:47:22 +02:00
3644cc690c
Put Checks from xml to xsl for Abbrecher
2021-04-01 21:28:27 +02:00
131ec0e33c
change buchbar to zeitaufzeichnung
2021-04-01 18:29:19 +02:00
8a672780b2
Fix Typo in Anzahl MA
2021-04-01 18:13:58 +02:00
5cdc7f9542
Revert "impiment different text"
...
This reverts commit 9bf8d58a
2021-04-01 18:09:46 +02:00
3e7f75b43f
fix merge conflic at dbupdate_3.3
2021-04-01 14:48:56 +02:00
a6989fff11
Revert "impiment different text"
...
This reverts commit 9bf8d58a
2021-04-01 14:44:28 +02:00
5dafb3447b
Usability: Added column 'Empfehlungsanfrage_am', 'Empfehlungsanfrage_an'
...
...to STGL and lectors Overview site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-01 14:25:15 +02:00
fdf53ea3eb
Modified: Now user gets back error message if upload failes
...
...instead of hard program exit
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-01 14:15:02 +02:00
c54e934db9
Revert "impiment different text"
...
This reverts commit 9bf8d58a
2021-04-01 13:49:01 +02:00
d66fc6e493
Merge branch 'master' into 9503/csvExportProjektÜbersicht
2021-04-01 13:43:40 +02:00
eb1dabfc03
Merge branch '9503/csvExportProjektÜbersicht' of https://github.com/FH-Complete/FHC-Core into 9503/csvExportProjektÜbersicht
2021-04-01 13:38:42 +02:00
1a75666f01
rollback before merge and keep Überlappend fix in Zeitaufzeichnung
2021-04-01 13:36:02 +02:00
7fab658954
Merge branch 'master' into feature/Anrechnungen_NEU
2021-04-01 13:29:14 +02:00
2493cc57d4
abgabetool lektorview: decreased header table height
2021-04-01 09:48:49 +02:00
68a0e45472
Usability: Added column 'Empfehlungsanfrage_am', 'Empfehlungsanfrage_an'
...
...to STGL and lectors Overview site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-01 09:18:55 +02:00
9120268290
moved down icon with quickinfo for Tokensend
2021-04-01 02:34:13 +02:00
2850d0e5d8
"beautified" abgabetool page (lektorenansicht)
...
- moved Zweitbetreuer Text
- added icon with quickinfo for Tokensend instead of button with text
- disabled grading button and quickinfo instead of text for older Projektarbeiten
2021-03-31 23:45:17 +02:00
c37fb8836d
implement functionallity for phase
2021-03-31 19:14:01 +02:00
1b38b1adca
add functionality of buchbar to project overview
2021-03-31 18:22:56 +02:00
09a5072a4a
db update
2021-03-31 18:21:12 +02:00
7f713670b5
fixed recht
2021-03-31 17:57:35 +02:00
6c6a4f6cc2
fixed for student
2021-03-31 17:52:15 +02:00
803076d7d2
Merge branch 'feature-12337/nationenliste_sortieren'
2021-03-31 15:37:41 +02:00
047129de67
Update CHANGELOG.md
2021-03-31 15:16:22 +02:00
c169aec155
Update CHANGELOG.md
2021-03-31 15:15:24 +02:00
376f413d2a
Update LDAPLib.php
2021-03-31 14:58:31 +02:00
132b5097ee
Usability: Added column 'ZGV' to STGL and lectors Overview site
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-31 13:56:52 +02:00
9b57248007
zgv auch bei master uebernehmen
2021-03-31 13:12:20 +02:00
d53d91d7d1
Usability: Added filterbutton 'Alle anzeigen, die auf Empfehlung von LektorIn warten'
...
The filterbutton was added to the STGLs Overview site.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-30 17:02:15 +02:00
9ee473d9bd
Usability: Added Link to Anrechnungen in CIS LV Menu (for lectors)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-30 16:41:02 +02:00
3366cf224b
Merge branch 'master' into feature/Anrechnungen_NEU
2021-03-30 14:04:03 +02:00
7690a122b8
Refactored: Moved getAnrechnungstatusbezeichnung to AnrechnungLib
...
This method retrieves the Anrechnungstatusbezeichnung in the users language.
It is used multiple times -> moved to library.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-30 13:57:43 +02:00
96bdafbda8
Merge branch 'bugfix-12144/Bewerberstatistikmail_HTMLError'
2021-03-30 12:20:08 +02:00
016a9554b9
add null-check in zeitaufzeichnung.class because otherwise it ignores aktivitaet_kuzbz that is null
2021-03-29 19:00:44 +02:00
5b369f7020
Zaugnisnote_model: added getByPerson method
2021-03-29 18:49:41 +02:00
d183dda815
Fixed: Anrechnunglib returning values, Adapted error messages
...
Fixed: method getData in Controller was producing wrong returning message.
Fixed by removing, as library is returning boolean value now.
Adapted few error functions to be more generic and bilingual.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-29 18:48:26 +02:00
0bd89067f8
Überlappen Problem gefixed
2021-03-29 18:40:32 +02:00
287b961697
Fixed: Added serversite check on required form fields
...
After refactoring code to apply via AJAX call, required fields
have to be direclty validated in JS or on serversite. Now fixed by
checking on serversite.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-29 17:55:50 +02:00
c455778731
Fixed: Added formatted download-document-link after application was done
...
After refactoring the code and doing the application via AJAX call, the
document-download-link must be created on ajax success. This was missing
and is fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-29 17:50:19 +02:00
2c091cd405
Fixed: Recommendation button was not enabled correctly after withdrawing approvement
...
Now, if approvment is withdrawn, the recommendation button is enabled again
ONLY if no recommendation was submitted until yet.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-29 13:05:27 +02:00
b73c4aed03
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-03-29 11:05:49 +02:00
b7cb8b27ce
merge
2021-03-29 10:08:35 +02:00
e4aca8c7e3
Merge branch 'feature-98/Feiertage_in_Urlaubstool' of https://github.com/FH-Complete/FHC-Core into feature-98/Feiertage_in_Urlaubstool
2021-03-29 10:02:48 +02:00
43f55ce52b
überlappen fix
2021-03-29 10:00:56 +02:00
1599fedfce
Merge branch 'master' into feature-98/Feiertage_in_Urlaubstool
2021-03-26 19:35:48 +01:00
3221252f70
Merge branch 'master' into 9503/csvExportProjektÜbersicht
2021-03-26 19:23:02 +01:00
d2c4dd79d5
merge
2021-03-26 19:08:45 +01:00
0c429984b9
add new function to bisverwendung
2021-03-26 18:43:05 +01:00
279157b920
Added button to copy Empfehlungstext into reason textarea when rejecting
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 17:12:38 +01:00
f9cbd9caf5
Refactored code
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 16:51:11 +01:00
faf253c159
Adapted to keep individual filters by opening views in new tabs
...
When Detail Views were opened within the same browser window, individual
filters of the overview site were lost when returning to the overview.
Fixed by opening detail views in new tab.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 16:41:41 +01:00
e791e3267f
link zur mail vorlage hinzugefuegt
2021-03-25 15:52:14 +01:00
3359e2e972
Funktion checkDatum() aktualisiert
2021-03-25 15:45:09 +01:00
3ba4229eed
Refactored Students View + Controller
...
. Now application is done via AJAX call.
. Now messages are returned to user instead of hard exits.
. Now formatting status on client side, not on serverside.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 15:06:47 +01:00
d4ef17c183
Merge remote-tracking branch 'origin/master'
2021-03-25 13:27:36 +01:00
0c32ecac11
Umbenennung Inskriptionsbestätigung zu "Studienbestätigung"
2021-03-25 13:27:12 +01:00
8f2ef521e7
changed Projektarbeitsbeurteilung phrase for thema criteria
2021-03-25 13:22:39 +01:00
4450f5a473
Removed unnessessary code
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 12:14:26 +01:00
23e502f02e
mail vorlage hinzugefuegt
2021-03-25 10:44:11 +01:00
17f085d352
projektbeurteilung download für studenten im cis hinzugefuegt
...
projektbeurteilungsbutton anzeige nur wenn beurteilung bereits abgeschickt wurde
2021-03-25 10:23:40 +01:00
a68dfc1c6c
- Projektarbeitsabgabe: added Link to Projektarbeitsuebersicht to Zweitbegutachtermail
...
- updated abgabetool phrases
2021-03-24 22:49:34 +01:00
997f6f406b
Fixed: Now application can only be done for actual study semester
...
Before student could apply for past study semester, which should not be
possible. Fixed now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-24 17:16:17 +01:00
683e9ffdda
Modified to request recommendation (+send mails) ONLY if LV has lectors
...
Modifications done for STGL Overview and Detailview
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-24 16:22:56 +01:00
6ae8f00066
- Zweitbegutachter im Abgabetool angezeigt
...
- Tokenneuversand für zweitbegutachter möglich
2021-03-23 21:32:34 +01:00
a00009e49f
Erweiterung function checkDatum() um Gültigkeitsprüfung
2021-03-23 16:43:14 +01:00
4e0dfbf28a
change studienblatt if AbbrecherIn
2021-03-23 13:24:15 +01:00
10441baff3
sortierung anhand kurztext
2021-03-23 09:34:49 +01:00
287cddf926
added zgv ueberpruefung
2021-03-23 09:25:24 +01:00
989772402d
LVA-Liste prüft die Vertragszuordnung jetzt pro Lehreinheit statt pro LV
2021-03-23 08:38:55 +01:00
3a0720e4de
Changed: If LV has no lectors, show empty field instead of error message
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-22 17:28:29 +01:00
1113b833bd
Zeitsperre Fixed CSS
2021-03-22 15:41:17 +01:00
9bf8d58ab2
impiment different text
2021-03-22 14:46:56 +01:00
711bac0f6c
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into 9503/csvExportProjektÜbersicht
2021-03-22 14:44:52 +01:00
00656efaef
Changed filename on download to 'Anrechnungsantrag_OrgForm_LVID_VornameNachname'
...
Adapted STGL and lectors views to change the filename on download event.
All download functions moved from view to library.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-22 12:12:04 +01:00
050eef120c
Adapted download function in DMSLib to accept params filename and disposition
...
. Filename: uses given string as filename. Otherwise upload filename is used.
. Disposition: inline (open in new tab), attached (download dialog box)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-22 12:08:57 +01:00
fbb7b45b69
- added zweitbegutachterFehltWarnung phrase
2021-03-22 04:55:46 +01:00
2c9ca77500
Fixed code indentation, standart output, includes path, removed unused
...
variables and added a check to mail send where missing
2021-03-18 19:14:56 +01:00
4c0c6aa6cd
bugfix reload projekt
2021-03-18 12:04:28 +01:00
983ff1b16e
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
2021-03-18 11:43:42 +01:00
41e8b4094e
Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU
2021-03-18 10:58:57 +01:00
9b396eea4e
Added columns Organisationsform and Ausbildungssemester to STGL Overview table
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-18 10:57:49 +01:00
d345cbb43b
Added 'Zurücknehmen'-button for recommendation in STGL Detail View
...
Requested recommendations can now be withdrawn.
Now a button 'Zurücknehmen' is displayed as long as the Anrechnung
is processed by the lector and only as long the lector has not provided
a recommendation.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-18 10:55:58 +01:00
7340564d1e
Added job to send mail to STGL with yesterdays new Anrechnungen
...
. added AnrechnungJob sendMailToSTGL()
. removed functions to send mail from CTRL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-16 17:42:46 +01:00
95c5a9c475
added UNIQUE constraing to zugangstoken column of lehre.tbl_projektbetreuer
2021-03-15 23:48:00 +01:00
ee7d51d2b3
Pruefung_model.php: method for retrieving Prüfung by person and studiensemester
2021-03-15 23:27:28 +01:00
2ef2a906c3
- Projektarbeitsbenotung (abgabe_lektor_details.php): benoten button only shown when semester > SS2021
...
- updated phrases for text showing if older semester
2021-03-12 09:46:27 +01:00
73525c94ab
uid of student instead of logged in user is passed to sancho infomail
2021-03-11 12:42:18 +01:00
3db9b9abee
added projektbeurteilung pdfexport
2021-03-09 14:13:55 +01:00
e33eb2e9a9
Zeitraumabfragen für Projektphasen korrigiert
2021-03-09 13:23:56 +01:00
fb7835de57
added new zeitwuensche permission
2021-03-08 12:53:59 +01:00
5f187b5293
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-03-07 21:44:56 +01:00
5da754c9db
Anmerkung bei Lehreinheitmitarbeiter verschoben
2021-03-04 07:59:38 +01:00
5b546d25a8
- abgabe_student_details.php: added reply to and other header/footer to sancho Endupload mails
...
- sancho.inc.php: enabled reply-to and passing of footer image
2021-03-04 00:04:47 +01:00
6bb9c77ca1
abgabe_student_details.php: Mail to Erst- and Zweitbegutachter is a sancho mail
2021-03-03 10:43:37 +01:00
edf657fdb9
abgabe_student_details.php: Mail with link (and possibly token for second assessor) to project assessment is sent with final upload to first and second assessor.
2021-03-03 00:00:51 +01:00
9ba6f3b538
Fixed HTML code appearing within mail message body
...
. by breaking lines with \n
. using nowrap to avoid breaking text
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-02 15:44:46 +01:00
9cbcec7231
Fallback-Lösung für LV-Regel wenn im aktuellen Semester kein Status vorhanden ist
2021-03-02 15:26:44 +01:00
9677a5a4fd
- BenutzerModel: added comment for getFromPersonId method
...
- UPDATE permission for web for tbl_projektbetreuer added
- added phrase for Zweitbegutachter - link
2021-03-01 09:33:14 +01:00
8bd148f7e5
Hinweistext für Zahlungen angepasst
2021-02-26 15:01:23 +01:00
95c2e4bf9c
fix true false
2021-02-26 00:25:59 +01:00
54286a7e6c
Merge branch 'master' into 9503/csvExportProjektÜbersicht
2021-02-25 15:49:52 +01:00
d9cbea680e
Fixed Loading of AZG Relevant Checkbox in FAS
...
Fixed missing Column Warning in DB Update
2021-02-25 15:25:41 +01:00
8086501d04
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
2021-02-25 14:43:06 +01:00
6f27fccc09
- Corrected Permissions for Anrechnungen
...
- Removed Useless Sequence
2021-02-23 17:55:41 +01:00
616cfaaf41
Merge branch 'master' into feature/Anrechnungen_NEU
2021-02-23 14:21:47 +01:00
83b1286e08
Added column Antragsdatum to STGL/Lector Overview
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-23 14:21:21 +01:00
6446e424a9
Fixed: Now all buttons have a type (button / reset)
...
+ belonging adaptations in JS:
. removed e.preventDefault as no longer needed with button type=button
. removed empty text value settings with button type=reset
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-23 11:27:03 +01:00
581a4c33a4
Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit'
2021-02-23 08:48:30 +01:00
cb4f22141d
Merge branch 'feature-11142/Reihungstest_aufgenommene_bei_Neupriorisierung'
2021-02-23 08:36:53 +01:00
4ebd5a85bb
Avoided click event bubbling for nested buttons
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-22 16:12:15 +01:00
cf5ee6afa3
Merge branch 'master' into feature/Anrechnungen_NEU
2021-02-22 16:05:50 +01:00
4d041023a8
Problem beim Speichern der Lektorenzuordnung behoben wenn Semesterstunden leer sind
2021-02-22 08:49:52 +01:00
f208fbcd4b
Merge branch 'feature-11869/testtool_sprache_und_sprachwahl'
2021-02-19 17:15:00 +01:00
d69083eba2
Fixed Typo in Demo Page
2021-02-19 17:13:53 +01:00
b44853d536
Merge branch 'master' into feature-11869/testtool_sprache_und_sprachwahl
2021-02-19 17:13:25 +01:00
ad9de97a8c
Merge branch 'feature-10816/log_download_bescheid'
2021-02-19 16:23:07 +01:00
9a3addd79d
Removed comments on 'if (! defined('BASEPATH')) exit('No direct script access allowed');'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 14:59:11 +01:00
2723e130f0
Fixed repeating grant privileges on tbl anrechnungstatus to web user
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 14:53:03 +01:00
4b3cf019c3
Fixed flickering popup massage preventing approving AFTER withdrawing a rejection
...
This happened because of a conflict between HTML forms native submit behaviour
(automatically refreshing page) and our javascripts submit onclick functions.
Now fixed by setting event.preventDefault() within the js functions.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 13:56:15 +01:00
6d3407c309
Reset deleted filter button in STGL overview (show recommended)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 09:42:16 +01:00
ce2deb32e1
Deleted testuser
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 09:32:46 +01:00
eb95421ff9
ReihungstestJob.php: formatted sql
2021-02-18 04:26:54 +01:00
20413b1b03
abgabetool: replaced link in CIS to redirect to new Beurteilungsformular
2021-02-18 01:53:57 +01:00
b5c9567c01
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
...
# Conflicts:
# public/js/lehre/anrechnung/approveAnrechnungDetail.js
2021-02-17 19:09:09 +01:00
abcf41f7a3
Added feature to withdraw approvals/rejections for STGL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-17 19:07:13 +01:00
d9d71c42ce
Added feature to withdraw approvals/rejections for STGL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-17 18:54:53 +01:00
577d0f1eb5
Fixed Filename
2021-02-17 15:21:38 +01:00
935b370166
added filter for bachelor and master
2021-02-17 15:07:09 +01:00
0993b94507
Anrechnungen Tooltip korrigiert bei STGL Filter
2021-02-17 11:44:35 +01:00
a02d581d0a
Merge branch 'feature/Anrechnungen_NEU'
2021-02-17 08:49:24 +01:00
94d335600c
- Added new protected method getOldestJob to JQW_Controller
...
- Added new public method getOldestJob to JobsQueueLib
2021-02-16 21:21:11 +01:00
734db4a2a8
Granted Web User for tbl_anrechnung_status; Added Sequence Anrechnung Status
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-16 18:22:00 +01:00
241fb34b23
Added filter button to STGL Overview (filter: show all progressed by STGL)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-16 18:04:27 +01:00
1ca22970a9
Adapted: Show only applications that were requested for recommendation
...
Change in lectors overview.
Now lectors only get Anrechnungsanträge, where the STGL had requested
a recommendation.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-16 17:37:14 +01:00
86a065d0d6
Fixed: Now checking user by prestudent_id to entitle to read DMS document
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-16 16:31:42 +01:00
fec8fbb6d4
Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts
2021-02-16 09:46:50 +01:00
3366f091dd
Anrechnungen - Fixed Details Page for People with multiple Accounts
2021-02-15 21:12:14 +01:00
4d81f91840
Problem behoben wodurch falsche Anrechnungen geladen wurden
2021-02-15 16:44:34 +01:00
6522def7a2
Merge branch 'feature/Anrechnungen_NEU'
2021-02-15 11:44:07 +01:00
acec92fa2b
Adapted mail message for students (different text for approved/rejected)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-15 11:26:59 +01:00
bf1686e253
display Holidays in Datepicker
2021-02-15 11:11:54 +01:00
38220ab772
Logeintrag beim Downloaden eines Bescheides
2021-02-15 08:11:37 +01:00
da4e913a38
ReihungstestJob.php:
...
- studiensemester is passed as parameter
- info mail is sent to lower priority when higher priority is cancelled (abgewiesen)
- info mail is sent to master studiengänge as well if higher prio is cancelled/aufgenommen and there are other bachelor prestudenten in same semester
2021-02-13 00:37:33 +01:00
2973c9e856
Merge branch 'feature/Anrechnungen_NEU'
2021-02-12 16:14:59 +01:00
bff6307a62
Anrechnungen
...
- Neuer Job zum Setzen der Anrechnungsnote hinzugefügt
- Direktes setzen der Zeugnisnote bei Anrechnung entfernt
2021-02-12 15:52:26 +01:00
d44c526ba4
Minor changes
...
. phrases
. GUI
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-11 16:37:44 +01:00
6dea79180c
Adapted tables' boolean headerfilter to be used with strings
...
i.e. entering 'yes' will filter all truish entries
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-11 16:06:20 +01:00
ea45ce9934
Sprache und Sprachwahl fixed, wenn kein Studienplan verfügbar ist.
...
Ablauf_ID wird nun mitgeschickt
2021-02-11 11:57:45 +01:00
c23a3bdac9
Fixed button breaking line in smaller devices; now all buttons inline
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-11 11:52:57 +01:00
eaf902c528
Adapted tooltips for Students VIEW, minor change of phrase text
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-11 11:36:38 +01:00
41f8a0e3b3
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
...
# Conflicts:
# system/phrasesupdate.php
2021-02-10 18:31:26 +01:00
c0843e9506
Translated STGL and Lectors VIEW to English
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-10 18:25:48 +01:00
3cbb1b5c95
Translated STGL and Lectors VIEW to English
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-10 17:26:25 +01:00
c82ebaf678
Translated Students VIEW to English
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-09 16:31:32 +01:00
81151025da
Fixed non-existing phrases
...
. anrechnungNichtEmpfehlenAsk
. empfehlungNegativ
The phrases did not exist anymore, they got new name. Now fixed.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-09 14:54:32 +01:00
d1537df896
Fixed: Now Nachweisdokument- and Detail-Links clickable after table update
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-09 14:36:29 +01:00
3eecd74b1f
Merge branch 'master' into feature/Anrechnungen_NEU
2021-02-09 10:54:28 +01:00
6e689ce657
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-02-09 10:53:41 +01:00
8a3096edf1
Merge branch 'feature-11841/studiengang_dropdown'
2021-02-09 08:06:51 +01:00
a39256d21d
Merge branch 'feature-11575/anzahl_der_markierten_personen'
2021-02-09 08:03:41 +01:00
544def7f5a
- Organisationseinheit Dropdown in zeitaufzeichnung is limited by funktionen, only dizipl. Zuordnung, standardkostenstelle Zuordnung and funktionale Zuordnungen are shown
2021-02-09 04:41:14 +01:00
c69188dffe
Corrected typos in name that caused button not being disabled
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 18:25:27 +01:00
17ae1b144c
Corrected: Now correct text for confirmed positive recommendation
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 18:13:50 +01:00
2a59d2464b
Uncommented tooltips for genehmigung/empfehlung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 18:07:40 +01:00
77774e8cec
Corrected STGL permission check to check against UID
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 18:01:06 +01:00
00799f2f64
Adapted: Ordered Notizen to retrieve last inserted first
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 17:35:34 +01:00
25400d8b5f
Removed updateamum/updatevon when updating Anrechnungmodel
...
They are not needed. Just confusing.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 17:25:34 +01:00
494cf1f688
Changed style & flow of approve/reject/recommend/dont recommend
...
This was done for better clarity in workflow.
Now, when clicking on approve/reject/recommend/dont recommend - button,
this will always lead to second panel. In that one the user may leave
a reason, but in any case the user need to CONFIRM (or break) the action.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 17:19:58 +01:00
8c666ceef2
Studiengang Dropdown angepasst
2021-02-08 17:09:34 +01:00
d84da96669
display Feiertage and Wochenenden
2021-02-08 09:57:08 +01:00
fd79551f00
- Pruefungsprotokoll bugfix: replaced bitwise and with logical and
2021-02-04 20:37:05 +01:00
253ffa7e93
Hinweistext bei Zahlungen hinzugefügt
2021-02-04 17:53:57 +01:00
be5ff3f122
Changed CIS menu title and icon for Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 17:11:36 +01:00
c8ceacc972
Added checks if user is entitled to read DMS document / Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 17:05:05 +01:00
071a6a4ee6
Added tooltips (Upload info, Read Infoboxen-info)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 15:42:26 +01:00
4a8fa95a3a
Changed: Now infobox color is blue and icons are info-icons
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 15:36:12 +01:00
1f88bfae40
- Projektbetreuer Model: added getBetreuerByToken method
...
- phrasesupdate: added new Projektarbeitsbeurtielung phrases
2021-02-04 11:21:40 +01:00
cfc3b4f985
Corrected: Added space to be able to disable textarea
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 11:04:20 +01:00
e6da4b2e2d
Minor changes
...
- unfold 'Antrag Voraussetzungen' in Infopanels
- open Detailpage on same page (not on new tab)
- unified sancho mails titles
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 10:56:03 +01:00
e9664c179a
Added Genehmigungs GUI + Begreundungsnotiz for rejected Anrechnungen in STGL VIEWS
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 10:24:08 +01:00
52450561fd
Added method getApprovedOrRejected() to Anrechnung Model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 10:20:10 +01:00
5abac91058
Anazahl der markierten Personen hinzugefügt
2021-02-04 09:50:05 +01:00
fc8df1b10d
Wording korrigiert im CIS Profil
2021-02-04 07:56:18 +01:00
d380e6ac49
Added change of status in lectors Detail GUI
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 16:22:19 +01:00
a3c33ed385
Added change of status when STGL requests for recommendation
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 16:21:15 +01:00
5a8c779bcd
Corrected URI and permissions
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 16:18:06 +01:00
110f05b91c
Corrected empfehlung_datum
...
Now the query uses the correct status kurzbz 'inProgressDP'.
This is because the date the lector sends the recommendation (=empfehlung_datum),
the status is changed to inProgressDP and the insertamum is set there.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 15:43:14 +01:00
5e1bbfe718
Minor change to InfoPanels
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 15:32:42 +01:00
e780a3e505
Added GUI for STGL Detail VIEW + logic (Antrag- and Empfehlungdata)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 15:30:53 +01:00
0affbf4e41
Added param to calling function rejectAnrechnung to work properly
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 14:53:40 +01:00
5109828772
Adapted STGL overview: info/begruendungsangabe when approving/rejecting
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 12:59:46 +01:00
39016b873f
Adapted STGL overview: info/begruendungsangabe when approving/rejecting
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 12:41:26 +01:00
1c0c8e9ad4
Hided empfehlung/begruendung panels in lector overview after sending recommendation
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 12:37:48 +01:00
9790fc650b
Adapted lector overview to slide in/out info when recommending
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 11:13:05 +01:00
ec16354594
Adapted Controller for lector Details to process Empfehlungen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 11:03:58 +01:00
8b6f0f56af
Corrected not collapsing 'Fristen' in Infopanels
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 11:02:26 +01:00
b13fb0cda8
Added lector Detail GUI to retrieve and process Empfehlungen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 11:01:02 +01:00
5235915d6a
Changed method getNotizByAnrechnung() -> added param titel
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 10:57:27 +01:00
b8046aeccf
Added insertvon when saving new Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 10:55:46 +01:00
297c96c3e5
Changed method getLastAnrechnungstatus() -> added param status_kurzbz
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 10:53:51 +01:00
8fc338ccb4
Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview
...
. Begruendung is added as Notiz
. GUI to attach begruendung will slide down the moment 'Nicht Empfehlen'
is clicked
. added phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-02 14:06:49 +01:00
da3720e65d
Added lectors detail view CONTROLLER
...
+ adaptations to AnrechnungLib
+ phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-01 10:11:57 +01:00
a0658a61c3
Added lectors Detail VIEW to review and recommend Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-01 10:10:55 +01:00
a218b36323
Added getUID() by prestudentID - method to Prestudent Model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-01 10:03:18 +01:00
fcf15c410e
Merge branch 'master' into feature-9612/Casetime_Zeitwarnungen_differenzieren
2021-01-29 15:32:49 +01:00
c6f6a626d3
Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen
2021-01-29 15:30:58 +01:00
5b3daa76df
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
2021-01-29 15:30:22 +01:00
1ea521e858
Merge branch 'master' into 9503/csvExportProjektÜbersicht
2021-01-29 15:28:41 +01:00
907ecca333
Added coloured status alert in students view
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-29 11:55:27 +01:00
70d02e25f9
Removed doublecheck of last status
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-29 11:54:52 +01:00
8ba7744acb
HOTFIX: Removed test-UIDS!
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-29 08:23:25 +01:00
f3feb53438
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
2021-01-29 08:04:20 +01:00
02e4004300
Merge branch 'master' into feature/Anrechnungen_NEU
2021-01-29 08:02:04 +01:00
ea7d0692b9
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-01-29 08:01:15 +01:00
106cbe8194
HOTFIX: Removed test-UIDS!
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-29 07:59:24 +01:00
aff6e2ed8a
Changed: Now "Herkunft der Kenntnisse" are required
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-28 19:38:59 +01:00
ce794d0e54
Added important help text for students view regarding applying correclty
...
German only. English will follow.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-28 18:55:02 +01:00
14d1762c9f
Changed email links to correct CIS URL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-28 16:52:14 +01:00
bd293f3b3a
Changed mail text to inform students about approved/rejected Anrechnungen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-28 16:04:21 +01:00
c3f24f3038
- Projektarbeitsbeurtielung: added app Projektarbeitsbeurteilung and phrases for Projektarbeitsformular
2021-01-28 13:03:18 +01:00
8d09ee7299
Modified to update Zeugnisnote, if already exists
...
During approving process the zeugnisnote is set to 6 (angerechnet).
If zeugnisnote already exists, it will be updated now.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-28 11:28:44 +01:00
6a37c71cfc
Added sending Sanchomail to lector asking to recommend Anrechnung
...
Mails are send to lectors (prio for LV-Leitung, if not present to all
lectors of LV) Anyway, as many there recommendation may be requested
for many lvs at the same time, the receiver array will be unique to ensure
sending only once to one and the same lector. e.g. if lector is lv-leitung
for lv x and lector for lv y, will get only one mail.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-28 10:21:56 +01:00
35009097f1
Added sending Sanchomail to student when Anrechnung was approved/rejected
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-27 14:49:30 +01:00
697e5057cf
Added sending Sanchomail when Anrechnung is (not) recommended by lector
...
Mail goes to STGL. If not present, it will be sent to STGL assistance.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-27 11:37:51 +01:00
3fb2c3d387
Added Sanchomail sent when Anrechnung is applied by student
...
Mail goes to STGL. If not present, it will be sent to STGL assistance.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-27 10:33:19 +01:00
8a75bc9fdd
Added method getFullName() to Person_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 18:54:42 +01:00
db10f78505
Added method getLeitung() to Studiengang_model to retrieve STGL by studiengang_kz
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 18:52:28 +01:00
82780e9626
Added column "Herkunft (der Kenntnisse)" to STGL and lectors VIEW
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 15:39:18 +01:00
e06a6768a4
Changed text as required in Students Anrechnung' View
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 15:26:16 +01:00
3f3d7aa7d7
Changed lektors status text to 'Empfehlung angefordert'
...
...to make status in process more understandable.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 13:57:57 +01:00
7d0ff4fcee
Added check, when STGL tries to request recommendation for already recommended Antraege
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 13:56:34 +01:00
5b77a5d08f
Restricted to upload only pdf files
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-25 18:23:59 +01:00
aefd0842db
Added tooltip for unselectable Anrechnungen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-25 18:18:13 +01:00
1b00ae78b4
Created Anrechnungen LektorInen: GUI, Controller, Tabledata, Phrases
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-25 17:07:39 +01:00
7dc21fde5a
FAS Länge der Betriebsmittel Nummer auf 32 Zeichen erhöht damit Schlüsselnummern gespeichert werden können
2021-01-22 13:57:28 +01:00
0da2c6a74c
Changed tabulator requiredPermissions for STGL Anrechnungen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-21 14:41:46 +01:00
0bf0c2a152
Merge branch 'master' into feature/Anrechnungen_NEU
2021-01-21 14:07:40 +01:00
71b8122a20
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-01-21 14:06:58 +01:00
2359592032
Merge branch 'master' into feature/Anrechnungen_NEU
...
# Conflicts:
# application/libraries/AnrechnungLib.php
# application/views/lehre/anrechnung/requestAnrechnung.php
# system/dbupdate_3.3.php
# system/phrasesupdate.php
2021-01-21 14:06:03 +01:00
0528ae3eb9
Added uebernahmedatum and benotungsdatum to zeugnisnote
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-21 13:39:31 +01:00
dc98b766c9
Now filtering / formatting correctly the updated data
...
...by adding status_kurzbz to returning json object
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-21 12:50:07 +01:00
fd5b68d3b8
Set persistent layout and persistent sorting to STGL Anrechnungen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-21 12:21:31 +01:00
8a03ccab5d
Visibly greyed rows that are unselectable (at start and on update)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-21 11:19:11 +01:00
99db4ec3ce
Adapted empfehlung to be human readable
...
ja/nein/- instead of boolean/null
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-21 11:08:57 +01:00
47c8432faf
Added filter buttons to STGL Anrechnungen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-21 10:51:22 +01:00
9e5b03b2dc
Adapted Select-all-button to select only Anrechnungen progressed by STGL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 19:16:17 +01:00
97d86cc702
Added logic & GUI adaptations for requesting recommendations
...
. Added request recommendation-methods in Controller and Library
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 19:07:33 +01:00
3a285c5672
Added status inProgressLektor
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 19:05:56 +01:00
9a0ea02e0c
Minor code enhancement
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 19:03:53 +01:00
a09abfd70c
Added Zeugnisnote = 6 (angerechnet) when Anrechnung is approved
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 15:14:31 +01:00
114ac7a69e
Corrected Personenkennzeichen: students matrikelnr instead of person bpk
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 13:40:33 +01:00
1bd66d0ee2
Corrected: No genehmigt_von and update info when Anrechnung is rejected
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 13:15:28 +01:00
f0ef091c5f
Added logic & GUI adaptations for rejecting Anrechnungen
...
. Added rejecting-methods in Controller and Library
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 11:48:07 +01:00
046f807788
Added ECTS to tabledata
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 11:06:53 +01:00
4ed786d65a
Added promise check (browser compatibility) and redrawing table on resize
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 11:03:47 +01:00
964bd40c14
Added logic & GUI adaptations for approving Anrechnungen
...
. Added approve-methods in Controller and Library
. Added row selection checks to avoid selecting approved and rejected
Antraege
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-20 11:02:15 +01:00
5c1c9f1df4
Beim Löschen eines Prüfungstermins kann ein Infomail versendet werden
2021-01-20 10:18:00 +01:00
943961127f
implement checkbox
2021-01-19 16:15:03 +01:00
403304e1a7
Adapted CSS: Red button for rejecting, blue for approving
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-19 15:56:34 +01:00
360aec41ee
Restricted tabledata to retrieve only for studies of STGL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-19 15:47:31 +01:00
8d26cc9a86
Added permission lehre/anrechnung_genehmigen to Controller
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-19 15:45:04 +01:00
1a050adea4
Added permission to DB: lehre/anrechnung_genehmigen and lehre/anrechnung_empfehlen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-19 15:42:08 +01:00
b5dd85f2a6
Created Anrechnungen STGL: GUI, Controller, Tabledata, Phrases
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-19 14:43:32 +01:00
adcb865cbf
Merge remote-tracking branch 'origin/master'
2021-01-19 13:47:20 +01:00
0c40452b4d
Statusgrund in Excel-Export Studierende
2021-01-19 13:47:07 +01:00
9e0febdff6
Abfrage der Gebiete angepasst
...
Damit auch QuereinsteigerInnen des 2. Semesters die Gebiete sehen
2021-01-19 13:46:15 +01:00
8441345d7a
add azgrelevant to save method in bisverwendungclass
2021-01-19 13:22:47 +01:00
f185c92db7
Created Anrechnungen Students GUI, Controller, DB-tables, library, phrases
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-19 13:03:26 +01:00
c0952af290
Corrected default value for empfehlung_anrechnung to be nullable
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-19 08:27:59 +01:00
407d8d9613
Fehler behoben wodurch nicht alle Semester eines Studiengangs im FAS angezeigt wurden wenn nur direkte Inskriptionsgruppen vorhanden sind und keine Spezialgruppen oder Verbandsgruppen
2021-01-18 21:04:17 +01:00
4df012798f
Changed bpk to Matrikelnummer
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-18 15:09:01 +01:00
e04e584410
Added Anrechnungsdatum
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-18 15:08:16 +01:00
3ffc5c7d3f
Deactivated application deadline
...
Deactivated application deadline by setting checking variable
is_expired to false. This is to keep the logic for a later time when the
application deadline is going to be defined.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-18 13:59:29 +01:00
0edccc299c
Deleted js-file - not needed by now
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-18 13:52:26 +01:00
4e0fd56d99
Corrected empfehlung default value
...
Now default value is empty instead of false, as there are 3 different
stati to retrieve
1. null = no recommendation at all (default)
1. true = recommended
1. false = not recommended
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-18 13:45:11 +01:00
de5c67d2f1
Devided methods getAnrechnungData and getAnrechnungDataByLv
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-18 13:41:46 +01:00
b6f5bc2703
Added phrases for Anrechnung beantragen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 15:27:44 +01:00
0d546dc0c0
Renamed POST parameter lv_id, studiensemester
...
...to stay consistent
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 15:24:26 +01:00
67c130f9c1
Included Anrechnung beantragen into CIS Menu
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 15:22:20 +01:00
aff838d3c3
Fixed typo studiensemester in AnrechnungLib
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:55:42 +01:00
a1dfd3f598
Created new model Anrechnungstatus_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:21:53 +01:00
dc84c91dae
Added methods saveAnrechnungstatus() and getLastAnrechnungstatus()
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:21:00 +01:00
85ec64876d
Changed permission to student/anrechnung_beantragen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:18:28 +01:00
091d921efa
Redesigned and adapted GUI
...
Added download, alerts, new layout and styles that fit better to new
adaptations and to other GUIs.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:16:53 +01:00
b57a3ec90f
Added logic to download and open a document
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:13:17 +01:00
5af134312c
Added logic for uploading file and saving anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:12:08 +01:00
3116d4c7c9
Adapted index method and library(deadline, status, refactored code, lib functions)
...
- Check if application deadline is expired
- Refactored retrieving Anrechnung data (reusable)
- Adapted status for student view (new, in progress)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 14:09:33 +01:00
98deb3d2a0
moved creation of tbl_projektarbeitsbeurteilung to FHC_Core_Abschlusspruefungsbeurteilung extension
2021-01-14 10:32:42 +01:00
44e8bd57b0
Set default value to NOW() for insertamum in lehre.tbl_anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 10:00:44 +01:00
78e4edd590
Added permission student/anrechnung_beantragen
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-14 08:36:53 +01:00
254dad8700
db changes for projektarbeitsbeurteilung
...
- added lehre.tbl_projektarbeitsbeurteilung
- added columns zugangstoken, zugangstoken_gueltigbis to lehre.tbl_projektbetreuer
2021-01-13 21:15:44 +01:00
47f66644ef
Added Bezeichnung 'berufliche Praxis' to Anrechnungbegruendung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-13 14:55:50 +01:00
2454104cc3
Changed datum type from timestamp to date in tbl_anrechnung_anrechnungstatus
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-13 14:37:55 +01:00
57722553ec
- new funktion type kstzuordnung for cost center assignment in public.tbl_funktion
2021-01-13 00:05:03 +01:00
5cd163819d
Added upload function to DmsLib
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-11 15:24:12 +01:00
1fefffcab3
Added / Adapted DB for Anrechnungen
...
- Added column dms_id, studiensemester_kurzbz, anmerkung_student und
empfehlung_anrechnung in tbl_anrechnung
- Changed genehmigt_von and begruendung_id to be NULLABLE in
tbl_anrechnung
- Added DMS category "anrechnung"
- Added DMS category permissiongroup for DMS category "anrechnung"
- Add table anrechnung_status
- Added table anrechnung_anrechnungstatus
- Für bestehende genehmigte Anrechnungsanträge wird ein Eintrag mit dem
Status 'approved' angelegt
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-11 13:43:57 +01:00
57c0f3020a
Bei den Zahlungsbestätigungen werden nur noch Zahlungen angezeigt bei denen das Buchungsdatum nicht in der Zukunft liegt um zu verhindern, dass Studierende die Zahlungen tätigen bevor sie eine Rechnung bekommen
2021-01-07 16:52:26 +01:00
04174d35f5
Added Anrechnungsdata (student, lv and lectors of lv)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-05 12:19:27 +01:00
fb29dc1e0e
Added method getLvByStudent() to Lehrveranstaltung_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-05 12:17:41 +01:00
8309dfb3ca
Created CONTROLLER Anrechnungen for students (CIS)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2020-12-22 16:00:07 +01:00
e7d9d8859c
Created VIEW Anrechnungen for students (CIS)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2020-12-22 15:43:44 +01:00
6a9871c0d5
Feldgroesse für ZGV angepasst für Darstellung auf kleinen Devices
2020-12-22 09:42:35 +01:00
5dbad37416
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
# Conflicts:
# locale/de-AT/global.php
# locale/en-US/global.php
2020-12-21 15:54:18 +01:00
d62b1bead4
change table
2020-12-21 09:27:23 +01:00
30960adf81
fix typo in query
2020-12-21 08:55:33 +01:00
c3ab40282b
add azgrelevant column and alter zeitaufzeichnung column in bis.tbl_bisverwendung
2020-12-16 16:39:43 +01:00
74c12372c8
also hide hours on edit
2020-12-15 13:17:23 +01:00
7fdadc48cf
Merge branch 'master' into 9503/csvExportProjektÜbersicht
2020-12-15 09:48:42 +01:00
095c11f167
Jobwatcher verschickt Infomail an Administrator falls Cronjobs im Status Running hängen bleiben
2020-12-11 11:10:29 +01:00
7ed9266b0a
Neuen Config-Eintrag hinzugefügt um die Mahnspanne bei den Zahlungen im FAS auszublenden
2020-12-07 10:58:29 +01:00
33cc431267
Added Phrases for Additional Informations
2020-12-04 15:41:59 +01:00
15d15faf8a
Zeiteneintragung nicht möglich wenn zuvor Projektübersichtexport angeklickt wird
2020-12-03 11:49:11 +01:00
3cf6e338d7
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-12-03 10:33:05 +01:00
47d7a4688f
Zeiterfassung: Zeitausgleich und Krankenstand nur ganztägig eintragbar
2020-12-02 15:16:07 +01:00
8109fd6757
Merge remote-tracking branch 'origin/master'
2020-12-02 13:57:32 +01:00
47d09ec7eb
Tablesorter für Meldungsübersicht
2020-12-02 13:57:26 +01:00
c33856ee50
Zeitsperren: User bekommt Warnhinweis bei auffällig langem Zeitraum
2020-12-02 12:57:54 +01:00
b5510f023e
Fixed Corner Case where wrong actual Studysemester ist retrieved if Start and End Dates are overlapping
2020-12-02 12:18:02 +01:00
a8227e1f91
Zeiterfassung: Tagesübergreifende Einträge verhindern
2020-12-02 11:58:51 +01:00
32a174d836
Zeiterfassung: Eintraege in der Zukunft
2020-11-30 11:09:49 +01:00
442cd67d08
Changed COVID page text, Removed placeholder in COVID textarea
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2020-11-30 11:01:09 +01:00
ace636ef52
workerqueues (JQW_Controller and JobsQueueLib.php): added getJobsByTypeStatus method
2020-11-27 03:03:37 +01:00
c7605b2107
Merge branch 'feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen'
2020-11-26 13:30:21 +01:00
73688eec83
Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen
2020-11-26 12:52:24 +01:00
d0d133b3ba
Infocenter Nation aus Defaultfilter entfernt
2020-11-26 12:49:52 +01:00
9b6cb231c0
Messages in FAS show the Date of the last Status change (read/unread-status)
2020-11-25 16:54:44 +01:00
3c2fdc1991
added Aufenthaltsfoerderung_model
2020-11-25 16:31:13 +01:00
0738f28144
Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen
2020-11-25 14:52:22 +01:00
562fab9281
ZGV-Nation in Infocenter Filter per Default sichtbar
2020-11-25 14:43:22 +01:00
34560fe78b
Merge branch 'bug-10179/Message_recipient_without_internal_account'
2020-11-25 14:31:47 +01:00
6e5c555a40
Fixed MessageLib->_sendNoticeEmail
2020-11-23 16:19:23 +01:00
119d5d99df
Fixed Query to get User for Messages by PersonID and OrganisationUnit
2020-11-23 16:18:43 +01:00
451e0e7843
Fixed MessageLib->_sendNoticeEmails: date and array comparisons
2020-11-19 00:09:53 +01:00
1cf06681d3
bpk vorrübergehend auskommentiert
2020-11-18 17:45:37 +01:00
798ff3db24
Bugfix Abfrage Rechte
2020-11-18 17:44:15 +01:00
73a38a0835
Formatierung XML-Output
2020-11-18 17:41:30 +01:00
b31585af98
Bugfix ical_coodle
...
Leeres VEVENT entfernt, wenn kein Termin vorhanden
2020-11-18 17:40:35 +01:00
34e3756d74
Mitarbeiter zusammenlegen entfernt / Extension-Tabellen auf Vorhandensein pruefen
...
- Mitarbeiter zusammenlegen entfernt.
- Bevor Personen auch in extenstions zusammengelegt werden: pruefen, ob
die entsprechenden Tabellen existieren. (diese sind nur vorhanden, wenn
extensions FHC-Core-ALMA, FHC-Core-SAP installiert sind)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2020-11-18 13:14:59 +01:00
9d2c004c6d
Checks if the benutzer exists MessageLib->_sendNoticeEmails
2020-11-18 08:51:48 +01:00
232f261a76
Merge branch 'bugfix-8370/Fehlermeldung_korrigieren_in_LehrauftragBestellen'
2020-11-17 17:56:46 +01:00
a1d2eb51a7
Loading Name of a Person doesnt load all person Data
2020-11-17 17:49:32 +01:00
2103e78dcc
Merge branch 'feature-9858/Freigegebene_Urlaube_loeschen_wenn_in_Zukunft'
2020-11-17 17:44:31 +01:00
594faabf0c
Merge branch 'feature-10352/dvuh_ernp_meldung'
2020-11-17 17:38:49 +01:00
60963c691b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen
2020-11-17 12:20:22 +01:00
4cbbd662b6
Automatisch Personen in tbl_sap_mitarbeiter zusammenlegen
...
Wenn doppelt angelegte Personen zusammengeführt werden, wird nun ggf auch
in der Tabelle tbl_sap_mitarbeiter die hinterlegte Person upgedatet.
Ausnahme: wenn in der tbl_sap_mitarbeiter die Person auch schon doppelt
angelegt ist. In diesem Fall gibt es ein exit mit der Aufforderung, dies
direkt (manuell) in der tbl_sap_mitarbeiter zu ändern.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2020-11-16 17:48:24 +01:00
adb96ed33f
Automatisch Personen in tbl_sap_students zusammenlegen
...
Wenn doppelt angelegte Personen zusammengeführt werden, wird nun ggf auch
in der Tabelle tbl_sap_students die hinterlegte Person upgedatet.
Ausnahme: wenn in der tbl_sap_students die Person auch schon doppelt
angelegt ist. In diesem Fall gibt es ein exit mit der Aufforderung, dies
direkt (manuell) in der tbl_sap_students zu ändern.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2020-11-16 17:23:05 +01:00
4feabb25e0
Firmenhandys sind nur für Mitarbeiter sichtbar
2020-11-13 14:55:51 +01:00
56c958319d
fix bug in export
2020-11-12 15:49:45 +01:00
a86dcbd290
- Added matr_aktiv to person table for indication of not yet active matrikelnummern
...
- PersonModel getPersonStammdaten: staatsbuergerschafts- and geburtsnationcode are also retrieved
2020-11-11 23:29:18 +01:00
e499a07d7e
bpk-Prüfung auskommentiert
2020-11-09 15:16:54 +01:00
443caa91f2
Messaging sysntem: the internal email account is used only if the user
...
account is older then 24 hours
2020-11-09 10:45:25 +01:00
ef3b86af4a
Merge branch 'feature-10176/Diplomasupplement_Auslandsaufenthalt'
2020-11-09 08:27:01 +01:00
575e097e7f
Diplomasupplement - Englische Version für duales Studium hinzugefügt
2020-11-09 08:20:30 +01:00
df8e7a9006
BIS Check für Aufenthaltszweckcode korrigiert wenn 1,2 und 3 gleichzeitig erfasst wurde
2020-11-06 12:39:37 +01:00
17affaa57d
BIS-Meldung Kennzahlen für Eisenstadt und Pinkafeld angepasst
2020-11-06 09:42:05 +01:00
4465fbc877
DVUH Meldung: Renamed Ersatzkennzeichen input field text to SVNR/Ersatzkennzeichen
2020-11-04 22:43:45 +01:00
01032c63d3
Update der Person in ALMA Tabelle, wenn Personen zusammengelegt werden
...
Falls nur die zu löschende Person in ALMA vorhanden ist, mit der zu
behaltenden Person ersetzen.
Falls bereits die zu ersetzende UND zu löschende Person in ALMA
vorhanden sind, muss erst direkt im ALMA Bibliothekssystem und in der
tbl_alma gelöscht werden.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-11-04 15:29:36 +01:00
2ceefabec9
DVUH Meldung: Dokumenttyp can be entered for ERNP Meldung (Dropdown)
2020-10-30 15:47:15 +01:00
6e37edd30b
DVUH ERNP Meldung: added noticetext as warning, different country example (D instead of A)
2020-10-30 13:27:34 +01:00
d78308d43f
DVUH Meldung: added ERNP Meldung for retrieving bpk for e.g. foreign residents
2020-10-29 23:40:02 +01:00
fa73cf5272
Added phrase 'global/durchfuehren'
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-10-29 14:19:02 +01:00
31d80567a6
Fixed Warning on User creation if C/O of Adress is missing
2020-10-23 15:43:41 +02:00
2b6f8d9040
Fixed alias name of loglib in JQW_Controller
2020-10-23 10:42:12 +02:00
817d35dce7
Spalten aus der Spaltenprüfung für tbl_bestellung entfernt da dieser über das Addon hinzugefügt wurden
2020-10-23 08:26:33 +02:00
283a5d2c22
BIS-Meldung: Angerechnete ECTS bei Auslandssemester wird nur gerprüft wenn das Auslandssemester vorbei ist
2020-10-22 17:15:53 +02:00
bf0ada5d1e
Merge branch 'feature-10172/Firmenhandy_von_FHC_nach_SAPSF'
2020-10-22 14:11:17 +02:00
a7d577baa5
person/Kontakt_model: added getZustellKontakt method for getting latest Zustellkontakt
2020-10-22 00:38:52 +02:00
3ec0aabfee
person/Kontakt_model: added getZustellKontakt for getting latest Zustellkontakt
2020-10-22 00:30:37 +02:00
a26f1701ec
Diplomasupplement: andere Formulierung bei dualem Studium, orgform kommt vom Status
2020-10-20 23:08:01 +02:00
f1f9084a82
Merge branch 'feature-8528/BIS-Meldung_Studierendenmeldung_anpassen'
2020-10-20 14:06:55 +02:00
4b81727b73
Diplomasupplement: added auslandssemesterdata to sonstige angaben
2020-10-20 00:37:49 +02:00
c9c0e9e168
Merge branch 'master' into feature-8528/BIS-Meldung_Studierendenmeldung_anpassen
2020-10-19 17:09:44 +02:00
4654339681
Renamed library alias LogLib into LogLibJob when loaded in
...
JOB_Controller
2020-10-18 23:40:48 +02:00
048238a16f
Merge branch 'feature-9150/TableWidgetAdaptations_for_Sync-Projects-FHtoSAP'
2020-10-15 13:38:58 +02:00
e6a761abd7
Darstellungsfehler in OE-Widget behoben
2020-10-15 13:38:01 +02:00
7fe2f3ef39
Adapted span-width of date in each tablerow
...
Allows nice align of error messages.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-10-15 11:03:16 +02:00
14fa1b24ad
Display Full Name instead of Email Adress of Supervisor
2020-10-14 13:23:19 +02:00
df667b1eec
merge
2020-10-14 12:44:32 +02:00
a6e77b73c8
Merge remote-tracking branch 'origin/master'
2020-10-13 18:32:27 +02:00
15877dd914
Lehrveranstaltung_model getStudents: possible to get only active students
2020-10-13 18:32:09 +02:00
c1e4278e71
Changed permission denying - text in 'Lehrauftrag bestellen'
...
If a permission is correctly set, but the permission is restricted on
organisational units Department or Kompetenzfeld, the error-text gives now
meaningful information about the abort.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-10-13 15:45:37 +02:00
4ced199e88
Freigegebenen Urlaub löschen auch in Zeitsperren
2020-10-13 12:26:06 +02:00
5802ca8ea2
versende Email an Vorgesetzten wenn freigegebener Urlaub gelöscht wird
2020-10-13 09:26:06 +02:00
6128a7ae6e
add X to delete approved vacation
2020-10-12 15:31:37 +02:00
2a09e1af8a
Verhindert dass Matrikelnummern angefordert werden für Studiengänge mit Kennzahl > 10000
2020-10-07 08:57:12 +02:00
cd3557ed98
Zeitsperretyp kurzbz in DropDown entfernt
2020-10-05 17:34:28 +02:00
5e4107fa4f
Added Permission to edit Payments that are already transfered to external System
2020-10-02 15:00:57 +02:00
17251de9b0
Shelf TableWidget.js for new branch
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-10-01 11:50:56 +02:00
c8bd604fe2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-10-01 11:17:41 +02:00
388a266822
Modified Dropdown-Widget Organisationseinheit
...
Modified to enable empty default-value and default text.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-10-01 11:17:14 +02:00
c485400142
user is able to delete approved vacation if in the future
2020-09-29 14:56:15 +02:00
51c4e1f92b
zeige keine Prüfungstermine wo positive Note vorhanden ist
2020-09-25 13:00:41 +02:00
08536d63df
display Full Name of Supervisors for vacation reqeust
2020-09-25 12:19:18 +02:00
f672cd2d53
user can enter project with projectphase even if not assigend to project
2020-09-24 11:14:32 +02:00
3d274645ac
correct user
2020-09-24 08:52:33 +02:00
14fbfc7860
diplay date in error message
2020-09-24 08:48:59 +02:00
52fe60090e
zeige keine Prüfungstermine wo Note vorhanden ist
2020-09-24 08:25:28 +02:00
b62a2007af
Schlagwortdienst auf HTTPS geaendert
2020-09-23 16:33:14 +02:00
16fb610b3f
impliment checks for ProjektPhase
2020-09-23 14:24:17 +02:00
4183e7f4f7
changed errormessage for projects that are already complited
2020-09-23 13:44:46 +02:00
49fb4d8afa
sort csvExport
2020-09-23 13:16:07 +02:00
85c6aa08fc
fix bug for empty projekt and projektphasen
2020-09-23 12:45:00 +02:00
0a63d40e72
Merge branch 'bug-9862/inventarStauts'
2020-09-23 10:24:26 +02:00
b79ab2a043
add dropdown again when writing permissions
2020-09-23 10:16:57 +02:00
4fa86ce173
display latest status in status bar in inventory search
2020-09-22 11:20:01 +02:00
ecfe6762a7
Zahlungsreferenz im CIS kann nun ausgeblendet werden
2020-09-18 16:01:23 +02:00
e2fb60a327
Merge branch 'feature-9718/Zahlungsbestaetigungen_nur_fuer_FH_und_Log'
2020-09-18 15:44:27 +02:00
3b33b6bcdb
Formatierung des Betrags bei automatisierten Gegenbuchungen korrigiert
2020-09-18 11:55:52 +02:00
48a9395d93
Merge remote-tracking branch 'origin/master'
2020-09-16 22:15:12 +02:00
d37dbb5d11
Optional farbliche Hervorhebung der Studienpläne
2020-09-16 22:15:05 +02:00
ad98fed84b
additionally export projectphasen without project
2020-09-16 12:34:26 +02:00
82d7f4edd2
fix brackets; remove error_reporting
2020-09-16 09:37:31 +02:00
0153364885
Prüfungsprotokoll Freigabe: passed data to controller in better way (password and freigegeben bool in a separate object)
2020-09-15 18:11:37 +02:00
e717a3b65c
Merge branch 'logging'
2020-09-15 13:43:57 +02:00
6fccfbb073
Changed LogsViewer job queue workers filters description
2020-09-14 15:25:17 +02:00
65ee03f6ae
- Added new constant OPT_MINUTES to FilterWidgetLib
...
- Now is it possible to use minutes and hours in the FilterWidget
- LogsViewer tool now displays milliseconds for execution time column
- Changed filters for LogsViewer tool
2020-09-14 15:01:33 +02:00
3309157a99
Merge remote-tracking branch 'origin/master'
2020-09-14 11:11:58 +02:00
080e3582cf
Mitarbeiter_model getPersonal: possible to reduce result to eonly certain uids
2020-09-14 11:11:44 +02:00
fbd4ded720
- Added new constants P_NAME_REQUEST_ID and
...
P_NAME_REQUEST_DATA_FORMATTER tp logLib
- Added new properties _requestId and _requestDataFormatter to LogLib
- Added new public method setConfigs to LogLib
- Added possibility to choose the request id when the LogLib is loaded
- Added possibility to format the request data using the
_requestDataFormatter parameter
- Now LogLib always stores the request id + log level
- Added possibility to change the execution time parameter
- Adapted application/core/JOB_Controller.php code
- Adapted application/core/JQW_Controller.php code
2020-09-11 17:43:39 +02:00
01a8ec69de
Merge branch 'feature-9472/betriebsmitteltyp'
2020-09-11 15:43:46 +02:00
a565b66751
display only projektphasen of the user
2020-09-10 13:07:51 +02:00
612c339305
only get project phases that user is assigned to in CSV Export
2020-09-10 10:39:33 +02:00
e933cce0e8
add project ID to csv export
2020-09-10 09:29:39 +02:00
2e8ed786f4
impliment export
2020-09-09 13:05:28 +02:00
8173328c92
Merge branch '9502/csvImportChecks' of https://github.com/FH-Complete/FHC-Core into 9502/csvImportChecks
2020-09-09 10:51:23 +02:00
e4f3139205
impliment zeitaufzeichnungs checks
2020-09-09 10:50:42 +02:00
8021b8aef9
Added config variable ZAHLUNGSBESTAETIGUNG_ANZEIGEN_FUER_LEHRGAENGE
...
If set to false, Lehrgang-payment confirmations will not be displayed
for download in CIS.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-09-08 16:29:53 +02:00
be285b2217
Kartenverwaltung angepasst damit Erfassung und Kartenausgabe möglich ist wenn nur die Nummer2 (Mifare) angegeben wird
2020-09-08 15:59:05 +02:00
f0ef9ab333
Removed unnecessary ";"-character at beginning of buchungsnummer
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-09-08 12:02:05 +02:00
9b78acb655
Added log-entry for Zahlungsbestaetigung-Download
...
Will log the accounting number and the uid of the person who made the
download to be able to detect:
. how many users downloaded a payment confirmation
. how many payment confirmations were downloaded
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-09-08 12:00:04 +02:00
37884b1f7e
cleanup code
2020-09-08 09:49:57 +02:00
c31d74e9ba
Added return value to Job to to avoid wrong logging Errors
2020-09-08 08:44:13 +02:00
bd4c0b4a14
Merge remote-tracking branch 'origin/master'
2020-09-07 21:29:26 +02:00
1f24b1e878
Frau Matthissa Olensky zu Abbrecher-Mail hinzugefügt
2020-09-07 21:29:19 +02:00
9b3036e95d
Adapted in CIS: Display Zahlungsbestaetigung for FHTW studies only.
...
If config entry ZAHLUNGSBESTAETIGUNG_ANZEIGEN is true and campus is
FH Technikum Wien, only payments of FHTW studies are displayed now.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-09-07 16:33:22 +02:00
2e44f58df9
check time in project for user input
2020-09-07 16:11:17 +02:00
0d2e5523de
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-09-07 11:05:23 +02:00
2ececb33d9
Removed right white space from matrikelnummer
...
The white space was causing incorrect display when right aligning the text.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-09-07 11:02:08 +02:00
6c857b7c24
cleanup var_dump
2020-09-03 15:25:33 +02:00
9250485cb3
check for time in csv import
2020-09-03 15:22:46 +02:00
82ceb27450
Filter für Semester entfernt
2020-09-03 13:08:33 +02:00
1e97ac7278
UUID für Matrikelnummernabfrage hinzugefügt damit eine manuelle Suche nach Matrikelnummer möglich ist
2020-09-01 19:40:16 +02:00
153ca3a961
Bei der archivierung von Ausbildungsvertraegen wird die UID nicht uebergeben da diese sonst doppelt erstellt werden wenn die Person bereits inskribiert ist
2020-08-31 20:37:21 +02:00
6d1a3d410a
Option zur Anzeige aller Prüfungen unabhängig vom Semester der LV hinzugefügt
2020-08-28 14:34:21 +02:00
b365ac5611
Funktion zum Zahlungsausgleich hinzugefügt
2020-08-28 09:50:48 +02:00
cb8dd948f0
Ansicht um Mitarbeiter ohne bPk erweitert
2020-08-26 13:10:18 +02:00
8a4d2abfd9
Added Start and End Date to getAktOrNextStudiensemester
2020-08-20 20:33:17 +02:00
5349bf7e4b
bPk kann per config für alle Benutzer abgefragt werden
2020-08-20 09:16:55 +02:00
f5a68a1e44
change wawi.tbl_betriebsmitteltyp typ_code from character(2) to varchar(6)
2020-08-19 10:40:43 +02:00
f2804fd2f6
Datenverbund pruefeBPK API um UUID erweitert
2020-08-19 09:47:47 +02:00
fb05afb349
Datenverbund BPK Prüfung auf API Version 0.5 aktualisiert
2020-08-19 09:00:05 +02:00
a44326c836
Studiengang zum Noten-Freigabemail hinzugefügt
2020-08-14 09:19:39 +02:00
176d153eb2
Merge branch 'feature-7697/SAPSF_erweiterte_Attributliste'
2020-08-13 17:29:37 +02:00
676b3b3039
- added sanitizeProblemChars to common helper for sanitizing chars
...
- improved alias handling in benutzermodel
- added kurzbz handling to employeemodel
2020-08-12 21:33:08 +02:00
3f98d5106f
Merge branch 'feature-6656/Worker_queue'
2020-08-11 07:35:45 +02:00
bc305dc86c
Merge branch 'master' into feature-6656/Worker_queue
2020-08-10 18:11:31 +02:00
93ecc89ebe
Added method getPhones_byPerson to Kontakt model.
...
Gets all latest phones of person where zustellung is true. Ordered by
telefon > mobil > firmenhandy > else.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-08-06 10:32:45 +02:00
188319a1fc
Adapted method getZustellAdresse of Adresse Model
...
Added param select.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-08-05 18:38:27 +02:00
1d2233152c
Added method getBetriebsmittel to Betriebsmittelperson Model
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-08-05 18:23:51 +02:00
2b0ff28c41
Added getAll_byPersonID in Kontakt Model
...
Get all latest contact data of person, where Zustellung is true.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-08-05 18:20:11 +02:00
bd388a03ad
codex/Bisverwendung_model: getVerwendungen ordered by beginn by default
...
resource/Mitarbeiter_model: possible to retrieve Vorgesetzte within a timespan
2020-08-01 08:20:52 +02:00
40766e7161
Added new public method getJobsByTypeStatusInput to controller core/JQW_Controller
2020-07-22 17:10:11 +02:00
a9ba3f039f
Added new public method getJobsByTypeStatusInput to library JobsQueueLib
2020-07-22 16:51:38 +02:00
73bf1fb050
Reverted changes added by commit be7ea871be
2020-07-22 16:47:41 +02:00
dedced3ea8
Merge remote-tracking branch 'remotes/origin/feature-8528/BIS-Meldung_Studierendenmeldung_anpassen' into feature-8528/BIS-Meldung_Studierendenmeldung_anpassen
2020-07-22 16:12:32 +02:00
a0994473cc
Changed private email-adress to Fachhochschule-email-adress
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-22 15:30:52 +02:00
625a95c830
Merge branch 'bugfix-8664/Richtiges_Pruefungsprotokoll_fuer_Incomings_laden'
2020-07-22 14:52:03 +02:00
712cc635f5
Merge branch 'feature-8743/Alte_Pruefungsprotokolle_ausblenden'
2020-07-22 14:43:01 +02:00
3c2d961fb2
Höhe für PopUp angepasst
2020-07-22 14:27:23 +02:00
747d1d8d32
Fixed bug in application/core/JQW_Controller.php
2020-07-22 13:52:13 +02:00
9c732a4870
Added utility methods updateJobs and generateJobs to controller core/JQW_Controller
2020-07-22 13:34:37 +02:00
ade81e5460
Merge branch 'feature-6656/Worker_queue' of https://github.com/FH-Complete/FHC-Core into feature-6656/Worker_queue
2020-07-22 01:00:04 +02:00
be7ea871be
- Added new config entry job_schedulers_list to config/jqm.php
...
- Library JobsQueueLib:
- Added constant JOB_SCHEDULERS_LIST
- Constructor now loads the jqm configs
- Added new public method schedule
2020-07-22 00:56:52 +02:00
88e25524b3
person/Benutzerfunktion_model.php getBenutzerFunktionByUid method: added organisationseinheit_bezeichnung to Benutzerfunktionen, added sorting order (datumbis, datumvon)
2020-07-22 00:48:45 +02:00
25080188cc
Merge branch 'MS_Wrong_sender_if_reply_message_with_token_if_message_recipient_ou'
2020-07-20 18:26:10 +02:00
476f1cd7a7
Merge branch 'feature-8815/Zahlungsbestaetigungen_sperren'
2020-07-20 18:17:17 +02:00
1e60c7667b
Merge branch 'hotfix-Workaround_for_Chrome_bug_autofilling_username'
2020-07-20 18:10:38 +02:00
8658485dfe
Merge branch 'feature-9141/Zeitaufzeichnung_SupportLink'
2020-07-20 18:02:09 +02:00
82c8ca7f80
Adapted logic to display Pruefungsprotokolle of certain time period
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-20 16:50:29 +02:00
618644d41f
Added GUI buttons to display Pruefungsprotokolle of certain time period
...
Possible time periods: today / last week / all
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-20 16:48:48 +02:00
514c79c2dd
Zeitaufzeichnung Supportlink
2020-07-20 10:21:42 +02:00
c295aa53cf
Fixed broken loop of Lehrgang-students
...
Variable 'result' for email-query was overwriting the main variable
'result' to loop through student-query. Fixed now.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-15 15:47:48 +02:00
212a879077
Modified to accept studiensemester as GET-parameter
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-15 15:42:52 +02:00
fcd7121801
Added: Hiding Zahlungsbestaetigungen in CIS and FAS
...
If config entry ZAHLUNGSBESTAETIGUNG_ANZEIGEN is set to false,
confirmation of payments (Zahlungsbestaetigung) is not available.
CIS: zahlungen - page request will fail
FAS: downloading confirmation of payments will not be available
(hidden button)
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-15 12:51:51 +02:00
649d0e7f5d
Fixed: retrieving correct Prüfungsprotokoll data for Incomings
...
Study type (Bachelor/Master) and -kennzahl and -name are retrieved from
Studienordnung. Studienordnung is not assigned to Incomings, so this data
was missing.
. Now study type is always retrieved from Abschlusspruefung.
. If no Studienordnung is provided, studykennzahl and -name are retrieved
from Student.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-14 17:40:47 +02:00
638c095e86
Added new xml field in Standortcode in container Lehrgangmeldung
...
Added xml field Standortcode in container Lehrgangmeldung > Lehrgang > StudentIn.
The default value should be set in config-file.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-13 14:34:03 +02:00
3ccc0eb753
Added new XML fields in container StudentIn + Plausichecks
...
Added this new fields + validation checks for:
. AkadGradeVorname
. AkadGradeNachname
. bPK
. ZustellPLZ
. ZustellGemeinde
. ZustellStrasse
. ZustellNation
. coName
. eMailAdresse
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-07 14:39:47 +02:00
de5ae4bdca
Minor correction of former error-log output
...
For better readability a comma will be set to seperate error messages.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-07 14:34:15 +02:00
5ec1583777
Added new validation checks in container IO
...
Added new validation checks (plausichecks) for:
. Aufenthaltszweckcode
. Aufenthaltsfoerderungscode
. ECTS erworben
. ECTS angerechnet
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-07 14:31:13 +02:00
a6b5cc71e4
Added new XML fields in container StudentIn + Plausichecks
...
Added this new fields + validation checks for:
. AkadGradeVorname
. AkadGradeNachname
. bPK
. ZustellPLZ
. ZustellGemeinde
. ZustellStrasse
. ZustellNation
. coName
. eMailAdresse
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-07 14:26:43 +02:00
1ba0695829
Changed co_name char length from 64 to 256
...
Adapted to AQ Austrias requirement for BIS.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-02 12:25:51 +02:00
998127740f
Added co_name to FAS Adressedialogue/-fields & to class Adresse
...
This new field co_name = Abweichender Empfaenger is required for
BIS Meldung.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-02 12:08:19 +02:00
2d86477e1b
Added column co_name to tbl_adresse (= Abweichender Empfaenger)
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-07-02 12:04:30 +02:00
21703cfc00
add functions to delete entries
2020-06-30 15:40:30 +02:00
ebb6484f3d
Chrome-bug: Force Chrome to autofill username in hidden input field
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-06-30 10:04:18 +02:00
507be8c673
Merge remote-tracking branch 'origin/feature-6656/Worker_queue' into feature-6656/Worker_queue
2020-06-26 23:18:01 +02:00
f820fa76fb
ressource/Mitarbeiter_model.php: possible to get Personal with personalnr >= 0, for excluding accounts like e.g. alumni
2020-06-26 23:17:37 +02:00
c53e6ce28d
Merge remote-tracking branch 'origin/master'
2020-06-26 12:51:38 +02:00
433c2af8a5
Quickfix Kontofilter Offene Gegenbuchungen
2020-06-26 12:51:31 +02:00
7ba3c49a35
Sperre für Kontobuchungen hinzugefügt die bereits ins SAP übertragen wurden.
2020-06-25 21:40:14 +02:00
1ef8b95c49
codex/Bisverwendung_model:
...
- getVerwendungen method: Verwendungen sorted by ende
2020-06-22 20:46:37 +02:00
96a9662559
Removed useless Code that causes PHP notices
2020-06-22 19:37:13 +02:00
5b264bb6a9
codex/Bisverwendung_model:
...
- added getVerwendungen method
person/Benutzer_model
- added comment
person/Benutzerfunktion_model
- added getBenutzerFunktionByUid method
ressource/Mitarbeiter_model
- added getVorgesetzte method
- extended getPersonal method
2020-06-22 11:20:27 +02:00
32490dfc2d
organisation/Studiensemester_model->getLastOrAktSemester: changed query to get more data
2020-06-21 21:57:50 +02:00
6ee2a0b47e
Merge branch 'feature-8274/TimesheetOnlyFixangestellte'
2020-06-19 14:25:22 +02:00
83469bac67
Timesheet: show only fixangestellte
2020-06-19 14:05:54 +02:00
7604b0ae64
Anzeige Protokoll im FAS
2020-06-18 13:59:01 +02:00
8a52169bda
Textkorrektur Diplomasupplement
2020-06-18 13:58:22 +02:00
596494708d
CL/Messages_model->prepareHtmlRead changed to redirect to an
...
authenticated controller to reply to a message in case the receiver
is the the system sender
2020-06-17 14:57:01 +02:00
5bd62e9ac8
Merge branch 'feature-7274/SAPSF_neuer_User_wird_aus_SF_geholt_und_im_FHC_angelegt' into feature-6656/Worker_queue
2020-06-17 12:25:01 +02:00
c0693b3899
Merge branch 'master' into feature-6656/Worker_queue
2020-06-17 09:03:41 +02:00
e8272a1757
Datenverbund Schnittstelle UUID zu Simple Requests hinzugefügt
2020-06-15 14:33:42 +02:00
623028ae62
Merge branch 'bug-7983/Pruefungsprotokoll_Speichern_ohne_Note'
2020-06-15 13:18:54 +02:00
7ce489e847
- added iso3166_1_a3 field to bis.tbl_nation
...
- person/kontakt_model: renamed getFirmenTelefon to getFirmentelefon, separated vorwahl from telefonklappe
2020-06-10 10:11:19 +02:00
c2e9d27909
- Pruefungsprotokoll can be saved even when no grade provided
...
- removed console log
2020-06-09 13:09:35 +02:00
742c9fa857
Check that user is an active employee in message-cronjob
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-06-04 11:33:58 +02:00
d5019289f5
Absolventen können sich nun auch zu Prüfungen anmelden
2020-06-04 09:49:33 +02:00
1a1ef262c6
Merge branch 'feature-7384/Message_reply_from_FAS_does_not_change_aktionstyp_in_Infocenter'
2020-06-03 16:13:00 +02:00
ab128c0af0
Merge branch 'feature-7432/Notenuebernahme_keinePunkte_bei_Termin_1'
2020-06-03 16:10:34 +02:00
524e3f277e
Merge branch 'feature-7529/Bundesadler_auf_Urkunden_im_Selfservice'
2020-06-03 15:45:24 +02:00
b2644d2a17
Anzeige von Fehler- und Erfolgsmeldungen optimiert
2020-06-03 14:00:05 +02:00
5b76d2035e
Merge branch 'feature-7387/AusbildungsvertragHerunterladen'
2020-06-03 13:05:51 +02:00
8304b4a1ae
Adapted GUI: display user fields in tinymce-editor on doubleclick
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-06-02 16:31:52 +02:00
2906c1803e
Changed 'Eigene Felder'-Alias: if alias is NULL, uid is used as alias
...
This is to ensure the email is built correctly.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-06-02 16:29:51 +02:00
d35ee0c834
Adapted method to retrieve user fields when method is called by a cronjob
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-06-02 15:06:22 +02:00
8b80f2226e
Added logic for cronjob to add senders fields into message body
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-06-02 15:03:31 +02:00
87686ebd70
Phrasen angepasst
2020-05-29 16:47:41 +02:00
944b46c352
Merge branch 'feature-7772/Digitalisiertes_Pruefungsprotokoll'
2020-05-29 15:11:55 +02:00
8d9cc078bd
Spalte sort von Abschlusspruefungsantritt zu Gegencheck hinzugefügt
2020-05-29 15:08:51 +02:00
466264befe
Prüfungsprotokoll:
...
- changed phrases
- added notice that grade cannot be set when Einverständniserklärung is not checked
2020-05-29 13:00:31 +02:00
f03ed2f666
Prüfungsprotokoll:
...
Verfassungscheck is not checked by default, if no grade filled out
2020-05-29 10:48:00 +02:00
bc32a643f1
Prüfungsprotokoll:
...
- phrases: multilingual database fields shown depending on language (e.g. beurteilung, studiengang,...
- added phrases
- added timepicker css
- if student not in condition, time can still be filled out
2020-05-28 20:53:21 +02:00
2fc0b0f0ce
Prüfungsprotokoll
...
- Löschen von Abschlussarbeiten mit freigegebenem Protokoll wird verhindert
- Berechtigungen für web User erteilt damit protokoll gespeichert werden kann
2020-05-28 19:36:08 +02:00
c0bde2a6cd
Removed Bundesadler and Logo for direct FAS Dokumente Download
...
While Bundesadler and Logo should be printed in archived documents,
it should NOT be printed in direct download via menu tab 'Dokumente'.
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-28 12:49:36 +02:00
f1a346c545
Prüfungsprotokoll:
...
- new fields: beginnzeit, endezeit, Prüfungsantritt
- Einverständniserklärung: if not checked no save possible
- can be saved and freigegeben
- added phrases
2020-05-28 11:08:38 +02:00
16c3ca6d0a
Merge remote-tracking branch 'origin/feature-7772/Digitalisiertes_Pruefungsprotokoll' into feature-7772/Digitalisiertes_Pruefungsprotokoll
2020-05-28 10:12:28 +02:00
2ab70b5fa1
Spalte sort bei lehre.tbl_abschlussbeurteilung
2020-05-28 10:11:54 +02:00
4f1796ee9d
Added logic to add message vars data of logged in user into message body
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-28 09:48:31 +02:00
ebd9c2c0ba
Added method to retrieve message vars data of the logged in user
...
This method retrieves the specific data of the logged in user to be
used in 'Meine Felder'
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-28 09:46:15 +02:00
772c4fa308
Prüfungsprotokoll Übersichtsliste für Vorsitz hinzugefügt
2020-05-28 09:44:52 +02:00
634401485a
Renamed 'Meine Felder'-msg names and small method adaptation to retrieve fields
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-28 09:42:51 +02:00
744cf8945a
Wartende Jobs angepasst damit Tage als Parameter akzeptiert werden statt Monate
...
Emfpänger korrigiert damit nur ein Infomail pro Person verschickt wird
2020-05-27 12:06:52 +02:00
046994f14b
Added phrase 'meineFelder'
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-27 11:53:56 +02:00
a5e0c9ca5a
Added logic to provide fields of logged in user in Messaging system
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-27 11:52:12 +02:00
7ab2155d6a
Added method to retrieve data of logged in user in Message model
...
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-27 11:49:35 +02:00
1be1d1c8e9
Added GUI for 'Eigene Felder' + layout adaptations
...
. GUI: added multidropdown 'Eigene Felder', which contains fields of
the logged in user
. Layout: Message text area has now min and max height; sending
button now aligned correctly; multidropdowns now aligned to text area
Signed-off-by: Cris <hainberg@technikum-wien.at >
2020-05-27 11:48:05 +02:00
21e43d7a08
Created DB view public.vw.msg_vars_user (data of logged in user)
...
This data will be used by the messaging system to provide data of the
logged in user.
2020-05-27 11:37:49 +02:00
b56b5af561
Abschlussprüfungen im FAS für digitales Prüfungsprotokoll adaptiert
...
- Prüfungsantritt kann im FAS gesetzt werden
- Freigabestatus des Protokolls wird im FAS angezeigt
- Sortierung der Prüfungsantritte hinzugefügt
2020-05-27 11:36:06 +02:00
2ca2ece708
Abschlusspruefung database changes
...
- created table lehre.tbl_abschlusspruefung_antritt
- added protokoll,endezeit,pruefungsantritt_kurzbz,freigabedatum to lehre.tbl_abschlusspruefung
2020-05-26 16:05:23 +02:00
862b48e3a7
Changed aborting messages for easier debugging
2020-05-26 10:53:19 +02:00
d263216aa0
Changed: Download in CIS Selfservice does not require to be signed anymore
...
Self-Download is determined by attribute 'stud_selfservice', not by
'signiert' anymore. This is required e.g. for Bachelor diploma, that
should be downloadable but does not need to be signed.
2020-05-26 10:51:42 +02:00
7b574761c5
Merge branch 'master' into feature-7387/AusbildungsvertragHerunterladen
2020-05-26 10:36:37 +02:00
6cb5d757be
BugFix Akte löschen
2020-05-26 10:36:05 +02:00
bade5cb237
Merge remote-tracking branch 'origin/master'
2020-05-26 10:19:14 +02:00
c9da68687d
Merge branch 'feature-7387/AusbildungsvertragHerunterladen'
2020-05-26 10:18:56 +02:00
3199d5e25f
Added Function for Loading Last Student Status of all Prestudents of a Person
2020-05-25 21:43:32 +02:00
ad42aece5a
Personalmeldung: Plausibilitätsprüfungen erweitert
...
Rundungsfehler behoben bei sehr kleinen SWS wodurch keine Lehre Funktion erstellt wurde
2020-05-25 19:21:25 +02:00
28d0563fa5
Digital Pruefungsprotokoll is displayed for Bachelor/Master, English/German
2020-05-25 18:21:08 +02:00
a814debf5b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-7529/Bundesadler_auf_Urkunden_im_Selfservice
2020-05-25 17:06:05 +02:00
ad136d1407
Added setting of XML-tag 'archivierbar' in pdfExport
...
If the template is archivable, XML-tag 'archivierbar' is added.
2020-05-25 17:00:27 +02:00
26d030d633
Created method setXMLTag_archivierbar in Dokument class
...
This method appends an XML tag named 'archivierbar' with value 'true' to
the XML data.
2020-05-25 16:57:33 +02:00
89ccb2f3a5
Renamed column bis.tbl_nation.ISO-3166-1-A-2 as iso3166_1_a2
2020-05-22 17:18:59 +02:00
13dc57b90c
Added ISO-3166-1-A-2 column to bis.tbl_nation
2020-05-22 16:17:46 +02:00
08b0a7bf08
Merge branch 'hotfix/DigitalerLehrauftrag_Sprache_umschalten'
2020-05-20 08:49:30 +02:00
3d52c4b598
Merge branch 'bug-7422/Bewerbungsfrist_wird_falsch_angezeigt'
2020-05-20 08:38:57 +02:00
ed3e0f2b48
Exportparameter für db_fetch_array hinzugefügt
2020-05-19 18:05:44 +02:00
01e11d9453
Hack für BEW-BB, wenn auch BEW-DL-Ergebnisse vorliegen
2020-05-19 17:47:33 +02:00
bfbde54fa8
Ausbildungsvertrag im Bewerbungstool herunterladen
...
- Akten archivieren auch für PreStudenten (Tab auch für PreStudenten sichtbar)
- Neues Attribut "akzeptiertamum" in tbl_akte
- Akzeptierte Ausbildungsverträge dürfen nur von Admins gelöscht werden
- Filter für akzeptierte Ausbildungsverträge
2020-05-19 17:17:48 +02:00
e459c9bf02
Personalmeldung
...
- Abwärtskompatibilität für ältere PHP Versionen
- Problem behoben mit leeren Lehre Verwendungen wenn Lehraufträge mit 0 Semesterstunden vorhanden sind
2020-05-19 16:19:17 +02:00
55ac09ca53
Personalmeldung: Lektoren mit Verwendungscode 2 bekommen nicht mehr automatisch eine Verwendung vom Code 1 erstellt
2020-05-15 17:28:53 +02:00
da9c16835e
Personalmeldung Hauptberuflich korrigiert
2020-05-15 11:40:23 +02:00
90eaf41b2c
studentDBDML.php: wenn Gesamtnotepunkte und Prüfung übernehmen aktiviert, werden Punkte bei Notenübernahme auch für Prüfung übernommen
2020-05-14 16:15:19 +02:00
784afe0044
crm/Prestudent_model getPrestudentWithZgv: added order for Bewerbungstermine
2020-05-14 13:40:34 +02:00
7859559311
Merge branch 'bug-7422/Bewerbungsfrist_wird_falsch_angezeigt'
2020-05-14 13:04:41 +02:00
8905508687
Merge branch 'hotfix/DigitalerLehrauftrag_Infoblatt-link_nur_fuer_externe_Lektoren_anzeigen'
2020-05-14 12:46:08 +02:00
8d8a16e7a1
Personalmeldung: Plausibilitätsprüfung hinzugefügt für Mitarbeiter mit echtem DV ohne Vertragsstunden
2020-05-14 12:42:44 +02:00
274ace0027
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into hotfix/DigitalerLehrauftrag_Sprache_umschalten
2020-05-14 12:32:18 +02:00
dda5b6ddb7
Personalmeldung Übersichtstabelle zeigt Detailinformationen zu Codes an
2020-05-14 12:10:14 +02:00
a1600c9f3a
CL/Messages_model->sendImplicitTemplate now writes the person log in any case
2020-05-13 17:55:56 +02:00
f45f4f6987
Fixed check for external lector to display / hide infosheet correctly
2020-05-13 17:13:42 +02:00
7e1f1acb22
Prestudent_model getPrestudentWithZgv: Bewerbungsfrist shown corretly evne if Prestudent from Drittland
2020-05-13 16:18:05 +02:00
604b277df7
Merge branch 'hotfix-7537/BIS-Meldung_Externe_Lektoren_JVZAE_richtig_berechnen'
2020-05-13 14:27:22 +02:00
8be6ada961
Adapted anteilige JVZAE for external lectors
...
Now the 'anteilige JVZAE' of an external lector is calculated
ONLY if the teaching activity happend within the duration of the
contract-duration (BIS-Verwendung).
This avoids multiple calculations (before the jvzae was calculated for
each contract)
2020-05-13 11:33:09 +02:00
704d39095b
- ressource/Mitarbeiter_model.php - improved getPersonal method
...
- person/Kontakt_model.php - added getFormaKontakttyp and get FirmenTelefon methods
2020-05-12 19:34:17 +02:00
4851471814
Merge remote-tracking branch 'origin/master'
2020-05-12 10:39:03 +02:00
4412677d58
FHTW Prüfungsprotokolle in anderen Formaten exportieren
2020-05-12 10:38:56 +02:00
30bbf6a9c8
Auswertung FHTW Link Testfortschritt
2020-05-12 10:38:06 +02:00
fa099cf845
Aufforderung Notfallkontakt nur für MA anzeigen
2020-05-11 16:25:18 +02:00
25899b56df
Zeitaufzeichnung. Anzeige der Lehraufträge ohne check auf Stundensatz
2020-05-07 17:51:26 +02:00
8be6552235
Added check if language isset in COOKIE in hlp_language_helper
2020-05-07 14:48:05 +02:00
6696c33755
Organisationsformen werden in der Übersichtsliste jetzt immer in der gleichen Reihenfolge angezeigt
2020-05-06 17:20:56 +02:00
d78e23a80d
Frist für Prüfungsanmeldung deaktiviert
2020-05-06 10:59:44 +02:00
24b2efb95c
Merge branch 'hotfix/DigitalerLehrauftrag_SpaltenEinAusblenden'
2020-05-05 16:16:47 +02:00
67a5fe82e7
Fixed: Now column-picker activates/deactivates correctly column buttons
...
Before the problem was using the pseudoclass 'active'. Now, by using
a css class instead, it works.
Also, before when clicking the button twice (activate/deactivate) - it
was always on focus (and therefore always grey). Also fixed.
2020-05-05 16:07:48 +02:00
b7a9f139af
Merge branch 'review/DigitaleLehrauftraege'
2020-05-05 08:03:13 +02:00
e8648e52ec
person/Benutzer_model.php: generated alias string is sanitized (special characters, spaces,...)
2020-05-04 20:21:57 +02:00
b9639b3f97
Merge branch 'feature-6301/DigitalerLehrauftrag_Translation_Ueberarbeitung' into review/DigitaleLehrauftraege
2020-05-04 14:44:04 +02:00
13d78f923c
Link zur Pivot mit Testfortschritt implementiert
2020-05-04 14:27:09 +02:00
554fb2586a
person/Benutzer_model:
...
- added methods for generating alias and checking if alias exists
ressource/Mitarbeiter_model:
- added method getPersonal
2020-04-30 21:42:30 +02:00
3b9a7206db
Hilfe Link im Abgabetool korrigiert
2020-04-30 09:56:07 +02:00
55ea860663
Infocenter and RT filterwidget filters updated
2020-04-28 22:56:06 +02:00
b0be89a9e8
Merge branch 'feature-6642/Auswertung_FHTW_mit_Termin_Multiselect'
2020-04-28 13:04:06 +02:00
ec849c7daf
Längenprüfung für ZGV Ort hinzugefügt
2020-04-28 08:16:52 +02:00
7afbad87d4
Anpassung der Personalmeldung - Hauptberufcode muss für Management und Verwaltung muss nicht angegeben werden
2020-04-28 07:47:38 +02:00
6b2af33e60
Neuen Config Eintrag hinzugefügt für Ausnahmeliste an Studiengängen die nicht zur Stundenobergrenze hinzugerechnet werden
2020-04-27 17:54:39 +02:00
364d754b51
Anpassung Datumsformat, Darstellung aller RTs des laufenden
...
Studienjahres
2020-04-27 15:52:47 +02:00
e388db6e2e
Merge branch 'feature-5491/UDFWidget_add_new_features'
2020-04-23 12:24:21 +02:00
ec884fe372
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-04-21 15:59:09 +02:00
b935d7a175
Merge branch 'feature-6814/Infocentertool_nach_dem_RT_hinzugefuegte_Bewerbungen_auf_Detailseite_markieren'
2020-04-21 15:33:11 +02:00
4679701bcd
Merge branch 'feature-6963/Messaging_system_hide_button_to_write'
2020-04-21 15:16:38 +02:00
ebb6e1b90f
Fixed Phrasename for Back Button
2020-04-21 15:15:57 +02:00
900d93fb4d
Merge branch 'feature-6789/Messaging_answer-Button_for_assistants'
2020-04-21 14:48:49 +02:00
a0bb912f8d
Fixed: typo error in accepted-tooltip
...
Now phrase is retrieved correctly
2020-04-21 13:36:32 +02:00
872a35c1fd
Added all Helptext-phrases
...
Added phrases and translations for all Guide-to-this-Site-helptext.
(order-, approve- acceptLehrauftrag helptext)
2020-04-21 13:34:15 +02:00
989409f860
Created view for acceptLehrauftrag-Helptext (using phrases-system)
2020-04-21 13:31:58 +02:00
3dacba5625
Created view for approveLehrauftrag-Helptext (using phrases-system)
2020-04-21 13:31:37 +02:00
af8b6ed93d
Created view for orderLehrauftrag-Helptext (using phrases-system)
2020-04-21 13:31:13 +02:00
e698485a39
Merge branch 'feature-6634/Neue_Variable_Orgform_Bezeichnung_in_vw_msg_vars'
2020-04-21 11:26:59 +02:00
67a29b2ff7
Moved Tablesettings-Helptext to server (using phrases-system)
2020-04-20 14:58:24 +02:00
637dbefce0
Removed user_language property from FHC_JS_DATA_STORAGE_OBJECT
...
To persist on a consistent translation system, the translation should be
performed by phrases system on serversite.
Therefore the user_language property is removed from
FHC_JS_DATA_STORAGE_OBJECT.
2020-04-20 14:55:01 +02:00
971e239d8e
Merge branch 'feature-5961/DigitalerLehrauftrag_Auszahlungsinfoblatt_externe_Lehrende' into review/DigitaleLehrauftraege
2020-04-17 11:04:37 +02:00
cee3d7bdd3
Merge branch 'feature-5883/DigitalerLehrauftrag_ColumnPicker' into review/DigitaleLehrauftraege
2020-04-17 09:33:32 +02:00
b89ccf2595
Merge branch 'feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege' into review/DigitaleLehrauftraege
2020-04-17 08:54:21 +02:00
d5c8077d80
Merge branch 'feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren' into review/DigitaleLehrauftraege
2020-04-17 08:47:16 +02:00
eace7ab868
Merge branch 'feature-7252/Urlaubstool_DarstellungNichtFreigegebene'
2020-04-17 08:09:45 +02:00
53dd517b90
Merge branch 'feature-7074/Reihungstest_Bewerbungstool_Login'
2020-04-16 13:35:52 +02:00
68d934f12e
Bessere Darstellung vergangener nicht freigegebener Urlaube
2020-04-16 01:43:33 +02:00
3855d6eb18
Vorlageermittlung korrigiert bei Sancho Mails damit immer die letzte aktive Vorlage genommen wird
2020-04-15 11:07:48 +02:00
e25bf60bf1
Added GUI and phrase for info sheet for external lecturers
...
A new link was set.
. only shown to external lecturers
. links to dms document infoblatt for external lecturers
2020-04-15 09:51:25 +02:00
2a99f37508
Added Help-Text (Guide to this page) to orderLehrauftrag & approveLehrauftrag
...
Moved text to function_getHelptext, which will switch language depending
on the given user language.
2020-04-14 13:58:40 +02:00
262fdc277e
Added Help-Text (Guide to this page) to acceptLehrauftrag
...
Moved text to function_getHelptext, which will switch language depending
on the given user language.
2020-04-14 12:52:03 +02:00
64b8b81b91
Textkorrektur
2020-04-07 13:18:16 +02:00
b270103893
Diverse Anpassungen
...
- Testseite optisch verbessert
- Gebiet kann nicht mehr gestartet werden, wenn RT gesperrt wurde.
- Loginseite mit Einführungsvideo und check, ob Browser Firefox ist
2020-04-07 12:44:10 +02:00
c641a52898
Merge branch 'feature-7082/Cronjob_message_für_wartende'
2020-04-06 08:50:05 +02:00
abf8671ac9
Added phrases to phrasesupdate
2020-04-02 17:14:52 +02:00
db78fa20f3
Added Multilingualism to all Lehrauftraege View GUI-items
...
Attention: part of phrases-array is used by javascripts.
(acceptLehrauftrag.js, approveLehrauftrag.js, orderLehrauftrag.js)
2020-04-02 17:12:36 +02:00
aaaa5f52ae
Added Multilingualism to all Lehrauftraege tooltips
2020-04-02 17:07:04 +02:00
b6f509c057
Added Multilingualism to all Lehrauftraege Tablewidgets' columns fields
2020-04-02 16:33:26 +02:00
b960a5ec58
Added Multilingualism for Tablewidget: Help / GUI items
...
Shorter phrases are realised via FHC_PhrasesLib.
Longer text (including HTML tags) are realised by
. first retrieving language of FHC_JS_Storage_Object
. then switching to corresponding language text while rendering.
2020-04-02 15:53:06 +02:00
fe9e222182
Introduced user_language to FHC_JS_DATA_STORAGE_OBJECT
...
This is to retrieve easily user language via Javascript.
Retrieving using the storage will not cause any async issues as an
AJAX Call would do.
2020-04-02 15:46:07 +02:00
c09f4e4beb
Merge remote-tracking branch 'origin/feature-6642/Auswertung_FHTW_mit_Termin_Multiselect' into feature-6642/Auswertung_FHTW_mit_Termin_Multiselect
2020-04-01 20:36:09 +02:00
2bb4d74500
Stylefix
2020-04-01 20:36:06 +02:00
f8e80198c2
Bugfix Abgabetool
2020-04-01 20:35:18 +02:00
2a59165332
Added new date format column ReihungstestDate to system/infocenter/infocenterFreigegebenData.php
2020-04-01 18:53:13 +02:00
299f16dd8c
- View system/messages/ajaxWrite added new button backButton
...
- Added new function backToInOut to public/js/messaging/write.js
- Assigned function backToInOut to backButton click event
- Added new phrase backToReadWeiteMeassage to system/phrasesupdate.php
2020-04-01 18:27:10 +02:00
88caff35fb
Fehler in der Suche behoben bei dem Redirects nicht korrekt funktionieren wenn ein Link in einer anderen Sprache angeklickt wird.
2020-04-01 16:47:00 +02:00
35970696ca
CL/Messages_model->prepareHtmlRead hide reply button only if the sender
...
is not the system sender and are present configurations to reply
2020-03-31 21:48:55 +02:00
e038fa4f34
- system/messages/MessageClient->read now loads view system/messages/ajaxRead with $this->CLMessagesModel->prepareAjaxRead() as parameter
...
- view system/messages/ajaxRead.php can hide the button to write new messages
- Added new public method prepareAjaxRead to model CL/Messages_model
2020-03-31 21:28:16 +02:00
a2c9954a6d
- FAS_UDF->index declared missing array data
...
- public/js/UDFWidget.js changed save button caption to "Speichern"
2020-03-31 20:40:41 +02:00
91d78066a4
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-03-31 20:33:01 +02:00
625b0f1167
- jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting now accept
...
new message senderId to specify the sender for all the messages
- jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting adapted code
to make use of the new method CLMessagesModel->sendExplicitTemplateSenderId
- jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting now logs the
number of prestudents retrieved from database
- Renamed CLMessagesModel->sendExplicitTemplate as CLMessagesModel->sendExplicitTemplateSenderId
- Added new parameter sender_id to CLMessagesModel->sendExplicitTemplateSenderId to specify the sender person id
- Added new public method sendExplicitTemplate to CLMessagesModel as
wrapper method for sendExplicitTemplateSenderId
- CLMessagesModel->sendExplicitTemplate tries to retrieve the sender id
from the authentication session
2020-03-31 20:21:18 +02:00
36079cde6a
Zwischenseite für Testtool Anmeldung hinzugefügt
2020-03-31 16:21:15 +02:00
646378ad1a
Login für Testtool angepasst damit ein Login über das Bewerbungstool möglich ist wenn im Config aktiviert
2020-03-31 12:20:33 +02:00
0aef629134
Adapted SQL query for Projektbetreuungen
2020-03-31 11:57:46 +02:00
76afc73c49
Fixed: Now Projektbetreuer are selectable again
...
Before Projektbetreuer, that should be selectable in ordering process,
were excluded from selection. This is fixed now.
2020-03-31 11:50:11 +02:00
1376509a37
Adapted SQL for MessageJob
2020-03-31 10:48:06 +02:00
9d4482767b
Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren
...
# Conflicts:
# public/js/lehre/lehrauftrag/acceptLehrauftrag.js
# public/js/lehre/lehrauftrag/orderLehrauftrag.js
2020-03-31 09:57:24 +02:00
e3257eef25
- CL/Messages_model->sendExplicitTemplate now gets the sender id from
...
the configuration if the user is not logged (ex. job)
- Added new job application/controllers/jobs/OneTimeMessages.php
2020-03-30 22:44:03 +02:00
2938e0bdb0
Bugfixed: Removed undefined functions
...
After moving functions to Tablewidget.js, these function calls doesnt
exist anymore in the earlier corresponding javascripts. Therefore they
must be removed.
2020-03-30 19:27:12 +02:00
e272975a17
Changed / Adapted Dropdown PDF Download for Lehrauftraege
...
Changed:
GUI. Now using Dropup button instead of 2 single buttons to give
clarity and ability to add more pdf download in a single point.
Adapted:
GUI and JS now adapted to newer GUI version (after merging column picker
branch into feature branch)
2020-03-30 19:10:59 +02:00
eac386496a
Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege
...
# Conflicts:
# public/js/lehre/lehrauftrag/acceptLehrauftrag.js
2020-03-30 12:32:39 +02:00
d0c989ee63
Merge branch 'master' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege
2020-03-26 14:31:49 +01:00
0b1d847882
Added Download PDF of accepted Lehrauftraege (seperated by FH /Lehrgaenge)
...
Lectors can now download as pfd all their accepted Lehrauftraege.
Therefore two buttons are available for seperate download of
Lehrauftraege on FH or Lehrgaenge.
The queries are proofing now if a contract exists and if the status is
'akzeptiert'.
2020-03-26 14:16:37 +01:00
5b9c1f7ccc
vilesci/stammdaten/auswertung_fhtw:
...
- correct order of RT beendet text in Testende mail
2020-03-25 20:34:14 +01:00
54c2357016
vilesci/stammdaten/auswertung_fhtw:
...
- preselect RTs of current date if no selection
- fixed prestudent_id selection event bug
2020-03-25 18:50:50 +01:00
bb4d01f6e7
Merge branch 'feature-6587/DigitalerLehrauftrag_Fehlermeldung_Storno'
2020-03-25 16:23:04 +01:00
ef631e328d
vilesci/stammdaten/auswertung_fhtw:
...
- fixed bug where no results are shown when filtering by other criteria than reihungstestids
2020-03-25 16:16:30 +01:00
95ea5ab608
Merge branch 'feature-6594/Studienerfolgsbestaetigung_Englisch_Studiengangstyp_anzeigen'
2020-03-25 16:05:52 +01:00
0546b8c388
Merge branch 'master' into feature-6594/Studienerfolgsbestaetigung_Englisch_Studiengangstyp_anzeigen
2020-03-25 16:01:13 +01:00
384a086188
Gegencheck für bezeichnung_mehrsprachig in tbl_studiengangstyp hinzugefügt
...
Prüfung fuer Spaltenexistenz korrigert
2020-03-25 15:58:02 +01:00
898a498c2c
Merge branch 'feature-6050/Stundensatz_vorschlag'
2020-03-25 15:32:44 +01:00
2d1baebf1f
BACode korrigiert
2020-03-25 15:31:24 +01:00
ac305f4238
Merge branch 'master' into feature-6050/Stundensatz_vorschlag
2020-03-25 15:05:07 +01:00
dea3139897
Merge branch 'feature-6568/NotfallkontaktV2'
2020-03-25 14:59:12 +01:00
0ba7d3fc94
Profil zeigt Infotext an wenn der Notfallkontakt fehlt
2020-03-25 14:58:21 +01:00
b4b9707d29
Merge branch 'feature-6622/Messaging_vorlagen_mehrfach_in_der_liste'
2020-03-25 14:12:47 +01:00
18a3e7be99
Infocenter details:
...
- mark Applications before Freigabe of an applicant if placement test already took place
- removed "style" attributes in zgvpruefungen.php view
2020-03-24 18:28:50 +01:00
f4747e431c
Filtered out Lehrauftraege with non-employees and where stunden is 0 (or null)
...
Now the initial filter and the new/changed filter will filter out
Lehrauftraege, where no mitarbeiter exist or stunden are not assigned to.
The 'show-all'-filter still displays these Lehrauftraege, but will set
them to unselectable.
A tooltip on the status-icon will show an appropriate
information-
2020-03-24 17:48:59 +01:00
70bfb1fd3a
Changed error message for Vertragsstorno
...
Changed error message for better understanding of the issue.
2020-03-23 13:54:35 +01:00
96fff5b759
BACodes an neue BIS Codes angepasst
2020-03-20 15:40:59 +01:00
ff0572071b
Merge branch 'master' into feature-6050/Stundensatz_vorschlag
2020-03-20 09:00:17 +01:00
bcddff958c
vilesci/stammdaten/ausertung_fhtw.php:
...
- fixed bug, datepicker dropdown is shown in front of input elements now
2020-03-19 13:06:26 +01:00
1a9ac9e1fa
LVA Liste anzeige der Anzahl der Lehraufträge korrigiert
2020-03-18 13:44:36 +01:00
ab15e3522e
Merge branch 'feature-6740/Lektorenzuordnung_Anzeige_Vertragsstatus'
2020-03-18 12:44:50 +01:00
3ff527b2ad
- Added check on property status in private method _checkJobStatus of JobsQueueLib
...
- When updating a job now it is checked if the job is present in the
database
2020-03-18 00:56:28 +01:00
65873f736c
Merge branch 'feature-5920/Personalmeldung_Berechnung_VZAE_JVZAE'
2020-03-17 16:27:40 +01:00
44fc614f67
Durchschnitt und gewichteter Durchschnitt können per config in Notenliste ausgeblendet werden
2020-03-17 14:19:22 +01:00
d425dd86cc
vilesci/stammdaten/ausertung_fhtw.php:
...
- display correct message when RT is gesperrt
- one email is sent for each stg and orgform when clicking on "Testende", but with email text for all selected RTs
2020-03-17 13:06:41 +01:00
91ab79d6eb
Config Einträge für BIS Meldung aktualisiert
2020-03-17 12:09:36 +01:00
17a5a85ad9
vilesci/stammdaten/ausertung_fhtw.php:
...
improved layout of Reihungstestparameter input form (responsive, RT-selection)
2020-03-16 16:13:06 +01:00
77e2db5a7c
Bugfix
2020-03-16 15:24:48 +01:00
8c76f38b4d
Plausibilitätsprüfungen für Personalmeldung ergänzt.
...
Anpassungen für Studiengang-Container
2020-03-16 13:52:29 +01:00
7b9b5e0dd5
ohne Angabe des Studiensemesters werden nun alle LVs exportiert
2020-03-16 13:36:52 +01:00
fd95f0f67c
Firmenhandys werden immer angezeigt auch wenn eine normale Klappe vorhanden ist
2020-03-16 13:11:16 +01:00
fbe7a3ca53
Merge branch 'master' into feature-5920/Personalmeldung_Berechnung_VZAE_JVZAE
2020-03-16 11:13:13 +01:00
dd2c384de0
Personalmeldung angepasst:
...
Übersichtstabelle hinzugefügt
Erhalterkennzahl und Meldedatum wird dynamisch ermittelt
2020-03-16 11:04:40 +01:00
4ac4abf907
views/system/messages: dynamic resizing of variables window in message write view
2020-03-13 19:27:31 +01:00
d00aec9a72
auswertung_fhtw.php:
...
- multiselect von Reihungstests möglich
- css in public/auswertung_fhtw.css ausgelagert
2020-03-13 19:25:25 +01:00
0245bff11c
admin/edit_gebiet: Offsetpunkte werden aufgerundet statt kaufmännisch gerundet
2020-03-13 19:23:50 +01:00
1f4722b7a0
- Config hinzugefügt um Lektorenzuordnungen im CIS nur anzuzeigen wenn der Vertrag erteilt wurde
...
- Verträge werden erst ab Status erteilt für Lektoren angezeigt
2020-03-12 19:24:47 +01:00
d1e47ad73e
Corrected: erste Korrekturen nach BIS Uplaod und Validierung, -- ACHTUNG: TODO ! -
...
. kleine Korrekturen (Typen-, Semantikecheck)
. TODO!!!: Meldedatum und ErhKz ersetzen!
2020-03-12 18:55:28 +01:00
54dd6734ba
Added XML Output
2020-03-12 18:53:21 +01:00
4d1dbdfae9
- Added new model system/JobTriggers_model
...
- Loads jqm configuration in controller system/jq/JobsQueueManager
- Added new table system.tbl_jobtriggers to system/dbupdate_3.3.php
- Added new privacy method _addNewTriggeredJobToQueue to JobsQueueLib
- JobsQueueLib is called by addNewJobsToQueue and updateJobsQueue
2020-03-12 18:51:26 +01:00
a25851613b
Changed ba1code to ba1code_bis in getVerwendungenBISMeldung()
2020-03-12 18:50:03 +01:00
e99112dc64
Enhanced code readability (structure)
2020-03-12 16:36:15 +01:00
c171ba3de6
Added Berechnung Sonstiges Dienstverhaeltnis (zB. Werkvertraege)
2020-03-12 15:59:09 +01:00
2767dcde9f
Added BIS configs
2020-03-12 15:57:36 +01:00
b07b987d29
Merge branch 'feature-5920/Personalmeldung_Berechnung_VZAE_JVZAE' of https://github.com/FH-Complete/FHC-Core into feature-5920/Personalmeldung_Berechnung_VZAE_JVZAE
2020-03-12 15:45:26 +01:00
a65c5076be
Started XML generieren - NOT COMPLETED -
2020-03-12 15:45:07 +01:00
67a100ea50
Corrected BIS-meldungsrelevante SWS in getLehreinheiten_SWS_BISMeldung
...
Zuvor wurde boolean bismelden der Mitarbeiter-Tabelle geprueft.
Nun wird der korrekte boolean bismelden der Lehreinheitmitarbeiter-Tabelle
geprueft, da nur die bisrelevanten Lehreinheiten herangezogen werden sollen.
2020-03-12 13:29:48 +01:00
a03e3f3355
Added result array to properties of Lehreinheitmitarbeiter class
2020-03-12 13:24:17 +01:00
588f2996b3
Added get_SWS_groupByStg()
...
Ladet Semesterwochenstunden-Summe gruppiert nach Studiengang und
Studiensemester. Es werden die Studiensemester herangezogen, die im
Zeitraum zwischen beginn und ende beginnen.
2020-03-12 13:22:57 +01:00
9c8312f880
Added Lehre-Container
...
Lehrecontainer mit
. StgKz
. SommersemesterSWS
. WintersemesterSWS
Lehrtaetigkeit an Lehrgaengen bzw. Lehrtaetigkeit an STG,
die nicht BIS-gemeldet werden, werden exkludiert.
2020-03-12 13:20:30 +01:00
da621a2154
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-03-12 11:19:17 +01:00
a5884127f7
Corrected Realtives Beschaeftigungsausmass
...
Fuer Verwendungen von angestellten Personen in der Admin/Verwaltung, jedoch
mit Lehrtaetigkeit, werden fuer die Lehre eigene Verwendungen mit
Verwendungscode 1 erstellt. Das relative Beschaeftigungsausmass muss dann
entsprechend angepasst werden. Zuvor wurden dem rel BA der Hauptverwendung
die rel BA von Sommer- und Wintersemester abgezogen. Fuer die richtige
Berechnung der VZAE darf jedoch nur das rel BA Wintersemester abgezogen
werden. (Faellt in den Stichtag 31.12)
2020-03-11 14:54:09 +01:00
72c2ce6410
Added Container Funktion
...
. FunktionsCode
. BesondereQualifikationsCode
. Studiengang
- StgKz
2020-03-11 14:44:18 +01:00
5bd9ece44a
Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker
2020-03-10 16:59:15 +01:00
e8460f03c1
Fixed Syntax Error in Phrases Page
2020-03-10 16:56:00 +01:00
505dba7f4c
Added Inbox/Outbox Link to CI Page
2020-03-10 16:42:22 +01:00
2df57dd019
Fixed Syntax Error in Message API
2020-03-10 16:41:01 +01:00
40915ba3e1
Neue Funktionen für BIS-Meldung ergänzt
2020-03-10 16:36:21 +01:00
9bb4e2507a
- Added two new functions to config entry ou_function_whitelist
...
- Fixed Vorlage_widget to retrieve univocally templates
2020-03-09 13:41:17 +01:00
da201df534
Added Berechnung fuer Studentische Hilfskraefte
...
Die Jahres-/Vollzeitaequivalenz fuer Studentische Hilfskraefte werden
ueber eine kalkulatorische Stundenpauschale berechnet.
2020-03-09 12:23:47 +01:00
88fc901bf7
- Added new config entry ou_function_whitelist in message.php
...
- Added new constant CFG_OU_FUNCTION_WHITELIST in library MessageLib
- MessageLib->getOeKurzbz now filters out organization units based on config entry ou_function_whitelist
- Removed redundant templates in Vorlage_widget
2020-03-06 16:56:27 +01:00
8363f0d26c
Fixed marker in JobsQueueViewer
2020-03-06 14:30:52 +01:00
6b0bf89592
Removed load config loads in JobsQueueLib
2020-03-06 14:25:52 +01:00
e92880b79a
- Added new private methods _checkPermissions and _convertJobs to controller system/jq/JobsQueueManager
...
- Added new public method updateJobsQueue to controller system/jq/JobsQueueManager
- system/jq/JobsQueueManager->getLastJobs now checks permissions
- Added new public method updateJobsQueue to JQW_Controller
- Less redundant constansts in Library JobsQueueLib
- JobsQueueLib constructor now loads models JobsQueueModel, JobTypesModel and JobStatusesModel
- Added new public methods getLastJobs, addNewJobsToQueue and updateJobsQueue to JobsQueueLib
- Added new private methods _checkNewJobStructure, _checkUpdateJobStructure, _checkJobType, _checkJobStatus, _inArray, _dropNotAllowedPropertiesNewJob and _dropNotAllowedPropertiesUpdateJob to
2020-03-06 14:15:10 +01:00
d2e7336f2c
Granted permission to user fhcomplete and vilesci for sequence seq_jobsqueue_jobid
2020-03-06 14:14:11 +01:00
ba566ab459
Added new models system/JobStatuses_model and system/JobTypes_model
2020-03-06 14:13:25 +01:00
3bfe1cdeea
- Fixed messages and comments in PermissionLib
...
- JobsQueueManager->addNewJobsToQueue now checks permission to write new jobs in the queue
- Added statuses for system.tbl_jobstatuses in system/dbupdate_3.3.php
- Added permission access type (read/write) in configuration file application/config/jqm.php
2020-03-05 18:48:26 +01:00
cd815acdbf
- Added new constant BEGINNING_OF_TIME
...
- Added new config entry job_type_permissions_white_list in jqm.php
- Added new navigation entry jobsqueueviewer
- Added new model application/models/system/JobsQueue_model.php
- Added new option in FilterWidget for hours comparison with dates
- Added new filter core-jq-lastHour to system/filtersupdate.php
- Added new statements to system/dbupdate_3.3.php to create tables system.tbl_jobstatuses, system.tbl_jobtypes and system.tbl_jobstatuses
- Added new views application/views/system/jq/jobsQueueViewer.php and application/views/system/jq/jobsQueueViewerData.php
2020-03-05 15:57:06 +01:00
b40feaf71e
- system/dbupdate_3.3: added "Orgform DE" and "Orgform EN" to vw_msg_vars
...
- adjusted comments of vw_auswertung
2020-03-05 15:06:54 +01:00
b77e30f56b
Merge branch 'bug-6651/Messaging_Request_URI_Too_Long_Refresh_Button'
2020-03-05 14:38:22 +01:00
afb5cc3205
Added getMitarbeiterBISMeldung()
...
getMitarbeiterBISMeldung:
Gibt alle Mitarbeiter zurück, die im BIS Meldungszeitraum bisgemeldet
sind
2020-03-05 14:31:20 +01:00
3d663cdbd7
Added getVerwendungenBISMeldung() + isHabilitiert()
...
. getVerwendungenBISMeldung:
Holt alle Verwendungen eines Mitarbeiters innerhalb des BIS
Meldungszeitraums
. isHabilitiert:
Prueft, ob Mitarbeiter habilitiert ist
2020-03-05 14:29:56 +01:00
040dfccf7d
BIS Personalmeldung NEU: Container Person und Container Verwendung
...
* Einholen von BIS relevanten Personen- und deren Verwendungsdaten
* Konstruktion von Container Person
* Konstruktion von Verwendung Container
- Berechnung von JVZAE
- Berechnung von VZAE
- Beruecksichtigung von
. Karenzen / TZ-Bildungskarenzen
. Echten Dienstvertraegen (mit und ohne inkludierte Lehrtaetigkeit)
. Freie Lektoren auf SWS Stundenbasis
2020-03-05 14:23:09 +01:00
97ff2dce38
Merge branch 'feature-6511/Reihungstest_Punkteberechnung_fixes'
2020-03-05 12:11:04 +01:00
59cc8b78f9
Spaltenbezeichnung fuer BIS Code korrigiert
2020-03-05 12:05:47 +01:00
cfb56b5adb
Datenbankanpassungen für BIS Schnittstelle V. 6.8 hinzugefügt
...
- Kodextabellen fuer Beschaeftigungsart1 angepasst (Möglichkeit zum Hinzufügen von multiplen Einträgen für die selbe Beschaeftigungsart)
- Kodextabellen für Verwendung angepasst an die neue Version
- Aktualisierung der Verwendungsplausibilitätsprüfungen
- Script zur Generierung für neue Verwendungen an neuen Meldezeitraum angepasst
- Funktionen Block im FAS entfernt/ausgeblendet.
2020-03-05 11:57:11 +01:00
30c6f10d80
First proposal
2020-03-04 15:54:23 +01:00
8ec6265bd5
Fixed windows new lines
2020-03-04 11:17:23 +01:00
05a2cca130
Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization
2020-03-04 11:14:09 +01:00
95beb1c361
testtool edit_gebiet.php: changed maxlength of offsetpunkte field so up to 4 decimals can be entered
2020-03-03 09:27:19 +01:00
edf7800120
- Controller system/messages/Messages parameters are now retrieved via HTTP POST
...
- public/js/messaging/messageWrite.js function parseMessageText now perform a HTTP POST ajax call
2020-03-02 16:45:04 +01:00
de62bc0f3d
Merge branch 'feature-3716/Messaging_inbox_outbox_user'
2020-03-02 16:13:04 +01:00
331c90b64b
Merge branch 'feature-6079/Infocenter_Freigabe_nach_RT_Anmeldung'
2020-03-02 16:03:28 +01:00
b169a7f672
Merge branch 'feature-5490/Cronjobs_Priorisierung'
2020-02-28 18:16:40 +01:00
967ce5a106
Finalisierung prioritizationJob
2020-02-28 18:15:54 +01:00
caf57092e4
- Page to write a new message from FAS/Infocenter has a wider and higher variables drop down
...
- Tabulator fix CSS
2020-02-28 17:05:11 +01:00
48d422dd83
Deleted File "Priorisation"
2020-02-28 15:02:23 +01:00
27e8208868
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-02-28 14:56:41 +01:00
2ed062ab40
Bugfixes auswertung_fhtw
2020-02-28 14:56:31 +01:00
88693f2dea
Merge branch 'bugfix-6005/Digitaler_Lehrauftrag_Hidden_Field_4Chrome'
2020-02-28 13:44:37 +01:00
e3211ff73d
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-02-28 13:44:34 +01:00
cfcf8f7ba7
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-02-28 13:44:13 +01:00
dcc9faa01e
Reihungstest Punkteübernahme im FAS kann über ein Config deaktiviert werden
2020-02-28 11:57:30 +01:00
895418ef82
auswertung_fhtw:
...
- replaced Notice "gewichtet" for points sum and percent sum to show only in "percent" column
2020-02-28 11:49:43 +01:00
833174f331
Merge branch 'feature-3716/Messaging_inbox_outbox_user'
2020-02-28 11:05:14 +01:00
4d98128a39
Merge branches 'feature-3716/Messaging_inbox_outbox_user', 'feature-5490/Cronjobs_Priorisierung' and 'master' of https://github.com/FH-Complete/FHC-Core
2020-02-27 18:31:48 +01:00
a9bc7a6c77
auswertung_fhtw:
...
- Notice "gewichtet" added for points sum and percent sum
- added percent sign for percent sum
- removed commented code
2020-02-27 17:20:25 +01:00
0b74d28f82
admin/edit_gebiet.php: "minimale Punkteanzahl" in "maximale Negativpunkte" umbenannt
2020-02-27 17:06:25 +01:00
ad7981c09e
Merge branch 'feature-6141/Testtool_Sprache_Fallback'
2020-02-27 16:43:40 +01:00
8d7cc638bd
Zusatztext Prio für Assistentinnen
2020-02-27 16:41:08 +01:00
34b6581849
- Renamed BenutzerfunktionModel->getByPersonId to getActiveFunctionsByPersonId
...
- BenutzerfunktionModel->getActiveFunctionsByPersonId changed query to get only active functions
- Removed commented code
2020-02-26 17:22:59 +01:00
6874408200
Bugfix Fallback Bild
...
Bugfix Loginliste
2020-02-26 17:11:11 +01:00
47f33ed930
Added function getLehreinheiten_SWS_BISMeldung
...
This function retrieves semesterwochenstunden of a given studiensemester
for all employees who should be BIS reported.
2020-02-26 17:11:00 +01:00
bdb5385699
Merge branch 'master' into Historie_PreStudent_Tab
2020-02-26 15:20:55 +01:00
6509d74f4b
Fix height of Prestudent-Statuslist on smaller Screens
2020-02-26 15:20:08 +01:00
f072cc4f3d
Studienerfolgsbestätigung:
...
- added studiengangtyp englisch in RDF
- added bezeichnung_mehrsprachig in tbl_studiengangstyp
2020-02-26 14:08:26 +01:00
34afbe9f63
system/dbupdate_3.3: added "Alias Studienassistenz" to check for creation of vs_msg_vars in dbupdate
2020-02-26 13:53:05 +01:00
a50cc6cba8
- jobs/MailJob->sendAllMessageEmailNotices changed since parameter default value
...
- Moved ALT_OE from MessageLib to CL/Messages_model
- MessageLib->_setSentError renamed to _updatedRecipientNoticeEmailInfo
- MessageLib->_sendNoticeEmail changed to have more information about a not sent notice email
- Recipient_model->getNotSentMessages now does not retrieve messages with notice email send failure
2020-02-25 16:41:27 +01:00
a1da5b9bf4
Merge branch 'feature-6141/Testtool_Sprache_Fallback'
2020-02-24 22:05:00 +01:00
ed78f7c7af
frage.php: Fallback auf DEFAULT_LANGUAGE wenn kein Vorschlag in der Sessionsprache vorhanden ist
2020-02-24 22:03:06 +01:00
9586a3e551
Updated function getFirstPrioPrestudentRT
2020-02-24 21:01:41 +01:00
8c30666043
Testtool Login shows applicants only once (Only application of first priority) -> Only for FHTW!
...
New function getFirstPrioPrestudentRT in prestudent.class.php
Link to pivot-table in mail to assistants
auswertung_fhtw berücksichtigt nun orgformen (studienpläne) aus tbl_ablauf
2020-02-24 18:43:38 +01:00
166a4a76e8
stammdaten/auswertung_fhtw.php:
...
- added column "Punkte mit offset"
- removed commented code concerning RT-punkte without Physik
2020-02-24 16:44:57 +01:00
b9d973a6e8
Merge branch 'feature-3716/Messaging_inbox_outbox_user' of https://github.com/FH-Complete/FHC-Core into feature-3716/Messaging_inbox_outbox_user
2020-02-24 11:09:00 +01:00
96150dd5a2
Merge branch 'master' into feature-6141/Testtool_Sprache_Fallback
2020-02-23 21:30:06 +01:00
8507f63936
GUI-changes in writeTemplate
...
- Show only "bezeichnung" of template in select for regular users
- New styled "Preview"-Button.
- Click on "Preview" automatically scrolls to Preview-Div
2020-02-23 20:51:16 +01:00
d07b0684c3
Orgform nur dazu schreiben, wenn es mehr als Eine gibt
2020-02-23 20:47:54 +01:00
b8b36e975e
Orgform_kurzbz in bankverbindung.class und zahlungen_details.php
2020-02-23 18:18:14 +01:00
0addc4ffb5
gebiet.class.php: improved offset calculation, LIMIT maxfragen instead multiplication
2020-02-21 17:22:50 +01:00
ae0853b048
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-02-21 17:04:43 +01:00
304d7727f0
- CL/Messages_model-> sendReply applied workaround for Infocenter
...
- MailJob now extends JOB_Controller and writes logs in DB
- MailJob->sendMessages renamed to sendAllMessageEmailNotices
- sendAllMessageEmailNotices now accept new parameter since to restrict number of messages
- MessageLib->sendAllEmailNotices now accept new parameter since and adapted to use new MessageLib->_sendNoticeEmails
- Recipient_model->getMessages renamed to getNotSentMessages
- Now accepts only limit and since as parameters
- Changed query to retrieve only message ids
2020-02-21 16:59:25 +01:00
8a8ed725c4
Merge branch 'master' into feature-5490/Cronjobs_Priorisierung
2020-02-20 20:48:40 +01:00
f146afb77f
Merge branch 'Historie_PreStudent_Tab'
2020-02-20 20:47:33 +01:00
45599ec2ec
Merge branch 'master' into Historie_PreStudent_Tab
2020-02-20 20:43:52 +01:00
ff7f150cb6
prioritizationJob created
2020-02-20 20:42:37 +01:00
a42cf10140
Merge branch 'feature-5489/Kontonummern_der_Studiengaenge_in_DB'
2020-02-20 18:51:26 +01:00
f1cf82c107
Spalte Alias hinzugefügt, Spalte Prio umbenannt
2020-02-20 18:48:15 +01:00
7043422fe9
Zahlenformat bei Lehrauftragsexport korrigiert
2020-02-20 18:11:37 +01:00
fc9ae760b5
public.vw_msg_vars: added variables semester, Studiengangsassistenz, relative Prio
2020-02-20 17:07:57 +01:00
c1adc94204
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-02-20 16:41:42 +01:00
9a9b847138
Fixed Tabulator include in FHC-Header
2020-02-20 16:21:31 +01:00
1ac1c118d5
Fixed Message Reply
2020-02-20 15:53:43 +01:00
4477afc5ed
Merge branch 'feature-3716/Messaging_inbox_outbox_user'
2020-02-20 14:59:49 +01:00
0b3d5e19a3
CL/Messages_model->sendReply now uses as sender id the logged user person id or the previous message recipient id
2020-02-20 14:39:37 +01:00
cc5bfdc292
Merge branch 'feature-5153/Reihungstest_Gewichtung_der_Gebiete'
2020-02-18 17:43:30 +01:00
d74a516202
- testtool edit_gebiet.php: hinweis for suggestion offsetpunkteanzahl is always shown
2020-02-18 17:33:44 +01:00
0db611ed27
- Added new config entry in mail config file called enable_debug
...
- If enable_debug is true then info about the mail are logged into the CI error logs
- Fixed queries to get sent and received messages with Recipient_model, now messages for which a notice email was not sent are retrieved and messages are sorted by insertamum
- CL/Messages_model:
- Before setting a message as read check if a record is already present
- If the recipient is a prestudent then in table tbl_msg_message oe_kurzbz is set with the ou of the prestudent
- The sender id (person_id) now is get from the currently logged user also when replying
- MessageLib->_sendNoticeEmails checks that the message was sent only from FAS (NOT from infocenter)
2020-02-18 15:19:58 +01:00
a063a73c41
reihungst admin edit_gebiet.php: checking that there are same negativpoints for one gebiet and one level before showing offsetpunkte suggestion for RT gebiete
2020-02-17 19:26:55 +01:00
b94aad14fb
- Added new config entris for messaging: ou_receivers_no_notice and ou_receivers_private
...
- MessageLib:
- Renamed method sendAllNotices to sendAllEmailNotices
- Renamed method _sendOneNotice to _sendNoticeEmails
- Renamed method _sendNotice to _sendNoticeEmail
- If the recipient contact is empty is not anymore a blocking error
- Recipient_model->getMessageById renamed to getMessagesById, not it accepts an array of message ids, could return more results
- Fixed bug in public/js/messaging/writeReply.js to send subject value
2020-02-17 18:29:07 +01:00
4d3024e3f7
Placeholder Geburtsdatum
2020-02-17 16:43:28 +01:00
23828023ee
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-02-17 10:55:58 +01:00
11f3fad1f7
Changed logic to send notice email to a message recipient
2020-02-14 19:17:09 +01:00
ed332717ce
Infocenter Details:
...
- added notice for entering the placement test points when Freigabe after RT participation
2020-02-14 18:23:14 +01:00
c81a25988e
Historie-Feld nebeneinander
2020-02-14 15:31:20 +01:00
119a2b200a
Neuen Modus für Lehreinheitenvorrückung hinzugefügt bei dem die Stundensätze abhängig von der Beschaeftigungsart aktualisiert werden
2020-02-14 14:46:54 +01:00
99dc36b501
Stundensatz wird bei Fixangestellten mit voller inkludierter Lehre (-1) immer auf NULL gesetzt. (abhängig von Config)
2020-02-14 13:54:06 +01:00
1ac14fca24
Prüfungstermine werden nicht mehr doppelt angezeigt
2020-02-14 07:33:28 +01:00
b3d80a8e3b
Merge remote-tracking branch 'origin/master'
2020-02-13 19:08:43 +01:00
b60e7ed439
Option zur Ausgabe der Fragen ohne Lösungen
2020-02-13 19:08:37 +01:00
21da8dfb51
- Added offsetpunkte Berechnung for Suggestions on admin/edit_gebiet page
...
- offsetpunkte are validated before saving
2020-02-13 18:49:01 +01:00
a4bfdfb4a0
Fixed merge with stashed files in system/messages/htmlWriteTemplate.php
2020-02-13 12:49:57 +01:00
c54579ef7d
/system/messages/MessageClient/read sent messages: read them all
2020-02-12 16:39:00 +01:00
937db42e11
- Allow to change the subject in all reply pages
...
- Remove tabs and/or blanks from subject when replying
2020-02-12 16:14:50 +01:00
6882199d0e
Bugfixes to allow to write to a person or to a prestudent from different GUIs
2020-02-12 14:43:11 +01:00
58a458dc73
Maximalbreite bei Projektarbeiten-Lehreinheiten hinterlegt da sonst der
...
rechte Teil des Karteireiters nicht mehr lesbar ist
2020-02-12 14:06:33 +01:00
98b2abeb51
BugFix show PreStudent Variables instead of Person Variables in Msg
2020-02-12 09:40:19 +01:00
4b3f6f109d
Bugfix Load Phrases in ViewMessage
2020-02-12 09:08:32 +01:00
de7ecb678c
Fixed phrases
2020-02-11 18:28:29 +01:00
98918bc336
- Bugfix: fixed phrases in views/system/messages/*
...
- Added new phrases where missing or hard coded
- Fixed windowz new lines in /application/*
2020-02-11 18:05:26 +01:00
16cb4a0d4c
- Replace "This is a notice to notice you that you have been noticed..." with:
...
EN: "This message will be delivered to the Infocenter of UAS Technikum Wien"
DE: "Diese Nachricht wird an das Infocenter der FHTW zugestellt "
- Bugfix: fixed phrases in system/messages/MessageClient/write
2020-02-11 16:49:25 +01:00
b41ef00b3d
crm/Prestudent_model: hasBewerber can optionally check bewerber only for a Studiengangtyp. In InfoCenter, only Bachelors are checked after Freigabe (for setting Bewerber and Reihungstestbooleans)
2020-02-11 16:42:04 +01:00
1b9693e316
Bugfix: Infocenter write page person id and prestudent id are swapped
2020-02-11 16:10:39 +01:00
c7b33fe160
Bugfix: FAS write page person id and prestudent id are swapped
2020-02-11 16:04:08 +01:00
a63f6bd256
Filter InfoCenterNotSentApplicationAll Spalten getauscht
2020-02-11 15:25:17 +01:00
52e30e7cbb
Merge branch 'master' into Historie_PreStudent_Tab
2020-02-11 15:01:12 +01:00
8f915d3c39
Initial File
2020-02-11 14:44:23 +01:00
58a67ead5d
Berücksichtigung von Studienplan bei Ablauf
...
+ Kleine GUI-Anpassungen
2020-02-11 14:42:45 +01:00
11231b99c2
Fallback Sprache
2020-02-11 14:41:59 +01:00
ba7b4cf3ad
New Unique Index unq_idx_ablauf_gebiet_studiengang_semester
...
UNIQUE INDEX unq_idx_ablauf_gebiet_studiengang_semester in testtool.tbl_ablauf löschen und durch neuen INDEX ersetzen, der auch den Studienplan einschließt
2020-02-11 14:41:21 +01:00
d5e8d33adc
public.vw_msg_vars: added orgform_kurzbz for tbl_bankverbindung
2020-02-11 10:28:43 +01:00
3a8e7427a7
Enhanced active status behaviour of button group
...
Active status of button help / settings was not clear before. This is
corrected now.
2020-02-11 08:59:23 +01:00
5953b6932f
Bufixed Chromes autofilling username in random input field
...
If no username input field is required, Chorme is autofilling a random
inputfield with username. This is a Chrome bug.
Workaround by adding a hidden username field. Also setting autocomplete=
new-password should help stopping random autofill in some browsers.
2020-02-10 15:42:34 +01:00
66bdbbde26
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-02-10 14:53:35 +01:00
7fdaaace50
If Prestudent is freigegeben for RT and has already a Bewerber with reihungstestangetreten = true, a new Bewerber for the prestudent is created, reihungstestangetreten and teilgenommen are set to true
2020-02-07 17:46:29 +01:00
0239246ab0
- Renamed APIv1_Controller to API_Controller
...
- Adapted code
- Added functionalities to API_Controller to log into the database
2020-02-07 15:11:00 +01:00
b0380f4b64
FilterWidget and TableWidget Pages can now also be access with Readonly Permission
2020-02-07 13:16:55 +01:00
e724f7159f
Datentyp der Offsetpunkte auf Numeric korrigiert
2020-02-07 11:31:08 +01:00
57af86a8bd
Merge branch 'feature-4900/3_Geschlecht'
2020-02-07 08:43:51 +01:00
40891496b1
Studienblatt RDF exportiert das Geschlecht und die Unterrichtssprache in Deutsch und Englisch
2020-02-07 08:40:18 +01:00
7f8415e6dc
system/Variable_model: replaced concatenation of names array with ? (parameter replacement by CI) to prevent SQL injections
2020-02-06 14:52:26 +01:00
17ef2f173b
Fixed Error in Bewerberstatistik Excel Export
2020-02-06 14:28:15 +01:00
91bb16c474
Regenerate Session ID after Testtool Login
2020-02-05 17:26:53 +01:00
32c6f30aa7
Sortierung der Studienordnungen korrigiert
2020-02-05 16:16:24 +01:00
3d31bf1e07
Sortierung der Studienordnungen angepasst damit bei 2 Studienordnungen des selben Studiengangs mit gleichem Beginndatum bevorzugt die länger gültige (neuere) herangezogen wird beim Export der LV-Informationen
2020-02-05 16:10:33 +01:00
e2f4e35a7f
Lehrauftragsverwaltung zeigt per Default das aktuelle Studiensemester statt dem nächsten
2020-02-05 15:25:00 +01:00
a5ad57ceee
testtool/admin/edit_gebiet.php: Offsetpunkte können nun über admin GUI eingetragen werden
2020-02-04 17:53:32 +01:00
15b3532359
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-02-04 17:16:17 +01:00
749e9be64d
Messaging system: student writes new message: separate logic for master and bachelor
2020-02-04 17:02:25 +01:00
a66d319581
Fixed some XSS Bugs
2020-02-04 14:58:33 +01:00
53ac4d11ba
Do not retrieve the degree program name from studiengang table but directly from the organization unit table
...
in student sent messages page and student write to organisation unit page
2020-02-04 14:42:53 +01:00
e19533c0ba
Removed legacy Link from Vilesci Menu
2020-02-04 14:30:12 +01:00
d496bf5993
When the recipient is infocenter then place a * close to the drop down description and a note under the tinymce box.
2020-02-03 16:44:29 +01:00
16f6bdbf70
Merge branch 'feature-5128/FHC-IDAM_account_activation'
2020-02-03 14:53:24 +01:00
7c087011d7
Merge branch 'feature-5156/Lehrauftragslisten_Stundensatz'
2020-02-03 13:05:43 +01:00
ca2d5d9d08
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-01-30 17:10:28 +01:00
b2542b5fcc
Added HELP button and collapsable help-info to TableWidget [ALPHA VERSION]
...
Now this is a standard behaviour of TableWidget.
Removed also table related help information from general
Hilfe-zu-dieser-Seite help.
[ALPHA VERSION]: minor issue to be fixed:
button color not toggling correctly when opening help then settings
(and way round)
2020-01-30 17:09:31 +01:00
40771ba669
Removed Deprecated Kreuzerltool
2020-01-30 16:19:14 +01:00
9a9d08da39
Merge branch 'bugfix-5822/Digitaler_Lehrauftrag_Sonstiges'
2020-01-30 14:16:25 +01:00
3f0336ffc6
Removed deprecated File
2020-01-30 14:05:29 +01:00
bce7f60df4
Moved layout options to TableWidget
...
Now this is a standard behaviour of TableWidget.
2020-01-30 13:22:49 +01:00
6897ccdd6b
Moved empty table placeholder text to TableWidget
...
Now this is a standard behaviour of TableWidget.
2020-01-30 12:43:50 +01:00
e1df2cbf23
Added tooltips on column headers (displaying title) in TableWidget
...
Now this is a standard behaviour of TableWidget.
2020-01-30 12:30:26 +01:00
8c36b0b67a
Reduced default minimum size of columns in Stornierte Lehraufträge
2020-01-30 12:28:51 +01:00
3b2b279bf9
Changed default visibility / order of columns
...
Now fitted to the users primary needs. Columns can be displayed/hidden
via Columnpicker by user afterwards.
2020-01-30 12:27:13 +01:00
bc1c33432f
Avoid of triple points at end of header title (more space)
2020-01-30 12:24:28 +01:00
bf1427e901
Added border to tabulator / tabulator header cells
2020-01-30 12:22:51 +01:00
bb6ebc1521
Fixed possible XSS Attack when passing "javascript:" or different protocol handler als parameter
2020-01-30 09:27:16 +01:00
98bb9987da
Now inkludierte Lehre also checking former (past) BIS Verwendungen
...
This allows display of column 'Betrag' in Lehraufträge annehmen.
(Important for external lectors, who want to see Betrag of their new
Lehrauftraege. They usually don't have active BIS Verwendung at the
beginning of each term, therefor last (past) BIS Verwendung needs to be
checked)
2020-01-29 09:55:59 +01:00
9bdee6d0f8
Corrected SQL query: now retrieving employees UID via tbl_mitarbeiter
...
Some Lectors, who were assigned as Projektbetreuer, received an email on
their (past) student-email-account. Now this is corrected.
2020-01-28 17:33:04 +01:00
2e30841b0d
- added UDF prestudent dropdown to infocenterDetails
...
- crm/Prestudent_model: improved code, e.g. replaced ->retval
2020-01-28 17:21:47 +01:00
0df02e8df2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-01-28 14:36:41 +01:00
f22931ffa8
Adapted row color when hovering on selected rows
...
Before row color was changing from selected-blue to grey, although row
was still selected, which was somehow confusing for the user.
Now color stays blue.
2020-01-28 12:33:23 +01:00
198a3eb2d5
Adjusted tabulator size to window screen size
2020-01-28 12:29:18 +01:00
b270e65d2e
Extended FHC_TableWidget with column picker, header & footer
...
Added standard behaviour to FHC_TableWidget:
. Added column picker to new TableWidgetHeader div.
. Moved former footerElement (including Alle aus-/abwählen
buttons, CSV Downloads) from single specific files to new
TableWidgetFooter divs.
. Adapted other files to work with new FHC_TableWidget behaviour
2020-01-28 12:26:56 +01:00
87aa482234
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-01-28 11:03:51 +01:00
8f908887be
- Method parseMessageText of controller system/messages/Messages could accept also the prestudent_id parameter
...
- If prestudent_id parameter then CLMessagesModel->parseMessageTextPrestudent is called
- Fixed show_error(getData error in model CLMessagesModel
- Added new method parseMessageTextPrestudent to model CLMessagesModel
- Method _prepareHtmlWriteTemplate of model CLMessagesModel now checks if data are from a prestudent and then uses MessageLib->getMessageVarsPrestudent
- Added new method getMessageVarsPrestudent to MessageLib
- Function parseMessageText in js/messaging/messageWrite.js could call system/messages/Messages/parseMessageText with prestudent_id parameter
2020-01-24 18:13:03 +01:00
3bee0210a8
Fixed XSS Vulnerability in CIS Schedule
2020-01-24 11:30:24 +01:00
350f252ba7
Semester für Lehreinheitenvorrückung auf 10 erhöht
2020-01-24 08:59:43 +01:00
4497874908
public.vw_msg_vars: added iban and bic of Studiengang of prestudent
2020-01-23 17:17:44 +01:00
3875f404d6
Merge branch 'bug-6052/Kollisionscheck_fehlerhaft'
2020-01-23 14:41:42 +01:00
15fa4a6c90
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-23 09:55:00 +01:00
a396f4a4ba
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-23 09:41:57 +01:00
09323d167b
controllers/system/infocenter/InfoCenter.php: bugfix - links are not built incorrectly anymore when switch from freigegeben to uebersicht with filter_id
2020-01-23 09:39:00 +01:00
8a809fd1f3
Fehler behoben im Kollisionscheck beim Setzen von neuen Stunden mit direkten Gruppen.
...
Hier wurde fälschlicherweise eine Kollisionsmeldung angezeigt obwohl laut Raumvorschlag eine Zuordnung möglich ist
2020-01-23 08:30:51 +01:00
3e72f399be
Infocenter is now hardcoded in recipient messages to avoid to display an empty "message to"
2020-01-22 15:04:07 +01:00
b5772feeb2
Merge branch 'bug-5936/Fix_composer_packages'
2020-01-22 09:10:13 +01:00
13e24230bc
Fixed font awesome in composer and gitignore
2020-01-21 12:18:08 +01:00
d29e4ebf22
Merge branch 'feature-5665/Incoming_Zeugnisse'
2020-01-21 11:38:01 +01:00
1dee4a3649
rdf/zeugnis.rdf.php: for Incomings, all grades are printed on zeugnis (even if flag zeugnis = false)
2020-01-20 11:36:29 +01:00
dbe8fb186f
- old Reihungstestuebersicht stammdaten/reihungstestverwaltung.php: commented out FAS übertragen button
...
- adapted Reihungstestpunkteberechnung in aufnahmetermine.rdf.php for Gewichtung of Punkte for Studiengaenge
2020-01-17 18:33:07 +01:00
0244caaa70
- Moved core from Redirect controller to ViewMessage controller
...
- Dropped Redirect controller
- Adapted configs and paths because of these changes
2020-01-17 15:39:34 +01:00
50f633ce3e
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-17 15:04:47 +01:00
63f475cd27
- Moved controllers Redirect and ViewMessage to system/messages/
...
- Changed config entries in message.php
- Changed Redirect controller to improve code and logic
2020-01-17 15:02:42 +01:00
d753c7e517
Merge branch 'feature-4262/Bewerberstatistik_Korrektur'
2020-01-17 11:32:29 +01:00
00dbce34c6
Merge branch 'master' into feature-4262/Bewerberstatistik_Korrektur
2020-01-17 11:32:10 +01:00
e60a5d9d72
Merge remote-tracking branch 'origin/master'
2020-01-17 11:31:42 +01:00
e7f2c4597e
Testtool Admin GUI optimiert
...
Anzeige von Leveln in Übersicht
"Round" in check_gebiet bei Zufallsfrage
2020-01-17 11:31:36 +01:00
11fa6bc197
Reihungstestpunkte werden im FAS nach neuer Formel und mit Gewichtung übernommen
2020-01-17 10:20:11 +01:00
47682f37df
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-16 16:36:57 +01:00
6eeb6abde0
Problem behoben wodurch der Excel Studierendenexport im FAS nicht funktioniert wenn ein leeres UserDefinedField Objekt vorhanden ist
2020-01-16 15:07:48 +01:00
4e43d37780
- Droped not used packages from composer.json
...
- Fixed packages version in composer.json
- Renewed file composer.lock
- Checked & Fixed imports paths
- Moved /vendor/FHC-Vendor to /FHC-Vendor
2020-01-15 18:08:29 +01:00
908d63f07e
Merge branch 'feature-5698/Clean_ViewMessage_MessageToken_model'
2020-01-15 13:17:41 +01:00
b29871be59
Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages'
2020-01-15 10:04:17 +01:00
886cc24aae
Merge branch 'feature-5364/EBCL_Zertifikat'
2020-01-15 09:52:33 +01:00
3600f18cd0
Merge branch 'feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default'
2020-01-15 08:05:54 +01:00
e537c0e00a
Fixed Errorhandling for Phrases
2020-01-15 08:04:18 +01:00
128ca90a0f
GeschlechtX Attribut hinzugefügt zu Personalmeldung
2020-01-14 17:58:29 +01:00
db50f6c856
- Updated pruefling - getReihungstestPerson method to calculate RT results with new formula
...
- added offsetpoints to testtool.vw_auswertung_ablauf and vw_auswertung
2020-01-13 18:11:13 +01:00
7c2df5eefb
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-01-13 14:21:25 +01:00
2859dfb17d
Dropdown für Studiensemester enthält nur mehr die vergangenen 4 Semester
2020-01-13 14:15:57 +01:00
7ba864bb5b
bei Anlage von Prüfungsterminen werden nur die letzten 4 Semester als Option angezeigt
2020-01-13 08:59:03 +01:00
59b6909239
stammdaten/auswertung_fhtw.php:
...
- removed Gewichtung from single Reihungstestgebiete
- added Gewichtung as Information in excel in Gebiet table headers
2020-01-10 18:26:46 +01:00
f589a3dd15
Merge remote-tracking branch 'origin/master'
2020-01-09 14:53:26 +01:00
cb47937e54
Bugfix Komma bei Punkten
2020-01-09 14:53:18 +01:00
08ab547716
FAS Zertifikat export
...
- lehrveranstaltungnotenoverlay.xul.php, zeugnisnote.rdf.php: renamed lv_studiengang_kz field to studiengang_kz_lv to have same naming convention as other fields
- Studentenansicht (studentnotenoverlay.xul.php): added studiengang_kz_lv field to export using correct Zertifikat Vorlage for TLS Workshops Studiengang
2020-01-09 12:44:02 +01:00
2073b7ceda
Reihung wird nicht neu gespeichert wenn letzte Anmeldung gelöscht wird
2020-01-09 08:40:40 +01:00
13785a4697
PHP Notice entfernt wenn eine Nachprüfung eingetragen wird ohne dass eine Note vorhanden ist
2020-01-08 17:13:23 +01:00
03903ec51b
Usernames are always lowered and trimmed after Login
2020-01-08 17:06:14 +01:00
a5fae5f07f
Lehrauftragsverwaltung - Berechtigungsprüfung beim Akzeptieren von Lehraufträgen angepasst wenn Lektor mehrere Accounts besitzt
2020-01-08 16:16:49 +01:00
3adba32420
Merge branch 'feature-3334/FilterWidget_remove_old_filters_session_cached'
2020-01-08 15:53:29 +01:00
bf9cc35dd5
TableWidget fixed a typo
2020-01-08 15:52:03 +01:00
232379ae72
Added SESSION_TIMEOUT constant to TableWidgetLib
2020-01-08 15:49:26 +01:00
bd055087cf
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2020-01-08 15:48:36 +01:00
26228430aa
Customized error messages
...
Before the user got only a general error message ('Systemerror') when
an error occured. Now the error messages are more individual for better
debugging experience.
2020-01-08 15:46:17 +01:00
8e78382230
Merge branch 'feature-3334/FilterWidget_remove_old_filters_session_cached'
2020-01-08 15:43:05 +01:00
d8437a9936
Fehler beim Auslesen des gewählten Studiengangs korrigiert
2020-01-08 13:48:45 +01:00
fb80628510
Studiengang wird bei Prüfungsanmeldung nicht mehr geprüft
2020-01-08 13:15:29 +01:00
dc06ee6f9e
Umbau Funktion getListeUser auf Startdatum
...
Abfangen wenn Ende NULL oder größer als Start
2019-12-20 16:49:48 +01:00
9f67384ab4
Personendetails inaktive Status ausgrauen
2019-12-20 16:48:09 +01:00
84393825c7
Historie des PreStudenten in PreStudent-Tab
...
+ Zugangscode in Detail-Tab
2019-12-20 16:47:07 +01:00
ac4350959b
Cleaned and improved code
2019-12-20 16:25:27 +01:00
4f69152a2b
Merge branch 'feature-5663/Create_new_helper_function_getError' into feature-5698/Clean_ViewMessage_MessageToken_model
2019-12-20 16:18:58 +01:00
befb707870
Merge branch 'feature-5663/Create_new_helper_function_getError' into feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default
2019-12-20 15:08:28 +01:00
1832f9a78a
- Set reloadDataset = true when widget is loaded
...
- Remove reloadDataset = true where these widgets are called
2019-12-20 14:43:09 +01:00
ad82d17cfe
- vilesci/stammdaten/auswertung_fhtw.php: hide filter row cell of hidden gesamt percent column for sorting
2019-12-20 10:38:20 +01:00
4e6fc7c607
- Create new function getError in helper hlp_return_object_helper that should just returns retval
...
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
2019-12-18 18:35:19 +01:00
a39a491c09
- vilesci/stammdaten/auswertung_fhtw.php: Reihungstestpunkte werden mit 4 Dezimalstellen ins FAS übernommen
2019-12-18 17:29:18 +01:00
827860e9cc
Fixed Navigation Menu Entry to be displayed correctly
2019-12-18 16:36:26 +01:00
e120d77b41
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-12-18 16:34:52 +01:00
943f3dfac2
- vilesci/stammdaten/auswertung_fhtw.php: added invisible column for Gesamt for correct sort with colspan
2019-12-18 16:18:08 +01:00
8f3aadd3e2
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-18 16:08:11 +01:00
3be1c627b2
Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag
2019-12-18 15:53:27 +01:00
2dd540c9e6
Changed Permission for Lehrauftrag-Report from lehre/bestellen to lehre/erteilen
2019-12-18 15:50:30 +01:00
df057faa8f
Added default text 'Keine Daten vorhanden' for empty tables
...
Before the tabulator sometimes looked kind of 'undone', when no data was
loaded. Now a nice message is displayed if the table is empty.
2019-12-18 15:45:34 +01:00
ff9aa5c48a
Expanded 'lector'-column width
2019-12-18 15:40:16 +01:00
83fb32bc18
Reordered columns: Now Ausbildungssemester right after STG-Typ-Kurzbezeichnung
2019-12-18 15:38:14 +01:00
4b33f6c0bd
Minor code prettyfying (tabs instead whitespaces, line wraps)
2019-12-18 14:51:45 +01:00
627ad0e499
Added phrase 'Stornierte Lehrauftraege' to phrasesupdate
2019-12-18 14:49:52 +01:00
34a55e2332
Added/Adapted JS functions for 'Stornierte Lehrauftraege'
...
- redrawed tabulator when opening the collapsed module. Must be done
to display stornierte lehrauftraege.
- generated storniert-tooltip
- generated storniert-status icon
- adapted selectableCheck to leave stornierte unselectable
2019-12-18 14:48:53 +01:00
ef3eedb989
Added data query and tabulator for 'Stornierte Lehrauftraege'
...
This file is triggered within the view acceptLehrauftrag.php.
It displays information about the lectors cancelled contracts:
- Vertragstyp
- Bezeichnung
- Stunden
- Betrag
- Storno Datum
- Storno von
2019-12-18 14:37:38 +01:00
754868e7fd
Added GUI for Stornierte Lehrauftraege (for the lectors)
...
Added new button 'Nur stornierte anzeigen'. When the button is clicked,
a collapsed modul opens below showing details about cancelled contracts
of the requested study semester.
2019-12-18 14:31:17 +01:00
1a298c7e46
AuthLib->_createAuthObjByPerson now checks that the benutzer is active, and no more the person
2019-12-18 12:43:39 +01:00
a20e8da298
Fixed Error Handling in AuthLib
2019-12-18 07:49:49 +01:00
57d4da7cbd
- vilesci/stammdaten/auswertung_fhtw.php: RT punkte werden anhand Formel mit Gewichtung berechnet
...
- Spalte "offsetpunkte" in testtool.tbl_gebiet hinzugefügt, sodass berechnete Prozente immer positiv sind
- RT-punkte ohne Physik entfernt
2019-12-17 18:02:42 +01:00
218a468587
Lecturer Menu Entry is now only viisible with the correct Permission
2019-12-17 17:51:20 +01:00
e509f7acd1
Added comments and cleaned code
2019-12-17 16:57:02 +01:00
719f2d7314
- Changed controller system/FAS_UDF, less busy now
...
- Method execReadOnlyQuery of DB_Model less strict check against SQL statements
- Added new public method setup to DB_Model to setup the model after initialization
- Added new constants to UDFLib
- Added new private method _printEndUDFBlock and _printEndUDFBlock to UDFLib
- Added new public methods setUDFUniqueId, getSession, getSessionElement, setSession, setSessionElement, saveUDFs and isAllowed to UDFLib
- Removed model system/FAS_UDF_model
- View views/system/fas_udf now uses the view templates/FHC-Header
- Added new parameter udfs to view templates/FHC-Header
- Added new properties to UDFWidget
- Added new private methods _initUDFWidget, _checkParameters and _startUDFWidget to UDFWidget
2019-12-17 13:35:41 +01:00
b6b3870e94
Trimmed Username after HTTP Basic Auth in Codeigniter
2019-12-17 09:04:27 +01:00
f0b26ef77e
STIP Antwort Parameter korrigiert
2019-12-17 08:33:21 +01:00
c2b9f3a3da
Amended help info: HOWTO Spaltenbreite verändern
2019-12-16 14:18:57 +01:00
80f100f5fb
Changed name order: first + family name -> to family + first name
...
This change allows sorting by family name.
2019-12-16 13:57:58 +01:00
e2b75bcca9
- system/Variablenname_model getDefaults: replaced string concatenation of variable names in query by ci parameter replacement to prevent SQL injections
2019-12-13 16:37:33 +01:00
416acfcb73
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-12-13 16:35:45 +01:00
7e58a0f0d2
Removed NavigationLib from acceptLehrauftrag Page because it is not used
2019-12-13 08:55:39 +01:00
478bfdb9a0
Navigationwidget can be called without initial Permission
2019-12-13 08:54:49 +01:00
5b27f29a92
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-12 13:54:20 +01:00
9bf1715cb4
Removed unused code from CTRL Lehrauftrag bestellen
2019-12-12 13:43:07 +01:00
cbdb90c227
Berechtigungsfunktion angepasst damit auch Berechtigungen aus den Rollen geladen werden
2019-12-12 13:39:07 +01:00
a585b2a26b
BIS Meldung angepasst für 3. Geschlecht
2019-12-12 08:27:57 +01:00
14e54ea48c
Merge branch 'feature-4998/FHC-IDAM_REST_Schnittstelle_zum_Setzen_des_Aktivierungscodes' into feature-5128/FHC-IDAM_account_activation
2019-12-11 18:55:10 +01:00
cde7e82033
Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag
2019-12-11 16:13:04 +01:00
d442b5f6e7
Fehlende Phrase für Rückstelldatum hinzugefügt
2019-12-11 15:48:34 +01:00
113fd0cc10
Anpassungen für 3. Geschlecht (x/divers) hinzugefügt
...
- Eigene Tabelle für Geschlecht
- Mehrsprachige Bezeichnung für Geschlecht
- Diverse hartcodierte DropDowns ersetzt
2019-12-11 15:44:58 +01:00
905df6912a
Changed: column description from 'Auftrag' -> to 'LV- / Projektbezeichnung'
2019-12-11 15:32:29 +01:00
9911d792e4
Changed: Inkludierte Lehre when not is null AND not 0
...
Now the return value is also checking against 0.
2019-12-11 15:31:36 +01:00
d5df8d8584
Fixed: delete/change restrictions in FAS now ONLY when config var is true
...
Before deleting/changing of lectors was disabled, no matter if the
regarding config entry was set to true or false. This is fixed now.
2019-12-11 11:52:16 +01:00
8dd860e768
Faktor aus Lehrauftragsberechnung entfernt da dieser in Zukunft anderwertig verwendet wird
2019-12-11 11:12:12 +01:00
1a3a56483c
Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag
2019-12-10 15:32:31 +01:00
34d736262b
added Lehraufträge Lehrendeuebersicht to menu
2019-12-10 15:32:08 +01:00
e35e4f0398
Changed: methods condition checking 'datum' instead of 'insertamum'
2019-12-10 12:06:32 +01:00
e8942a69b6
Changed: linking URL to CIS_ROOT now
2019-12-10 12:04:03 +01:00
72ec67a605
Fixed: errormsg missing data_arr in cronjob is fixed now
2019-12-10 10:26:50 +01:00
6093819eca
Button zum Löschen von Prüfungsanmeldungen hinzugefügt
2019-12-10 09:04:48 +01:00
1043633640
typ+kurzbz in dropdown
2019-12-09 18:19:28 +01:00
8d95c3820b
Added column Studienplan to table of Lehrauftrag bestellen
...
Added column with most recent, valid studiyplans of the records lv.
2019-12-09 15:47:43 +01:00
d5a8d83fdb
Merge branch 'feature-3367/Lehrauftrag_Markierung_Tempus'
2019-12-09 14:47:20 +01:00
74af42cfe6
Zertfikat TLC Workshops:
...
- aded studiengang_kz of Lehrveranstaltung to rdf and Lehrveranstaltung so correct Vorlage is used for Zertifikat
- renamed context entry "Freifaecher-Zertifikat erstellen" to "Zertifikat erstellen"
2019-12-09 09:52:03 +01:00
881fa5a582
Summen der akzeptierten Lehraufträge werden getrennt ausgewiesen in der Lehrauftragsliste
2019-12-06 16:07:19 +01:00
fc2d26e96d
Gruppenbezeichnung bei Lehraufträge korrigiert
2019-12-06 11:32:24 +01:00
29f923fb71
Statistiken korrigiert damit auch Stunden ohne Stundensatz aufscheinen
...
Faktor aus Betragsberechnung für Lehraufträge entfernt
2019-12-06 11:13:50 +01:00
9d06f9ccbd
Merge branch 'feature-5426/Matrikelnummer_V0.5'
2019-12-05 14:31:26 +01:00
e91657f833
Merge branch 'feature-4879/STIP_Schnittstelle'
2019-12-05 14:29:40 +01:00
6e89a917ae
Added missing phrases
2019-12-04 15:12:19 +01:00
64976c31df
Added new weblogservice type: API
2019-12-04 13:56:10 +01:00
4cf6ed9e0c
Added new CryptLib as a collection of different encryption/hashing algorithms based on phpseclib
2019-12-04 13:27:49 +01:00
1492dc6073
Coodle better message when saved
2019-12-04 13:04:48 +01:00
68f22de7fc
Auskommentierte Zeilen entfernt
2019-12-04 11:08:06 +01:00
ce54feb220
Anpassung der Matrikelnummern API Endpoints
...
Alte Version /dvb/VERSION/reservierung.xml auf Version 0.5 geändert /rws/0.5/matrikelreservierung.xml
2019-12-04 11:07:59 +01:00
312d4b41af
Merge branch 'Lehrverband_in_PreStudentstatus'
2019-12-04 11:03:52 +01:00
e0967d6265
Merge branch 'master' into Lehrverband_in_PreStudentstatus
2019-12-04 11:03:20 +01:00
5c3aed92f0
Added missing phrase
2019-12-03 16:07:45 +01:00
24f69c4333
Anpassung STIP Schnittstelle an Version 3.0
...
- Neue Abfrage für Matrikelnummer und StudiengangKz hinzugefügt
- Antwort von Matrikelnummer und StudiengangKz hinzugefügt
2019-12-03 08:37:00 +01:00
4f22079ef8
Merge remote-tracking branch 'origin/master'
2019-12-02 18:29:17 +01:00
1ca3da12eb
Merge branch 'feature-4092/Berechtigung_aendern_der_ZGV_FAS'
2019-12-02 18:29:04 +01:00
4f6f3ddc7c
Tempus
...
- Vertragsfilter wird nur angezeigt bei aktivierten Vertragsdetails
- Vertragsfilter wird zurückgesetzt werdenn die Details neu geladen werden
- Detailsframe hat eine Defaultgröße damit der Frame nicht herumspringt beim Filterwechsel
2019-12-02 18:01:29 +01:00
446587b16c
Merge branch 'feature-5127/Zum_RT_freigegeben_reihungstestangetreten_filter'
2019-12-02 15:03:31 +01:00
152ee0cfff
Merge branch 'feature-4889/Projekte_Admin_setzt_den_Projekttyp'
2019-12-02 14:55:48 +01:00
7f752bf666
Merge branch 'feature-3478/Reporting_User_speichert_und_lädt_Ansichten_einer_Pivot_Tabelle'
2019-12-02 14:30:54 +01:00
64437eba62
Merge branch 'feature-4822/Sonderzeichen_uid'
2019-12-02 13:52:25 +01:00
e910be58e3
Added phrases for account activation
2019-11-29 16:37:33 +01:00
abf663d97d
Natalie statt Dragana in Account Deaktivierung Mail
2019-11-28 17:28:50 +01:00
11997bde6b
Merge branch 'feature-5352/RTGebieteKopieren'
2019-11-28 17:26:24 +01:00
6f66f7f57e
Neue Seite um ganze Reihungstestgebiete zu kopieren
2019-11-28 17:25:28 +01:00
fc54fcb049
Anpassung Statistik an zentrale RT
2019-11-28 17:21:43 +01:00
2c2a23dfe9
Bugfix Studentencheck
...
Verbesserungen Studentenmeldung:
- Select zum Wechseln der Studiengänge für Admins
- Studiensemester als GET-Param für vergangene Meldungen
2019-11-28 17:18:51 +01:00
c2bc48d320
- Placed a timestamp in the filter/table widget session
...
- Added a constant as fallback timeout for filter/table widget
- Added a parameter to specify the filter/table widget life time
- Filter/table widget on load removes expired filter/table widgets from session
2019-11-28 16:51:38 +01:00
5aa8027a37
system/dbupdate_3.3.php
...
- foreign key fk_tbl_projekt_projekttyp in fue.tbl_projekte: ON DELETE RESTRICT statt ON DELETE CASCADE
- privileges fue.tbl_projekttyp: Only SELECT for Web and Wawi
2019-11-28 15:28:17 +01:00
ff6b7a024d
Filter im Tempus nach Vertragsstatus hinzugefügt
2019-11-27 18:18:44 +01:00
e86db7b610
system/dbupdate_3.3.php
...
- added statistik_kurzbz for system.tbl_filters to Gegenpruefung array
2019-11-27 15:51:46 +01:00
0319d0cc2a
- Added new constants in config/constants.php:
...
- LANG_SESSION_ACTIVE_LANGUAGES
- LANG_SESSION_CURRENT_LANGUAGE
- Added new functions in helper hlp_language_helper:
- setUserLanguage
- getDBActiveLanguages
- getActiveLanguages
- Adapted code to make use of them
- Added new controller controllers/widgets/Language
2019-11-26 15:24:26 +01:00
bc4bebb39f
Minor changes in job MailLehrauftragToApprove
...
Optimized code, added logInfo.
2019-11-26 14:46:28 +01:00
a93ddfbe3d
Added cronjob mailLehrauftraegeToAccept()
...
This daily job sends information about all lehr-/projektauftraege
approved (and not accepted/cancelled) the day bofore.
Receivers: lectors
2019-11-26 14:44:24 +01:00
45e381e043
Added function getApproved_fromDate() to Vertragvertragsstatus_model
...
This method returns all contracts, where the status had been set to
'erteilt' on given date.
2019-11-26 14:41:27 +01:00
a33d64427e
vilesci/personen/import/mitarbeiterimport.php:
...
- uid validity is checked with php as well
- fixed tablesorter error when no mitarbeiter found when "Vorschlag laden" is clicked
- changed width of "Vorschlag laden" table for better layout
- adding mitarbeiter to existing person: adress fields are now disabled when 'Adresse nicht anlegen' is selected, enabled when "Bestehende Adresse überschreiben" or "Adresse hinzufügen" are selected
2019-11-25 17:58:44 +01:00
94bafe4d6d
Fixed cancel-error-msg & wrong status 'geändert' by adding permission
...
Before the assistance was receiving error msg when cancelling a contract.
Also study program leader and assistance got wrong status displayed.
This was due to missing permission check in vertrag.rdf.php and is
fixed now.
2019-11-25 17:11:41 +01:00
0f9b29c52e
- Added private method _checkHTTPS to core/FHC_Controller
...
- Method _checkHTTPS is called in core/FHC_Controller constructor immediately after the parent constructor call
- Method _checkHTTPS checks if the HTTPS protocol is enabled and used, if NOT then an error is raised and the execution is terminated
2019-11-25 16:25:10 +01:00
586c626ff0
Fixed: Corrected incorrect SQL query in Benutzerfunktion_model
...
Incorrect bracket was causing error message. This is fixed now.
2019-11-25 09:35:42 +01:00
24db32f658
Added function getOrdered_fromDate() to Vertragvertragsstatus_model
...
This method returns all contracts, where the status had been set to
'bestellt' on given date.
2019-11-25 08:55:30 +01:00
0a335b7627
Added cronjob mailLehrauftraegeToApprove()
...
This daily job sends information about all lehr-/projektauftraege
ordered (and not approved) the day bofore.
Receivers: Department-/Kompetenzfeldleiter
2019-11-25 08:46:31 +01:00
ea09dfda58
Optimized text of 'Hilfe für diese Seite'
...
Added information for lectors page. Some minor text enhancements to
avoid misunderstanding.
2019-11-25 08:43:46 +01:00
df555426a0
Changed: column STG-type is visible now
2019-11-25 08:39:53 +01:00
4da3062c00
Added LV-ID to group-header title
2019-11-25 08:38:01 +01:00
819face9f9
Funktionen für BIS-Meldung angepasst/ergänzt
2019-11-25 08:36:35 +01:00
107a8ea9a9
vilesci/personen/import/mitarbeiterimport.php:
...
- uid special characters check performed, form submitted if passed, submisson prevented otherwise
- uid length check >= 4 >= 32
- correct line breaking of left block when "Vorschlag laden" table is displayed
2019-11-22 18:06:20 +01:00
ceb3f212c9
- Added support for language in session in function getUserLanguage from helper hlp_language_helper
...
- If the language is loaded from database then it is checked that the language is enabled
2019-11-22 12:05:07 +01:00
9e6af6579f
Aktueller Vertragsstatus wird im Tempus angezeigt
2019-11-20 14:01:27 +01:00
e4f1215d50
- added database table fue.tbl_projekttyp
...
- foreign key projekttyp_kurzbz in fue.tbl_projekt table
2019-11-19 14:27:29 +01:00
996e9147bc
views/system/infocenter/infocenterFreigegebenData.php: Interessenten with reihungstestangetreten = TRUE from prestudent table are removed from resultset
2019-11-18 18:47:54 +01:00
6bf7d46ace
- Added securimage via composer
...
- Added securimage in application/views/templates/FHC-Header.php
2019-11-18 15:04:52 +01:00
78dcf5ca26
Räume können optional auch bei Terminkollision gebucht werden
2019-11-18 07:31:53 +01:00
2657c64b81
Merge branch 'feature-4590/Freifächer_am_Notenspiegel'
2019-11-15 14:13:11 +01:00
cbb82ade3c
Merge branch 'feature-4837/CIS_insertvon_bei_Reservierungen_anzeigen'
2019-11-15 14:06:45 +01:00
4e83a4863a
Merge branch 'feature-4835/Zeitaufzeichnung_Admin_exportiert_Projektliste_eines_Users'
2019-11-15 12:13:40 +01:00
10b351f4da
Merge branch 'feature-4834/Zeitaufzeichnung_OhneUeberlappung'
2019-11-15 12:12:14 +01:00
084056a1a0
Merge branch 'feature-4825/Infocenter_zurückstellen_Farbe_intensiver'
2019-11-15 11:44:45 +01:00
2f28d9aee9
Merge branch 'bug-3736/FilterWidget_apply_filter_before_saving'
2019-11-15 11:37:24 +01:00
453589b54e
Merge branch 'feature-4022/Fotoliste_PHP_Notice_wenn_keine_Studierenden_zugeteilt_sind'
2019-11-15 11:23:15 +01:00
0d3e94af32
Merge branch 'feature-4463/Untergebene_ohne_Assistenz'
2019-11-15 11:16:07 +01:00
617f435a7c
Merge branch 'feature-4825/Studiensemester_Studienjahr_anlegen_bessere_Fehlermeldung_wenn_existiert'
2019-11-15 11:08:53 +01:00
c17bbfff5d
Added missing tables and columns to DB-Reverse-Check
2019-11-15 08:26:47 +01:00
a093d470e4
Fixed merge mistakes in FilterWidget
2019-11-14 15:40:35 +01:00
2a73f440ee
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-11-14 14:41:47 +01:00
415b37a8f4
- Write message page is opened in same window
...
- After message is sent then read page is loaded
2019-11-14 14:21:36 +01:00
565cf93f5d
- Messages GUI multilingual
...
- Tabulator refresh fixed
2019-11-14 13:49:31 +01:00
7bc8255787
Added fixed column width to all betrag- and all status-columns
2019-11-12 17:51:18 +01:00
5488bfbc28
Amended 'Hilfe zu dieser Seite' information for Lehrauftrag akzeptieren
...
Added information about filter and selection.
2019-11-12 17:42:51 +01:00
cc4baa9dfb
Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag
2019-11-12 16:21:38 +01:00
b0d9010aec
Fixed: now status 'geändert' renders correctly when Stunden are NULL
...
When FAS Stunden were left empty, the vertrag_stunden were compared with
null stunden. So: comparing 0 with null was setting status to 'geaendert',
although practically there was no change to the contract.
This is fixed now.
2019-11-12 16:17:45 +01:00
7aea534778
Added formatter to column Stunden: null values -> format to '0.0'
...
Before the field was left empty. Now 0.0 will be displayed, even if
FAS Stunden are left empty.
2019-11-12 16:11:40 +01:00
e092a6c33e
Minor change: removed unused field
2019-11-12 16:08:10 +01:00
609adcc431
Dashboard für Lehraufträge hinzugefügt
2019-11-12 16:02:13 +01:00
80ed75a6ad
Im Statistik SQL wird die Variable $user automatisch durch den eingeloggten User ersetzt.
2019-11-12 15:59:19 +01:00
26cd749f01
Added 'Hilfe zu dieser Seite' link & collapsable module
...
Now a 'how to use this site' - help information is provided to the user
for Lehrauftrag bestellen / erteilen / annehmen.
2019-11-12 12:08:54 +01:00
3f1f509dfa
Renamed column 'LE-ID' -> to 'LV-Teil'
2019-11-12 12:05:31 +01:00
d1f99ac667
Removed initial filter from Lehrauftrag akzeptieren
...
Now Lehrauftrag akzeptieren is showing initially all lehrauftraege.
2019-11-12 12:04:29 +01:00
321da96728
Fixed: Vertragsstatus in Projektbetreuung now showing correct status
...
Before it was showing incorrectly status 'Geändert', it means even if
contract and lehrauftrag had same stunden or betrag.
Now this is fixed.
2019-11-12 11:59:51 +01:00
bd723e234e
Changed order of Studiensemester_widget
...
Now it is ordered chronologically (WS2020-SS2020-WS201-SS2019...), which
fits better to daily usage.
Before it was ordered alphabetically.
2019-11-12 11:56:11 +01:00
9f3c9d5481
Unified default text displayed in Dropdown-Widgets
...
Now the dropdown widgets used in lehrauftrags-process have all same
look & feel when nothing is (pre-)selected. It will display
'Ausbildungssemester' or 'Studiengang'.
2019-11-12 11:53:57 +01:00
3b697df851
Changed side menu window target from _blank -> to _self
...
Now side menu links Lehrauftrag bestellen and Lehrauftrag erteilen
are opening within tab itself.
2019-11-12 11:46:01 +01:00
f5a7c77707
infocenter Übersicht: changed color of onhold students to dark yellow, #CDAD00
2019-11-12 10:51:17 +01:00
ba0dfee18f
FilterWidget: apply filter changes before saving it
2019-11-07 16:06:09 +01:00
5c21e29a0a
- Studiensemester + Studienjahr anlegen: if Studiensemester/Studienjahr to add already exist, more beautiful error message displayed instead of page crash with database error
...
- renamed methods "saveStudienjahr" and "saveStudiensemester" und Studienjahr and Studiensemester controller to clearer "updateStudienjahr" and "updateStudiensemester"
2019-11-06 16:57:58 +01:00
551eeaa004
- infocenter: different color for onhold - applicants so they can be better distinguished in infocenter uebersicht from parked
2019-11-06 16:38:45 +01:00
ece06bc462
Notice email for all people allowed to receive messages for an organisation unit
2019-11-06 16:34:20 +01:00
4e50f6eea2
Assistenzfunktion wird nicht mehr automatisch als disziplinäre Zuordnung
...
zur jeweiligen Abteilung gewertet. Zur Ermittlung der Untergebenen wird nur
noch die oezuordnung verwendet
2019-11-06 15:55:13 +01:00
5d57fd2441
automatische Pause erst ab 2019-11-06
2019-11-06 14:58:53 +01:00
01d3755df2
Zeitaufzeichnung Projektlisteexport: commented out "gedruckt am" (printed on)
2019-11-06 11:52:24 +01:00
b95b7c0707
Dropped TableWidget.css from FHC_Header: Not used at the moment
2019-11-06 10:53:37 +01:00
a1eec8e551
Merge branch 'feature-4834/Zeitaufzeichnung_OhneUeberlappung'
2019-11-06 10:22:39 +01:00
5fa07f68c5
Minor changes: page title text; removed values not used by Tablewidget
2019-11-05 16:52:37 +01:00
9571e1ed7d
Changed: Check if HAS INKLUDIERTE LEHRE now done by AJAX within js file
...
After moving javascript code from the view to an external js file, the
usage of global variable has_inkludierteLehre was causing css issues.
Now the check if lector has inkludierte lehre is an extra method in the
controller which is called by AJAX in the tabulators render-callback
function.
2019-11-05 16:47:36 +01:00
94506d8a14
Fixed: Corrected icon bestellt instead of icon changed when updating rows
...
Because of recently commited extra check of stunden/vertragstunden to
determine geaenderte Lehrauftraege correctly, the row update callback
function needed also extra information to format status icon correctly.
This is fixed now.
2019-11-05 16:32:00 +01:00
557906c4dd
LogsViewer always reload dataset
2019-11-05 16:27:35 +01:00
11635e376d
Changed filterwidget to tablewidget in Lehrauftrag akzeptieren
2019-11-04 17:08:44 +01:00
86a129a5e3
- user story 4023: when Fotoliste is generated for more than 1 Mitarbeiter (e.g. Freifächer), now different photos for each Mitarbeiter are generated (person_id is used instead of Matrikelnr)
2019-11-04 17:08:36 +01:00
9c2ce1614b
Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag
2019-11-04 17:00:38 +01:00
3e5e65bfc4
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
2019-11-04 16:58:19 +01:00
6997791794
Überlappungen nicht mehr möglich
...
feature Pause automatisch stempeln
2019-11-04 16:09:11 +01:00
f70fddbb27
Moved embedded js-script within view files --> to own javascript files
...
Moved out all js related code from views
lehrauftrag bestellen/erteilen/akzeptieren to own javascript files.
2019-11-04 15:35:34 +01:00
ed818c72d9
Merge branch 'master' into feature-4026/TabulatorWidget
2019-11-04 15:08:42 +01:00
927975aa5f
No PHP notice (undefined variable foto_url_arr) is shown when exporting Fotoliste
2019-11-04 13:57:51 +01:00
3a95c4f22f
Lehrverband in PreStudentstatus
2019-10-30 22:19:11 +01:00
763c34e27d
Merge branch 'master' into feature-4092/Berechtigung_aendern_der_ZGV_FAS
2019-10-30 20:17:43 +01:00
71aba3a78c
Recht in Checksystem
2019-10-30 20:17:29 +01:00
5184ab58c8
Merge branch 'master' into feature-4822/Sonderzeichen_uid
2019-10-30 20:14:21 +01:00
7d5dd646fa
Fehlermeldung wenn Sonderzeichen in UID
2019-10-30 20:13:22 +01:00
2a4360862a
- Reply Button in Inbox/outbox Page
...
- Write new message Button with Layer/Popup
- Degree Programs drop down displays longer name (if prestudent bestätigt (alias interessent with bestaetigtam != null ) receiver-> dp, otherwise -> infocenter)
- SQL to get OU recipient doesn't use beginn / End of function
- Always set insertvon in tbl_msg_status
- Add Multilanguage Support for Message Page (not completed yet)
- If in sent mode do not set messages as read
- Error message when there are no Messages available shouldnt be displayed
2019-10-30 18:35:46 +01:00
36e5009d68
Fixed problems with DialogLib
2019-10-30 18:31:21 +01:00
6594a5288b
Better CSS for messaging system pages
2019-10-30 18:30:50 +01:00
d40fd6391a
Added some phrases for the messaging system, english only
2019-10-30 18:30:16 +01:00
0fc2de2155
Fixed & Secured: Approving LA not causing permission error anymore
...
Before the organisational unit of the lv was sent via AJAX to the server
and used for checking the permissions on that organisational unit.
This was insecure (post data manipulation) and organisational units were
wrong (prepared string instead of oe_kurzbz).
This is fixed now by serverside check of organisational unit.
(based on given vertrag_id)
2019-10-30 15:05:31 +01:00
47f1fe1377
Added methods getLehreinheitID() and getLehreinheitData() to Vertrag_model
...
. getLehreinheitID(): Gets Lehreinheit ID corresponding to the contract.
. getLehreinheitData(): Gets (table) data of lehreinheit_id
corresponding to the contract.
2019-10-30 14:54:40 +01:00
13fa392e04
Moved often used external models to top of Vertrag_model
2019-10-30 14:51:39 +01:00
c0abce27d6
insertvon Person wird bei Reservierungen details (stpl_detail.php) und "Meine Reservierungen"-Liste angezeigt
2019-10-30 14:42:32 +01:00
7f549299cb
Fixed: Restricted permission for display of side navigation menu LA-Erteilen
2019-10-30 10:42:02 +01:00
65c3a83a20
Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag
2019-10-30 08:24:05 +01:00
fff1025eed
Adapted FAS to display status 'Geändert' when CHANGED HOURS (and NO betrag)
...
Up to now changes were identified only by comparing betrag with
vertrag_betrag.
Problem is: when a new Lehrauftrag betrag is set with 0 or NULL and only
hours are set, a later change of hours cannot be identified (as the betrag
and vertrag_betrag do not change). This is fixed now.
2019-10-29 18:12:16 +01:00
a02c1cd579
Added FORMATTER form_formatNullToStringNumber: formats NULL to '0.00'
...
Now this is used to display 0.00 in Betrag-column when the value is null.
2019-10-29 17:41:17 +01:00
998dbe7528
Added FORMATTER form_formatNullToStringNumber: formats NULL to '0.00'
...
Now this is used to display 0.00 in Betrag-column when the value is null.
2019-10-29 17:40:12 +01:00
3129707a10
Adapted GUI and filter to UPDATE also CHANGED HOURS
...
Up to now changes were identified only by comparing betrag with
vertrag_betrag.
Problem is: when a new Lehrauftrag betrag is set with 0 or NULL and only
hours are set, a later change of hours cannot be identified (as the betrag
and vertrag_betrag do not change). This is fixed now.
2019-10-29 16:21:13 +01:00
49f7f61273
Merge branch 'feature-3801/Use_different_source_CI_REST'
2019-10-29 15:17:38 +01:00
bc05f32d5e
Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken'
2019-10-29 15:04:02 +01:00
e9b20283b5
Berechtigung in FAS einbauen
2019-10-29 14:53:40 +01:00
d760df8198
Merge branch 'feature-4960/Javascript_Timestamp'
2019-10-29 14:50:19 +01:00
5be68be408
Added Anti-Cache Functionality
2019-10-29 14:49:35 +01:00
8d2c85734e
Adapted Controller to UPDATE also CHANGED HOURS
...
Up to now changes were identified only by comparing betrag with
vertrag_betrag.
Problem is: when a new Lehrauftrag betrag is set with 0 or NULL and only
hours are set, a later change of hours cannot be identified (as the betrag
and vertrag_betrag do not change). This is fixed now.
2019-10-29 13:16:38 +01:00
3897f120ee
Merge branch 'feature-4152/CIS_Funktionen_Wochenstunden'
2019-10-29 11:09:12 +01:00
31850ebfa1
Added param validation to Vertrag_model methods & minor code improvement
2019-10-29 10:43:52 +01:00
438b7b5b9e
Moved methods from Vertrag_model to Vertragvertragsstatus_model
...
Moved out and adapted methods which correspond to Vertragsstatus
from Vertrag_model to Vertragvertragsstatus_model.
2019-10-29 10:41:40 +01:00
22a517b88d
Added LogsViewer to CI Menu
2019-10-29 06:51:36 +01:00
4d248f3a1e
- cis/private/profile/index.php: Wochenstunden on profile are only shown to own user or admin
2019-10-28 17:29:09 +01:00
9e9612d317
Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets'
2019-10-28 16:28:57 +01:00
ab947cf5f1
Fixed: Tooltip of geaenderte LA will show up now
2019-10-28 16:26:38 +01:00
720f117312
Added/Extended PERMISSION-checks to Lehrauftraege
...
Added permission-checks to
. navigation
. controller methods
. tabulator data query
. cancel contract
2019-10-28 16:25:56 +01:00
c55f790d4a
- Only zeugnisrelevante Noten are shown in Notenspiegel (for excluding e.g. ECI LVs)
2019-10-28 16:24:10 +01:00
85b6c7556f
Merge branch 'feature-4404/Dieter_Dummy_umbenennen'
2019-10-28 15:23:05 +01:00
a18d9ccced
Merge branch 'feature-4027/Personen_zusammenlegen_Pruefling'
2019-10-28 14:59:44 +01:00
c179655124
Merge branch 'feature-4562/Extends_helper_hlp_authentication_helper'
2019-10-28 14:52:30 +01:00
2d68d2ffeb
Adapted Header and Background Style for CIS-CI Pages
2019-10-28 14:43:05 +01:00
ff856315d1
- uid for Projektliste Zeitaufzeichnung Export is passed already when calling the Zeitaufzeichnung with uid parameter
2019-10-28 11:38:46 +01:00
25c2d57993
Added missing Phrases for Password Change
2019-10-28 07:42:10 +01:00
4b6e290c5b
Merge branch 'TempusLektorFilter'
2019-10-25 19:55:52 +02:00
08cdd48510
Merge branch 'master' into TempusLektorFilter
2019-10-25 19:54:11 +02:00
acf132da39
Merge branch 'feature-3778/PunkteübertragReihungstestpunkteFAS'
2019-10-25 19:52:57 +02:00
7c0e3867b6
Merge branch 'master' into feature-3778/PunkteübertragReihungstestpunkteFAS
2019-10-25 19:50:48 +02:00
f373ffb529
Merge branch 'feature-4366'
2019-10-25 19:47:59 +02:00
3760af9394
Merge branch 'master' into feature-4366
2019-10-25 19:47:32 +02:00
4e9588cf76
Alte Vorlagen Ausbildungsverträge in Core gelöscht
...
-> sind in Addon FHTW
2019-10-25 19:45:43 +02:00
c9a3886e07
Nachgereichte Dokumente in FAS löschen
...
Wenn kein Dokument im DMS vorhanden ist, aber die akte auf "wird nachgereicht" gesetzt ist, darf diese im FAS gelöscht werden.
2019-10-25 19:45:09 +02:00
9d70d4c30f
Dokumenttyp "ZgvMaPre" hinzugefügt
...
Für Download aus Bewerbungstool
2019-10-25 19:44:22 +02:00
754868da90
Usability-Verbesserungen
...
- GUI-Überarbeitung
- vorläufige Terminzusagen als ical abonnierbar
-
2019-10-25 19:42:27 +02:00
3c13dafa47
- zeitaufzeichnung_projektliste.php: uid wird übergeben sodass Admin Zeitaufzeichnungen aller Nutzer sehen kann
2019-10-25 17:14:20 +02:00
7cf812deae
Minor GUI change for better usability
...
Now first button group groups ONLY defined process steps.
(the show-changed button is moved outside)
2019-10-25 12:33:06 +02:00
ae313175c8
Fixed: 'Alle auswählen'-button filters now correctly
...
The changed contracts were still selected when using the 'Alle Auswählen'
button. This is fixed now.
2019-10-25 12:29:38 +02:00
89ad21b1ef
- Infocenter uebersicht bugfix: tablesorter filter storage is the same for homepage with and without "/index" (for keeping tablesorter filter when coming back from details page)
2019-10-25 10:26:54 +02:00
1971ec8ed1
- Infocenter.php bugfix: GET parameter list is separated by "&" and not by ? (params filter_id, reloadDataset)
2019-10-25 10:20:56 +02:00
5b72ccdea1
Fixed: Unfolding LV-list was broken when certain config var -> fixed now
...
This error was caused when config var
FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN was set to false
due to incorrect converting of php boolean into js boolean.
Fixed now for LV and Projektbetreuung.
2019-10-25 09:52:54 +02:00
fe94cfc350
Avoided removing lector on Key-press 'Entf', when contract exists
...
The remove of the lector was avoided by disabled 'Entfernen' in the
context menu, but still possible on key press 'Entf'. Now this is
prevented and a message is displayed. For lectors in LV and for
Projektbetreuer.
2019-10-25 08:35:07 +02:00
b6bd2dd104
Changed STORNO: Now cancelling always possible (since contract exists)
...
Before cancelling a contract was only possible if vertragsstatus was
'akzeptiert'. Now contract cancellation for LV and Projektbetreuung
since the lector has a contract. (from status 'bestellt' on)
2019-10-25 08:24:43 +02:00
2b18be33af
Button zur Bestätigung nur mehr unterhalb des Textes
2019-10-24 17:31:25 +02:00
172421f4a9
Fixed: Size of password field now visible also when resizing
2019-10-24 16:05:22 +02:00
f3006d4760
Minor doc changes
2019-10-24 15:59:30 +02:00
30ef50fa4c
Fixed: BIG AMOUNT of Lehrauftrage not causing POST param limit issue anymore
...
Before the number of params was overflowing POST param limitation of 1000.
Now data is json stringified on clientside to pack all data in only one
string. Adaptations were done also on serverside.
2019-10-24 15:57:50 +02:00
9d0944b717
Reduced posting data (client-side)
...
This is to achieve better performance when sending loads
of Lehrauftraege.
2019-10-24 15:48:08 +02:00
89fc2ecd0a
Fixed: Corrected number of rows in CSV download
...
The new line in concatinated groups was causing extra lines in
excel file and messing the structure.
Also adapted download status title to enable correct data import of
csv text file.
2019-10-24 15:44:38 +02:00
5936476dd5
Minor GUI optimizations
...
. Changed status icon on header row
. No mousepointer on unselectable geanderte LA in LA akzeptieren
2019-10-24 14:19:05 +02:00
746f082121
Fixed: Excluded dummy lectors from all selections/filters
...
Some selections/filters were not selecting/filtering correctly out the
dummy lectors OR filtering out Betreuung.
It needs: personalnummer >= 0
. > to ensure no dummies
. = to retrieve also Betreuungen
(where personalnummer is provided with NULL)
2019-10-24 14:14:48 +02:00
bceb11b420
Added INITIAL FILTER to LA akzeptieren
...
Initial filter is: erteilte LA.
Now these rows are presented to the user when loading the page.
2019-10-24 14:08:23 +02:00
e68337c685
Added INITIAL FILTER to LA erteilen
...
Initial filter is: no dummies, neu or geändert.
Now these rows are presented to the user when loading the page.
2019-10-24 14:04:57 +02:00
7cf02c3566
Added INITIAL FILTER to LA bestellen
...
Initial filter is: no dummies, neu or geändert.
Now these rows are presented to the user when loading the page.
2019-10-24 14:03:08 +02:00
9a71c29ca2
Added FOOTER to tabulator with CSV download and adapted GUI to LA akzeptieren
...
New:
. tabulator footer with
- buttons Alle auswählen/abwählen
- display number of selected rows
- CSV download
. filter buttons
- accept-button now initially activated and focused, toggle on click
- now as buttongroup in extra row
2019-10-24 13:51:43 +02:00
a5e915066a
Added FOOTER to tabulator with CSV download and adapted GUI to LA erteilen
...
New:
. tabulator footer with
- buttons Alle auswählen/abwählen
- display number of selected rows
- CSV download
. filter buttons
- approve-button now initially activated and focused, toggle on click
- now as buttongroup in extra row
. Lehrauftrag erteilen - button disabled when filter on dummies
2019-10-24 13:47:30 +02:00
83eb4bd5f3
Added FOOTER to tabulator with CSV download and adapted GUI to LA bestellen
...
New:
. tabulator footer with
- buttons Alle auswählen/abwählen
- display number of selected rows
- CSV download
. filter buttons
- order-button now initially activated and focused, toggle on click
- now as buttongroup in extra row
. Lehrauftrag bestellen - button disabled when filter on dummies
2019-10-24 13:44:05 +02:00
92cfa521f7
Fixed DB-error when vertragsbetrag IS NULL
...
Now if betrag is null will be converted to 0.
2019-10-24 13:28:18 +02:00
fbec49a663
- bugfix: parking & zurückstellen datepicker: current day cannot be selected, because default time is 00:00, and it would be immediately exceeded
2019-10-24 11:43:10 +02:00
4de5f1533f
- parking and zurückstellen date and buttons: adapted layout for correct line breaking
2019-10-24 11:29:38 +02:00
771fb6f823
Phrase
2019-10-23 13:48:17 +02:00
7ccffc24ee
- Added database column statistik_kurzbz in system.tbl_filters
...
- Added row 'report' for app in system.tbl_app
2019-10-23 13:16:24 +02:00
d3e22185e3
Changed wording: akzeptiert -> angenommen
...
Changed wording according to customer request.
Only if visible on GUI, not on all technical usages.
2019-10-22 16:41:16 +02:00
0dcf1980ca
Optimized HEADER FILTER in tabulator to use COMPARISON OPERATORS
...
Now header filter parses the given filterstring.
If it starts with a comparison operator it will be used for comparison.
Otherwise just compare the stringnumbers to be equal.
2019-10-22 16:27:27 +02:00
836c61e3b8
Changed user icons in filter- and status buttons (PNG icons)
...
Setting png icons is a workaround to use font-awsome 5.9.0 icons
until system can be updated to newer font awsome version.
Changed for filter/status buttons:
. ordered
. approved
. changed
2019-10-22 12:06:32 +02:00
fd3f74807b
Added font-awsome 5.9.0. USER ICONS in PNG format 150x150
...
PNG icons are used in status- and filter buttons
Setting png icons is a workaround to use font-awsome 5.9.0 icons
until system can be updated to newer font awsome version.
2019-10-22 11:59:38 +02:00
b59ba3f156
erlaube Terminkollision bei Raumreservierung
2019-10-22 07:20:36 +02:00
e65fc08e31
Merge remote-tracking branch 'origin/master'
2019-10-21 18:24:28 +02:00
e22d560134
Quickfix Export Studienblatt als .doc
2019-10-21 18:21:35 +02:00
a3ba7e381f
BugFix Betreuertyp BetreuerPraktik
2019-10-21 18:20:49 +02:00
49be024ca9
Coodle
...
- Umfragestart ohne Terminwahl verhindern
- Coodle FreeBusy einbinden
- Coodle Zusagen als iCal abonnieren
2019-10-21 18:19:57 +02:00
325f7dd09a
Changed order of displaying status in Lehrauftrag akzeptieren
...
First erteilte
Then bestellte
Last akzeptierte
2019-10-21 17:35:55 +02:00
ce84e0bea4
Removed unused vertrag data from queries and filters
...
. Removed unused:
- vertrag_insertvon (now using insertvon of vertrag_vertragsstatus instead)
- vertrag_insertamum
- vertrag_updatevon
- vertrag_updateamum
2019-10-21 17:33:41 +02:00
06f31997f2
Added bestellt_von/erteilt_von/akzeptiert_von columns and TOOLTIPS
...
. added tooltips on bestellt-, erteilt- and akzeptiert-column with
insertvon information
. adapted tooltips on status column
. added columns to all tabulator queries and to the filters
2019-10-21 17:29:23 +02:00
af29146bb5
Fixed: now variable erteilt is initialized correctly
2019-10-21 17:19:50 +02:00
cc28a92205
Added update of status icon directly after bestellen/erteilen/akzeptieren
...
Now the status icon and row formats are refreshed directly after the
bestell-/erteil-/akzeptieren-button was clicked.
Returning and updating vertrag_betrag in tabulator rows is needed to
detect when geaenderte have been updated and enable correct formatting.
2019-10-21 10:07:23 +02:00
790065a281
Added phrases for password change page
2019-10-18 14:42:08 +02:00
fde9af3eed
Anmeldebutton wird erst ab 2 Monaten vor Prüfung angezeigt
2019-10-17 12:42:22 +02:00
383558f262
new config variable
2019-10-17 07:41:28 +02:00
b3748fb910
Added focus on clicked filter button
2019-10-16 17:23:42 +02:00
49f7ac1c72
Minor changes: Changed tooltip text / Enhanced code
...
. standardized tooltip text
. geaenderte Lehrauftraege: bold in bestellen (selectable),
marked orange and not selectable in erteilen and akzeptieren
. removed parseFloat (not needed, now better perfomance)
. better var names for readability reasons
2019-10-16 15:13:46 +02:00
8881f799c3
Adapted filter select-all to select also geaenderte Lehrauftraege
2019-10-16 14:53:49 +02:00
4f065c9234
revert change
2019-10-16 14:47:42 +02:00
fbfa3badf1
Berechtigung korrigiert beim Löschen von Reservierungen direkt aus der Wochenplanansicht
2019-10-16 14:36:25 +02:00
19a88a8648
Added filter button for geaenderte Lehrauftraege to LA bestellen/erteilen
2019-10-16 12:42:13 +02:00
58ec6f8f31
SaveSort in Dokumentezuteilung
2019-10-16 12:08:20 +02:00
809b2b3e64
Anpassung FHTW Incomings auslesen
...
An der FHTW können nur die Incomings ausgelesen werden, wenn die stg_kz 10006 übergeben wird
2019-10-16 12:07:52 +02:00
280c4ca19f
Adapted filters for DUMMY lectors
2019-10-16 12:00:40 +02:00
aa6946bfff
Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag erteilen
2019-10-16 11:59:09 +02:00
9f8921e186
Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag bestellen
2019-10-16 11:58:44 +02:00
ed2a029139
Added GUI for DUMMY lectors in Lehrauftrag erteilen
...
. dummy status icon/tooltip/formats
. dummy filter button
2019-10-16 11:57:39 +02:00
5ccd23f68d
Added GUI for DUMMY lectors in Lehrauftrag bestellen
...
. dummy status icon/tooltip/formats
. dummy filter button
2019-10-16 11:56:26 +02:00
70605a83e1
Removed uncommented doc text!
2019-10-16 09:00:08 +02:00
9fc3d165db
Added status icons/tooltip/formats for GEAENDERTE in Lehrauftrag erteilen
2019-10-16 08:58:11 +02:00
5030f0b1ed
Major addition of tabulator functionality methods III / Enhanced code
...
III: Same as for orderLehrauftrag is here adapted to acceptLehrauftrag:
. MOVED out function from datasetRepFieldDefs to javascript for better
maintainance
. Added status column and status icons with tooltips
. Added status buttons to filter status rapidly
. Rows formatting enhanced and bootstrapped
. day of date now with 2 digits
2019-10-16 08:53:37 +02:00
745b227c1a
Merge branch 'hotfix-4790/FAS_UDF_tab_saving_is_broken'
2019-10-15 16:06:48 +02:00
7daac696b3
- Renamed controller system/UDF.php to system/FAS_UDF.php
...
- Renamed view system/udf.php to system/fas_udf.php
- Adapted code with new names
- Added model system/FAS_UDF_model with only FAS functionalities
- Removed FAS functionalities from model system/UDF_model
- Fixed session problems in controller system/FAS_UDF
2019-10-15 15:40:47 +02:00
733685b67e
Merge branch 'feature-2533/ZeitaufzeichnungCSVImport'
2019-10-15 14:10:27 +02:00
6d14423b82
Merge branch 'feature-4210/BIS_UHSTAT2_Erweiterungen'
2019-10-15 13:56:38 +02:00
509fdef03b
- Removed tabulator local pagination for messages list
...
- Removed error messages when the messages list is empty
2019-10-15 11:54:01 +02:00
934f8dc3c5
Fehlende Berechtigung für Tabelle aufenthaltfoerderung hinzugefügt
2019-10-15 09:35:02 +02:00
5ac6e4f01d
Added Ausbildungssemester to CONTROLLER
2019-10-15 08:46:00 +02:00
049820b468
Created Ausbildungssemster DropdownWidget
...
. returning 10 semester by default
. returning given numer of semester
2019-10-15 08:43:19 +02:00
36c8a4dbbe
Added Ausbildungssemester to tabulator QUERY
2019-10-15 08:41:16 +02:00
4c85c88725
Added Ausbildungssemester-Dropdown to GUI
2019-10-15 08:38:43 +02:00
0514ec87ba
Renamed main title to Lehrauftraege bestellen/erteilen/annehmen
2019-10-14 16:56:50 +02:00
a793a2f88c
Added hidden column with vertragdata
...
. Added hidden columns with vertragsdata to erteilt- and akzeptiert-
tabulator tables. This is to be able to detect where contract were
changed and mark/disable that lehrauftrag.
. Adapted filter
2019-10-14 16:44:03 +02:00
c370a27c18
Added table columns orgform_kurzbz and ausbildungssemester
...
. Columns lehrveranstaltung-orgform_kurzbz and -semester are now visible
in all tabulator-tables in bestellen - erteilen - akzeptieren.
. Renamed names of auftraege (no need to display semester text anymore)
. Adapted filter
2019-10-14 16:39:31 +02:00
19d69fdb59
Personen zusammenlegen (vilesci/stammdaten/personen_wartung.php): When merging prestudent, prueflinge are transferred from deleted prestudent to remaining prestudent.
2019-10-11 15:55:16 +02:00
d87e47c3ab
Major addition of tabulator functionality methods II / Enhanced code
...
II: Same as for orderLehrauftrag is here adapted to approveLehrauftrag:
. MOVED out function from datasetRepFieldDefs to javascript for better
maintainance
. Added status column and status icons with tooltips
. Added status buttons to filter status rapidly
. GroupBy Lehrveranstaltung: rows are grouped by LV, formatted
. Added calculation per group AND total
. Rows formatting enhanced and bootstrapped
. Fixed selection of data
. day of date now with 2 digits
2019-10-11 15:14:53 +02:00
fa28536093
Import für projekt, phase, oe und service
...
uid;aktivitaet;start;ende;beschreibung;OE;Projekt;Phase;Service
phase wird in der liste angezeigt
phase auch im export
2019-10-11 15:02:35 +02:00
dcaf4b26cb
Major addition of tabulator functionality methods / Enhanced code
...
. MOVED out function from datasetRepFieldDefs to javascript for better
maintainance
. Added status column and status icons with tooltips
. Added status buttons to filter status rapidly
. GroupBy Lehrveranstaltung: rows are grouped by LV, formatted
. Added calculation per group AND total
. Rows formatting enhanced and bootstrapped
. Fixed selection of data
. day of date now with 2 digits
2019-10-11 14:32:17 +02:00
7605daed01
Added vertrag-columns and lv bezeichnung to tabulator query and filter
...
Mainly usage is to update contract.
2019-10-11 13:55:36 +02:00
8a246a9f94
Added methods deleteStatus(), updateStatus() to Vertragvertragsstatus_model
...
. Updates the date of the given vertragsstatus.
. Deletes the given vertragsstatus of the contract.
2019-10-11 13:44:21 +02:00
0d5906e7bc
Added method updateVertrag() to Vertrag_model
...
Updates Vertrag and, if resets vertragsstatus as follows:
- if vertragsstatus 'erteilt': delete status 'erteilt' and
update date of status 'bestellt'
- if vertragsstatus 'bestellt': update date of status 'bestellt'
2019-10-11 13:42:39 +02:00
1af0ed466b
Added UPDATE contract logic to Controller orderLehrauftrag()
...
If a contract already exist and there is a difference between the
origin contract betrag and the lehrauftrag/projektbetreuer-betrag (after
FAS changes), the contract is updated.
2019-10-11 13:38:58 +02:00
5eb1c61adc
Anmeldebutton wird erst ab 2 Monate vor Prüfung angezeigt
2019-10-11 12:55:52 +02:00
9b53c18c4d
Diplomasupplement - Problem behoben wodurch das Auslandssemester nicht korrekt angedruckt wurde
2019-10-10 16:39:40 +02:00
051cfdf053
Testtool - Problem behoben beim Laden der Fragen wenn das Gebiet keine Demofragen hat
2019-10-10 14:40:11 +02:00
7ed31d9077
Testtool
...
- Corrected JQuery Version
- Fixed PHP Warning if no Ablauf is set
2019-10-10 07:35:39 +02:00
9ad853ca77
Filter invalid bPK from Response
2019-10-10 07:13:08 +02:00
76f2cde1f0
Problem behoben bei der Notendurchschnittsberechnung über alle Semester wenn inoffizielle Noten vergeben werden
2019-10-09 17:59:18 +02:00
e528071624
Fixed Error on Loading Menu in Testtool if only 2 Languages are available
2019-10-09 17:26:09 +02:00
0f5a8f2328
LVs in Liste nur anzeigen wenn min. 1 Prüfungstermin vorhanden ist
2019-10-09 15:30:52 +02:00
6484fcb822
Datenverbund API
...
- Problem behoben wodurch die Vergabemeldung nicht funktioniert
wenn ED10065 gleichzeitig mit ZD10076 als Antwort geliefert wird
- Neue Suchfunktion hinzugefügt für Vorname, Nachname, Geburtsdatum
- Neue Suchfunktion hinzugefügt zum Suchen nach Matrikelnummer
2019-10-09 11:01:52 +02:00
9b0fcbbfdd
Neuen Config Eintrag hinzugefügt um News am Infoterminal zu deaktivieren.
...
Dies kann die Performance der Infoterminals steigern wenn viele Newseinträge mit großen Bilder/Videos vorhanden sind
2019-10-09 10:07:30 +02:00
39dec7bb97
Make Dieter Dummy lecturer seemingly disappear
...
- deactivate profile page (error message is shown)
- removed from CIS search results
- no profile link in lvplan
2019-10-08 18:07:09 +02:00
2729b17d00
Adapted projektbetreuer rdf to return also vertrag_id
2019-10-08 13:44:26 +02:00
f1174f155e
Adapted DB-connection via $_POST type 'cancelVertrag' to cancel contracts
...
Adapted to cancel projektauftraege.
2019-10-08 13:43:39 +02:00
daa181a021
Added JS methods to perform Vertragsdetail-GUI & Vertragsstorno
2019-10-08 13:41:59 +02:00
4fb6ce3840
Added config var FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN
...
Boolean var to show/hide Vertragdetails in FAS Projektarbeit tab.
2019-10-08 13:38:37 +02:00
2af7909f66
Created GUI for Vertragdetails in FAS Projektarbeit
2019-10-08 13:37:17 +02:00
c98438c93d
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2019-10-08 11:44:35 +02:00
65da21f0fa
Größe der Akkordeonansicht korrigiert
2019-10-08 11:44:18 +02:00
b92a9f3433
Fixed Typo
2019-10-08 10:56:34 +02:00
33f6b41c98
Insertamum in Vorlagen
...
Insertamum, Insertvon, Updateamum und Updatevon in Vorlagen Class und Vorlagenverwaltung
2019-10-07 19:02:01 +02:00
120ffb0319
Merge remote-tracking branch 'origin/master'
2019-10-07 18:59:36 +02:00
2c23842fcb
BugFix Filterwidget DragAndDrop behaviour
2019-10-07 18:58:52 +02:00
753225e39e
Studienplan-Sprache für Cronjob correctStudienplan
2019-10-07 18:52:07 +02:00
03950b10b3
Geschlecht in lehrtaetigkeit.pdf.php
2019-10-07 18:51:01 +02:00
262a7d82e5
BugFix Projektarbeitsbenotung Assistenzrechte
2019-10-07 18:50:32 +02:00
2c45c933e1
Studiengang_Dokumente Usability verbessert
2019-10-07 18:49:48 +02:00
72a3c2845f
tablesorter filters saved in local storage in infocenter Übersicht are not deleted when using zurück button or freigegeben on infocenter details page.
2019-10-07 18:30:06 +02:00
fa4667baa7
CIS profil (cis/private/profile) Funktionen: separate blocks for current and future funktionen
2019-10-07 15:21:10 +02:00
db7687e1ff
Notebookregistrierung für Mitarbeiter deaktiviert
2019-10-07 14:00:46 +02:00
ee199236f1
CIS profil Funktionen:
...
- added Wochenstunden column
- added Wochenstunden and Vertragsstunden Summe
- removed semester and institut column
-
2019-10-07 10:09:47 +02:00
c739fb0dc5
Mitarbeiterexport exportiert nun zusätzlich die Anrede
2019-10-07 09:59:29 +02:00
4e0264e2d4
Added method cancel() to vertrag.class to cancel contracts
2019-10-07 08:57:52 +02:00
3e3a238dd9
Added DB-connetction via $_POST type 'cancelVertrag' to cancel contracts
2019-10-07 08:55:55 +02:00
e4969de9f3
Adapted FAS GUI to cancel contracts
2019-10-07 08:50:23 +02:00
0dddf57577
Added functionality & method VertragStornieren() to cancel contracts
2019-10-07 08:49:37 +02:00
5ef7fa2112
- PersonLogLib: rename _saveLog function to _savePsLog (processtate log)
2019-10-03 17:16:27 +02:00
854dcb7cea
- Infocenter: dataset in Übersicht is reloaded when clicking on back button from details page.
2019-10-03 16:23:19 +02:00
a7133a2573
Semesterticket ignoriert Groß/Kleinschreibung bei Vorname und Nachname
2019-10-03 15:46:58 +02:00
fce3659573
- Infocenter Übersicht: zurückgestellte BewerberInnen werden grün markiert
2019-10-03 15:22:54 +02:00
73e248534b
- infocenterDetails: added phrases rueckstelldatumUeberschritten and parkenZurueckstellenInfo
2019-10-03 10:15:10 +02:00
96385e978d
Anmerkung bei Abschlussprüfungen ist jetzt wieder sichtbar auch wenn die Uhrzeit ausgeblendet ist
2019-10-02 18:28:00 +02:00
e60839af27
Minor addings for correct GUI behaviour when Vertragsstorno is enabled
...
. disabled all fields of LektorInnendaten to prevent changings when
vertrag is already accepted
. added disabling the storno button by default
2019-10-02 18:10:52 +02:00
d9df0196a4
Adapted getLehreinheitmitarbeiter() to return also vertrag_id
2019-10-02 17:26:30 +02:00
4adf1c6db9
Adapted lehreinheitmitarbeiter rdf to return also vertrag_id
2019-10-02 17:25:21 +02:00
eabbf701b3
Added post type 'getLastVertragsstatus'
...
This will return the most recent vertragsstatus_kurzbz of passed
vertrag_id.
2019-10-02 17:24:11 +02:00
f939535444
Adapted JS method LeMitarbeiterAuswahl() to perform Vertragsdetails-GUI
2019-10-02 17:21:10 +02:00
38ae98cc36
- Infocenter Details: possible to set persons on hold, i.e. person is out of workflow temporalily (e.g. when waiting for info), but this can only be undone manually
2019-10-02 17:19:31 +02:00
544fd4d976
Added config var FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN
...
If set to true the Vertragdetails will be displayed in FAS
LektorInnenzuteilung.
2019-10-02 17:13:16 +02:00
4472868fcd
Created GUI for Vertragdetails in FAS LektorInnenzuteilung
...
Added groupbox with the contract details:
. status
. stunden (of original version of contract)
. studiensemester (of original version of contract)
The display is determined by global config value.
2019-10-02 17:11:32 +02:00
bc9a5b4b06
Added new functions getAuthFirstname and getAuthSurname to helper hlp_authentication_helper
2019-10-02 16:33:44 +02:00
b5c1285fb4
- Infocenter filter dataset is reloaded anytime Infocenter menu is clicked for Übersicht, Frreigegeben or Reihungstestabsolviert
2019-10-02 15:48:42 +02:00
c0afb92ddc
Merge branch 'feature-4190/Cronjobs_log_in_database'
2019-10-02 14:29:53 +02:00
ebcf75cfb4
Merge branch 'feature-3995/User_bucht_Zeit_auf_Arbeitspaket'
2019-10-02 13:53:38 +02:00
0dd82d42b3
Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets'
2019-10-02 10:57:58 +02:00
f1497df019
Adapted vertrag rdfs to new attributes vertragstunden, -studiensemester
...
Adapted rdf vertrag, vertragdetails to new attributes vertragsstunden
and vertragsstunden_studiensemester_kurbz.
2019-10-02 09:42:31 +02:00
605b88e8d7
Adapted queries to new vertragstunden, -studiensemester in vertrag.class
...
Adapted methods:
load, loadVertrag, loadZugeordnet, loadNichtZugeordnet
2019-10-02 09:39:38 +02:00
10963fd5c7
Added Stunden/Studiensemester of original contract to FAS Vertragsreiter
2019-10-02 09:30:41 +02:00
cdf3295e01
Auswahl für Prüfungsintervall ergänzt
2019-10-02 07:18:12 +02:00
4375a1ad0e
Added (Ausbildungs-)semester to query, tabulator columns and filter
2019-10-01 15:33:35 +02:00
dfe4e3d82c
Embedded into FH-Complete Navigation
...
. Added navigation items to top and left side menu for
Lehrauftraege bestellen and Lehrauftraege erteilen.
. Added NavigationWidget to views.
2019-10-01 14:28:15 +02:00
ac1f31f31f
Added possibility to have same TableWidget in more pages
2019-10-01 12:46:19 +02:00
15370267c6
Minor code and GUI changes
...
. changed file name lehrauftrag to orderLehrauftrag
. changed order of buttons
Both for consistecy
2019-10-01 08:14:36 +02:00
4ad2fe7dfb
Changed permission check: now using lehrauftrag_akzeptieren
2019-09-30 15:27:12 +02:00
1c3a5c395d
Added permission lehrauftrag_akzeptieren
...
This permission is for lectors to accept their lehraufträge.
2019-09-30 15:26:47 +02:00
6ff2f19c56
Changed the STG-Kürzel to 'typ + kurzbz' in Lehraufträge + Vertragsmodel
...
Before the organisational unit was set, but it should be a combination
of typ + kurzbz of the stg. This is changed now in
. all Lehraufträge
. Vertragsmodel
. filtersupdate
2019-09-30 15:09:45 +02:00
df12a9aa5d
Changed button show-accepted to show-approved
...
It makes more sense for lectures to show only approved lehraufträge by
one click to be then able to accept them.
2019-09-30 14:25:24 +02:00
04ac4f55fd
Removed groupBy option of tabulator
...
This was decided for better usability.
2019-09-30 14:22:04 +02:00
998e906ad3
Fixed: made row unselectable after updating the row
...
Changed command to work with our actual jquery version.
2019-09-30 14:20:05 +02:00
6b29461e06
Added empty password field
2019-09-30 14:16:48 +02:00
fd0eaaa366
Fixed: SQL subquery to only return one row
...
The subquery was sometimes returning more rows causing error message.
This is fixed now.
2019-09-30 14:11:04 +02:00
3938000cfc
Changed Kürzel for Studiengang-Dropdown-Widget to upper(typ||kurzbz)
2019-09-30 14:05:22 +02:00
484cc844ed
- Zeitaufzeichnung Projektphasen dropdown is shown right from Projektdropdown
...
- Projektphasen Dropdown is shown only if selected Projekt has Projektphasen
2019-09-27 16:44:01 +02:00
10e1539b22
infocenterData.php, infocenterFreigegebenData.php, infocenterReihungstestAbsolviertData.php: column data is retrieved from selected Studiensemester variable, and not from future Semesters
2019-09-27 14:36:18 +02:00
471c1ab9ef
top border of projekt name row is shown also in excel
2019-09-27 11:43:55 +02:00
4a00395d08
Moved directory creation to correct position to avoid problems if the entry
...
is not displayed
2019-09-27 09:49:47 +02:00
05898bdde5
system/dbupdate_3.3.: removed UPDATE, INSERT, DELETE permissions from user web for public.tbl_variablename
2019-09-26 17:46:40 +02:00
1273c32419
- Renamed controller system/JobsViewer.php to system/LogsViewer.php
...
- Renamed directory views/system/jobs to views/system/logs
- Changed FilterWidget query in view system/logs/logsViewerData.php to load all logs
- Added more filters in database to load different log types
2019-09-26 17:40:51 +02:00
4cb766d293
- added rights SELECT UPDATE INSERT DELETE for web and vilesci for tables bis.tbl_bisio_zweck and bis.tbl_aufenthaltfoerderung
2019-09-26 17:05:56 +02:00
bdb0cb7772
- added codex/Bisiozweck_model.php
2019-09-26 16:17:35 +02:00
c902ea28c0
Merge branch 'bug/soapclient'
2019-09-25 17:27:11 +02:00
6ed669cf02
Fixed PHP7 Bug that break SOAP Response
2019-09-25 17:24:22 +02:00
0c82d4fffc
Added new views for TableWidget
2019-09-25 17:19:08 +02:00
8210c3fdc7
Derived TableWidget from FilterWidget, added:
...
- libraries/TableWidgetLib
- widgets/TableWidget
- controllers/widgets/Tables
- public/js/TableWidget.js
2019-09-25 17:15:46 +02:00
aefc0dfd2c
Adapted filter for orderLehrauftraege and approveLehrauftraege
...
Added columns stg_oe_kurzbz and gruppe.
2019-09-25 17:01:05 +02:00
a70507a079
Adapted tabulator to display columns in correct order after query change
2019-09-25 16:58:33 +02:00
61a6bc7bfc
Fixed SQL query: corrected column order in subquery for Projektbetreuung
2019-09-25 16:25:04 +02:00
6f5de6a786
Adapted SQL query: gruppen aggregated in one cell, not in seperated rows
...
Before same lehreinheiten of same lector were shown in different rows,
when they were taught in different groups. This caused incorrect contract
inserts.
One contract is for per lector and per lehreinheit. Gruppen are only
displayed in one cell (aggregated if more)
2019-09-25 15:39:42 +02:00
83dd828be7
Minor adaptation to changed method isMitarbeiter()
2019-09-25 14:13:16 +02:00
169ffbb568
Changed method isLektor() to isMitarbeiter()
...
Because boolean field lektor is not necessary maintained, check is now
for overall mitarbeiter.
2019-09-25 14:11:38 +02:00
d7cbc89d8b
Added password validation to accept Lehraufträge in view & controller
...
. added password input field in view
. added password check in controller
. adapted ajax data object and logic to handle password check
2019-09-25 12:15:19 +02:00
8685f5ed1b
Minor fix: Corrected wrong hover color behaviour
...
Now the row stays green when accepted. Before it was still changing
color when hovering.
2019-09-25 12:11:28 +02:00
30c60881a7
Changed check for inkludierte Lehre
...
Now inkludierte Lehre returns false when value is null (= freelancer
lector), else true (= fix employed lector)
This impacts the visibility of the column 'Betrag': hidden for fix
employed lectors, shown for freelancer lectors.
2019-09-25 09:53:52 +02:00
dc64cadc4a
Changed: now rows are marked green only for accepted Lehraufträge
...
This is to achieve same behaviour for whole process Lehraufträge
bestellen/erteilen/akzeptieren.
2019-09-25 08:50:21 +02:00
43452a2127
Hided column 'Betrag' if lector has inkludierte Lehre
...
If the lectors actual Verwendung has inkludierte Lehre, the tabulators
column betrag is hided.
2019-09-24 16:10:23 +02:00
223f3110bd
Added method getLast()
...
This method gets latest (active) Verwendung of the user.
2019-09-24 16:06:50 +02:00
3340922a35
Extended/Adapted method setStatus()
...
Extended check: if new status is 'akzeptiert', the latest status has
to be 'erteilt'.
Adapted code as check for having certain status was outsourced to method
hasStatus.
2019-09-24 10:21:05 +02:00
1a58c977fe
Added method getLastStatus()
...
This method gets the latest Vertragsstatus for the given Vertrag and
Mitarbeiter.
2019-09-24 10:15:21 +02:00
812899e885
Added method hasStatus()
...
This method checks if Vertrag has the given Vertragsstatus.
2019-09-24 10:14:22 +02:00
a910527109
Added method isLektor()
...
This method checks if a given user is a lector (and eventually if is
fix employed)
2019-09-24 10:13:08 +02:00
3abfaebb1a
Created filter to accept Lehraufträge
2019-09-24 10:11:07 +02:00
6caec74df5
Created SQL-query and tabulator to accept Lehraufträge
2019-09-24 10:10:42 +02:00
9829532e4f
Created View to accept Lehraufträge
...
Created view and jQuery functions to manipulate the tabulator.
2019-09-24 10:08:20 +02:00
9325edd326
Created Controller to accept Lehraufträge
...
Created index- and acceptLehrauftrag methods.
2019-09-24 10:06:03 +02:00
a2ecd9bdbc
- zeitaufzeichnung_projektliste.php: separate sheet for each projekt
...
- fixed rounding sum issues for Projektphasen
- subtraction of pausen from Projektphase duration
- errorfree display if no projekt entered
- added projektphase_id to zeitaufzeichnung.class.php in getListe methods
2019-09-23 17:47:11 +02:00
0a4dffa704
FilterWidget is now back to only one filter per page, but others features were kept
2019-09-20 17:54:44 +02:00
b1815039fd
Merge branch 'feature-2147/CallerLibrary_and_CallerModel_controllers'
2019-09-19 17:00:19 +02:00
73904dd007
Added contract description when saving new contract
...
Description was missing, now generated when inserting new contract.
2019-09-19 15:56:30 +02:00
18a36ea497
Fixed controller api/v1/person/Benutzer
2019-09-19 14:33:02 +02:00
aa5ad40d5c
Minor code enhancement
...
changed clearFilter method; deleted comment
2019-09-19 14:19:45 +02:00
dd22ae71e3
Added alert/exit when no lehrauftrag was selected
2019-09-19 14:17:03 +02:00
2d8618b746
Added button to show only new Lehraufträge
2019-09-19 14:16:26 +02:00
6d2f911d58
Extended tabulator functionalities
...
Added some adaptations like
. group by lektor
. deselection on rowUpdate
. row formatting
. Text "Anzahl" to bottom line
2019-09-19 14:07:59 +02:00
615ed03fbe
Added method getOE_isEntitledFor()
...
The method checks permission of the logged in user and retrieves all
organisational units this user is entitled for.
2019-09-19 13:28:15 +02:00
8566039cc4
Fixed: Added check before DB insert
...
A check was missing if the contract already had that status. Error
was given. This is fixed now.
2019-09-19 13:23:12 +02:00
62cd1b6317
Adapted widget to receive and display only passed OrgUnits in Dropdown
2019-09-19 13:20:35 +02:00
cad203496f
Created filter to approve Lehraufträge
2019-09-19 13:18:03 +02:00
9de4faf25d
Created View data to approve Lehraufträge (query & tabulator)
2019-09-19 13:16:30 +02:00
1cbbf2652d
Created View to approve Lehraufträge
2019-09-19 13:15:17 +02:00
efd5ae6411
Created Controller to approve Lehraufträge
2019-09-19 13:13:03 +02:00
6669014ac4
Neue Felder für UHSTAT2 Meldung zu IO Karteireiter hinzugefügt
...
Mehrfachangabe von Zweck des Auslandsaufenthalts
Mehrfachangabe von Förderung des Auslandsaufenthalts
Neue Felder für erworbene und angerechnete ECTS hinzugefügt
BIS Schnittstelle um die neuen Felder erweitert
2019-09-19 09:19:09 +02:00
1da2a19d57
Ansprechpartner bei Account Deaktivierung korrigiert
2019-09-18 13:39:03 +02:00
e39a4252eb
Added param mitarbeiter_uid to method save()
...
For performance reasons.
(Before the uid was retrieved by loading BenutzerModel each time when
saving lots of contracts)
2019-09-17 15:58:40 +02:00
ad5309e273
Corrected SQL: bestellt/erteilt/akzeptiert in same row; added mitarbeiter_uid
...
. Corrected SQL to get bestellt/erteilt/akzeptiert in same row
Before it was creating new row for each stati, which was wrong.
. Added mitarbeiter_uid column.
. Changed column names for better maintainance and understanding.
(e.g. row_index instead of id)
2019-09-17 15:54:41 +02:00
14c279a03d
Problem behoben wodurch Matrikelnummern für das falsche Semester
...
angefordert wurden
2019-09-17 15:45:48 +02:00
c30135f197
Now MessageClient extends FHC_Controller and then starts the authentication
2019-09-17 10:38:25 +02:00
31cb13ec14
- Zeitaufzeichnung: Projektphase can be selected and saved for a project
2019-09-17 10:36:53 +02:00
131d031cae
- added column projektphase_id to tbl_zeitaufzeichnung
2019-09-17 10:29:24 +02:00
bf8b7e0ccd
Added JobsViewer
2019-09-16 14:00:51 +02:00
77f822cfc2
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2019-09-12 19:21:25 +02:00
4181893fdd
Hinweistext hinzugefügt wenn bei der Kartenverwaltung
...
zu viele Einträge gewählt werden da es vorkommen kann dass dadurch die maximale
Anzahl an POST Parametern überschritten wird und das Speichern der Daten
nicht korrekt funktioniert.
2019-09-12 19:19:50 +02:00
123fef945f
- copied pivot.de.js pivottable language file from reporting addon to public folder
2019-09-12 18:10:36 +02:00
8efb6035c9
Mitarbeiter Defaultwert für Fixangestellt und Aliasgenerierung ist
...
konfiguriertbar
2019-09-12 17:36:40 +02:00
66cdfa5772
Merge branch 'bug-4218/LVPlan_Direkte_Gruppen_im_Verband'
2019-09-12 15:42:52 +02:00
c91cfcb679
Added tabulator options and behaviour
2019-09-12 14:18:14 +02:00
b92f3a1ee5
Adapted tabulator data-query (row index; some extra columns)
...
. Added incrementing id column which provides unique number to enable
tabulator to use it as row index.
. Added extra colums studiengang_kz, lv_oe_kurzbz
2019-09-12 14:16:08 +02:00
35b37179e9
Added Javascript button functionalities and functions for Tabulator
...
Added buttons and functionalities for
. showing all
. showing new
. select all
. deselect all
...Lehraufträge in tabulator-table
Added methods to manipulate date-data and filtering in tabulator.
2019-09-12 14:09:57 +02:00
90c257f7bb
Fotoliste zeigt nun korrekte Studiengangsbezeichnung wenn Gruppen aus
...
anderen Studiengängen zugeteilt sind
2019-09-12 14:09:18 +02:00
94d13fd77a
Added method getBenutzerByBerechtigung
...
This method returns user who are authorized with berechtigung and,
if given, authorized for the specific organisational unit.
2019-09-12 14:04:48 +02:00
edd7f56481
Corrected query: load uids only from *active* benutzer
2019-09-12 13:57:02 +02:00
b8ed622f96
Added method getParent()
...
This method gets only one parent of given organisational unit.
This ist to easily retrieve department of a studiengang or
fakultät of department etc.
2019-09-12 13:53:39 +02:00
3c98988c1c
Added new method hasVertrag()
...
This method checks if a Projektbetreuer has a corresponding contract.
If vertrag_id is null => is still a new Projektauftrag
If vertrag_id is present => Projektauftrag has been ordered and a
contract has been created.
2019-09-12 13:51:54 +02:00
237a906ecf
Added new method hasVertrag()
...
This method checks if a Lehrauftrag has a corresponding contract.
If vertrag_id is null => is still a new Lehrauftrag
If vertrag_id is presendt => Lehrauftrag has been ordered and a contract
has been created.
2019-09-12 13:50:31 +02:00
10b476c27e
Added methods save() and setStatus()
...
. save method inserts a new Vertrag, sets Vertragsstatus to 'bestellt'
and assigns vertrags_id to either corresponding Lehreinheitmitarbeiter
or corresponding Projektbetreuuer
. setStatus inserts a new Status to a given Vertrag
2019-09-12 13:45:50 +02:00
6b1e225991
Added private methods to send mail when ordering Lehrauftraege
...
These two methods will send email to 1. authorized Kompetenzleiter or
2. Departmentleiter with data about
. study semester
. study program
. amount of Lehrauftraege
2019-09-12 13:30:04 +02:00
0703984fa6
Added Controller method orderLehrauftrag
2019-09-12 13:26:29 +02:00
5150c1fc44
Removed DBSkel changes from master branch
2019-09-12 10:41:40 +02:00
418be38a52
Merge branch 'feature-3778/PunkteübertragReihungstestpunkteFAS'
2019-09-11 16:08:41 +02:00
d7fd969ac6
Anzeige und speichern für aktuelles Semester und nächstes Semester möglich
2019-09-11 14:53:00 +02:00
2b0ca26db1
Merge branch 'feature-3866-2/Ueberarbeitung_Testtoolsprache_fix'
2019-09-11 14:46:40 +02:00
e17bde6b21
Fragensprache und Interface-Sprache im Testtool zusammengeführt.
...
Wenn die Testsprache geändert wird, wird jetzt auch automatisch das User Interface angepasst.
2019-09-11 14:43:04 +02:00
c95b865b2f
Bei Kartenrücknahme wird nun zusätzlich der Typ des Betriebsmittels geprüft damit nicht
...
unbeabsichtigt andere Betriebsmittel mit der selben Nummer ausgetragen werden
2019-09-10 17:42:45 +02:00
fc98365e09
Bugfix Notebookregistration PHP7
2019-09-10 16:05:42 +02:00
4126167e81
PHP7 Bugfix für Notebook registrierung
2019-09-10 14:53:04 +02:00
a91cf041d8
Methodenaufruf korrigiert
2019-09-10 08:19:05 +02:00
8d775c4dce
Merge remote-tracking branch 'origin/master'
2019-09-09 15:59:22 +02:00
9237087b33
BugFix
2019-09-09 15:59:16 +02:00
b3caf988fd
EMail an Studierende Link im CIS zeigt nur noch Spezialgruppen an die nicht leer sind
2019-09-09 15:00:49 +02:00
66b605de45
Berechtigung für das Löschen von Reservierungen korrigiert
2019-09-09 14:20:07 +02:00
67415a4707
- possible to read and write user Variables in Codeigniter
...
- added Variablenname_model, VariableLib, Variables controller
- Infocenter Übersicht - infocenterData, infocenterFreigegebenData, infocenterReihungstestAbsolviertData: added possibility of toggle of infocenter_studiensemester variable, only prestudents of selected Studiensemester are shown
2019-09-06 17:33:56 +02:00
36ff38b0ee
- FilterWidget: added method reloadDataset() for reload of dataset only
2019-09-06 17:29:22 +02:00
562e509875
- added tbl_variablenname table, which is referenced by tbl_variable for storing available Variables and their defaults
2019-09-06 16:31:01 +02:00
3742cc92f4
Merge remote-tracking branch 'origin/master'
2019-09-06 16:06:13 +02:00
5255e6166d
crm/Prestudent_model, education/Lehrveransaltung_mode, person/Person_model: models are loaded in constructor to avoid multiple load
2019-09-06 15:49:47 +02:00
f395eb2d16
Merge branch 'FASgendern'
2019-09-06 15:41:13 +02:00
5b3e3e2e54
Merge branch 'master' into FASgendern
2019-09-06 15:40:48 +02:00
c93d81ab5e
Merge remote-tracking branch 'origin/master'
2019-09-06 15:38:09 +02:00
97ed8ce4ad
Merge branch 'Praktikantin2019'
2019-09-06 15:37:59 +02:00
be91fc93c0
- organisation/Studiensemester_model: added getPreviousFrom method, getNextFrom(): next studiensemester with start = ende is not skipped
2019-09-06 15:36:32 +02:00
eeeb2f0583
Reservierung check auf Titel und Beschreibung
2019-09-06 15:36:03 +02:00
41f7958248
Task 292 Summe der Betreuerstunden
2019-09-06 15:35:35 +02:00
d5a743edad
Merge branch 'master' into FASgendern
2019-09-06 15:14:19 +02:00
eea7912e9a
FAS gegendert
2019-09-06 15:09:08 +02:00
3f7615daaa
Fehler behoben wodurch in der Verbandsansicht Gruppen des falschen Verbandes
...
angezeigt wurden wenn eine direkte Gruppe hinzugefügt wird
2019-09-06 14:50:37 +02:00
39f63c10df
Fehler behoben beim Speichern der Sortierung im Studienplan über Vilesci GUI
2019-09-05 15:51:51 +02:00
934d56c32c
Changed Wiki path to wiki.fhcomplete.org
2019-09-05 10:28:03 +02:00
36942d586d
Direkte Gruppen werden Defaultmäßig als Mailgruppen erstellt und als
...
nicht sichtbar
2019-09-04 12:29:38 +02:00
6c2cc7412d
Enhanced tabulator selection/filtering functionality
...
. Added buttons "select all" and "deselect all"
. Now filtering will deselect previously selected rows (before: if user
selected rows and filtered after, the previously selected rows were kept
causing misleading Lehrauftrag orderings)
. Added bottom calculations
2019-09-03 10:26:24 +02:00
ee2452ad69
Merge branch 'fb-4148/ZeitaufzeichnungAktivitaeten'
2019-09-02 09:21:33 +02:00
d06c03f0db
- updated pivottable in composer to v 2.21.0
2019-08-30 15:52:47 +02:00
6dcf97c848
Added using of specific, limited studiengang-array in Dropdown-Widget
...
By passing an array of studiengang_kz the dropdown-menu will only be
populated with them.
2019-08-29 14:22:34 +02:00
aad5f7bd5e
Amended Lehrauftrag Controller - GUI with Tabulator-table
...
Amended the Lehrauftrag Controller GUI:
. corrected DB query
. corrected processing of GET-params
. corrected filter of tabulator (LE-ID caused problems -> now LE_ID)
. now stg are retrieved by permission entitlement of user
. implemented Tabulator filter and other properties/functions
. minor GUI adaptations
. added phrase
2019-08-29 14:19:01 +02:00
e95cc7556e
tablesort_bootstrap layout changes: removed background color from filter row
2019-08-29 14:08:34 +02:00
b910f220ac
Added method getSTG_isEntitledFor to retrieve STG by entitlement of user
2019-08-29 14:07:45 +02:00
f778297fb5
Reihenfolge der Eingabefelder angepasst
2019-08-29 11:15:58 +02:00
ff858a495d
- Added new core controller JOB_Controller
...
- Added new webservicetyp_kurzbz "job" to table system.tbl_webservicetyp in system/dbupdate_3.3.php
- Added new filter "All jobs viewer"
- Added new __construct to LogLib to set properties
- Added new public methods logInfoDB, logDebugDB, logWarningDB and logErrorDB to LogLib
- Added new private method _logDB to LogLib
- Renamed LogLib private method _format to _getPrefix
- Added new private method _getDatabaseDescription to LogLib
- Changed method _getCaller to use different levels of debug_backtrace
- Added new properties and constants to LogLib to log to the database
2019-08-28 17:26:41 +02:00
16e8bf9606
Added lehrauftrag-permissions to tbl_berechtigung
...
Permissios
. lehrauftrag_bestellen
. lehrauftrag_erteilen
2019-08-28 11:57:46 +02:00
6f5ad2bbe1
Adapted filter for Lehrauftragsstatus
...
Added
. name "Lehrauftragsstatus" and
. columns "LE-ID" and "Gruppe"
2019-08-28 11:33:58 +02:00
441c9350e4
Added app 'lehrauftrag' to syystem.tbl_app
2019-08-28 11:30:17 +02:00
498678e726
Stipendienstelle Schnittstelle angepasst um Fehler zu vermeiden wenn
...
Personen abgefragt werden die im gewählten Semester keinen Status haben
2019-08-23 13:08:18 +02:00
7c640b6dc4
Wienerlinien Webservice Notice behoben. Token wird jetzt Kleingeschrieben übermitelt
2019-08-23 12:47:28 +02:00
f769e07989
Added missing permission for Group Menu Entry in Vilesci
2019-08-23 09:57:28 +02:00
99155d970c
Fixed Notice in Testtool
2019-08-22 17:36:32 +02:00
44258aef5e
Added 3 Vertragsstati: bestellt / erteilt / akzeptiert
2019-08-21 14:37:37 +02:00
843be83f11
Korrektur Tippfehler Ausbildungsvertrag Lehrgänge Deutsch
2019-08-14 18:28:16 +02:00
463a53a2bf
Bugfix Gruppen-Suche
2019-08-14 18:27:48 +02:00
ffe74c538d
Merge branch 'master' into TempusLektorFilter
2019-08-14 11:57:48 +02:00
2e3075b8c4
Aktualisieren funktioniert nun wieder
...
Studiengänge in Lektorenliste werden richtig sortiert
2019-08-14 11:57:12 +02:00
277028e412
Diplomasupplement und Bescheid aus Auswahl-Select entfernt
...
Diplomasupplement und Bescheid haben einen Sonderstatus und sollten nur fürs archivieren verwendet werden
2019-08-13 10:44:55 +02:00
95c06f5d73
Image-Cropper entfernt
...
Bildupload auf die Version vor Bildzuschnitt geändert, da Cropper nicht mehr zuverlässig funktioniert
2019-08-13 10:44:06 +02:00
858b985765
Merge remote-tracking branch 'origin/master'
2019-08-09 14:13:32 +02:00
87f4824f8a
BugFix User story #3776
...
Fehler in Testtool-check levelgleichverteilung
2019-08-09 14:13:28 +02:00
467c8b60cc
- statistik.class.php, fixed error: only non-published statistiken were loaded by default, now all are loaded
2019-08-07 16:49:57 +02:00
7ac68bb66c
Merge branch 'StatusabhaengigerDokumentenupload'
2019-08-06 19:05:04 +02:00
1af701cf75
Merge branch 'master' into TempusLektorFilter
2019-08-06 19:01:00 +02:00
026bec29c4
Merge branch 'master' into feature-3778/PunkteübertragReihungstestpunkteFAS
2019-08-06 19:00:24 +02:00
ee39f4479c
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-08-06 18:59:31 +02:00
2898039b73
Removed duplicated constant STATUSGRUND_ID_EINSTIEG_SOMMERSEMESTER
2019-08-06 18:58:43 +02:00
310493fbe4
Liste ohne Namen der Studenten ergänzt
2019-08-06 14:24:16 +02:00
49a5a8d78c
Studiengangskürzel pro Student in Liste ergänzt
2019-08-06 14:23:15 +02:00
37d4ad032a
Phrasen ergänzt bzw. angepasst
2019-08-06 14:22:09 +02:00
69c22e9a17
Beschriftung OE
2019-08-06 12:05:31 +02:00
90864e7f99
Merge branch 'master' into fb-4148/ZeitaufzeichnungAktivitaeten
2019-08-02 17:26:37 +02:00
d7c37d20cb
Zeitaufzeichnung nach differenzierten Aktivitäten
2019-08-02 17:18:09 +02:00
561de90844
Merge branch 'feature-3925/Sonstiges_Sprint_144'
2019-08-02 08:40:41 +02:00
694ed5a19b
Merge branch 'master' into feature-3925/Sonstiges_Sprint_144
2019-08-02 08:29:23 +02:00
757ba05bc7
Started Lehrauftrag data query [PRE-ALPHA-VERSION]
...
Started: Building the Lehrauftrag data query to populate the
tabulator-table.
2019-08-01 15:49:23 +02:00
bb99d7b722
Started Lehrauftrag View [PRE-ALPHA-VERSION]
...
Started: Building the Lehrauftrag view.
2019-08-01 15:47:47 +02:00
157237963b
Lehrauftrag Controller [PRE-ALPHA-VERSION]
...
Started: Building the Lehrauftrag Controller.
2019-08-01 15:45:06 +02:00
a81098f884
Added method getSTGLByUID(uid) to Benutzerfunktion_model
...
The method getSTGLByUID(uid) gets information of all STG of which a given
user is in charge of as a study course manager.
2019-08-01 15:38:33 +02:00
2daef49e52
Extended usability of Studiengang_widget [PRE-ALPHA-VERSION]
...
Started: Extended Studiengang_widget to be used with specific given
array of studiengaenge.
2019-08-01 15:34:06 +02:00
cf5177e5e1
Added method getNext() to Studiensemester_model
...
getNext() returns the upcoming study semester.
2019-08-01 15:25:52 +02:00
d2e8b01e30
- codeigniter-restserver is now provided and loaded via composer (libraries/REST_Controller.php, config/rest.php, language/english/rest_controller_lang.php, libraries/Format.php, etc)
...
- Added new core controller core/RESTFul_Controller.php that extends REST_Controller and partially overrides part of the latter
- Changed application/config/rest.php to keep the minimal useful set of configs
- Controllers core/APIv1_Controller, controllers/api/v1/CheckUserAuth.php and controllers/api/v1/Test.php now extend core/RESTFul_Controller
- Changed method _remap interface for core/APIv1_Controller
- Removed application/core/REST_Controller.php
- Removed application/libraries/Format.php
- Removed application/language/english/rest_controller_lang.php
2019-07-31 14:46:31 +02:00
d0605ba3cf
Fixed broken group search
2019-07-31 08:30:57 +02:00
bb966a1f13
Falsche Dokumentenvorlage korrigiert
2019-07-30 13:56:30 +02:00
1e856773b9
Fixed broken Session on Infoterminal
2019-07-29 15:38:28 +02:00
b18d1576c1
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-07-26 13:53:39 +02:00
f9dcbbb6c9
Correct sorting behaviour
2019-07-26 13:53:07 +02:00
81947b3df2
Tempus Filter nach LektorIn
2019-07-26 13:48:09 +02:00
9faa2e0077
Gruppenverwaltung: Direktsuche nach Gruppen implementiert
2019-07-26 13:42:05 +02:00
c3a3125e49
Suche nach direkten IDs vorübergehend auskommentiert
2019-07-26 13:41:19 +02:00
c6dd9199c8
Übersichtsseite, wo Contents verwendet werden
2019-07-26 13:40:33 +02:00
970744464d
Added jqueryui to home.php, now required from AjaxLib.js
2019-07-18 16:33:01 +02:00
4f119c8d92
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
...
# Conflicts:
# system/dbupdate_3.3.php
2019-07-18 12:11:07 +02:00
6752dc649f
Now is possible to have more than one FilterWidget in a single page
2019-07-17 11:38:47 +02:00
96f285ad4b
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-07-16 15:56:31 +02:00
e60e61a11e
Neuer Tablesorter und Parser für Sortierung nach Datum
2019-07-16 15:54:28 +02:00
af08e06ade
English und Stufe in Funktion getStudiengaengeDokument
2019-07-16 15:53:20 +02:00
7e1052ecc2
Neuer Tablesorter und parser für Datum, Betrag uns Studiensemester
2019-07-16 15:52:19 +02:00
2013c86ad3
Added jQuery wrapper to tabulator
2019-07-12 18:03:04 +02:00
9cb1062275
Added new option hideMenu to FilterWidget
2019-07-11 12:59:30 +02:00
31caf460ec
Removed extra divs from views/widgets/filter/tableDataset.php
2019-07-11 12:14:35 +02:00
2691c4b7da
Anonymisiert
2019-07-11 11:45:20 +02:00
73220d8dd6
More options to hide or show filter widget settings panel
2019-07-11 09:42:13 +02:00
cbac8c450c
Aus Livesystem aktualisiert
...
War anscheinend nicht auf dem Letztstand
2019-07-10 18:16:48 +02:00
2c773b7035
SQL der Auswertung angepasst. Buttons eingebaut
2019-07-10 18:13:18 +02:00
bea28d9971
Kopieren von Berechtigungen, Neu-Formular oben
2019-07-10 18:09:00 +02:00
b2e5b2a0bb
Letzter Status Abgewiesener -> Kein Mail an Assistenz
...
- Wenn letzter Status Abgewiesener ist wird die Assistenz nicht über das Testende informiert.
- Bestehende Raumzuteilung wird bei Punkteübernahme gesetzt
2019-07-10 18:08:21 +02:00
2daf745ad5
- Moved controller system/Filters to widgets/Filters
...
- Renamed FiltersLib to FilterWidgetLib
- Adapted code in widgets/FilterWidget, public/js/FilterWidget.js and public/js/infocenter/infocenterPersonDataset.js
2019-07-10 14:39:59 +02:00
7050def0bb
public/js/FilterWidget.js: fixes
2019-07-10 13:35:34 +02:00
9fd91c2888
FilterWidget + Tabulator final version
2019-07-09 16:21:08 +02:00
2922aa26fe
Added tabulator to composer, FHC-Header and a CSS for it
2019-07-09 11:57:52 +02:00
f0ee8b0161
Added Tabulator to FilterWidget (alpha version)
2019-07-09 11:30:16 +02:00
7f7c554fd8
Added Vertragsstunden/VertragsstundenStudiensemester in FAS
...
Added two hidden fields
. Vertragsstunden
(tbl_vertrag.verstragsstunden)
. VertragsstundenStudiensemester
(tbl_vertrag.vertragsstunden_studiensemester_kurzbz)
to FAS-tab Verträge, which can be displayed by the user.
2019-07-08 17:24:07 +02:00
a08f450330
Corrected sorting order
2019-07-08 17:06:45 +02:00
68b8d018de
Minor Layout Fix
2019-07-08 17:05:17 +02:00
651bbb681b
Ändern der Stufe per Ajax
2019-07-08 17:03:28 +02:00
93d49822af
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-07-08 17:01:55 +02:00
d0f40a1cf2
Added columns vertragsstunden/vertragsstunden_studiensemester_kurzbz in tbl_vertrag
2019-07-08 15:11:23 +02:00
61e21d605e
Fixes
2019-07-08 10:47:54 +02:00
2f846796b6
Work in prorgess on _manageTableColumns
2019-07-05 17:29:48 +02:00
93a6652c5f
Gradelist - Max-ECTS-Sum includes ECTS of assigned Courses without Grades
2019-07-05 17:07:06 +02:00
02693ed790
Infotext im Tempus angepasst bei Lektoren mit Selbstverwalteter Pause (SVP)
2019-07-05 16:28:58 +02:00
96783da013
Bugfix to get old Sabredav working with php7
2019-07-05 16:12:27 +02:00
e9e58decee
Changed file naming convention for table files
2019-07-05 11:56:43 +02:00
ebea830f14
Merge branch 'fb-3922/ZeitwunschZustimmung'
2019-07-05 09:16:01 +02:00
b5c1512d68
Merge branch 'master' into fb-3922/ZeitwunschZustimmung
2019-07-05 09:11:46 +02:00
19425b93f0
Employees can now also be assigned directly to Courses (for Elective Courses)
2019-07-05 07:29:03 +02:00
638a0a90a4
- Berechtigungscheck for reservation deletion on "meine Reservierungen anzeigen"-page corrected
...
- removed "Alle Reservierungen anzeigen" Link
2019-07-04 17:25:24 +02:00
ddaa129bab
- Removed controllers api/v1/system/CallerLibrary.php and api/v1/system/CallerModel.php
...
- Removed library libraries/CallerLib.php
2019-07-04 17:25:13 +02:00
48bcc77c97
- Added CSS public/css/Tabulator.css and public/css/TinyMCE.css
...
- Added these new CSS to views/templates/FHC-Header.php
- Unified messages CSS in public/css/messaging/message.css
- Messages Inbox/Outbox GUI beautified
2019-07-04 17:18:01 +02:00
48c5713688
geteilte arbeitszeit konfigurierbar
2019-07-04 17:02:11 +02:00
18ea98416f
From/To toggle tabulator columns
2019-07-04 15:11:58 +02:00
d4828cf615
Merge branch 'ausbildungsvertragdocuments'
2019-07-04 13:33:51 +02:00
5a0943534d
Merge branch 'master' into ausbildungsvertragdocuments
2019-07-04 13:29:25 +02:00
f664f1442f
- public/js/DialogLib.js: if dialog already present, it is removed before new one is attached (if dialogs are displayed on same page one afte another)
2019-07-04 11:25:32 +02:00
71615770f1
Merge remote-tracking branch 'origin/master'
2019-07-04 11:21:50 +02:00
8f5b32ee94
education/Lehreinheit_model: getLesForLv method: Lehreinheiten ordered by lehreinheit_id by default
2019-07-04 11:21:30 +02:00
c62b4dc018
- Added new public method setMessageRead to system/messages/MessageClient
...
- system/Recipient_model methods getReceivedMessages and getSentMessages now retrieve person_id from tbl_msg_status
- Added new public method setMessageRead to CL/Messages_model
- Improved code in public/js/messaging/read.js
2019-07-04 11:15:07 +02:00
f8ecc0b916
matr_nr bei Studenten ergänzt
2019-07-04 10:40:38 +02:00
12d0bbfa52
Fixed invalid Session Handling on Infoterminal Page
2019-07-03 18:07:29 +02:00
b495a4bffd
Merge remote-tracking branch 'origin/master'
2019-07-01 16:03:58 +02:00
c3cd354f4c
Spalte "Fixangestellt" hinzugefügt
2019-07-01 16:03:52 +02:00
a8f7199ee8
nur für fixangestellte, neuer text
2019-07-01 15:53:57 +02:00
c4c361e94c
Merge branch 'master' into fb-3922/ZeitwunschZustimmung
2019-07-01 15:52:49 +02:00
71791ada4b
Infotext Phrase für Notendurchschnitt angepasst
2019-07-01 14:42:27 +02:00
7886cfc9e3
Tooltiptext für Notendurchschnitt auf Gradeliste hinzugefügt.
...
Menüpunkt im FAS gegendert
2019-07-01 14:37:14 +02:00
99e541d506
Fixed receiver/sender retrieved from database
2019-06-28 19:18:18 +02:00
34dc82766a
- Renamed public/js/messaging/messageClient.js to public/js/messaging/read.js
...
- Added new JS public/js/messaging/write.js used in view application/views/system/messages/ajaxWrite.php
- Added new public method write, listReceivedMessages, listSentMessages and sendMessageToOU to controller system/messages/MessageClient.php
- Removed private method _getReceiversByOekurzbz from MessageLib
- Fixed method sendMessageOU of MessageLib
- Added new public method prepareAjaxWrite to model CL/Messages_model
- Fixed method prepareAjaxReadReceived of model CL/Messages_model
- Added new public method prepareAjaxReadSent to model CL/Messages_model
- Changed method CL/Messages_model->_personLog interface
- Added new public method getOrganisationunitsByPersonId to crm/Prestudent_model
- Added new public method getReceivedMessages to model system/Recipient_model
- Changed getReceivedMessages method of model system/Recipient_model
- Changed view system/messages/ajaxRead.php
- Added new view system/messages/ajaxWrite.php
2019-06-28 19:01:25 +02:00
93ecdaaf0b
Ergänzung BugFix
2019-06-28 16:23:14 +02:00
779b05dab2
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-06-28 15:58:55 +02:00
d333555d06
Added Stufe to Function getStudiengaengeDokument
2019-06-28 15:58:18 +02:00
6fca967be0
Vorlage Bestätigung der Lehrtätigkeit gegendert
2019-06-28 15:55:27 +02:00
b27ed8abd0
Uncomment check for Levelgleichverteilung
2019-06-28 15:55:01 +02:00
45947dfca2
Added DiplomasupplementDebug
...
Shows just Table of Records with Course ID
2019-06-28 15:54:36 +02:00
162b935b8c
Bugfix RT-Auswertung
2019-06-28 15:49:45 +02:00
fff467536f
- correct mitarbeiter uid when deleting reservierung
...
- reservierung data saved correctly
2019-06-28 13:38:10 +02:00
e0b5f0ba8e
- Only assistance who created the reservation or for whom is reserved can delete reservierungen
...
- logging every time a reservation is deleted
2019-06-28 13:23:00 +02:00
f32d2ac56b
Merge branch 'issue-3823/Lehrveranstaltungssuche'
2019-06-27 17:55:54 +02:00
04ba491508
Merge branch 'master' into issue-3823/Lehrveranstaltungssuche
2019-06-27 17:51:09 +02:00
f204b7448e
Dont display Courses withour Grades on Transcript
2019-06-27 17:49:43 +02:00
0c9225925b
Removed 'Lehrziele'-link
2019-06-27 09:31:50 +02:00
3f1feebcac
Merge branch 'master' into issue-3823/Lehrveranstaltungssuche
2019-06-26 08:25:23 +02:00
c70b69b94e
Course Search in FAS is now case insensitive and supports umlauts
2019-06-26 08:19:49 +02:00
19def99066
Changed CIS 'Allgemeiner Downloadlink'-URL from CIS to Moodle
2019-06-25 16:50:16 +02:00
cd54b90b31
Spalte stufe in function getStudiengaengeDokument
2019-06-25 11:24:58 +02:00
e65fcdb94e
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-06-25 11:24:13 +02:00
8a07fe69a4
Vorlagen für Diploma Supplement Debug
2019-06-25 11:21:20 +02:00
e4b66935af
bewerbung_abgeschicktamum auskommentiert
...
Leider gibt es bestaetigte Bewerbungen, die nie abgeschickt wurden
2019-06-25 11:20:50 +02:00
a9875206b0
filter_saveFilters-Function entfernt
2019-06-25 11:19:45 +02:00
dc35b285c9
Errormessage angepasst, wenn Dokumentkonvertierung fehlschlägt
2019-06-25 11:19:22 +02:00
2e6891a6f4
Show LV-ID in Projektarbeit-Dropdown
2019-06-25 11:18:25 +02:00
6799ea9d34
Show Betreuerart in Lehrveranstaltungsübersicht
2019-06-25 11:17:21 +02:00
7ff6427d55
Notenspiegel Student umbenannt in Studienverlauf und Menüpunkt nach Berichte->Student verschoben
2019-06-25 08:48:20 +02:00
7f92d89a67
Added additional configuration items
...
- CIS_LVPLAN_SAALPLAN_ANZEIGEN
Hides Saalplan on Schedule Page
- CIS_NOTENLISTE_OFFIZIELL_ANZEIGEN
Only display official Grades in CIS Gradelist
2019-06-24 17:48:38 +02:00
27ccd086ac
- Added new functions getAuthFirstname and getAuthSurname to helper hlp_authentication_helper
...
- Added methods getReceivedMessages and getSentMessages to model system/Recipient_model.php
- Added jqueryui and dialoglib to view system/messages/ajaxRead
- Added method prepareAjaxRead to model CL/Messages_model
- Removed private method _getAuthUser from model CL/Messages_model
- Adapted code in model CL/Messages_model to use functions isLogged and getAuthPersonId
2019-06-24 17:32:31 +02:00
6ad63faa86
geteilte dienste
2019-06-24 14:43:08 +02:00
1b8f494205
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-06-24 14:03:03 +02:00
3da9a2a78d
Diplomasupplement RDF: ECTS Summen richtig berechnet auch für Widerholer (auch wenn alte Note negativ, neue positiv wird diese dazugezählt)
2019-06-24 14:02:50 +02:00
8c9827b9a2
Link zum Profil bei Suche wird für Mitarbeiter immer angezeigt
2019-06-24 10:43:55 +02:00
5072088e0d
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2019-06-21 13:35:28 +02:00
477ebe7cc7
- core/Auth_Controller does NOT load anymore hlp_authentication helper
...
- Added function getAuthPersonId to hlp_authentication helper
- Added function isLogged to hlp_common helper
- hlp_authentication helper functions getAuthPersonId and getAuthUID make use of isLogged function
- AuthLib loads hlp_authentication helper after a successful login or if a user is already logged
- FilterLib does NOT load anymore hlp_authentication helper
- FilterLib does NOT use anymore BenutzerModel and getAuthUID, but retrieves user data directly using the person_id from getAuthPersonId
2019-06-21 13:16:14 +02:00
1cb9c28f7d
- Added new controller system/messages/MessageClient used to read and write messages using a new GUI based on ajax and tabulator
...
- system/messages/MessageClient currently has only two methods: read and listMessages
- Added new view system/messages/ajaxRead.php used for the GUI to read messages
- Added new parameters to templates/FHC-Header: tabulator and momentjs
- Added new packages to composer: tabulator and momentjs
2019-06-19 17:53:51 +02:00
b364cfae06
- Moved controllers FASMessages and Messages to system/messages/
...
- Adapted code to use the new path
2019-06-19 15:29:17 +02:00
45636fa069
Prüfungsanmeldung ist nun für alle Studenten des Studiengangs möglich
2019-06-19 14:54:39 +02:00
99570978c3
- Renamed view system/messages/messageHTML to system/messages/htmlRead
...
- Renamed view system/messages/messageWriteReply to system/messages/htmlWriteReply
- Removed views system/messages/messageReplySent and system/messages/messageForm
- Moved logic from controller ViewMessage to model CL/Messages_model
- Added new constants CFG_REDIRECT_VIEW_MESSAGE_URL to MessageLib
- Removed public method getPersonData from model system/MessageToken_model
- Changed query in method system/Recipient_model->getMessage to include column tbl_msg_recipient.sent
- Added new public method prepareHtmlRead to model CL/Messages_model
- Changed constant REPLY_BODY_FORMAT of model CL/Messages_model
- Added new constant NO_AUTH_UID to model CL/Messages_model
- Added new public method prepareHtmlWriteReply to model CL/Messages_model
- Changed public method sendReply of model CL/Messages_model
- Added new private method _getReplyBody to model CL/Messages_model
- Changed method _personLog of model CL/Messages_model to manage not authenticated users
2019-06-19 14:51:54 +02:00
f6e0f58b3d
- Renamed view system/messages/messageSent.php to system/messages/htmlSuccess.php
...
- Added new view system/messages/htmlError.php
- Renamed view system/messages/messageWrite.php to system/messages/htmlWriteTemplate.php
- Added new widget views: widgets/Dropdown_widget.php and widgets/MultipleDropdown_widget.php
- Added new CSS public/css/Widgets.css
- Controller system/FASMessages:
- Renamed method write to writeTemplate and method writeReply to writeReplyTemplate
- Removed all the private methods and moved all the logic to model CL/Messages_model
- Methods writeTemplate and writeReplyTemplate do not need anymore the sender id as parameter
- Controller system/Messages:
- Renamed method write to writeTemplate
- Renamed method send to sendImplicitTemplate
- Renamed method sendJson to sendExplicitTemplateJson
- Moved all the logic to model CL/Messages_model
- Adapted php and JS code to use these new methods names and interfaces
- Removed public method getIsAdmin from MessageLib
- Method _sendMessage of MessageLib now returns the saved message ids
- Added new package olifolkerd/tabulator to composer
- Added new parameter widgets to view templates/FHC-Header.php
- Added new HTML widget widgets/Dropdown_widget and widgets/MultipleDropdown_widget
- Added constants REPLY_SUBJECT_PREFIX and REPLY_BODY_PREFIX to model CL/Messages_model
- Added new public methods prepareHtmlWriteTemplatePersons, prepareHtmlWriteTemplatePrestudents, sendImplicitTemplate, sendExplicitTemplate, getVorlage, parseMessageText and getMessageFromIds to model CL/Messages_model
- Added new private methods _getAuthUser, _lowerReplaceSpaceArrayKeys, _addOeToPrestudents, _personLog and _prepareHtmlWriteTemplate to model CL/Messages_model
2019-06-18 18:25:26 +02:00
6076ecdeaa
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-06-17 15:18:19 +02:00
5a3a534984
Merge remote-tracking branch 'origin/master'
2019-06-17 15:12:46 +02:00
e4ad90781e
Spalten $bisorgform_kurzbz und $bezeichnung_mehrsprachig in orgformclass
2019-06-17 15:12:40 +02:00
73943f8188
Link zum Profil kann bei Suche deaktiviert werden
2019-06-17 13:22:47 +02:00
2c0cff3895
Merge remote-tracking branch 'origin/master'
2019-06-17 11:53:07 +02:00
332de0a299
Check auf eingetragene ZGV, wenn zu Bewerber gemacht wird
2019-06-17 11:52:59 +02:00
5bda5eb966
- Moved view system/messages/messageList.php -> system/infocenter/messageList.php
...
- Moved js public/js/messaging/messageList.js -> public/js/infocenter/messageList.js
- Updated includes in controller system/infocenter/InfoCenter.php and view system/infocenter/infocenterDetails.php
2019-06-14 15:40:15 +02:00
962e91a108
Added first version dbskel structure files
2019-06-14 12:58:43 +02:00
8843462c7d
load entry and display if exists
2019-06-14 11:49:50 +02:00
8ded1aa746
fixed errormessage when lecturer_uids param is not set
2019-06-14 11:21:55 +02:00
0ef94aacda
- Fixed query method getMessages in model models/system/Recipient_model.php
...
- Changed interface method sendMessages of job jobs/MailJob.php
- Added function terminateWithError to helper helpers/hlp_common_helper.php
- Changed method overrideConfigs of library MailLib
- Removed method getConfigs from library MailLib
- Added public method getEmailNumberToSent to library MailLib
- Changed method sendAllNotices of library MessageLib
- Renamed private method _sendNotice to _sendOneNotice in library MessageLib
- Added new private methods _loadDbNoticeEmailTemplate, _loadFsNoticeEmailTemplate and _sendNotice to library MessageLib
- Changed method _getNoticeBody in library MessageLib
- Removed methods _getNoticeHTMLBody and _getNoticeTXTBody from in library MessageLib
2019-06-13 18:23:24 +02:00
1131267326
Vorlagen in FHTW-Addon übersiedelt
...
Im Core sollen nur mehr Beispielvorlagen verbleiben
2019-06-13 17:19:24 +02:00
041d1be048
Added GUI for acceptance of self-managed breaks + saving logic
2019-06-13 16:23:16 +02:00
c887c61d96
Created class zeitaufzeichnung_gd & method save()
...
The save method saves the lectors decision about self-managing breaks
during parted working times.
2019-06-13 16:19:23 +02:00
c021acf396
Vorlagen für englisches Lehrveranstaltungszeugnis
2019-06-13 16:17:49 +02:00
b950d666d0
Created table campus.tbl_zeitaufzeichnung_gd
2019-06-13 16:17:13 +02:00
8135c6275e
- Fixed query building in method getMessages of model models/system/Recipient_model.php
...
- Better code in controller api/v1/system/Message.php
- Adapted controller api/v1/system/Message.php to use sendMessageUser and sendMessageUserTemplate methods from MessageLib
- Adapted model models/CL/Messages_model.php to use sendMessageUser and sendMessageUserTemplate methods from MessageLib
- Adapted model models/CL/Messages_model.php to use function parseText
- Removed constant MSG_INDX_PREFIX from MessageLib
- Added constants to MessageLib: CFG_SYSTEM_PERSON_ID, CFG_SEND_IMMEDIATELY, CFG_MESSAGE_SERVER, CFG_MESSAGE_HTML_VIEW_URL, CFG_OU_RECEIVERS, NOTICE_TEMPLATE_HTML, NOTICE_TEMPLATE_TXT, NOTICE_TEMPLATE_FALLBACK_HTML, NOTICE_TEMPLATE_FALLBACK_TXT, EMAIL_KONTAKT_TYPE and SENT_INFO_NEWLINE
- MessageLib does not load anymore library parser
- Improved MessageLib code
- Added private methodis _sendMessage, _getSender, _getNoticeBody, _getNoticeHTMLBody, _getNoticeTXTBody and _ouExists to MessageLib
- Added public methods sendMessageUser, sendMessageUserTemplate and sendMessageOU to MessageLib
- Renamed method sendAll to sendAllNotices in MessageLib
- Renamed method sendOne to _sendNotice and changed it from public to private
- Renamed method _checkReceiverId to _getReceiversByPersonId
2019-06-13 15:57:45 +02:00
a5b3f0ed88
- Moved constants EMAIL_KONTAKT_TYPE and SENT_INFO_NEWLINE from config/constants.php to MessageLib
...
- Added function parseTemplate to helper helpers/hlp_common_helper.php
- Changed method getMessages of model models/system/Recipient_model.php
- Changed views/templates/mailHTML.php and views/templates/mailTXT.php
2019-06-13 14:09:56 +02:00
a33660e857
Neuer Tablesorter, Spalte "Datei" in Übersicht
2019-06-12 18:03:13 +02:00
2ef386c34e
- Changed system/dbupdate_3.3.php to add oe_kurzbz to table public.tbl_msg_recipient and foreign key fk_tbl_msg_recipient_oe_kurzbz
...
- Removed not used constants for messaging from config/constants.php
- Renamed config entry assistent_function to ou_receivers and converted from string to array
- Moved controllers/MailJob.php to controllers/jobs/MailJob.php
- Controller MailJob now extends CLI_Controller
- Added new function parseText to helpers/hlp_common_helper.php
- Improved code function generateToken in helpers/hlp_common_helper.php
- helpers/hlp_sancho_helper.php now uses parseText function from hlp_common_helper
- Removed method parseVorlagetext from PhrasesLib.php
- PhrasesLib.php now uses parseText function from hlp_common_helper
- Removed method parseVorlagetext from VorlageLib
- Improved code of controller controllers/system/Messages.php (uses parseText too)
- Controller controllers/system/Vorlage.php now uses parseText
2019-06-12 17:27:35 +02:00
cb851ebf3b
Anpassung SQL für Excel-Export
2019-06-12 14:58:51 +02:00
c2781c1f99
Signierbar und Selfservice als Option in akteupdate
2019-06-12 14:57:21 +02:00
d3a1140c01
Stufe in function getAllDokumenteForPerson
2019-06-12 14:56:39 +02:00
c04e7b4057
Syntax-Fix
2019-06-12 14:56:10 +02:00
13678f0d43
Check, ob Bewerbung abgeschickt vor Status-Bestätigung
...
Status darf nur bestaetig werden, wenn Bewerbung schon abgeschickt wurde
2019-06-12 14:55:30 +02:00
cdfbf0c0ef
Link to LV-Overview from lva-liste
2019-06-12 14:54:42 +02:00
be09e3bf5e
Refactor Reihungstest-Jobs
...
- Link to Auswertung instead of Student-Table in E-Mail (Data security)
- Params in function for degraee-program, bcc and from
2019-06-12 14:51:57 +02:00
056f0a0a2d
Zeugnisvorlage angepasst damit auch Lehrveranstaltungen angezeigt werden die noch nicht benotet wurden
2019-06-11 18:23:09 +02:00
e55247487a
Suche nach Lehrveranstaltungen im FAS hinzugefügt
2019-06-11 07:56:35 +02:00
c631eb4bad
Removed legacy Addslashes
2019-06-07 21:04:28 +02:00
975e222faa
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-06-07 11:21:28 +02:00
1b87073060
Formatierung Datum der Anmeldefrist
2019-06-07 11:19:45 +02:00
d827f895b2
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2019-06-07 11:19:27 +02:00
da23fa77cc
Bugfix fürs Auslesen der studiengang_kz
2019-06-07 11:19:10 +02:00
9b87a69528
Removed Legacy Templates
2019-06-07 08:18:34 +02:00
960cfd40b3
Studiengangsname für Bescheid/Prüfungsprotokoll/etc wird vom Studienplan des letzten Status geholt anstatt vom Absolventenstatus
2019-06-07 07:58:38 +02:00
6062579948
Ausbildungsvertrag for Lehrgänge überarbeitet
2019-06-06 16:38:14 +02:00
f30296d9b3
Merge branch 'phpci'
2019-06-06 12:30:06 +02:00
d5f444e98c
public/tablesort.js: tablesorter is destroyed before new initialization if already applied to a table
2019-06-06 10:12:33 +02:00
033bb35f88
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-06-06 08:50:24 +02:00
fab7c72dda
Changed menu titles (BASIS -> Basisgebiete; Quereinstieg -> Quereinstiegsgebiete)
2019-06-06 08:50:15 +02:00
eb3f814e09
Enhanced CSS for correct responsive testtool behaviour
...
Bootstrap, HTML- and CSS stylings were colliding and causing issues when
resizing the screen. This is fixed now.
2019-06-06 08:48:25 +02:00
3dfa95b9cd
Changed phpci.yml
2019-06-05 16:35:18 +02:00
5fde855e12
- Added ignore option to php_cpd and php_code_sniffer in phpci.yml
2019-06-05 14:14:27 +02:00
0aec9ee694
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-06-05 13:57:31 +02:00
57102409c9
Phrase Matrikelnummer auf Personenkennzeichen korrigiert
2019-06-05 11:41:50 +02:00
448bb1ed91
Anzeige der Erfolgs-/Fehlermeldung verlängert
2019-06-05 11:25:24 +02:00
6b17dbca52
- Removed tests/codeception/_data/dump.sql
...
- Changed phpci.yml to make php_parallel_lint a blocking test
- Changed phpci.yml to configure the rules used by php mess detector
- Changed phpci.yml added allowed_warnings: -1 to php_code_sniffer
2019-06-05 11:19:05 +02:00
0f61a9e814
- Added parameters steps and selectedDirectories to controller controllers/system/DBSkel
...
- Added exit status to controller controllers/system/DBSkel
- Removed old code from libraries/DBSkelLib
- Added steps parameter to libraries/DBSkelLib to select the step/s to perform (colon separated)
- Added selectedDirectories parameter to libraries/DBSkelLib to select the directory/ies to process (colon separated)
- All DBSkel structure files are in php and SQL formats
- The steps order is the following: schema, sequences, tables, constraints, views, functions, grants and extras
- Current running modes are: dry run, new and diff
- Diff mode is still under construction
2019-06-05 10:22:14 +02:00
99d0564656
Removed convertProblemChars functions for correct presentation with CDATA
...
When using CDATA there is no need to first transform the signs into
HTML characters (e.g. & instead of &), actually it caused wrong
display in text. This is fixed now.
2019-06-04 11:59:50 +02:00
5a3aacbb58
Wellformed XML code with CDATA
...
The document was not created because of XML parsing error.
Now special signs like the & (ampersand) will be parsed correctly.
2019-06-04 11:26:50 +02:00
0eead44c6a
Fixed display for smaller screens
...
Now the answer-possibilities were compressed in an unreadable manner on
smaller screens. This is fixed now.
2019-06-03 16:47:23 +02:00
05a049edca
Infocenter message Quereinsteiger Freigabe
...
- Orgform bezeichnung shown in german and english
Infocenter Controller changes
- constants for Interessent and Abgewiesener names added
- removed unnecessary parameters in comments
crm/Prestudent_model
- fixed typo
2019-06-03 16:30:44 +02:00
ff31397bc5
Moved DMS Tools to Coreutils Repo
2019-06-03 14:26:40 +02:00
5db6614e5b
Commented Extension installation for PHPCI
2019-06-03 14:22:53 +02:00
8d5742136c
Gradelist
...
- added additional Informations for courses
- only display courses where the person is assigned to
- added SWS Sum
- Improved Multilanguage support
2019-05-28 18:37:21 +02:00
0c05e18949
Reverted additional View Permissions
2019-05-28 18:32:20 +02:00
fc316efd3d
Fixed XML parsing error of ampersand '&' for study description
...
Ampersand within study description was causing error messages in
rdf files while XML parsing. Now this is fixed (by wrapping with CDATA)
2019-05-28 17:16:27 +02:00
e8aeefd966
- Added configuration file for DBSkel
...
- Added library for DBSkel logic
2019-05-28 17:10:30 +02:00
7109b7974b
Added GRANT privileges on campus.vw_student
...
Needed to download some FAS documents (like Accountinfoblatt or
DiplomaSupplement).
2019-05-28 17:09:51 +02:00
70c2686932
- Added new controller system/DBSkel to call DBSkel procedure form CLI
...
- Removed libraries/MigrationLib.php
- Removed MigrationLib from libraries/CallerLib.php
2019-05-27 17:25:04 +02:00
e52e1fa001
Added job that informs about new applications sent after reihungstest absolved.
...
Added job that sends eMail(s) to the relevant stg assistance(s)
informing about all applicants, who have sent new applications
AFTER they had absolved a placement test in the actual studiensemester
AND who have been confirmed yesterday.
2019-05-27 10:42:02 +02:00
f409aa2c6f
Ausbildungsvertrag außerordentlich Studierende - Vorlage update
2019-05-24 15:37:40 +02:00
ce61b30ec4
spalte anzahlaktepflicht, bugfixes
2019-05-24 13:03:44 +02:00
2e69900a50
Erfolgsnachweise angepasst
...
- Infotext angepasst dass nur positive LVs angezeigt werden
- Studiensemester in Summenzeile entfernt
- ECTS und SWS werden immer mit 2 Nachkommastellen angedruckt
- Studiensemester und Ausbildungssemester Anzeige am Zeugnis getauscht
2019-05-23 18:41:50 +02:00
b72c3ba0e4
Added additional information in tempus to show if lecturer is fixed/external
2019-05-23 17:15:13 +02:00
9465852f2b
FAS search includes the matrikelnumber attribute
2019-05-22 18:10:37 +02:00
d341e5e1b1
Merge branch 'master' into stplreservierung
2019-05-21 18:32:33 +02:00
73328f0dea
Infocenter Message Sending
...
- Infocenter RT Freigabe not sent if Prestudent has ANY bestätigt Interessentenstatus for the Studiensemester (not only last Status)
- removed unnecessary interessentenCount array
- moved part of message send check logic to InfoCenter Controller
2019-05-21 18:28:28 +02:00
d95441fb52
text eidesstattliche erklärung angepasst
2019-05-21 13:30:14 +02:00
d449431469
SQL formatted
2019-05-17 14:49:10 +02:00
45c1304b51
convert_html_chars bei Studiengangsnamen
...
Um Sonderzeichen herauszufiltern
2019-05-17 14:48:49 +02:00
92b1850cd8
Cronjobverwaltung GUI-Verbesserungen
2019-05-17 14:45:44 +02:00
31de258b7f
Lehrgangsart in Studiengangübersicht
2019-05-17 14:45:27 +02:00
a8bd11b03c
Testuser für Camus International in Testtool Login
2019-05-17 14:45:13 +02:00
8e83de0672
Column Stufe in Class and studiengang_dokumente
2019-05-17 14:43:21 +02:00
aa2597d8b5
Add column Stufe to tbl_dokumentstudiengang
2019-05-17 14:37:24 +02:00
ee7209266f
CSV-Import um service_id erweitert
2019-05-17 09:28:04 +02:00
c0b448125d
CIS Wochenplan Reservierung update
...
- Mitarbeiter autocomplete for reserving one hour for multiple Mitarbeiter at same time
- possible to delete Reservations directly in Wochenplan
2019-05-16 17:32:34 +02:00
f7a4c5795b
- displaying Phrase "meine Reservierungen anzeigen" instead of "Meine Reservierungen löschen"
2019-05-16 17:27:38 +02:00
1121eb8352
- Updated composer.json and composer.lock
...
- Changed phpci.yml to be used with the new CI machine
2019-05-16 12:58:59 +02:00
5028e623c8
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-05-14 16:35:13 +02:00
94b19d8bd1
Fixed to get question in language of the actual logged-in Master study
...
When logging in with a Master study, the system was retrieving the
studyplan/study of the highest priored applied Master study. This
behaviour should only occure for Bachelor studies and was leading to
incorrect language setting.
Now if user logs in with a Master study, the actual studyplan/study and
the correct language setting are retrieved.
2019-05-14 16:34:37 +02:00
dcdfbbe0d7
- Added new constants LANG_SESSION_NAME and LANG_SESSION_INDEXES to constants.php
...
- Added new function getPhraseByLanguage to helpers/hlp_language_helper.php
2019-05-14 15:50:04 +02:00
6cc99bf2b9
Appended errormessage when retrieving invalid Gebiete
...
Now if the method check_gebiete() returns false, a userfriendly
errormessage will be displayed.
2019-05-14 15:25:51 +02:00
d6576dbd49
Updated composer files
2019-05-14 13:01:25 +02:00
e3ace2c462
Gebiete Navigation: Filtered out rejected studies
...
Fixed SQL query.
Now rejected studies are filtered out and will not be shown up in the
navigation.
2019-05-14 11:01:52 +02:00
b0cabff783
Optimized GUI
...
- Widened left navigation width to avoid width scrolling.
- Removed column 'Reihungstest' informing what kind of test
needs to be solved (Basic / Quereinstieg)
- Status now multilingual
- Renamend 'Quereinsteiger' to 'Quereinstieg'
- Nav-button of Quereinsteiger-Studiengänge in new color
2019-05-14 10:57:03 +02:00
83607fcfbc
Erinnerungsmail für Lehraufträge wird nur noch an aktive Studiengänge
...
verschickt
2019-05-13 15:28:49 +02:00
61f387e9f7
Added Format library needed by REST_Controller
2019-05-10 19:02:33 +02:00
8661daa1a6
- Removed not used config files in application/config
...
- Renamed hlp_message_helper to hlp_return_object_helper
- Adapted code to include the renamed helper
2019-05-10 10:38:55 +02:00
56e5718120
Merge branch 'master' into cleanci
2019-05-10 10:36:21 +02:00
0136d78cfd
Aligned ECTS in Gradelist
2019-05-10 07:53:39 +02:00
3f423898f9
Added alert when test includes MathML format and browser is not Firefox
...
By the moment applicants should absolve the tests using Firefox Browser
to ensure the correct display MathML. If they use another browser, they
will now get an alert.
2019-05-09 12:49:20 +02:00
1c81705e3d
Aufnahmetermine: Ist bereits eine Raumzuordnung für einen Reihungstest erfolgt und der Reihungstest wird im FAS auf einen neuen Reihungstesttermin geändert, dann wird die vorhandene Raumzuordnung der Person entfernt und ein entsprechender Hinweis angezeigt.
2019-05-08 15:10:42 +02:00
35c6322bbd
Abgabetool
...
- Handbuch zum Abgabetool für Assistenz verlinkt jetzt ins Wiki
- Fehlerhaften Tooltiptext entfernt
2019-05-08 11:40:35 +02:00
a9d59918ce
Abgabetool
...
- Handbuch verlinkt auf Wiki
- Fehler behoben wodurch Projektarbeiten doppelt in der Studierendensicht angezeigt wurden
- Hinweis beim Upload hinzugefügt damit keine Unterschriebenen Dokumente hochgeladen werden.
2019-05-08 11:28:14 +02:00
3c2e02c3aa
orgform for RT Freigabe Message retrieved only from Studienplan, otherwise empty string
2019-05-07 14:55:43 +02:00
c2a4c3413e
Removed dependencies from mcrypt Library to work with PHP7.2
2019-05-07 11:05:43 +02:00
e2cea2ab58
Translated new text components in RT-Tool starting page
...
. Translated new text components into English. Now the starting page is
available in German and English.
. Minor HTML-tag correction at login.php.
2019-05-06 15:48:57 +02:00
f44c841f22
Merge branch 'master' into StatusabhaengigerDokumentenupload
2019-05-06 14:08:50 +02:00
69d624b841
Fixed display of dragAndDrop filters
2019-05-06 14:06:44 +02:00
c18252a934
Merge remote-tracking branch 'origin/master'
2019-05-03 16:47:39 +02:00
855a24968d
Refactor cronjob remindApplicantsOfPlacementTest
...
- renamed function
- extend function with params $bcc and $from to set bcc-receivers and sender
- changed function getWorkingDays to isDateWorkingDay
- changed function getNextPlacementtestDate to getNextPlacementtests
- extend function getNextPlacementtests with optional $days param
2019-05-03 16:46:05 +02:00
6f4c76162e
BugFix Bezeichnung Studiensemester englisch
2019-05-03 16:40:14 +02:00
464aff2510
Auswertung FHTW
...
- Checken, ob Abgewiesener-Status vorhanden ist
- Checken, ob Gesamtpunkte gesetzt, wenn zu Bewerber gemacht wird
2019-05-03 16:39:02 +02:00
9c8512086a
Bugfix
...
jQuery-Fehler, wenn Rechte nicht vorhanden
2019-05-03 16:33:37 +02:00
c771e3ed85
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2019-05-03 13:23:30 +02:00
6d20102723
Status 'offen' wird nur angezeigt wenn Benotung aktiviert ist
2019-05-03 13:23:15 +02:00
25acc66b0b
- Infocenter: orgform is displayed in Messages Quereinstieg and Quereinstieg kurz
2019-05-03 11:47:00 +02:00
02bd9d528f
Fixed Bug where the Last Status was not displayed correctly on the gradelist
2019-05-03 11:15:59 +02:00
defc8926c9
Spalte Anmeldefrist wird bei Reihungstestuebersicht per Default mit angezeigt
2019-05-03 11:13:52 +02:00
ea4bdaef07
Fixed wrong menu item width in RT-Tool Menu (for active items)
...
When a group of gebiete have been started, then menu items were styled wrong.
Now it is well-formed.
2019-04-30 17:31:48 +02:00
2f38ab228b
Fixed display of master-study on starting page.
...
Added missing cells and data for Status and Reihungstest.
Removed var_dump.
2019-04-30 17:24:45 +02:00
625109071b
Fixed wrong menu item width in RT-Tool Menu.
...
When a group of gebiete were answered, then menu items were styled wrong.
Now it is well-formed.
2019-04-30 17:05:41 +02:00
eae51147f4
Styled same margin-top for start-, einleitung- and frage-page in RT-tool.
2019-04-30 17:02:44 +02:00
4b89a5dbe8
Styled frage page of Reihungstesttool.
...
Slightly styled frage page according to starting page style changes.
Added bootstrap.
2019-04-30 16:41:07 +02:00
58e2d3f000
Styled starting page of Reihungstesttool
...
The starting page (login.php) is well-formed.
Still missing translations of new text inputs.
2019-04-30 16:37:51 +02:00
4a0170d726
Fixed Select language for menu in Reihungstesttool (CHROME Incompatibility)
...
Now the select menu is working also on CHROME Browser.
Also added Bootstrap.
2019-04-30 16:28:57 +02:00
9101537c14
Merge branch 'master' into cleanci
2019-04-30 14:42:40 +02:00
8cb87556c6
CLI_Manager now loads form helper and ExtensionsLib
2019-04-30 14:19:48 +02:00
bbe62cb997
Added new controller system/extensions/CLI_Manager to manage extensions from command line
2019-04-30 14:16:54 +02:00
4151ae5364
education/Lehreinheit_model:
...
- prestudent_id also retrieved when getting students of a Lehreinheit
2019-04-30 14:00:01 +02:00
d4c7f1f18d
Merge branch 'master' into cleanci
2019-04-30 13:14:37 +02:00
3b4012798f
Fixed some comments typo
2019-04-30 13:13:34 +02:00
783910b84c
Changed the way to set the header if the user is not authorized
2019-04-30 13:12:12 +02:00
976df3868b
- Added new core controller CLI_Controller
...
- Adapted all the controllers jobs to use this new controller
2019-04-30 13:10:58 +02:00
d569ad59a9
Changed path of Lehrtätigkeitsbestätigung (cis -> content)
2019-04-29 12:04:17 +02:00
715fc9e3a7
Applyed actual date in Lehrtätigkeitsbestätigungs-template
2019-04-29 11:10:54 +02:00
2aea12ce56
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-04-29 11:00:10 +02:00
1b5ecca09a
Merge remote-tracking branch 'origin/master'
2019-04-26 17:21:15 +02:00
d4d6627c88
Auswertung FHTW BugFix Summe verdoppelt, wenn Auswertung ohne RT_ID
2019-04-26 17:21:06 +02:00
484a53a37c
Reihungstestverwaltung BugFix Doppelte PreStudenten
2019-04-26 17:20:33 +02:00
df73c0456e
New Tablesorter fixed Date sorting
2019-04-26 17:20:05 +02:00
c813312906
FAS Mitarbeiterimport UID optional
2019-04-26 17:19:42 +02:00
e1ed8b55f5
Fixed models
2019-04-26 12:51:02 +02:00
c84c484a2a
Fixed models
2019-04-26 12:43:51 +02:00
3a692f8a5e
Removed not used libraries and views
2019-04-26 11:38:28 +02:00
f0fe4bc239
Removed not used config files
2019-04-26 11:27:39 +02:00
50f3b95c89
Deleted all not used models by this project and by extensions
2019-04-26 11:16:41 +02:00
97af0bdc00
Removed migrations and seeds directory
2019-04-25 17:23:39 +02:00
55636c5bb7
Merge branch 'master' into cleanci
2019-04-25 17:06:28 +02:00
d1498a9b12
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-04-25 17:05:21 +02:00
f65f3daceb
- Added private property $_requiredPermissions to APIv1_Controller
...
- Removed method _isAllowed from APIv1_Controller
- Added public method _remap to APIv1_Controller
- PermissionLib loading moved from constructor to _remap in APIv1_Controller
- Changed method basicAuthentication in AuthLib, now calls loginLDAP
2019-04-25 17:02:43 +02:00
e38d822f82
Open link in _blank Window
2019-04-25 16:22:41 +02:00
1d6cd91074
CodestyleFix
2019-04-25 16:20:46 +02:00
dbb404743f
BugFix Personen Zusammenlegen Foto
2019-04-25 16:18:00 +02:00
ac27cb81e7
BugFix Bezeichnung Studiensemester englisch
2019-04-25 16:17:25 +02:00
3291fba775
BugFix Summe falsche Spalte
2019-04-25 16:16:27 +02:00
2cf15bcd74
REST_Controller now loads helper hlp_session
2019-04-25 14:53:35 +02:00
b0919a8740
Removed never used rdf/Basic controller
2019-04-25 13:52:06 +02:00
a0967588fb
Better error messages in DB_Model
2019-04-25 13:38:46 +02:00
80afb74be9
Modified RT-menu: Styled logout link
...
Now the logout link is also integrated in the menu.
2019-04-25 13:14:57 +02:00
286114255e
Better error messages in FS_Model
2019-04-25 12:59:07 +02:00
699aca74d1
- Changed helper and language autoload
...
- Changed language config
- Removed never used constants
- Changed rest_language in rest config file
- Adapted models that where extending FHC_Model
- Adapted code to load hlp_return_object
- Adapted code to use exit status codes constants
2019-04-25 12:09:31 +02:00
0738a0aee1
Marked studies that were rejected for the Reihungstest
...
Now the studies, that were rejected for the Reihungstest
(Prestudentstatus 'Abgewiesener'), are marked as rejected on the
Reihungstest-starting page.
2019-04-25 11:39:24 +02:00
f5433a2a73
Modified RT-menu: Styled start/intro links
...
Now the start and intro links are styled like buttons and integrated in
the menu navigation.
2019-04-25 10:36:40 +02:00
551de54f19
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-04-25 10:31:46 +02:00
1fe9a95236
Removed controllers/DBTools.php and core/FHC_Model.php
2019-04-24 19:49:34 +02:00
be6857822d
- Renamed application/helpers/hlp_message_helper.php to application/helpers/hlp_return_object_helper.php
...
- Added function _createReturnObject to hlp_return_object_helper.php
2019-04-24 19:48:21 +02:00
1da4cdb9aa
- Removed languages files for CI file system based phrase system
...
- Renamed application/language/de-AT/ to application/language/english/
- Kept language file rest_controller_lang.php to be used with the REST_Controller
2019-04-24 19:46:19 +02:00
a2b6d1e8dd
Fixed FreeBusy Import of Google Calender
...
Google Calender now exports FreeBusy Information without BEGIN:VFREEBUSY/END:VFREEBUSY Tags
2019-04-24 18:04:10 +02:00
617ed24073
Modified menu of Quereinstiegsgebiete
...
Now the menu of Quereinstiegsgebiete is clustered and displayed by study.
2019-04-24 16:52:20 +02:00
803c1cb4c3
Ändern des Erledigt-Status von Notizen setzt jetzt immer das Updatevon/Updateamum Feld
2019-04-23 15:32:37 +02:00
c049090987
- Added jquery checkboxes to FHC-Header template
...
- select checkbox range with shift key is automatically possible in FilterWidget tables
2019-04-19 13:16:37 +02:00
09478e0d6c
Schnitt is calculated only from positive grades in Studienerfolgsbestätigung
2019-04-19 11:12:17 +02:00
dfd97824de
Changed Version Number in Planner
2019-04-18 17:27:42 +02:00
fdf80f2d7e
InfocenterData, infocenterfreigegebendata, infocenterreihungstestabsolviertdata:
...
added log name "Login with user" to list of excluded logs for "last Action"
2019-04-18 17:15:21 +02:00
86902a0d35
Diplomasupplement, Studienerfolg, Zeugnis Dokumentvorlagen:
...
- ECTS (Diplomasupplement, Studienerfolg, Zeugnis) and lv Gesamtstunden (studienerfolg) werden korrekt berechnet, nicht angezeigte negative Lvs werden ausgenommen.
2019-04-18 13:37:18 +02:00
d104ac6a7f
BIS-Meldung Problem behoben wodurch GS Studierende nicht korrekt
...
gemeldet wurden wenn diese bereits im 1. GS Semester Absolvent sind
2019-04-17 16:28:29 +02:00
34791c96c4
Merge branch 'master' into ciauth
2019-04-17 15:46:27 +02:00
f05ebf3946
Unlocking in Infocenter now always reloads the Dataset and jumps to the correct Filter
2019-04-17 09:15:41 +02:00
ed7f3f90fb
Codestyle-Changes
2019-04-16 16:45:21 +02:00
0439c19cb1
Infocenter Notices "Anmerkung zur Bewerbung"
...
When there is an extra content after "Anmerkung zur Bewerbung" e.g. "Anmerkung zur Bewerbung (BWI)" the notice is also displayed on top
2019-04-16 16:44:55 +02:00
307f279e08
New optional param prestudent_id in function getBewerbungstoolNotizen
2019-04-16 16:43:25 +02:00
54507543d7
Minor typo fixes
2019-04-16 16:41:20 +02:00
2d5d6dd5ad
Fixed typo in script
2019-04-16 16:40:55 +02:00
e9521d056d
Implemented Nationengruppe
...
- New class
- Attributes in nation.class
- Attributes in bewerbungtermin.class
2019-04-16 16:40:31 +02:00
1d9f489402
New Table bis.tbl_nationengruppe
...
- Added Column nationengruppe_kurzbz to tbl_bewerbungstermine and tbl_nation
2019-04-16 16:38:15 +02:00
d01e334a12
Changes to Ausbildungsvertrag 2019
2019-04-16 16:36:54 +02:00
b6c9c5718c
Merge remote-tracking branch 'origin/master'
2019-04-16 16:32:54 +02:00
476ce1b93b
Added OrgForm as param to Excel-Export
2019-04-16 16:30:58 +02:00
d23357c331
InfoCenter Details AjaxLib calls update:
...
- using outputJson... methods instead of output type and json_encode
- added errorcallbacks for blocking errors
- called IC controller methods return success or error objects
- fitstudiengang is checked when sending freigabe stg message
2019-04-16 13:58:21 +02:00
255516c8fd
zgvpruefungen view InfoCenter:
...
- quickinfo for disabled freigegeben buttons comes from phrases
2019-04-16 13:32:25 +02:00
95af36fc59
public/DialogLib update:
...
- added alertWarning method
- outsourced code to _displayDialog method
2019-04-16 13:29:51 +02:00
ff90e48e28
accounting/Kostenstelle_model:
...
- corrected typo in method getKostenstellenForGeschaeftsjahrWithOe
- added method getKostenstellenBerechtigt for all Kostenstellen for which user berechtigt
2019-04-15 18:43:52 +02:00
aad0292d5a
Added function to get all Organisationsunits that are attachted to a course
2019-04-15 17:30:55 +02:00
b8a504b424
Budget FilterWidget Übersicht Updates:
...
- public/FilterWidget.js : ignore empty objects when rendering tablesorter table
- Insert Budget filter
- Insert app "budget"
2019-04-15 16:59:24 +02:00
bc68ca1e9f
Added english Version of Lehrveranstaltungszeugnis
2019-04-15 15:32:02 +02:00
b63809abfd
Fixed Errorhandling when switching between Users to display correct Errormessages
2019-04-12 15:27:17 +02:00
02bab0b301
Merge branch 'master' into ciauth
2019-04-12 14:30:28 +02:00
4605413891
FHC-Controller: changed scope of outputJson from private to protected
2019-04-12 14:29:45 +02:00
5b439eea1f
Merge branch 'master' into ciauth
2019-04-11 16:24:09 +02:00
4e0a47c17e
Merge remote-tracking branch 'origin/master'
2019-04-11 10:11:24 +02:00
d32c764955
- Lehrveranstaltung_model: getLvsWithIncomings method takes studienplan_lehrveranstaltung export field (= studienplanrelevant) into account
2019-04-11 10:11:08 +02:00
6b43e97361
Removed check against bisverwendung in FAS document lehrtaetigkeit
...
The check against bisverwendungen caused wrong date definitions,
when a lector is teaching without a contract.
Now the start end end time refer only the teaching activities.
PLUS
some code refactoring for easier maintainance
2019-04-10 18:47:10 +02:00
a5bd9502d8
Tempus zeigt das Datum der letzten Änderung von Zeitsperren im Tooltip an
2019-04-10 13:42:42 +02:00
86444d89cc
Bewerberstatistik - Legende hinzugefügt
2019-04-10 11:01:52 +02:00
39177fb97f
Removed check for Reihungsteststufe 1/NULL in getReihungstestErgebnisPerson
...
Removed check for Reihungsteststufe 1 in function
getReihungstestErgebnisPerson.
2019-04-10 10:53:43 +02:00
40755fa789
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2019-04-09 17:14:27 +02:00
c7e757c76f
Added document Lehrtätigkeit Bestätigung in FAS (only FHTW)
...
Now a new document exists to confirm the lecture activities which
include all the
. lehreinheiten of the mitarbeiter
AND
. projektarbeiten of the mitarbeiter (betreuer,...)
clustered by studiensemester.
2019-04-09 14:57:48 +02:00
5fc356cd4f
Added document Lehrtätigkeit Bestätigung in FAS (only FHTW)
...
Now a new document exists to confirm the lecture activities which
include all the
. lehreinheiten of the mitarbeiter
AND
. projektarbeiten of the mitarbeiter (betreuer,...)
clustered by studiensemester.
2019-04-09 14:39:07 +02:00
d5dfcae134
Added function getAllProjects to projectbetreuer class
...
This function retrieves all projektarbeiten by person.
(Only with stundensatz > 0)
2019-04-09 14:27:28 +02:00
ecadec9280
Changes in Models:
...
- education/Lehreinheit_model getLesForLv: studiengang_kz and studiengang_kuerzel of lehreinheitgruppen is also retrieved
- education/Lehrveranstaltung_model getLvsWithIncomingPlaces:
-- Retrieving not by Studienordnung Gültigkeit, but by tbl_studienplan_semester
-- retrieving lvs of studiengang ECI Campus International
2019-04-08 17:21:38 +02:00
c649bf3fbe
Fixed double basic gebiet-entries in Reihungstest
...
This issue popped up when basic gebiete of many Bachelor studies could not be merged (with unique gebiete) due to different reihung. This is fixed now.
2019-04-08 13:26:33 +02:00
5f194af126
Merge remote-tracking branch 'origin/master'
2019-04-04 18:34:13 +02:00
4815c9e73a
Fotoliste korrektur
...
Bilder verkleinert, damit mehr Platz auf Seite
2019-04-04 18:34:00 +02:00
ee2661a26e
Neue Inputs im Personen-Anlegen Formular
...
- Staatsbürgerschaft
- Geburtsnation
- OrgForm
2019-04-04 17:29:09 +02:00
1d9c2e90c6
Plausibilitätsprüfung zeigt nun Personen an die keinen Endstatus haben (Absolvent, Abgewiesener, Abbrecher) und deren letzter Status in der Vergangenheit liegt
2019-04-04 16:36:29 +02:00
c704a26690
Update Auswertung Lehraufträge
...
- Spalte Stundensatz dazu
- Lehrfach entfernt
- Anpassungen Spaltenbreite
2019-04-04 14:59:52 +02:00
44d6bb9c5f
Spalte "Department" in lehrauftragsliste_mail
2019-04-04 14:23:47 +02:00
eb63ce4ac5
Minor Codestyle-Fixes
2019-04-04 13:51:13 +02:00
42a3b6bc36
Übernahmebestätigung ohne Geburtsdatum
2019-04-04 13:50:34 +02:00
e7930c9f80
Fotoliste Querformat
2019-04-04 13:50:17 +02:00
ada594d83a
Removed "Die besten seit 1994" from Sancho-footers
2019-04-04 13:49:33 +02:00
445900249e
Fixed problem that causes projects not to be displayed in FAS when there are
...
special characters in the title
2019-04-03 16:24:01 +02:00
a2a876ff68
- InfoCenter Controller: Studiengangbezeichnung is retrieved from Studienordnung instead of Studiengang Tabelle when sending infocenter mail to Assistenz
2019-04-02 16:48:12 +02:00
74a23b9b75
ÖH Waehlerverzeichnis - Spaltenanzahl korrigiert
2019-04-02 15:12:49 +02:00
85c9b86864
- changed xsl Vorlagen for Lehrgänge: only positive grades are displayed on Studienerfolgsbestätigung, Diplomasupplement and Zeugnis
...
- deleted ZeugnisNeu Vorlagen which are not used anymore
2019-04-01 17:36:48 +02:00
f685b0c05f
Added placeholder file to application/extensions
2019-04-01 16:35:07 +02:00
4fadd6f40a
Merge remote-tracking branch 'origin/master'
2019-04-01 16:11:36 +02:00
2f5d388bdb
- changed xsl Vorlagen: only positive grades are displayed on Studienerfolgsbestätigung, Diplomasupplement and Zeugnis
2019-04-01 15:36:15 +02:00
36b730dd81
Remove saveFilters-Option from tablesorter
2019-04-01 14:06:48 +02:00
ba5bf6708f
Disz. Zuordnung in Lehrauftragsliste Mail
2019-04-01 14:05:57 +02:00
9dc44c5908
- only positive grades are displayed on Studienerfolgsbestätigung, Diplomasupplement and Zeugnis, no Studiensemester on Diplomasupplement
2019-04-01 09:48:20 +02:00
df8ccbdd69
Serialized array of config const FAS_REIHUNGSTEST_EXCLUDE_GEBIETE
...
Serialized and unserialized const array to make it work properly.
2019-03-28 16:53:59 +01:00
4c0d8e7f20
Fixed 0 values in Reihungstest end results
...
Fixed query to retrieve correct Reihungstest end results for basic question areas.
2019-03-28 16:38:32 +01:00
a8b40f6c20
Merge remote-tracking branch 'origin/master'
2019-03-28 15:52:11 +01:00
9f945b12f8
New function getNextPlacementtestDate
2019-03-28 15:51:48 +01:00
194481ee62
Bugfix cc and bcc
2019-03-28 15:51:35 +01:00
00df53b3e5
Code formatted
2019-03-28 15:50:34 +01:00
730dfead7b
Spalte für absolvierte Tests wieder eingefügt
2019-03-28 15:43:20 +01:00
85541e90dc
Änderungen in Auswertung FHTW
...
- Punkte ins FAS übertragen mit optionalen Gesamtpunkten und Bewerberstatus
- Vergangenes und kommendes Studiensemester in SQL
- Spalten für Mail, Qualikurs und Letzter Status
- Mail-Senden-Funktion
Div- GUI-Verbesserungen
2019-03-28 15:41:05 +01:00
dc8a76e674
Removed marks from anonymized Notenfreigabeliste
2019-03-28 13:09:03 +01:00
fd1f87e80b
Umbenennung LehreIntern zu Lehre
2019-03-27 17:46:10 +01:00
7f4176ade3
Added UID + marks to anonymized Notenfreigabeliste
...
Now the eMail with the anonymized Notefreigabelist displays students UID and marks.
2019-03-27 11:56:58 +01:00
6a2575b1b7
Merge remote-tracking branch 'origin/master'
2019-03-27 11:49:56 +01:00
9ef8adae39
Added return false to function akzeptiert in document.class
...
Method is expected to return boolean true or false. False was missing.
2019-03-27 11:49:29 +01:00
8bc8679143
- added method getLvsWithIncomings to education/Lehrveranstaltung_model (from mobility online extension)
2019-03-25 16:39:47 +01:00
c43a484f74
Merge remote-tracking branch 'origin/master'
2019-03-25 10:06:53 +01:00
aa584619d6
Check if FAS_REIHUNGSTEST_PUNKTE_BASISPUNKTE_ANZEIGEN is defined
2019-03-25 10:06:04 +01:00
26e88e43e0
Check if FAS_REIHUNGSTEST_PUNKTE_BASISPUNKTE_ANZEIGEN is defined
2019-03-25 09:30:21 +01:00
9eaa0b66d7
- Changed AuthLib->loginASByPersonId: now if to the given person_id is linked a uid, then permissions are checked using the uid
2019-03-22 11:54:25 +01:00
d2280b2ade
Removed Link from FAS to old Bugtracker
2019-03-22 07:26:55 +01:00
cf639cd345
Marked Columns gesamtstunden, faktor and stundensatz in tbl_projektarbeit as DEPRECATED
2019-03-22 07:20:02 +01:00
424c5883bc
Fixed Errorhandling on Datenverbund Client
2019-03-21 19:36:16 +01:00
3abc2e2948
Merge branch 'master' into ciauth
2019-03-21 17:04:51 +01:00
f92e32d8f0
- Added new public method getLandingPage to AuthLib.php
...
- AuthLib->redirectToLandingPage now calls getLandingPage
- Added new controller system/Login.php to perform login operations
- Added new view system/login/usernamePassword.php to login with username and password
- Added css/Login.css, images/logo-300x160.png and js/Login.js to be used by usernamePassword.php
2019-03-21 17:00:08 +01:00
abe64c1bfe
education/Lehreinheit_model:
...
- added info if Lehreinheit directly assigned (direktinskription) in getLesForLv method
- added getStudenten method for getting all students of a lehreinheit
2019-03-21 16:13:05 +01:00
8449e1f69c
- modified public/tablesort.js to accept additional tablesorter parameters
...
- filter cell not displayed if disabled in tablesorter (public/tablesort_bootstrap.css)
2019-03-21 16:09:30 +01:00
400a1adfde
- Added new entry permission_loginas_personids_blacklist in config file permission.php
...
- Renamed method loginAS to loginASByUID in AuthLib.php
- Added new public method loginASByPersonId to AuthLib.php
- Renamed method connect to anonymousConnect in LDAPLib
- Method LDAPLib->connectUsernamePassword now checks both username and password if they are empty strings
- Added new constant LOGINAS_PERSONIDS_BLACKLIST to PermissionLib
- Renamed method isEntitledLoginAS to isEntitledLoginASByUID in PermissionLib
- Added new public method isEntitledLoginASByPersonId to PermissionLib
- Added new private method _inLAPersonIdsBlacklist to PermissionLib
2019-03-21 15:36:22 +01:00
19bd3b9d6f
Merge remote-tracking branch 'origin/master'
2019-03-21 14:12:38 +01:00
cd5344cf6d
Anonymized reasons of absence in MA-Zeitsperre/Urlaube overview
...
Due to data protection regulation the reasons of employees absence are now displayed as a general 'absent' ('Abwesend').
2019-03-21 14:12:13 +01:00
8707fd4be6
Merge remote-tracking branch 'origin/master'
2019-03-21 14:02:36 +01:00
949c69b556
Bugfix
...
Auskommentierte Zeilen wieder einkommentiert
2019-03-21 14:02:17 +01:00
aaff64867b
Ordered Reihungstestgebiete by reihung
2019-03-21 09:38:02 +01:00
12019bfdae
Added Reihungstest results of basic areas (excluding Quereinsteiger)
...
Now there are 2 new fields in FAS > Aufnahmetermine displaying the results only of the basic areas (without points of Quereinsteigergebiete).
. First field: total result of basic areas
. Second field: total result of basic areas EXCLUDING physics
. Both fields are only shown for Bachelor-studies.
. Generally the display of these fields is controlled by the config file.
2019-03-20 17:41:06 +01:00
72a9d9dc01
Modified function getReihungstestErgebnisPerson in pruefling class
...
. Function now provides end resulting points only of the general basic question areas. (without quereinsteiger-gebiete)
. Function now accepts question areas to be excluded.
2019-03-20 17:32:52 +01:00
fe4017c786
Added function to install extensions from commandline
2019-03-20 16:30:44 +01:00
782e3fd1b1
Merge branch 'master' into ciauth
2019-03-20 16:29:33 +01:00
120a775dbb
Urkundendruck korrigiert wenn die Abschlussprüfung vom Typ Lehrgangsabschluss ist
2019-03-20 10:54:24 +01:00
3751add1c3
Merge remote-tracking branch 'origin/master'
2019-03-19 10:39:54 +01:00
0cc09629fb
Arbeitsplätze und Max. Person werden defaultmäßig angezeigt
2019-03-19 10:39:32 +01:00
d13a7f4720
Fixed testtool to set sprachwahl also for none-priority Bachelor studies
2019-03-19 09:32:06 +01:00
1009bb0682
Fixed testtool to retrieve correct languages
2019-03-18 15:37:20 +01:00
793b01818c
Vorlage lehrveranstaltungszeugnis für CampusInternational angepasst
2019-03-18 13:51:26 +01:00
14e4b11969
Set from, cc and bcc as param in sendSanchoMail
2019-03-18 11:59:13 +01:00
9cca1dfbc2
Arbeitsplätze in ort.rdf
2019-03-18 11:55:14 +01:00
ecc388fe2d
Div. Änderungen RT-Verwaltung
...
- Gesamtliste in EXCEL-Export
- Einklappen-Funktion
- Spalten mit Punkteberechnung vorläufig ausgeblendet um Seite schneller zu machen
2019-03-18 11:54:49 +01:00
67b7c4f132
Neue Reihungstest-Auswertungsseite für FHTW
2019-03-18 11:51:32 +01:00
6b8bfb6a3c
Fixed Testtool Login
2019-03-14 18:06:54 +01:00
e605773311
Merge branch 'master' into ciauth
2019-03-14 13:35:28 +01:00
4c2b1731a7
- Added configuration entry authentication_logout_page in auth.php
...
- Fixed function cleanSessionElement in hlp_session_helper
- Added constants AUTHENTICATION_LOGOUT_PAGE and SESSION_LANDING_PAGE to AuthLib
- Fixed method loginLDAP in AuthLib
- Added public method redirectToLandingPage to AuthLib
- Renamed method _storeAuthObj to _storeSessionAuthObj in AuthLib
- Added private method _storeSessionLandingPage to AuthLib
- Added private method _redirectTemporarily to AuthLib
2019-03-14 13:31:07 +01:00
922b0a2b32
Added display of weekday in Reihungstest-Dropdown
...
In FAS > tab Aufnahme-Termine > Dropdown: Reihungstest/Interview:
Now the weekdays of the Reihungstests are displayed.
2019-03-14 11:37:08 +01:00
3494c7a2ef
Merge branch 'master' into ciauth
2019-03-13 18:15:41 +01:00
04b1ec327a
- Added new config file permission.php
...
- It contains the following entries:
- List of permissions that are allowed to perform loginAs
- List of permissions that cannot be gained with loginAs
- List of users whose identity cannot be obtained with loginAs
- Removed config entries authentication_loginas_perms and authentication_loginas_blacklist from config file auth.php
- Added constants to PermissionLib: LOGINAS_ALLOWED, LOGINAS_BLACKLIST and LOGINAS_USERS_BLACKLIST
- PermissionLib loads the config file permission.php
- Added public method isEntitledLoginAS to PermissionLib
- Added private methods _inLAUsersBlacklist, _hasLANotAllowedPermissions and _hasLAPermissions to PermissionLib
- Added public method loginAS to AuthLib
- Fixed logout method in AuthLib
- Fixed loginLDAP method in AuthLib
2019-03-13 18:07:15 +01:00
09097c6205
Corrected function getReihungstestErgebnisPerson
...
Now the prestudent_id is retrieved by joining on study semester (instead of studienplan, which was inconsistent).
Added also restricion on stufe = 1 to retrieve only Reihungstest absolved on desktop.
2019-03-13 15:14:56 +01:00
53a0b60ba8
- Removed method getCheckUserAuth form api/v1/CheckUserAuth
...
- Changed LDAP_Model to a library: LDAPLib
- Removed controller system/Login
AuthLib:
- Added new private method _createAuthObjByPerson
- Moved config load from constructor to _authenticate
- Moved Person_Model load from constructor to _createAuthObjByPerson
- Removed method checkUserAuthByCode
- Removed method checkUserAuthByCodeEmail
- Adapted code to use LDAPLib
2019-03-13 11:57:36 +01:00
fd9a2266ec
Added new public method loginLDAP to AuthLib
2019-03-13 10:24:19 +01:00
991ca747d1
Separated Bachelor and Masters on testtool
...
Now if the logged-in prestudents study is a Bachelor-study, all other Bachelor studies he might have applied for, are displayed. Also the testing areas (gebiete) are shown only for that Bachelor studies.
If the logged-in prestudents study is a Master (or something else than a Bachelor), only that one particular Master study is displayed on the starting page. The testing areas are shown only for that one particular Master study.
2019-03-12 18:03:49 +01:00
0b5f9f51f7
Extended function getActualInteressenten to differ only by STG-type/-kz
...
Now the function accepts the optional arguments:
. typ (= studiengangstyp)
. studiengang_kz
to retrieve more specific data.
2019-03-12 17:53:44 +01:00
d1b4024b76
- Added new constants LDAP_NO_USER_DN and LDAP_TOO_MANY_USER_DN in constants.php
...
- LDAP_Model->getUserDN now returns errors with more information
- Login redirection is performed with HTTP code 302 instead of 301
- Fixed _checkHBALDAPAuthentication behavior
- AuthLib errors have more information
2019-03-12 16:14:58 +01:00
13db712fa7
- Changed authentication_login to AUTH_LDAP in auth.php
...
- Fixed paths in array authentication_login_pages in ayth.php
- Added new constants AUTHENTICATION_LOGIN and AUTHENTICATION_LOGIN_PAGES to AuthLib
- Added private method _redirectToLogin to AuthLib
- Better comments
2019-03-12 14:00:56 +01:00
aefd210273
- Added new configuration file auth.php for authentication
...
- Added new configuration file ldap.php for LDAP connection
- Added new controller system/Login to manage logins
- Added new controller system/Logout to manage logout
- Added new core model LDAP_Model to manage LDAP connections
- Added new constants in config/constants for authentication
- Added new function getCode to hlp_message_helper
- Now core/Auth_Controller loads the AuthLib as first step
- Now PermissionLib does NOT load anymore the AuthLib
- Removed old logic from PermissionLib
- Now function getAuthUID (hlp_authentication_helper) does not load anymore the AuthLib
- Now REST_Controller loads hlp_message_helper and hlp_common_helper
- core/APIv1_Controller does NOT load anymore hlp_message_helper and hlp_common_helper
- Added new constants to AuthLib
- AuthLib constructor now accept a parameter to enable the authentication immediatly (default)
- AuthLib loads configuration file auth.php and Person_model by default
- Added public methods getAuthObj and logout to AuthLib
- Renamed CheckUserAuthByUsernamePassword to checkUserAuthByUsernamePassword, CheckUserAuthByCode to checkUserAuthByCode and CheckUserAuthByCodeEmail to checkUserAuthByCodeEmail in AuthLib
- Added private methods _createAuthObj, _isLogged, _showInvalidAuthentication, _showError, _checkBTAuthentication, _checkHBALDAPAuthentication, _checkLDAPAuthentication, _checkForeignAuthentication, _storeAuthObj and _authenticate to AuthLib
2019-03-12 11:33:01 +01:00
abf766ce51
- Added session_start() to hlp_session_helper to start a PHP standard session (NOT CI session)
...
- Added functions cleanSession and cleanSessionElement to hlp_session_helper
- Renamed setElementSession to setSessionElement in hlp_session_helper
- Renamed getElementSession to getSessionElement in hlp_session_helper
- Adapted the code that were using this helper
- Autoload does NOT load anymore helper hlp_session_helper
- Controller controllers/system/Filters now loads the AuthLib
- Removed var_dump from controllers/jobs/ReihungstestJob
2019-03-12 11:16:42 +01:00
e45fc66770
- Added check if a Person is corretly selected when adding to a direct group
...
- Persons in the direct group drop down are now ordered by name
2019-03-12 08:04:13 +01:00
2fe8f9c540
Added Total Reihungstestpunkte WITH and WITHOUT specific areas in FAS
...
Now the total Reihungstestpunkte are calculated and displayed in two ways:
1. the total amount of points achieved on overall gebiete
2. the total amount of points achieved excluding specific areas, which are defined in the config file.
2019-03-11 17:17:38 +01:00
7f364835bf
Extended function getReihungstestErgebnisPerson: excluding gebiete opt.
...
Now questioning areas (gebiete) can be excluded when calculating the total Reihungstestpunkte.
excluding gebiete should be defined in the config array FAS_REIHUNGSTEST_EXCLUDE_GEBIETE.
2019-03-11 17:11:33 +01:00
ddf9153b7f
Function load_person: studiengang_kz is now optional
2019-03-08 15:03:25 +01:00
ff704d4a39
Merge remote-tracking branch 'origin/master'
2019-03-08 10:35:36 +01:00
4acc4f128d
Konstante "CAMPUS_NAME" in Vilesci-Config
2019-03-08 10:35:27 +01:00
1ef1f1ea7b
ID für Uhrzeit-Row bei FAS-Abschlussprüfung
2019-03-08 10:34:41 +01:00
505026896d
Neues Recht "reihungstestAufsicht"
...
RT-Aufsichtspersonen dürfen zB Tests freischalten, Personen hinzufügen, Antworten löschen
2019-03-08 10:33:49 +01:00
c325c98728
direct group deletion, education/Lehreinheitgruppe_model:
...
- fixed "bug" when checking if users are in group
- added additional checks for existence of group in lehreinheitgruppe and benutzergruppe before group deletion
2019-03-08 10:32:05 +01:00
5576159cb1
Prüfungstyp von Abschlussprüfungen zu Diplomasupplement XML hinzugefügt
...
Vorlagen angepasst damit Lehrgangsabschlüsse nicht als Abschlussprüfung
auf den Zeugnissen und Diplomasupplements angedruckt werden
2019-03-08 09:01:02 +01:00
5684f8788a
Updated Changelog and Tempus Version Number
2019-03-07 18:39:25 +01:00
d13872428b
Bug Fix: Beim Anlegen einer Firma im WAWI kam Fehlermeldung wegen falschem Typs des Lieferant-Feldes
2019-03-07 16:52:38 +01:00
68dd0f3cb8
- added method getLesForLv to education/Lehreinheit_model
...
- added methods direktUserAdd, direktuserDelete (for direkt User Zuordnung to le) to education/Lehreinheitgruppe_model
- added method getLvsByStudent to education/Lehrveranstaltung_model
- Added hasSequence = false to Benutzergruppe_model
- fixed typo in lehrveranstaltungDBML
2019-03-06 19:03:02 +01:00
31b0e8bea3
Config Eintrag hinzugefügt um den SelfService Dokumentendownload im CIS
...
zu aktivieren/deaktivieren
2019-03-06 13:25:32 +01:00
5335ac3a71
Added Reihungstest language logic
...
Now the language of the Reihungstest questions is set based on the language-settings of the STG, which has the highest priority. If the language-option is true, the user will have the option to choose between the languages.
2019-03-06 12:18:39 +01:00
af79da67cb
Added function to retrieve actual Interessenten (optionally only for prio)
...
The query retrieves all actual prestudenten with the status 'Interessent' of the users person_id. (+ prio, stg, stpl and ausbildungssemester)
Optionally the function limits the result to the one stg with the highest priority.
2019-03-06 12:09:14 +01:00
c23cefa77f
Added db_parse_bool to sprachwahl (testtool)
...
Now sprachwahl is returning a boolean
- function concerned: getAblaufVorgabeStudiengang
- files using this function are approved
2019-03-06 11:58:43 +01:00
92d5c8a9d2
Kategorien für Services hinzugefügt
2019-03-05 16:06:42 +01:00
d46f288978
Default Stunden für Bachelorbetreuung von 3 auf 4 Stunden geändert
2019-03-05 15:25:47 +01:00
ed94235e85
Added API call from employee updates
2019-03-05 14:04:32 +01:00
7979643006
Merge remote-tracking branch 'origin/master'
2019-03-04 19:02:27 +01:00
3c2873d301
OE-Baum kompakter gestaltet
...
- OEs mit hinterlegter Leitung und Freigabegrenze werden markiert.
- OE-Typ wird abgekürzt (1. und letzter Buchstabe)
2019-03-04 19:02:18 +01:00
c318819fe8
Job hinzugefügt zum aktualisieren von Studienplänen von Reihungstests
...
Wenn Studienpläne zugeordnet sind die in diesem Semester nicht gültig
sind, wird automatisch ein passender gesucht und zugeordnet
2019-03-04 15:54:53 +01:00
34dd7b2dc5
Recht "basis/organisationseinheit" zum Bereich "Stammdaten" hinzugefügt
2019-03-04 13:56:50 +01:00
2edc9c566c
Lehraufträgen inkludierte Lehre Spalten ausblenden
...
Bei Lehraufträgen mit inkludierter Lehre werden die Spalten "Satz" und "Brutto" nun gänzlich ausgeblendet, wenn inkludierte Lehre eingetragen ist
2019-03-01 13:44:57 +01:00
10da7bde5a
Typo corrected
...
Wochenrythmus ausgebessert auf Wochenrhythmus
2019-03-01 13:43:22 +01:00
63877ef8f9
Neues Recht lehre/reservierungAdvanced in LV-Plan implementiert
...
- Reservierungen können damit überschrieben werden
- Wenn Raum grundsätzlich nicht reservierbar, wird eine entsprechende Meldung angezeigt.
2019-03-01 13:42:34 +01:00
d1588d00dc
Neues Recht reservierungAdvanced
...
Erlaubt das Einfügen von Reservierungen auch über bestehende
- Berechtigung auf testtool.tbl_kategorie für web-user
2019-03-01 13:39:53 +01:00
17aa4b7756
BugFix
2019-03-01 13:38:19 +01:00
2524aa90cc
LehreExtern nicht mehr zur Auswahl anzeigen
2019-03-01 09:27:24 +01:00
7a1027280e
Added Reihungstest-Gebiete for person
...
Now the areas for the Reihungstest are put together depending on the studies the examinee is interested in and if the examinee is a Quereinsteiger or not.
Therefore all prestudents of the examinee are detected that are set for the actual and future studiensemester.
The areas are chosen because of the Studienplan. If not available, they are chosen because of the Studiengang.
2019-02-28 15:04:17 +01:00
03c6873b70
Unterstützung von Matrikelnummern zur Semesterticket Schnittstelle
...
hinzugefügt.
Es wird nun sowohl das Personenkenneichen als auch die Matrikelnummer
unterstützt.
2019-02-28 07:13:02 +01:00
fdddb52259
- Moved REST_Controller from libraries to core directory
...
- Changed the relatives includes
- Changed the controller api/v1/CheckUserAuth to be adapted to the AuthLib changes
- Removed function auth from helpers/hlp_authentication_helper
- Adapted function getAuthUID of helpers/hlp_authentication_helper to the AuthLib changes
- Adapted constructor of PermissionLib to the AuthLib changes
2019-02-27 11:24:27 +01:00
1068a0ab33
Doppelten Anmerkung Tag aus RDF entfernt
2019-02-27 09:13:28 +01:00
c20d7779ca
Moved all constants definitions from config/* to config/constants.php
2019-02-26 12:33:13 +01:00
729611aa87
Problem behoben beim Erstellen der Studienerfolgsbestätigung mit
...
Sonderzeichen
2019-02-26 08:35:37 +01:00
663c1d9f35
Merge branch 'messages'
2019-02-25 15:57:40 +01:00
acd918a547
system/MessageToken_model and system/PersonLog_model models now extend DB_Model
2019-02-25 15:57:07 +01:00
8dd7ed0335
Merge branch 'master' into messages
2019-02-25 15:28:13 +01:00
2d7cc09d02
- Added new model CL/Messages_model.php
...
- Moved logic from controllers system/Messages and ViewMessage to CL/Messages_model
- Better code
- MessageLib and PersonLogLib methods do not use anymore show_error and return success/error object
- helpers/hlp_message_helper: hasData function changed
2019-02-25 15:23:31 +01:00
e598264f30
New Cronjobs for Reihungstests
...
- runZentraleReihungstestAnmeldefristAssistenzJob
- runZentraleReihungstestNachtraeglichHinzugefuegtJob
- runRemindApplicantsOfPlacementTestJob
- New function getWorkingDays returns business days between two dates
- New function checkReachedRegistrationDate
- New function getApplicantsOfPlacementTestForCronjob
- New function getApplicantAssignedAfterDate
- New function getApplicantsOfPlacementTest
- New function getTestsOnDate
- New function loadStudiengaengeFromTyp
2019-02-25 10:30:34 +01:00
d98f66e27e
Academy-Logo für Bewerbungstool
2019-02-25 10:24:24 +01:00
6b4f480e70
BugFix Notenanzeige Incomings
...
Bei Incoming-Studierenden wurden bisher keine Noten angezeigt. Das ist nun behoben.
2019-02-25 10:23:55 +01:00
7ef2d44a78
Menüpunkt Lektorenzuordnunginstitute verschoben
...
Menüpunkt Lektorenzuordnunginstitute von "Extras" in "Statistik" verschoben
2019-02-25 10:06:48 +01:00
835c1081fc
BugFix Anzeige Begutachter
...
BugFix Mail an BetreuerInnen senden
2019-02-25 10:04:40 +01:00
07d994a68a
Attribute Sprache, Subject und OrgFormKurzbz in GUI und Klasse
...
- Tinymce für HTML-Vorlagen
- Kopierfunktion für Vorlagen
2019-02-25 10:03:22 +01:00
5020f00d3c
Merge branch 'master' into lvgruppen
2019-02-21 18:41:07 +01:00
8fdf91b4bb
CI Dashboard can now be injected by Addons
...
Cleaned Up CI Navigation
2019-02-21 18:10:25 +01:00
e9757016fe
Merge remote-tracking branch 'origin/master'
2019-02-21 17:18:35 +01:00
0cb86f84ed
Infocenter:
...
- No Message sent when FIT program Freigabe
2019-02-21 17:18:12 +01:00
1474400a3c
Zusatztext für Lehrgänge wird jetzt auch erstellt wenn der Lehrgang mit
...
Typ E erfasst ist
2019-02-21 11:29:58 +01:00
5fe28e4904
Removed Header Styling from default Header
2019-02-21 10:37:32 +01:00
a2d0ae6da8
Infocenter:
...
- FIT Programme Studiengänge 10021,10027 can be freigegeben an Studiengang
- earlier check for existing prestudentid in prestudentmodel in getPrestudentWithZgv method
- reduced Sprache attributed to sprache, locale, bezeichnung in prestudentmodel in getPrestudentWithZgv method
2019-02-20 16:50:20 +01:00
0645095af0
Unterscheidung ob intern / extern bei MitarbeiterInnen ind Suche und Profil
2019-02-19 15:31:58 +01:00
4b8615df8d
Merge remote-tracking branch 'origin/master'
2019-02-18 17:05:39 +01:00
ae29f9e93a
Function getStudiensemesterOnlinebewerbung with optional "art"
2019-02-18 16:55:58 +01:00
e93ee71466
Removed not implemented method
2019-02-15 15:34:48 +01:00
d82c35f964
Merge branch 'master' into messages
2019-02-15 15:31:55 +01:00
a913482ef4
- Added private method _replaceKeys to controller system/Messages.php
...
- Fixed replacement of keys in the message vars array
2019-02-15 15:30:04 +01:00
f3bc764930
- Better code
...
- Better errors handling
- Fixed include path for view messageList.php
2019-02-15 14:37:14 +01:00
c3d4cb4bfc
Spezielle Vorlage für ESA / EIF da dort der Stundensatz immer angedruckt
...
werden soll
2019-02-14 17:56:58 +01:00
37c4ad85b8
changed Name "getActiveKostenstellenForGeschaeftsjahr" to "getKostenstellenForGeschaeftsjahr" in Kostenstelle_model to avoid confusion (kostenstelle has active field in db, but meant is active as "valid in a Geschaeftsjahr")
2019-02-14 17:20:50 +01:00
4cd7abe60b
Wenn der letzte User aus einer direkten Gruppe entfernt wird, werden die
...
Stunden aus der tbl_stundenplandev entfernt
2019-02-13 17:55:51 +01:00
4e41086bdc
Direkte Gruppen umbenannt in GRP_<LEID>
2019-02-13 16:36:42 +01:00
9c78169c52
Merge branch 'master' into lvgruppen
2019-02-13 16:32:02 +01:00
7662edd061
Neue Notenübersicht für Studenten
...
- Ansicht aller LVs die der Studierende lt Studienplan besuchen muss
- Lehrveranstaltungen die ausserhalb des Studienplanes besucht wurden
- Notendurchschnitt pro Semester und über alle Semester nur für
Studienplanrelevante LVs
- Neuer Menüpunkt im FAS für Zugriff auf die Notenliste
2019-02-13 15:52:51 +01:00
0289ab85b5
infocenter default columns
2019-02-12 17:58:27 +01:00
c33e9ba501
extended infocenter message sending flow with special cases:
...
- Stgfreigabe not sent when already stg freigegeben
- statusgrund checked for rtfreigabe (null)
2019-02-12 17:56:36 +01:00
8511ebe667
Warning bei der Anzeige der Studierenden in den Mailverteilern behoben
2019-02-11 12:10:17 +01:00
fad7894ec8
Halfway commit
2019-02-08 17:20:36 +01:00
9729036e26
Added new function getData to helper hlp_message_helper.php
2019-02-08 17:19:56 +01:00
085d612d94
- Added new view system/messages/messageReplySent.php to show the message reply delivery status
...
- system/messages/messageSent.php is now used to thow message delivery status
- Moved JS from view system/messages/messageWriteReply.php to public/js/messaging/messageWriteReply.js
2019-02-07 14:18:32 +01:00
2ce471ac03
Bugfix: Prüfungsbeginn wird nun laut Reihung in DB berechnet
2019-02-07 10:34:56 +01:00
67461ce2a2
Lehraufträge zeigen die Organisationseinheit statt dem Fachbereich an
...
Fachbereich aus campus.vw_lehreiheit entfernt
2019-02-07 08:30:54 +01:00
5508974c49
Added additional degree programs to Infocenter freigegeben and absovliert page
2019-02-06 18:39:27 +01:00
ab7cdd0da4
Added additional degreeprograms to infocenter page
2019-02-06 18:23:38 +01:00
91fbabde6f
- Added new directory application/views/system/messages/
...
- Moved application/views/system/message* to application/views/system/messages/
- Adapted code to use those views with the new path
- Fixed function getCode in public/js/AjaxLib.js
- In public/js/messaging/messageWrite.js is now used AjaxLib.js
- Changed method parseMessageText in MessageLib.php to replace the keys of the data parameter
- Removed function write from application/controllers/system/Phrases.php
- Adapted code in application/controllers/system/Messages.php to use the changed method parseMessageText in MessageLib.php and path of the moved views
2019-02-06 18:18:57 +01:00
1ef2d64127
Added Columns Zugangscode to MessageVars View
2019-02-06 17:05:13 +01:00
2c6fe99770
Removed Tempus PDF Manual and linked to Wiki instead
2019-02-06 16:11:36 +01:00
e7313edb5b
Added updateaktivam to User Load
2019-02-06 11:28:40 +01:00
e25034560f
Merge branch 'master' into messages
2019-02-05 18:13:06 +01:00
6b6e030b69
Bootstrap sometimes needs jQuery!
2019-02-05 15:26:38 +01:00
8ccb94af38
Last things missing from the missing commits
2019-02-05 12:23:34 +01:00
7a84ef3736
Beim automatischen Erstellen von Prüfungsterminen nach der Noteneintragung im FAS wird Lehreinheit jetzt korrekt ermittelt.
2019-02-05 10:53:10 +01:00
49b224c10b
Infocenter:
...
- even if a prestudent is already freigegeben for a studiengang, and if Quereinstieg, "shorter" Quereinstiegsinfomessage is sent when zum RT freigegeben
- message sending: replaced ugly html parsing for check if already freigegeben with AJAX call
2019-02-05 10:52:19 +01:00
d8ff6a3237
Changed Version Number
2019-02-05 10:51:02 +01:00
aa6b4a312b
Bugfix beim Abzug diverser Abwesenheitszeiten von der Gesamtarbeitszeit
2019-02-05 10:50:32 +01:00
922d2367f2
- Changed the name of CI session from ci_session to sess_ci_session
...
- Changed CI session expiring time from 7200 to 1800 seconds
2019-02-05 10:49:08 +01:00
2aacfd0cc7
Interessentenanlage überarbeitet
...
- Anlegen von neuen Interessenten erzeugt nun immer einen neuen Prestudenten.
- Eine Person darf jetzt mehrere Prestudent-Einträge pro Studiengang haben
- Ajax Requests umgebaut auf JQuery
2019-02-05 10:47:51 +01:00
d8b7a03155
Arztbesuch und Behördenweg in Projektliste von der Tagesarbeitszeit a bziehen
2019-02-05 10:47:18 +01:00
6102499794
Cleanup deprecated Escaping function
2019-02-05 10:46:01 +01:00
57461473aa
Neue Studienpläne werden automatisch zu Reihungstests hinzugefügt zu denen der alte Studienplan zugeteilt war sofern die Gültigkeit passt
2019-02-05 10:43:25 +01:00
915f83c7be
Add person.matr_nr to output
2019-02-05 10:42:19 +01:00
4379121637
- Added hasSequence in models to avoid sequenceerrors
...
- Added getByDate, generateMatrikelnummer methods
2019-02-05 10:40:39 +01:00
b58475d6c5
- FilterWidget can represents the retrieved data with tablesorter or pivotUI
...
- Added new constants to FiltersLib
- Added new parameter pivotui to FHC-Header to load JS and CSS for pivotUI
- Renamed constat WIDGET_URL_TABLE_DATASET to WIDGET_URL_DATASET_TABLESORTER in FilterWidget
- Added new constat WIDGET_URL_DATASET_PIVOTUI to FilterWidget
- Added new private properties _datasetRepresentation and _datasetRepresentationOptions to FilterWidget
- Renamed FilterWidget->loadViewTableDataset to loadViewDataset
- FilterWidget->loadViewDataset loads tablesorter or pivotUI view depending on the value of property _datasetRepresentation
- FilterWidget accepts two new parameter: datasetRepresentation and datasetRepOptions
- datasetRepresentation is required
- FilterWidget stores in session the _datasetRepresentation and _datasetRepresentationOptions properties
- Adapted view views/widgets/filter/filter to use loadViewDataset
- All views using FilterWidget have been adapted to use the required parameter datasetRepresentation
- Added new constats DATASET_REP_TABLESORTER and DATASET_REP_PIVOTUI to public/js/FilterWidget.js
- Added new private property _datasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
- Based on property _datasetRepresentation FilterWidget.js will represent the FilterWidget data with tablesorter or pivotUI
- Added new private method _renderDataset to FHC_FilterWidget in public/js/FilterWidget.js
- Renamed method _renderTableDataset to _renderDatasetTablesorter in FHC_FilterWidget in public/js/FilterWidget.js
- Added new method _renderDatasetPivotUI to FHC_FilterWidget in public/js/FilterWidget.js
- Added bew method _setDatasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
2019-02-05 10:38:22 +01:00
c839e8e4a1
- Added personid param for adding notiz
...
- Changed filesystem permissions
2019-02-05 10:34:36 +01:00
6a512d7b25
Infocenter notizen update
...
- removed html specialchars in quickinfo
- notizen are retrieved by ajax when click on tablerow
2019-02-05 10:33:11 +01:00
f6a1f65150
LVPlan SQL für LOAD_UEBER_SEMESTERHAELFTE angepasst damit auch für Wiederholer ein korrektes ergebnis geliefert wird
2019-02-04 18:34:30 +01:00
9c83d10e20
DienstreiseMT-Stempelungen können parallel zu Arbeitszeit eingetragen werden
2019-02-04 18:32:00 +01:00
ee4e7c5038
Work in progress on Messages controller and messageWrite
2019-02-01 17:28:01 +01:00
61b8c74326
Merge remote-tracking branch 'origin/master'
2019-02-01 17:09:31 +01:00
5a2c886cb7
Textkorrektur Ausbildungsvertrag
...
Studiengebühr umbenannt in Studienbeitrag
2019-02-01 17:07:14 +01:00
1b377474b6
- Created Javascript DialogLib in public/js for showing JQuery UI succes, error and info messages
...
- Used created DialogLib in infocenterDetails
2019-02-01 16:59:56 +01:00
2bf2cac383
- Added new method writeReply to FASMessages
...
- Moved logic from Messages and MessageLib to MessageLib\
- Better code in views/system/messageWrite.php
- Adapted content/messages.js.php to use writeReply
2019-02-01 12:04:20 +01:00
d98c7ec9b2
Changes to gitignore
2019-01-31 17:52:45 +01:00
a834b42f4e
Auto stash before merge of "master" and "origin/master"
2019-01-31 17:15:15 +01:00
be3375039e
Studenten Anlegen-Formular
...
- Zugangscode wird nach dem Prinzip des Bewerbungstools generiert
- Studiengangsdropdown mit Langbezeichnung
2019-01-31 16:58:57 +01:00
129fce2e64
Infoscreen-Verwaltung
...
Rechteprüfung bei Reboot-Funktion entfernt
2019-01-31 16:45:13 +01:00
3ecfb12db9
Reihungstestverwaltung mit Tablesorter-Filter
2019-01-31 16:44:38 +01:00
bfc307edbc
Vilesci Personen löschen verbessert
...
- Sicherheitsabfrage vor Löschung
- SQLs hinzugefügt
2019-01-31 16:43:19 +01:00
85c69f3486
Mitarbeiter Anlegen-Formular
...
Zugangscode wird nach dem Prinzip des Bewerbungstools generiert
2019-01-31 16:42:13 +01:00
fb66c8cb9a
Prüfungsprotokoll Bachelor DE und EN angepasst
...
- Nur mehr eine Bachelorarbeit an der FHTW
2019-01-31 16:28:58 +01:00
a4efee1d0f
Im FAS werden nur mehr OrgFormen des Studiengangs angezeigt
...
+ Reihenfolge Reihungstestangemeldet/Reihungstestnichtangemeldet geändert
2019-01-31 16:28:12 +01:00
2c0c1863b9
Diverse Phrasenkorrekturen
2019-01-31 16:21:58 +01:00
7a2114dcc8
CMS WYSIWYG-Editor erlaubt alle HTML-Elemente
2019-01-31 16:19:55 +01:00
60d45a0239
Relative Priorisierung in FAS
2019-01-31 16:18:22 +01:00
a0c5a42aed
Liste der Betreuerarten überarbeitet
...
- Inaktive Betreuerarten werden durchgestrichen
- Automatische Auswahl der Betreuerart nach Projektarbeitstyp
2019-01-31 16:15:37 +01:00
ebe174992d
Relative Priorisierung in Excel-Export
2019-01-31 16:03:13 +01:00
ca303c7c4a
Mailverteiler Personenliste mit Filter erweitert
...
In der Personenliste der Mailverteiler kann nun mit Filtern die Liste eingeschränkt werden. Diesen Personen kann man dann direkt ein Mail schreiben (mit dem eigenen Mailclient)
2019-01-31 16:02:18 +01:00
b56fb6deb8
Added Cronjob to automatically add direct groups to schedule
2019-01-31 08:43:24 +01:00
42829ed33e
Gruppenbezeichnung für direkte Gruppen angepasst
...
Debug Output entfernt
2019-01-29 18:43:36 +01:00
1ed020dab9
Raumvorschlag bei bereits verplanten Stunden angepasst damit direkte
...
Gruppen nicht kollidieren
2019-01-29 18:24:44 +01:00
de598c1ded
Merge branch 'master' into lvgruppen
2019-01-29 08:23:23 +01:00
cf347c42f2
Beim automatischen Erstellen von Prüfungsterminen nach der
...
Noteneintragung im FAS wird Lehreinheit jetzt korrekt ermittelt.
2019-01-29 08:18:06 +01:00
a2245cf1c4
Fehler behoben beim verplanen wenn nur direkte Gruppen zugeordnet sind
2019-01-28 07:55:42 +01:00
306da46c80
- Removed messagelink from controller system/infocenter/InfoCenter.php
...
- Improved MessageLib
- Added method getMessageVarsPerson to MessageLib
- Moved JS from views/system/messageWrite.php to public/js/messaging/messageWrite.js
- Added new controller controllers/system/FASMessages.php
- Adapted content/fasoverlay.js.php and content/messages.js.php to use FASMessages
2019-01-25 17:16:57 +01:00
5892496706
Keine Kollision bei Verschiebung
2019-01-25 08:24:05 +01:00
7e2336e9cc
Merge branch 'master' into lvgruppen
2019-01-24 08:34:17 +01:00
631ef93d6b
Infocenter:
...
- even if a prestudent is already freigegeben for a studiengang, and if Quereinstieg, "shorter" Quereinstiegsinfomessage is sent when zum RT freigegeben
- message sending: replaced ugly html parsing for check if already freigegeben with AJAX call
2019-01-22 17:45:34 +01:00
42768d7c92
Changed Version Number
2019-01-22 14:51:53 +01:00
d3803a848f
Bugfix beim Abzug diverser Abwesenheitszeiten von der Gesamtarbeitszeit
2019-01-21 16:38:06 +01:00
8253ba90fd
Kollisionsprüfung angepasst damit direkte Gruppen ignoriert werden
2019-01-21 15:09:26 +01:00
86f1671fb6
Changed CI session expiring time from 600 to 1800 seconds
2019-01-21 12:56:47 +01:00
2e1b8279fd
- Changed the name of CI session from ci_session to sess_ci_session
...
- Changed CI session expiring time from 7200 to 600 seconds
2019-01-18 15:16:16 +01:00
c4daf904f3
Reihungstestverwaltung Rechte verschärft
...
Es wird nun bei allen Aktion geprüft, ob für den betroffenen Studiengang (den Studiengang des Reihungstests) Rechte vorhanden sind
2019-01-16 19:16:08 +01:00
71c53296bb
Spalten für Verband und Gruppe hinzugefügt
2019-01-16 17:32:31 +01:00
bef3808a05
Interessentenanlage überarbeitet
...
- Anlegen von neuen Interessenten erzeugt nun immer einen neuen
Prestudenten.
- Eine Person darf jetzt mehrere Prestudent-Einträge pro Studiengang haben
- Ajax Requests umgebaut auf JQuery
2019-01-16 16:45:44 +01:00
82fd967f00
Direkte Zuordnung von Studierenden zu Lehreinheiten
...
* Direkte Zuordnung im FAS
* neues Boolean markiert direkte Gruppen
* Gruppen werden nicht vorgerückt
* Direkte Gruppen werden nicht bei der Lehreinheit und im
Lehrverbandsbaum angezeigt
2019-01-16 08:22:43 +01:00
69a55fc931
Arztbesuch und Behördenweg in Projektliste von der Tagesarbeitszeit abziehen
2019-01-14 14:31:26 +01:00
7cfff391eb
Cleanup deprecated Escaping function
2019-01-14 14:20:52 +01:00
925a6d40ec
Neue Studienpläne werden automatisch zu Reihungstests hinzugefügt zu
...
denen der alte Studienplan zugeteilt war sofern die Gültigkeit passt.
2019-01-14 14:09:42 +01:00
fe66abbd3d
add person.matr_nr to output
2019-01-14 13:58:37 +01:00
89849d30fb
- added hasSequence in models to avoid sequenceerrors
...
- added getByDate, generateMatrikelnummer methods
2019-01-11 18:39:48 +01:00
fa9976ec66
- FilterWidget can represents the retrieved data with tablesorter or pivotUI
...
- Added new constants to FiltersLib
- Added new parameter pivotui to FHC-Header to load JS and CSS for pivotUI
- Renamed constat WIDGET_URL_TABLE_DATASET to WIDGET_URL_DATASET_TABLESORTER in FilterWidget
- Added new constat WIDGET_URL_DATASET_PIVOTUI to FilterWidget
- Added new private properties _datasetRepresentation and _datasetRepresentationOptions to FilterWidget
- Renamed FilterWidget->loadViewTableDataset to loadViewDataset
- FilterWidget->loadViewDataset loads tablesorter or pivotUI view depending on the value of property _datasetRepresentation
- FilterWidget accepts two new parameter: datasetRepresentation and datasetRepOptions
- datasetRepresentation is required
- FilterWidget stores in session the _datasetRepresentation and _datasetRepresentationOptions properties
- Adapted view views/widgets/filter/filter to use loadViewDataset
- All views using FilterWidget have been adapted to use the required parameter datasetRepresentation
- Added new constats DATASET_REP_TABLESORTER and DATASET_REP_PIVOTUI to public/js/FilterWidget.js
- Added new private property _datasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
- Based on property _datasetRepresentation FilterWidget.js will represent the FilterWidget data with tablesorter or pivotUI
- Added new private method _renderDataset to FHC_FilterWidget in public/js/FilterWidget.js
- Renamed method _renderTableDataset to _renderDatasetTablesorter in FHC_FilterWidget in public/js/FilterWidget.js
- Added new method _renderDatasetPivotUI to FHC_FilterWidget in public/js/FilterWidget.js
- Added bew method _setDatasetRepresentation to FHC_FilterWidget in public/js/FilterWidget.js
2019-01-11 15:14:53 +01:00
a090468126
added personid param for adding notiz
2019-01-09 18:15:17 +01:00
1bdf8bd435
Infocenter notizen update
...
- removed html specialchars in quickinfo
- notizen are retrieved by ajax when click on tablerow
2019-01-09 18:10:55 +01:00
17ba5c15d8
Changed file permissions
2019-01-09 13:59:03 +01:00
e5acc1b292
LVPlan SQL für LOAD_UEBER_SEMESTERHAELFTE angepasst damit auch für
...
Wiederholer ein korrektes ergebnis geliefert wird
2019-01-09 10:58:52 +01:00
da7e1005a0
DienstreiseMT-Stempelungen können parallel zu Arbeitszeit eingetragen werden
2019-01-08 15:22:44 +01:00
ee4f41cc72
Added mailAdress as param in Link for Application Tool access
2019-01-08 13:52:03 +01:00
1ae8ad1459
Permission to edit priorisierung in FAS
...
Permission "basis/prestudent" needed to edit Priorisierung in FAS
2019-01-07 15:53:44 +01:00
444de536ba
Display and edit bewerbung_abgeschicktamum in FAS
...
- Edit bewerbung_abgeschicktamum with permission "basis/prestudentstatus"
- Display bewerbung_abgeschicktamum in PreStudent History and Details Window
2019-01-07 15:52:45 +01:00
df0009174e
sendSanchoMail for assistants sends minor (smaller) header and footer
2019-01-07 15:50:00 +01:00
12cf5a4bbb
Footer for Sancho Mail
...
- New constant "DEFAULT_SANCHO_FOOTER_IMG" in hlp_sancho_helper.php
- Footer Image as param in sendSanchoMail-function
- Added Footer Images for Sancho
- Added Black/White Images for Sancho (Header and Footer)
- Added minor Header and Footer Images for Sancho
2019-01-07 15:48:42 +01:00
398dc01a43
Merge remote-tracking branch 'origin/master'
2019-01-07 15:41:44 +01:00
9c6f2ee547
New Constants
...
STATUSGRUND_ID_EINSTIEG_SOMMERSEMESTER in global.config
VILESCI_ROOT in cis.config
2018-12-21 16:02:04 +01:00
8cfe2a9fa3
Personendetails
...
- Insertamum in Kontakttabelle
- PreInteressenten und PreIncoming deprecated
- PreStudenten nach Studiensemester sortieren
2018-12-21 15:58:53 +01:00
65d2b73580
NULL Werte berücksrichtigen
...
Wenn mehr als eine row vom SQL zurückkommen und diese nicht NULL ist, diese ins Mail schreiben
2018-12-21 15:56:46 +01:00
9443e8dc13
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-12-20 15:40:59 +01:00
fc5df89532
Removed Geschlecht Column from oeh Export
2018-12-20 15:40:35 +01:00
daec3b23ef
Filter updated
2018-12-20 10:04:20 +01:00
5301cc1855
Removed Legacy Script
2018-12-19 19:37:28 +01:00
2f30c59da2
Corrected Escaping
2018-12-19 19:36:49 +01:00
0b0355fba0
Removed Legacy Scripts
2018-12-19 19:14:56 +01:00
b97f540fc1
Fehler beim Zusammenlegen von Personen behoben der dazu führte, dass
...
nach dem Zusammenlegen kein Profilfoto mehr vorhanden ist.
Das Problem trat nur auf, wenn bei beiden Personen ein Foto vorhanden
ist.
2018-12-19 16:44:22 +01:00
43c8dfa3c6
Problem behoben bei DropAufLehrstunde wodruch die Blockung nicht immer
...
korrekt übernommen wurde
2018-12-19 15:43:26 +01:00
888eec1cb9
BPK zu OEH-Waehlerverzeichnis Export hinzugefügt
2018-12-19 11:01:35 +01:00
54a94aa6cb
Neuen CIS-Config Eintrag LVPLAN_LOAD_UEBER_SEMESTERHAELFTE hinzugefügt
...
Wenn der Config Eintrag auf true gesetzt wird, werden die Termine des
Vorsemesters auch nach der Semesterhälfte im Stundenplan angezeigt um
späte Nachprüfungstermine sichtbar zu machen.
Special Thanks to Klaus und Ronald für die laufende Genialisierung von
FHComplete
2018-12-19 08:06:05 +01:00
f7572fdb72
Funktion zum Laden von Verwendungen eines Monats hinzugefügt.
2018-12-19 07:43:33 +01:00
0a23698b7e
Fixed Loading of UDF Fields in FAS if there are only UDF Fields for
...
Persons
2018-12-19 07:35:16 +01:00
09a82b1a03
Diverse Filter für Infocenter angepasst
2018-12-18 16:30:59 +01:00
b77521ed4b
Fixed Organisationunit Menu in FAS to only display OrganisationUnits
...
with correct Permissions
2018-12-18 15:46:18 +01:00
99cd84ee04
Berechtigung für Reihungstestuebersicht angepasst
2018-12-17 09:47:25 +01:00
27e7f4745c
Merge remote-tracking branch 'origin/master'
2018-12-14 16:25:33 +01:00
42abb9878c
Ampelleiterübersicht
...
- Neuer Tablesorter
- Zählung der Ampeln
2018-12-14 16:24:26 +01:00
c0bfc3a693
Fixed loading of correct DegreeProgram Language
2018-12-13 14:54:19 +01:00
c8c0263fb1
Fixed Message Sending
2018-12-12 13:16:12 +01:00
d93b21fa22
Added new Config Entry STATUSGRUND_ID_EINSTIEG_SOMMERSEMESTER
2018-12-11 17:14:56 +01:00
eaaa8721cc
Infocenter:
...
- NumAbgeschickt zeigt nun keine Abgewiesenen mehr an
- Wenn ein Prestudent mehrere Interessenten hat von denen einer
Bestätigt ist und einer nicht wird das Studiensemester nun nur von den
Bestätigten Interessenten angezeigt
2018-12-11 15:39:52 +01:00
38e448f36e
Infocenter: Abgewiesene aus RT Liste entfernt
2018-12-11 10:59:36 +01:00
787d8de84f
Infocenter Organisationsform für freigegebene Studiengänge korrigiert
2018-12-10 17:17:55 +01:00
6e1986d191
Infocenter Filter für nicht abgeschickte Bewerbung korrigiert
2018-12-10 17:07:26 +01:00
3cb7b41114
Removed useless include
2018-12-10 14:41:02 +01:00
e0b1c78eef
- Bugfix: fixed method generateFilterMenu of FiltersLib to generate the correct link for menu entries
...
- Bugfix: system/Filters_model is loaded in every methods of FiltersLib and FilterWidget where it is used
2018-12-10 12:24:28 +01:00
6716ce5e2a
Merge remote-tracking branch 'origin/master'
2018-12-10 11:45:27 +01:00
835fe48442
- freigabemessage to bewerber only sent once each freigabe per semester (bachelor only)
...
- moved RTfreigabe button to right and made bigger
- new Vorlagen for Messages
- Message also sent for Studiengangfreigabe
2018-12-10 11:45:12 +01:00
2bc746f8b5
Merge remote-tracking branch 'origin/master'
2018-12-10 10:43:30 +01:00
663668f344
New function getPersonenReihungstest
...
- Loads all persons assigned to a test
2018-12-10 10:42:54 +01:00
280c3ac104
Reihungstestverwaltung
...
- Button um Assistenz über Testende zu informieren (vorerst auskommentiert)
- An der FHTW wird bei den Stufen eine Beschreibung eingeblendet
- Minor Usability an Bugfixes
2018-12-10 10:41:47 +01:00
955102b822
Changes in functions
...
- Optional studienplan_id in existsPrestudentstatus
- Optional order by in getPriorisierungPersonStudiensemester
- Function getPriorisierungPersonStudiensemester returns now object with priorisierung and studiengang_kz
2018-12-10 10:24:58 +01:00
d9e8c0ca71
FHTW Invitation Letter
...
Der Inivtation Letter kann an der FHTW von BewerberInnen heruntergeladen werden
2018-12-10 10:17:51 +01:00
a9dfe7d5ed
Infocenter Navigation angepasst damit auch auf Unterseiten zwischen den
...
filtern gewechselt werden kann
2018-12-07 12:12:45 +01:00
73cf593a50
Merge remote-tracking branch 'origin/master'
2018-12-06 12:43:10 +01:00
38b195beeb
Optimized Reihungstest-chronjob code
...
. Optimized code by retreiving data directly via model.
. Extended SQL query: study courses are now checked for active = true
2018-12-06 12:42:48 +01:00
dd7e025220
Optimized Reihungstest-chronjob code
...
. Optimized code by retreiving data directly via model.
. Extended SQL query: study plans are now checked for active = true
2018-12-06 12:40:51 +01:00
1f6f56f71c
Merge remote-tracking branch 'origin/master'
2018-12-06 08:28:48 +01:00
dee4a4a5a1
Removed ci_loader.php
2018-12-05 17:23:53 +01:00
41b55cf571
Added Reihungstest-chronjob -> sends info with Sancho mail
...
The job
-- checks if there are active studyplans which have no public placement tests assigned yet
-- retrieves faculty and amount of free places for each public placement test date.
This information is then sent by email in Sancho design.
2018-12-05 16:58:38 +01:00
535275adb1
Changed Sancho default header picture
2018-12-05 16:45:06 +01:00
ae38e867a9
Nachreichdatum für Dokumente kann im FAS editiert werden
2018-12-04 16:56:56 +01:00
141328bf87
Removed Mitarbeiter Include from functions.inc.php to get UDF in FAS
...
working again
2018-12-04 16:25:54 +01:00
d5b1c9c643
Infocenter: Added Column ZGVNation to FilterPages
2018-12-04 15:45:51 +01:00
56a665fb9b
Infocenter:
...
- Corrected Reihungstest angemeldet Column
- Changed Date Format and boolean Columns to German
2018-12-04 15:15:46 +01:00
8bbe26a365
Infocenter: Added Gender Column to Filter Pages
2018-12-04 14:41:40 +01:00
0352660194
Infocenter Back Link links now correctly to Reihungstest absolviert Page
...
if origin is set
2018-12-04 14:37:53 +01:00
09e452cf74
bewerber is unparked after sending reply message
2018-12-04 09:42:33 +01:00
d178164130
- Removed private methods _setNavigationMenuIndex, _fillCustomFilters and _fillFilters from controller organisation/Reihungstest.php
...
- Removed public method setNavigationMenuArrayJson from controller organisation/Reihungstest.php
- Removed JS include public/js/reihungstest/reihungstest.js from views/organisation/reihungstest/reihungstest.php
- Removed JS public/js/reihungstest/reihungstest.js
2018-12-03 14:53:25 +01:00
f7f13d3941
added information about statusgrund to freigeben log
2018-12-03 14:43:07 +01:00
3abc592c81
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-12-03 14:09:50 +01:00
03f74c2299
- Added new page "Reihungstest absolviert" to InfoCenter
...
- New const REIHUNGSTESTABSOLVIERT_PAGE in InfoCenter controller
- New permission reihungstestAbsolviert => 'infocenter' in InfoCenter controller
- Remove private method _setNavigationMenuFreigegeben from InfoCenter controller
- Added new private method _setNavigationMenu to InfoCenter controller
- Added new public method reihungstestAbsolviert to InfoCenter controller
- Changed method setNavigationMenuArrayJson in InfoCenter controller to include new page "Reihungstest absolviert"
- Changed method _setNavigationMenuIndex in InfoCenter controller to include new page "Reihungstest absolviert"
- Added orgform to column StgAbgeschickt in infocenterFreigegebenData.php
- Added new columns Statusgrund, ReihungstestAngetreten and ReihungstestApplied in infocenterFreigegebenData.php
- Added new filters for reihungstestAbsolviert in system/filtersupdate.php
- Changed freigegeben filters in system/filtersupdate.php
2018-12-03 13:33:57 +01:00
85cd0bade8
count of tablesorter-filtered datarows in infocenterübersicht also shown below the table
2018-11-30 16:49:26 +01:00
a28df53718
Infocenter changes
...
- new button for Freigabe zum Reihungstest, sending message to bewerber when freigabe
- button Freigabe for Studiengang with Statusgrund
- Ausbildungssemester can be saved
- Using Vorlagen for Freigabe Mail to assistance and message to bewerber
- Added Nation of address at details page
- Scroll to top button on details page
- moved messageList js to own file
2018-11-30 16:48:28 +01:00
be03294685
Renamed Aufbaukurs to Qualifikationskurs
...
Extended Permission Check
2018-11-30 16:10:50 +01:00
672aacac56
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-11-30 15:57:55 +01:00
6c59fc93e3
Studiengang des Reihungstests zur Übersichtsliste hinzugefügt
2018-11-30 15:57:24 +01:00
7523e275d5
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-11-30 15:08:27 +01:00
7a9eda3912
- Added new public method setNavigationMenu to controller system/Filters.php
...
- Method _setNavigationMenuFreigegeben of system/infocenter/InfoCenter controller now generate only the menu entry "Home"
- Added new const CUSTOM_MENU to FiltersLib to represent new FilterWidget parameter to specify if the menu for this filter is custom
- Added new consts NAV_MENU_FILTER_KEY, NAV_MENU_FILTER_NAME, NAV_MENU_CUSTOM_FILTER_KEY and NAV_MENU_CUSTOM_FILTER_NAME to FiltersLib as name and array keys of the filters menu array
- Added new const NAVIGATION_PAGE to FiltersLib which represents the navigation page parameter name
- Added new public method generateFilterMenu to FiltersLib to generate the filters menu structure array and stores it into the session
- Fixed methods setElementSessionMenu and setElementSessionHeader in NavigationLib
- Added new public method getFiltersByAppDatasetName to Filters_model to load all filters by their app and dataset_name
- Added new private property _customMenu to FilterWidget
- If _customMenu is NOT true then the new private method _setFilterMenu is called
- View infocenter/infocenterData.php: arranged the code differently and set customMenu as true
- View infocenter/infocenterFreigegebenData.php: arranged the code differently
- Added new global function refreshSideMenuHook to FilterWidget.js
- Renamed private method _getNavigationWidgetCalled to getNavigationPage in NavigationWidget.js
- Method refreshSideMenuHook of NavigationWidget.js now can accept parameters to give them to the ajax call
- In infocenterPersonDataset.js the function refreshSideMenuHook is declared only if the page is the index page
2018-11-30 14:58:38 +01:00
f40d29f774
Reihungstest Overview
...
- Changed Date-Format to German
- Schwund is taken from Config instead of hardcoded value
2018-11-30 10:15:48 +01:00
b6b9001ff2
Added Option for Sorting German Date Styles
2018-11-30 10:15:15 +01:00
1e55ce5f0a
Column Adress-Nation is now visible by default in FAS
2018-11-30 09:17:15 +01:00
b7cdbcb593
Updated Diploma Supplement templates with newer content
...
. Updated text in Diploma Supplement templates for
. master/bachelor (diplomaSupp_0.xsl) and
. Lehrgänge (diplomaSupp_Lehrgaenge.xsl)
. Deleted diploma supplement template for App Development (diplomaSupp_-7.xsl) as it is not active anymore.
2018-11-29 14:23:16 +01:00
a9f97cc755
Muted USort Warning-Output as Workaround for PHP 5.6 Bug
2018-11-29 07:23:35 +01:00
513815bbd2
Fixed wrong order of columns aliases in infocenterData and infocenterFreigegebenData
2018-11-28 14:57:54 +01:00
6ac176b412
Addonspezifische Tabellen aus Mergescript für Personen entfernt
2018-11-27 17:37:02 +01:00
874716921b
- Removed static menu entries InfoCenter/index and InfoCenter/freigegeben from config/navigation.php
...
- Added new constant FILTER_ID to controllers/system/infocenter/InfoCenter.php
- Added new constant PREV_FILTER_ID to controllers/system/infocenter/InfoCenter.php
- Changed InfoCenter controller methods _setNavigationMenuIndex, _setNavigationMenuShowDetails and _setNavigationMenuFreigegeben to generate links with possibly parameter prev_filter_id
- Changed views system/infocenter/infocenterData.php and system/infocenter/infocenterFreigegebenData.php to generate links with possibly parameter prev_filter_id
2018-11-27 17:02:34 +01:00
4be03a4657
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-11-27 17:00:41 +01:00
1671badf58
Moved permission check-functions to mitarbeiter.class.php
...
In order to avoid cross scripting problems:
MOVED functions
. check_isVorgesetzter
. check isVorgesetzter_indirekt
FROM functions.inc.php TO mitarbeiter.class.php
2018-11-27 16:20:34 +01:00
d9847a9ce6
- Added new private method _generateLink to NavigationWidget.js
...
- Now _buildLeftMenuStructure uses _generateLink to generate the menu entry href
2018-11-27 12:06:04 +01:00
2a05b46dd2
Increased Execution Time for DMS Faker
2018-11-27 11:05:53 +01:00
608a86e049
Neue Übersichtsseite für Reihungstests hinzugefügt
2018-11-27 11:04:08 +01:00
3fcfcd49b1
Fixed loading of the Vilesci Menü
2018-11-27 08:14:39 +01:00
d71e9a736f
Merge remote-tracking branch 'origin/master'
2018-11-26 18:14:01 +01:00
50c1b1b89a
New function getVerfuegbarePlaetzeReihungstest
...
Laedt die Anzahl an verfügbaren Plätzen bei einem Reihungstest.
New param "$studiensemester_kurzbz" for function getReihungstestPerson: Studiensemester, in welchem der Reihungstest liegen soll
2018-11-26 18:12:05 +01:00
7e6d9bb8cf
New right "reihungstestOeffentlich"
...
Erlaubt das Veröffentlichen von Reihungstests (Sichtbarkeit für BewerberInnen)
2018-11-26 18:09:37 +01:00
2be8045642
New Script studienplan_vorrueckung
...
Lädt alle Studienpläne, die für das Zielsemester noch keinen Eintrag im 1. Ausbildungssemester haben und kopiert diese ins Folge- Studiensemester
2018-11-26 18:09:14 +01:00
90209ec35d
Reihungstestverwaltung new features
...
- Auto set Anmeldefrist on datum-change
- Added Fakultäten/All Bachelor/ All Master/ All degree-Programs to autocomplete
- New right reihungstestOeffentlich to save boolean "oeffentlich"
- Copy of date also copies rooms an studienplans
- Beautify error-/success messages
2018-11-26 18:05:53 +01:00
137c8ca946
Added tablesorter, New Columns for prestudent-table
...
Studiensemester
Priorität
Studiengang
Organisationsform
Studienplan
2018-11-26 17:59:18 +01:00
f7d37d59eb
Korrektur Adresse FHTW
2018-11-26 17:56:17 +01:00
c362ae12ab
New param $aktiv and $gueltigInStudiensemester to searchStudienplaene
...
- $aktiv Optional. Wenn true werden nur aktive Studienpläne geliefert, wenn false nur inaktive, wenn null (default) alle
- $gueltigInStudiensemester Optional. Studiensemester_kurzbz in welchem der Studienplan gueltig ist
2018-11-26 17:55:45 +01:00
b2d664accf
New function loadStudiengaengeFromTyp
...
Laedt die Studiengänge die vom übergeben Typ sind
2018-11-26 17:54:06 +01:00
fad7705b65
New function getHoechstePriorisierungPersonStudiensemester
...
Liefert die höchste Priorität des PreStudenten einer Person in einem Studiensemester
2018-11-26 17:53:23 +01:00
95fdc69541
Add param $organisationseinheittyp_kurzbz in function getChilds
2018-11-26 17:52:44 +01:00
cc57b61f91
Anzeige der Priorisierung in FAS und Excelexport
2018-11-26 17:51:53 +01:00
fb52d91a7d
BugFix MS Excel
2018-11-26 17:47:59 +01:00
4adfed8d69
Moved permission check-functions to functions.inc.php
...
Moved some often used permission checks to function.inc.php
2018-11-26 16:39:52 +01:00
8567bdee2b
Lehraufträge FHTW ohne inkludierte Lehre
2018-11-26 16:23:48 +01:00
a85bda77cf
New Constants
...
- REIHUNGSTEST_ARBEITSPLAETZE_SCHWUND
- STATUSGRUND_ID_QUALIFIKATIONKURSTEILNEHMER
- STUDIENGANG_KZ_QUALIFIKATIONKURSE
2018-11-26 16:21:06 +01:00
9673823807
Studierenden Plausicheck hinzugefügt für Personen die eine Adresse
...
eingetragen haben die in der Gemeinde-Tabelle vorkommt aber eine Nation
ausserhalb Österreichs
2018-11-26 08:10:48 +01:00
a741ffbd41
- InfoCenter controller methods _fillFilters, _fillFiltersFreigegeben and _fillCustomFilters now use NavigationLib->oneLevel
...
- NavigationLib added parameter subscriptLinkHref to oneLevel
- NavigationWidget.js method _buildLeftMenuStructure now uses parameter subscriptLinkHref
2018-11-23 18:04:40 +01:00
74a8b496bc
Plausicheck hinzugefügt für Bewerber ohne Reihungstestabschluss da diese
...
sonst bei der Bewerbermeldung nicht berücksichtigt werden
2018-11-23 17:12:25 +01:00
5befdfda79
BIS-Meldung - Externe GS Studierende werden in der Übersichtstabelle
...
nicht mehr zu den normalen aktiven Studierenden dazugezählt
2018-11-23 16:07:13 +01:00
112e7127c9
Fixed typo
2018-11-23 15:15:17 +01:00
d4ac954958
BIS-Meldung - Bewerberblock für mehrere Organisationsformen wird jetzt
...
nicht nur geschrieben wenn der Studiengang die Orgform VZB hat sondern
auch wenn der Studiengang Studienpläne für mehr als eine
Organisationsform hat
2018-11-23 11:40:20 +01:00
0509a26b1e
Removed not useful code
2018-11-23 11:36:22 +01:00
b3c044bf86
Im Infomail für die Notenfreigabe ist per Default nur noch die Anzahl
...
der geänderten Noten enthalten. Es sind keine Studierendendaten mehr im
Mail vorhanden
2018-11-22 17:25:56 +01:00
c38d8eb1fc
Fixed Column Headers in Gradelist
2018-11-22 17:04:35 +01:00
d72c581167
SQL statements improved in application/views/system/infocenter/infocenterData.php and application/views/system/infocenter/infocenterFreigegebenData.php
2018-11-21 17:43:21 +01:00
477ea70aea
Merge remote-tracking branch 'origin/master'
2018-11-21 17:06:42 +01:00
411c87448b
Ersatzruhe Stempelung is ignored when generating Projektliste
2018-11-21 17:06:13 +01:00
050e3905c8
Fußzeile korrigiert
2018-11-21 16:52:52 +01:00
08af558e8f
- Better code in application/libraries/LogLib.php
...
- Added private property debugMode to application/core/DB_Model.php
- application/core/DB_Model.php now loads Loglib
- Added private method _logLastQuery to application/core/DB_Model.php
- Placed _logLastQuery in DB_Model methods: insert, update, delete, loadWhere, loadTree, execQuery
- DB_Model method load now calls method loadWhere
2018-11-21 14:59:31 +01:00
494c721b02
Spalte UID zur Notenliste hinzugefügt
2018-11-21 08:20:29 +01:00
009ec2150d
Aus Datenschutzgründen werden per Default in Notenfreigabemails keine Noten mehr
...
angezeigt. Das Verhalten kann über eine Config Eintrag geändert werden
2018-11-21 08:10:34 +01:00
64b246841e
Added Default Filter for bPK Wartung Page
2018-11-20 17:44:17 +01:00
add301d5e1
Fixed Filter Widget to Work without Checkbox Columns
2018-11-20 17:38:02 +01:00
6a26609aef
Datenverbund
...
- Added new Page to Manage missing bPK
- Improved Error Handling on DVB Class
2018-11-20 17:36:24 +01:00
412c05c7e3
DienstreiseMT-Stempelungen für den gesamten Bereich von 180 Tagen holen
2018-11-19 09:57:15 +01:00
a2ed32928c
LVPlanung Export angepasst
...
- Falsche Überschrift ALVS durch Semesterstunden ersetzt
- Problem behoben wodurch die Liste nicht erstellt werden konnte wenn
die Lehrvanstaltung keiner Organisationseinheit zugeordnet ist
2018-11-16 13:35:15 +01:00
d05bab11f1
Added Info about CSV-Format to page
2018-11-16 12:51:19 +01:00
8db7d2f310
Merge remote-tracking branch 'origin/master'
2018-11-15 15:03:49 +01:00
2154c01ef5
Adapted method getUntergebene() in mitarbeiter.class.php
...
Added an optional parameter include_OE_childs.
If true, the query will return not only the sub-employees but all sub-employees of all the sub organisational units which the superleader is in charge of.
2018-11-15 15:03:33 +01:00
8c3e29a93a
added titelpre and titelpost to infocenter details
2018-11-14 17:41:23 +01:00
9265f8cced
made tinymce responsive by default
2018-11-14 17:34:16 +01:00
04d3fb2167
Datenverbund
...
- BPK Abfrage für mehrere Einträge wird verzögert wenn die maximale Anzahl an Requests pro
Minute erreicht wurde
- Manuelle Abfrage von BPKs zu Datenverbund Client hinzugefügt
2018-11-13 18:02:22 +01:00
a71d48f67d
- BIS Check angepasst damit nicht BISrelevante Personen in den Checks
...
nicht aufscheinen
- Studentencheck angepasst worduch falsche Fehlermeldungen angezeigt
wurden
2018-11-09 14:59:21 +01:00
d657b2a5ed
Inaktive Personen mit Lehrauftrag werden in der Übersichtsliste rot markiert
2018-11-08 18:33:20 +01:00
be8c45c214
Zusammenlegen von Personen wird nicht verhindert wenn beide Personen die
...
selbe Matrikelnummer eingetragen haben
2018-11-08 09:33:23 +01:00
6bb6046979
Datenverbund
...
- Die Namenssuche vergleicht automatisch auf Übereinstimmung und uebernimmt
die Daten wenn eine vollständige Übereinstimmung gegeben ist
2018-11-07 09:44:34 +01:00
29b8af21f2
Added method getParents_withOEType in organisationseinheit.class.php
...
Method to retrieve all parent OEs WITH:
. full name of OE
. full name of OE type
2018-11-06 15:21:38 +01:00
0e660bd12a
Default Permission für neue Statistiken gesetzt
2018-11-06 09:06:37 +01:00
74f7a54c17
Add missing paranthesis
2018-11-05 22:02:41 +01:00
2674376e11
Datenverbund Schnittstelle
...
- Fehler behoben bei der Vergabemeldung von Matrikelnummern für Incoming
- Neuen Job für autmatisierte Ermittlung der BPKs hinzugefügt
2018-11-05 08:36:36 +01:00
2959e60df0
- beautified prio up/down arrows in infocenter
...
- infocenter freigabe/absage works with ajax now
- AjaxLib veil is displayed covering the whole page
- infocenter details studiengang kürzel is retrieved from studienordnung (if possible)
2018-11-02 18:22:57 +01:00
53684c4d50
Datenverbund Schnittstelle aktualisiert
...
- neue Option für Softrun hinzugefügt um bestehende Matrikelnummern zu
importieren ohne eine Vergabemeldung durchzuführen.
- Matrikelnummernabfrage nach Nachname und Geburtsdatum hinzugefügt
- Zusätzliche Prüfung hinzugefügt wenn die Person nicht nach
SVNR/Ersatzkennzeichen gefunden wird, wird alternativ nach Name und
Geburtsdatum gesucht. Wenn hier ein Eintrag gefunden wird, erfolgt keine
Vergabemeldung da hier manuell geprüft werden muss ob es sich um die
selbe Person handelt
2018-11-02 16:44:40 +01:00
01826bf88a
show all contacts in profile
...
display type firmenhandy if no extension available
added bezeichnung_mehrsprachig to tbl_kontakttyp
2018-11-02 15:29:53 +01:00
38d8ea33f7
Reverted and corrected last Commit
2018-11-02 11:50:56 +01:00
072a83fd39
Formatierung im Debug Output korrigiert
...
Fehlerhaften Returnwert bei nicht gefundener Matrikelnummer korrigiert
2018-11-02 11:45:42 +01:00
c4fec4fdcf
Fehler behoben wodurch nach der Vergabemeldung der falsche Wert in
...
Spalte SVNR angezeigt wurde.
2018-11-02 11:36:01 +01:00
ddc2f0a4af
Anpassung Datenverbund Schnittstelle
...
- BPKs werden bei der Vergabemeldung automatisch übernommen
- BPKs werden automatisch übernommen wenn dieses bei der Suche der
Matrikelnummer mitgeliefert wird
- Fehler behoben bei der Meldung mit falschen Datumsformat
- Neue Funktion zur Abfrage des BPK in Testclient hinzugefügt
- Testclient übernimmt die Zugangsdaten aus dem Config
- Automatisierte Datenabfrage erfolgt nur für Personen mit SVNR bzw
Ersatzkennzeichen
2018-11-02 10:49:49 +01:00
d5906fdc38
Added display of business handy on CIS search
...
Now if the CIS search is used to find a person or an organisational unit, the business handy will be displayed IF
. no telefonklappe exists
. a business handy nr is provided
. Zustellung is true
2018-10-30 17:19:25 +01:00
b1cc42b08e
Hinweistext in Vorlage eingebaut wenn versucht wird eine Diplomurkunde
...
für Bachlorarbeit zu drucken und umgekehrt
2018-10-30 15:52:43 +01:00
f35becb0b3
Moved permission for managing CaseTime timesheets to correct folder
...
Moved to addons/casetime/dbcheck.php
2018-10-30 15:07:24 +01:00
81ca9ecfb2
Added matrikelnummer in CIS profile
...
Now the matrikelnummer is shown in CIS profile when user is a student
2018-10-30 14:48:30 +01:00
e081003e16
if only 1 prestudent with prio null - possible to increase (set) prio to 1
2018-10-30 11:25:14 +01:00
0d8c65b6d3
Studiengang name on infocenter details is now retrieved from Studienordnung not from Studiengang
2018-10-25 14:56:39 +02:00
33c593c00c
Schriftfarbe bei belegten Terminen geändert
2018-10-24 15:11:58 +02:00
e00ccee235
Beim Zusammenlegen von Personen wird das bPK berücksichtigt und das
...
zusammenlegen ggf verhindert wenn zwei unterschiedliche bPK eingetragen
sind
2018-10-23 16:54:01 +02:00
e600022672
Fehler behoben wodurch die Vergabe der Matrikelnummern nicht korrekt
...
gemeldet werden konnte da das Datumsformat falsch war
2018-10-23 15:56:32 +02:00
5b191f592d
Fixed PHP Version issue on import
2018-10-23 14:51:14 +02:00
a0157b26be
Added permission for managing Casetime timesheets
2018-10-23 14:29:57 +02:00
5842fccd72
Merge remote-tracking branch 'origin/master'
2018-10-23 14:27:54 +02:00
42f1479e84
- included 'mobil' kontakte as 'Telefon'
...
- added fallback for non-standard contacts
2018-10-23 14:27:42 +02:00
fd41bc3b45
Fixed Matrikelnummer import for php<5.6.3
2018-10-23 09:36:35 +02:00
3423830f60
- priority display and priority change possible on infocenterdetails page
...
- different sort order of zgvpruefungen (prestudenten)
2018-10-22 15:28:21 +02:00
57166136d0
Added Sancho Helper: send mail in Sancho design & Sancho pics
...
. sancho.inc.php
added function to send mail in Sancho design.
. added 2 new jpg-Sancho-header-images
2018-10-22 14:59:29 +02:00
5ea0621a78
Abhängigkeit von Fachbereich für Auswertungen entfernt
2018-10-22 12:08:21 +02:00
558a3fbdb1
Abhängigkeit von Tabelle Fachbereich entfernt
2018-10-22 11:50:50 +02:00
e47cbd2c1c
SELECT, UPDATE for web on SEQUENCE public.tbl_rt_person_rt_person_id_seq
2018-10-18 14:54:27 +02:00
2ffda4ea4b
INSERT, UPDATE und DELETE Recht für web User für tbl_rt_person
2018-10-18 14:38:49 +02:00
b3f3dad34e
Removed function to convert to Windows Charset
2018-10-18 11:28:01 +02:00
eb093dc66d
Removed Hardcoded User
2018-10-18 11:19:11 +02:00
cfd28ecccd
Added function: Convert special chars to Windows Charset
...
Converts special chars (Ä,Ö,Ü, €,...) to Windows Charset to be displayed correctly in Excel, Words and others.
2018-10-18 09:59:01 +02:00
1a011466ec
Adapted date in bisverwendung.class.php
...
Adapted date in query.
2018-10-18 08:38:32 +02:00
ebafc554fe
Merge remote-tracking branch 'origin/master'
2018-10-18 08:29:55 +02:00
2f154c7b4b
Added function: Leading zeroes to integer number
2018-10-18 08:28:26 +02:00
82230c12a7
Personenzusammenlegen berücksichtigt die Matrikelnummer und verbietet
...
das zusammenlegen wenn beide Personen unterschiedliche Matriklenummern
haben
2018-10-17 08:07:40 +02:00
8efc526574
BIS-Export an neue BIS-Verordnung Version 6.6 angepasst
2018-10-16 18:09:39 +02:00
f99058f653
Fehler behoben wodurch Firmen im WaWi nicht korrekt geladen werden
...
konnten
2018-10-16 15:04:17 +02:00
9382a6dd5a
Neues Boolean Lieferant für Firmen hinzugefügt
2018-10-11 08:37:22 +02:00
174655b3ce
Merge remote-tracking branch 'origin/master'
2018-10-08 14:34:03 +02:00
4694207cc9
Warnhinweis Druckprobleme digitale Signatur
2018-10-08 14:31:30 +02:00
bcff06ef14
Anpassungen Lehrauftrag inkludierte Lehre
...
Wenn LektorInnen bei inkludierte_lehre -1 stehen haben, wird am Lehrauftrag bei Stundensatz und Brutto 0 ausgegeben
2018-10-08 14:27:00 +02:00
c8b0b416bb
Spalte "Priorisierung" in DB und Prestudent.class
2018-10-08 14:25:50 +02:00
a538fd57c6
Resized Edit and New Dialog for Employee Contracts
2018-10-04 22:39:28 +02:00
80b6f24f43
- Fixed bug when inactive parents are not retrieved even when includeinactive = true
2018-10-03 17:59:47 +02:00
fa75380fb4
- Dienstreisen werden bei Erstellung der zeitaufzeichnung Projektliste ignoriert
2018-10-03 10:04:55 +02:00
597ed8a16e
Added "zeitaufzeichnungspflichtig" to FAS and DB
...
The field 'zeitaufzeichnungspflichtig' indicates the obligation of an employee to record working times. (-> monthlists should then be created)
. added column to tbl_bisverwendung and value true for all employees, who are fix angestellt
. added FAS GUI in popup window when creating new contract of employment
-- by default checkbox is checked when employee is fix angestellt, otherwise unchecked.
2018-10-02 16:23:57 +02:00
f907cd7292
- Benutzerfunktionen can be retrieved recursively by oe (oe and all oes below)
2018-09-28 17:03:26 +02:00
fa99863f85
Gegencheck für Spalte lkt_ueberschreibbar hinzugefügt
2018-09-27 15:40:02 +02:00
70a80cd84c
- type-safe comparison für überschreibbare noten (default true)
...
- null-checks überschreibbare noten
2018-09-27 14:46:58 +02:00
79783f65c5
Merge remote-tracking branch 'origin/master'
2018-09-26 17:52:36 +02:00
4a384c17cb
- Fixed Projektliste bug concerning rounding difference (now no difference with casetime list)
2018-09-26 17:52:07 +02:00
7299e93969
Fixed creation of Studienblatt if there is an ampersand in the name of
...
the Degree program
2018-09-26 11:48:36 +02:00
73fa38c054
Merge remote-tracking branch 'origin/master'
2018-09-26 10:15:59 +02:00
2f14e08cef
- disabled overwriting non-ueberschreibbar grades in FAS
2018-09-26 10:15:31 +02:00
3986d7a89f
Zusätzliche Prüfung hinzugefügt beim Download von Notizdokumenten ob
...
diese auch tatsächlich an einer Notiz hängen
2018-09-26 07:44:49 +02:00
ddd6abde8c
Dokumente in Kategorien mit gesetzten Berechtigungen sind über dms.php nicht mehr zugänglich wenn die Person die Berechtigung nicht besitzt unabhängig davon ob diese zusätzlich über eine Gruppe gesperrt ist
2018-09-25 14:49:46 +02:00
e2fd07aa84
- Added E-Mail Header Precedence:bulk and Auto-submitted: auto-generated
...
to CI Mail Lib
- Sancho Mails are sent now with the new Mail Headers
2018-09-25 14:41:13 +02:00
445fe283fc
Freie Lektoren werden nicht mehr in der Urlaubsliste der Vorgesetzten
...
angezeigt
2018-09-25 14:11:36 +02:00
ae0c28bf92
Merge remote-tracking branch 'origin/master'
2018-09-24 17:52:45 +02:00
aa58bd7bee
- Noten can be marked as not ueberschreibbar
...
- CIS Gesamtnote - marked Noten cannot be overwritten, also no csv import possible
2018-09-24 17:52:31 +02:00
03415d00e7
Merge remote-tracking branch 'origin/master'
2018-09-24 17:13:21 +02:00
8f875c43dd
Archivierte Dokumente in Dokumentliste verbergen
...
Dokumente, die archivierbar sind (tbl_vorlage.archivierbar) werden nicht in der Dokumentenliste der Studierenden im FAS angezeigt.
2018-09-24 17:04:43 +02:00
e3e5f690a7
- Added Abgewiesener Status to exclude status from zeugnis (to be sure)
2018-09-24 11:54:00 +02:00
2d6f1cf5ca
Problem behoben beim Erstellen von Lehraufträgen für deaktivierte
...
Studiengänge
2018-09-21 15:14:57 +02:00
186b9816b6
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-09-20 18:33:42 +02:00
fa52f3a34e
Neue Mail Header hinzugefügt:
...
Precedence: bulk zur Markierung als Massenmail
Auto-Submitted: auto-generated zur Markierung als automatisch generiertes
E-Mail
2018-09-20 18:31:32 +02:00
4432de5492
Merge remote-tracking branch 'origin/master'
2018-09-20 16:41:52 +02:00
89d73d4984
Added Bezeichnung field to filter overview
2018-09-20 16:41:09 +02:00
1d74d6c758
Added updateaktivam, updateaktivvon, lastupdate to campus.vw_mitarbeiter
2018-09-20 15:57:11 +02:00
b61cabe6d1
Script für Mailverteiler abgleich aus Core entfernt und in Addon
...
verschoben
2018-09-20 15:48:56 +02:00
0e2b38d54d
Ansprechpartner bei Accountdeaktivierung korrigiert
2018-09-18 16:36:59 +02:00
5ca09b8ddc
Sperrdatum bei Zeitsperren, Erweiterte Zeiteintragungsfeatures wenn Projekte
...
zugeordnet sind
2018-09-17 16:54:26 +02:00
0898ad8c9e
Fehler behoben wodurch beim Ändern von DMS Kategorien PHP Notices
...
angezeigt wurden
2018-09-14 16:01:28 +02:00
c32f9b6b5a
PHP-Error behoben wenn versucht wird Suchanfragen über Caldav Schnittstelle
...
auszuführen
2018-09-14 15:54:18 +02:00
1cea25a6f3
load correct Studiensemester Model
2018-09-14 15:53:33 +02:00
3c5a518c0d
Merge remote-tracking branch 'origin/master'
2018-09-13 14:58:38 +02:00
99265cb30a
Moved functions to addons-casetime-function.inc.php
2018-09-13 14:58:13 +02:00
0916a27ecb
- replaced spaces by hyphens in lv group names
...
- updated comment for getBenutzerFunktionen
2018-09-13 09:55:06 +02:00
6695bf027e
added nategood/httpful to composer in core
2018-09-13 09:51:28 +02:00
352ccf530c
Bugfixed not-array-error-msg in Ampelverwaltung
2018-09-13 09:39:50 +02:00
b564c67a76
User können aus generierten Gruppen nicht mehr manuell gelöscht werden
2018-09-12 18:00:32 +02:00
3280383dd8
Merge remote-tracking branch 'origin/master'
2018-09-12 15:49:33 +02:00
b0a57b11ae
Added 3 CaseTimeServer functions
...
. added
- getCaseTimeZeitfehler
- getCaseTimeZeitsaldo
- getCaseTimeUrlaubssaldo
These functions were moved from other scripts to be reusable
2018-09-12 15:49:14 +02:00
e63d761f6b
Adapted getUntergebene-function: only active Benutzer
...
. adapted query to get only untergebene, who are active Benutzer
2018-09-12 15:47:26 +02:00
738b368838
RDF optimiert
2018-09-12 09:10:56 +02:00
792a293524
Berechtigungen - Berechtigungsrollen die zu Funktionen zugeteilt sind werden jetzt
...
korrekt aufgelöst
2018-09-12 07:06:06 +02:00
bbc6c8a470
zeigt LVs des Studienplans statt des Studiengangs bei Anrechnungen
2018-09-11 11:46:16 +02:00
de871961b1
Merge remote-tracking branch 'origin/master'
2018-09-10 16:59:03 +02:00
a8750710a4
Notenübersicht im CIS mit Notendurchschnitt
...
Der Notendurchschnitt und der gewichtete Notendurchschnitt wird nun in der Notenübersicht angezeigt.
Tablesorter-Parser zum sortieren der Studiensemester hinzugefügt
Neue Funktion "getStudiensemesterBetween" in studiensemester.class: Liefert alle Studiensemester zwischen den übergebenen.
2018-09-10 16:54:22 +02:00
ad5c82429f
Signierte Zeugnisse mit Logo und Fusszeile
...
Wenn Zeugnisse signiert und archiviert werden, wird nun das Logo und eine Fusszeile auf das Zeugnis gedruckt
2018-09-10 16:50:19 +02:00
b9ee34d493
Infoscreen BugFix Tablesorter
2018-09-10 16:48:18 +02:00
ab64ffc9ec
Vorherigen Commit Rückgängig gemacht, da die ECTS nicht semesterweise
...
gelifert werden sollen
2018-09-10 15:04:30 +02:00
3af811378d
STIP Schnittstelle - Fehler behoben wodurch die ECTS der positiv absolvierten LVs pro
...
Studiensemester nicht korrekt ermittelt wurden
2018-09-10 14:56:45 +02:00
b48e4b97e7
Infocenter: fixed caching problems in table sorter for locked/unlocked students
2018-09-10 14:46:05 +02:00
ce28ad4907
Merge remote-tracking branch 'origin/master'
2018-09-04 12:27:13 +02:00
d00a2d3483
Added function to get errors from CastTimeServer
2018-09-04 12:27:06 +02:00
926c02dd0d
changed field comment for bezeichnung
2018-09-04 10:03:30 +02:00
61d0ac7ca0
Added filter bezeichnung field to reporting to show before filter dropdown instead of kurzbz
2018-09-03 17:15:04 +02:00
979a46e410
- added unique constraint to reporting filter kurzbz
...
- added bezeichnung field to tbl_filter
2018-09-03 17:09:59 +02:00
02c26ff0b6
Removed studiensemester kurzbz from laststatus function call
2018-09-03 09:43:12 +02:00
452124c6cd
Bearbeiten bei DienstreiseMT-Stempelungen ausgeblendet
2018-08-31 11:44:48 +02:00
ce82ccfd99
bugfix for entries where aktivitaet_kurzbz is null
2018-08-30 20:05:20 +02:00
a7c0df6592
Merge branch 'master' into timesheet
2018-08-30 17:25:56 +02:00
dbf1dd3298
Studiengangname is retrieved from Studienordnung for CIS Ansichten Leistungsbeurteilung and Studentenprofil
2018-08-30 16:01:51 +02:00
b14daffc1e
Merge remote-tracking branch 'origin/master'
2018-08-29 11:34:17 +02:00
3546fe9885
Leerzeile am Anfang entfernt
...
Um das Excel als Serienbrief-Quelle verwenden zu können, muss sonst immer manuell die erste Zeile entfernt werden
2018-08-29 11:33:55 +02:00
ddd7cad9da
Bugfix in betriebsmittel.class
...
Check auf db_num_rows in Funktion zutrittskarteAusgegeben
2018-08-29 11:32:13 +02:00
521004f6a4
BugFix Personen_Wartung
...
- Wenn zwei gleiche rt_person Einträge vorhanden sind, wird ein Fehler ausgegeben und abgebrochen
- Check, ob Radiobuttons ausgewählt wurden
- Neue Funktion checkPersonRtStudienplanExists in reihungstest.class
2018-08-29 11:30:46 +02:00
6656a0f735
Spalte Fixangestellt in lehrauftragsliste_mail
...
+ Sortierung der Studiengänge nach Typ und Bezeichnung
2018-08-29 11:28:55 +02:00
f42986ce39
Überarbeitung Dokumente.php
...
- Übersichtlichere Gliederung
- Keine Extra-Seite mehr für Studienerfolgsbestätigung
2018-08-29 11:27:07 +02:00
9fbb7f78a6
add kurzbzlang of Studiengang to student array
2018-08-29 09:31:16 +02:00
588c6e5de5
DMS Upload Permissions moved to Class
2018-08-28 09:55:17 +02:00
1a675a9939
renamed and improved method for getting benutzerfunktionen
2018-08-27 18:25:12 +02:00
20e9e6966e
Merge remote-tracking branch 'origin/master'
2018-08-24 17:57:21 +02:00
5e00044b56
added function for retrieving Benutzerfunktionen by oe and Funktion
2018-08-24 17:57:07 +02:00
56340e992f
- Added constat CI_ENVIRONMENT to config/vilesci.config-default.inc.php
...
- Changed index.ci.php to use CI_ENVIRONMENT to set the environment variable CI_ENV
2018-08-24 12:12:11 +02:00
20993b006a
bool check, ob addon-tabelle existiert
2018-08-24 11:46:09 +02:00
c6ebe33c17
Merge remote-tracking branch 'origin/master'
2018-08-23 18:34:30 +02:00
a66766a3ab
- correct studiengang model loaded
...
- renamed getNextorAktSemester to getAktOrNextSemester
2018-08-23 18:34:04 +02:00
6c99b4f0bd
Fixed a problem where the results of a placementtest where summarized
...
when transfered to FAS if there are multiple placementtests for the same
studyplan
2018-08-23 15:53:12 +02:00
be5bf4c882
fix: correct studiengangbezeichnung in abschlusspruefung rdf is retrieved for fallback (my bad!)
2018-08-23 15:26:51 +02:00
4b6aefa3a1
added getNextOrAktSemester method
2018-08-23 10:55:49 +02:00
ceb9eb57de
removed unnecessary array merge
2018-08-23 10:23:33 +02:00
fdda54de47
Merge remote-tracking branch 'origin/master'
2018-08-22 17:37:44 +02:00
fbb3f1694b
- added function for generating unique lv-group strings
...
- added functions for getting students and lecturers by lv
- added function for getting Studiengaenge By Studiensemester
- added function for getting Ausbildungssemester by Studiensemester and Studiengang
2018-08-22 17:36:53 +02:00
879291d7be
Croppie.js für Bildzuschnitt
2018-08-20 16:33:44 +02:00
49822c3256
Merge remote-tracking branch 'origin/master'
2018-08-20 16:26:01 +02:00
204a77c8c1
BugFix Tippfehler Titelpost
2018-08-20 16:25:52 +02:00
83efd6205f
Bildprüfung Abfragekorrektur und Bildzuschnitt
...
Die Bildprüfung checkt nun ob eine Akte mit Lichtbild vorhanden ist. Bild wird entweder aus der Akte oder aus der Person geladen.
Bildzuschnitt mit Croppie hinzugefügt.
2018-08-20 16:25:22 +02:00
1b644e1fa8
Neue OE-Vorlagen für Zutrittskarten FHTW
...
Titel und Logo jeder Zutrittskarte kommt nun aus der OE
2018-08-20 16:19:20 +02:00
b78768fdde
Tippfehler Accountinfoblatt
2018-08-20 16:17:43 +02:00
d22d844df6
Kleine Phrasenkorrekturen
2018-08-20 16:17:21 +02:00
099e953684
Anzeigekorrektur für WarmUps an der FHTW
2018-08-20 16:16:44 +02:00
f4099c584e
use tbl_studienordnung studiengang bezeichnung instead of tbl_studiengang
2018-08-14 20:16:00 +02:00
4a19125ddd
Merge branch 'master' into timesheet
2018-08-09 15:50:02 +02:00
88cfc3265e
Lock entry per user if has submitted timesheets
2018-08-09 15:48:21 +02:00
19a680148f
Fixed composer.lock
2018-08-07 14:25:31 +02:00
f86d5b6e29
Zusatzinfo bei Änderung von Stammdaten
2018-08-01 15:07:25 +02:00
90af28b0c8
Lehrauftrag Vorlage provisorisch gefixt damit nicht mehrere leere Seiten
...
am Ende angehängt werden mit Libreoffice 6
2018-07-27 16:06:29 +02:00
a151d008dd
Problem behoben wodurch Reihungstestzuordnungen gelöscht wurden wenn
...
Personen zusammengelegt werden
2018-07-26 17:40:18 +02:00
2aad3257b6
Corrected Upload Permissions for DMS Documents
2018-07-26 08:28:43 +02:00
2e210b3ebb
Added Permissions for Web User to Write Messages
2018-07-25 15:54:13 +02:00
d47b844773
Added Missing Library for Screen-rebooting to Composer
2018-07-25 14:46:00 +02:00
75fcc170b8
Removed Undefined Property Notice on LVPlan Sync
2018-07-25 14:16:22 +02:00
308b989686
Avoid Division by Zero Errors
2018-07-25 14:09:50 +02:00
8022307972
Darstellungsprobleme des zweisprachigen Ausbildungsvertrages mit Libreoffice 6.0 behoben
2018-07-25 13:46:30 +02:00
7d1bf11586
Nicht mehr benötigten Cronjob entfernt
2018-07-24 13:28:09 +02:00
277aa8a9be
Changelog erweitert
2018-07-24 13:27:44 +02:00
5f7d5902aa
Infocenter Page now shows the number of filtered persons
2018-07-23 17:26:30 +02:00
2ae76d7172
Raumauslastung angepasst:
...
- Auswahl der Stundenplantabelle hinzugefügt
- Farbverlauf korrigiert
2018-07-23 14:14:45 +02:00
cee26693b5
Removed legacy Code from globals include
2018-07-23 14:14:14 +02:00
4c0aa1939f
Fehler beim Melden der Matrikelnummer über den Testclient behoben
2018-07-20 13:22:36 +02:00
590530acec
Switched position of missplaced translation-text
2018-07-20 10:28:29 +02:00
ace1e08e0b
Switched to FHC-Controller to avoid notice on Job Execution
2018-07-20 10:26:20 +02:00
69a8943b79
Studiensemester zu Abgeschickt Filter hinzugefügt
2018-07-19 15:12:57 +02:00
947ae856ae
Merge remote-tracking branch 'origin/master'
2018-07-19 00:41:30 +02:00
d7cbf936af
BugFix rt_person-Zuordnung
2018-07-19 00:40:48 +02:00
40828665a7
Header Navigation eingerückt
2018-07-18 16:29:54 +02:00
2045c21e63
Inventarliste Export um Spalte Status erweitert
2018-07-18 16:29:10 +02:00
bb52aee900
- Moved spl_autoload_register from application/config/config.php to application/config/core_includes.php
...
- application/config/core_includes.php is included by index.ci.php
- Renamed the prefix of the helpers from "fhc_" to "hlp_"
- Adapted the helpers includes
2018-07-18 12:04:00 +02:00
5635f1792c
- Removed config file application/config/fhcomplete.php
...
- Moved config messages entries from fhcomplete.php to application/config/message.php
- Renamed the config entry addons_aufnahme_url to message_redirect_url
- Adapted application/controllers/Redirect.php to use this new entry
2018-07-17 17:13:12 +02:00
3e79011ada
Merge remote-tracking branch 'origin/master'
2018-07-17 11:25:16 +02:00
823e8beb8b
Anzeige der englischen LV-Bezeichnung bei den Noten im FAS
2018-07-17 11:22:48 +02:00
07f99b81ff
Personen Zusammenlegen ueberarbeitet
...
- Personen können aus FAS heraus zusammengelegt werden (bis zu 2 Personen markieren -> Rechte Maustaste -> Personen zusammenlegen"
- Fotos und die existierenden Rollen werden in der Übersicht angezeigt
- Recht muss "basis/person" mit SUID sein
- Alle derzeit vorhandenen DB-Tabellen werden berücksichtigt
- Aktuelleres Foto wird übernommen, Fotosperren werden übernommen, Fotohistorie wird übernommen
- Ersatzkennzeichen bzw Sozialversicherungsnummer wird übernommen
- Letztbenutzter Zugangscode wird übernommen
- Adressen der verbliebenen Person werden zusammengeräumt (Doppelte löschen, Unvollständige zusammenführen)
- Kontakte der verbliebenen Person werden zusammengeräumt (Doppelte löschen, Unvollständige zusammenführen)
- Doppelte PreStudenten (im selben Studiensemester) werden gelöscht
- Neue Funktion getLog in personlog.class laedt die Log-Einträge einer Person
2018-07-17 11:22:06 +02:00
7df0f64af2
Coodle-Verbesserungen
...
- Personen-Autocomplete sortiert MitarbeiterInnen zuerst
- Einer neuen Umfrage wird der Ersteller automatisch als TeilnehmerIn hinzugefügt
- Wenn SessionStorage unterstützt wird, Warnung "ReservierungNichtMoeglich" nur einmal ausgeben
2018-07-17 11:06:35 +02:00
cb7c53bc5a
Neue Funktion isStudentBisGemeldet
...
- Checkt, ob ein Student schon BIS-Gemeldet wurde.
2018-07-17 10:57:37 +02:00
c2c48b5045
Fehler behoben beim Öffnen der Infocenter Seite mit aktivierten
...
Extensions
2018-07-17 09:31:00 +02:00
96f78a8446
URLs für Message Reply korrigiert
2018-07-17 09:30:32 +02:00
9f71849334
Bezeichnung und Titel von public.tbl_akte auf 64 Zeichen vergroessert
...
Beim Archivieren von Zeugnissen etc wird zusätzlich das Studiensemester
angegeben
2018-07-16 18:34:38 +02:00
7b26e513be
Fixed Problem while sending Ampel Mails
2018-07-12 14:14:08 +02:00
576d6e646e
Pfad für Datenverbund-Portal in Config ausgelagert
2018-07-12 12:01:44 +02:00
02cde41939
- Renamed function backwardCompatibleJSMsIe to generateBackwardCompatibleJSMsIe in fhc_header_helper
...
- Now function fhc_header_helper accept the path and file name as parameter
- Added jquerytreetable to FHC-Header
- Fixed includes in FHC-Header
- Now composer uses as much as possible stable releases of the packages (no git directly, no master branch directly...)
- Updated composer.json and composer.lock
2018-07-11 15:44:13 +02:00
04e2e1c54b
- Moved functions from FHC-Header to fhc_header_helper
...
- Added function backwardCompatibleJSMsIe to fhc_header_helper for backward compatibility with older versions of MS IE
- FHC_Controller now loads helper fhc_header too
- Added afarkas/html5shiv and scottjehl/Respond to composer
- Rename function sendMail in fhc_sancho_helper.php to sendSanchoMail
2018-07-11 13:43:18 +02:00
37ca34a6b5
- Renamed helpers to avoid conflicts with CI helpers
...
- Adapted helpers includes
2018-07-11 12:13:39 +02:00
095ce57da4
- NavigationWidget header menu dropdown fixed
...
- NavigationWidget optimizations
2018-07-11 11:57:17 +02:00
bfaf4e774b
APIv1_Controller now loads helper fhc too
2018-07-10 11:37:04 +02:00
eb89ee18fe
Merge branch 'master' into permissions
2018-07-10 10:43:40 +02:00
4a89c213dd
Added feature to create report description
...
. added feature to add content_id with a button in vilesci statistics
When content_id is set, a link is created to that content_id to add the description of concerned report.
2018-07-10 10:32:37 +02:00
ea5d9cc2b8
Merge branch 'master' into permissions
2018-07-09 12:17:11 +02:00
5b1d801a32
NavigationWidget: implemented drop down menu in the header menu
2018-07-09 12:15:19 +02:00
4a29c03c39
- Added private _onComplete method to AjaxLib that calls the eventually given completeCallback and hides the veil
...
- Changed method _checkAndGenerateAjaxParams to add the possibility to give a completeCallback function as parameter of the Ajax call
2018-07-09 11:24:01 +02:00
6791f58cb2
- Renamed the class veil to fhc-ajaxclient-veil in AjaxLib.css
...
- Added new classes to AjaxLib.css to configure the new error dialog box
- Adapted AjaxLib.js to use the class fhc-ajaxclient-veil
- Added a new private method _defaultErrorCallback to AjaxLib.js
- Now if an errorCallback function is not given when AjaxLib.js is used, then _defaultErrorCallback is used as fallback
2018-07-06 13:30:19 +02:00
c6f1b7beca
't' method of FHC_PhrasesLib now replace '{<parameter name>}' with '<paramter value>'
2018-07-05 17:14:29 +02:00
d08eb75b5a
Adapted MessageLib, PhrasesLib and UDFLib to use the function getUserLanguage from language_helper
2018-07-05 12:13:02 +02:00
83f262f170
- Added helper language_helper to retrive the language of the logged user
...
- FHC_Controller now loads also the language_helper
- Added missing comments to Auth_Controller
- Fixed comments of session_helper
2018-07-05 12:10:00 +02:00
56524dcef2
Merge branch 'master' into permissions
2018-07-02 17:44:14 +02:00
419e53a656
- Changed filtersupdate to better divide filters for infocenter overview and freigegeben
...
- Changed infocenterData to retrive overview filters
- Changed infocenterFreigegebenData to retrive freigegeben filters
- Changed InfoCenter controller to load overview and freigegeben filter's names into the left menu
2018-07-02 17:40:22 +02:00
a86111a803
Timesheet: Ersatzruhe, LehreExtern, Dienstreise
2018-07-02 15:21:52 +02:00
6e469c3668
Merge remote-tracking branch 'origin/master'
2018-07-02 13:50:34 +02:00
6e0134f2e9
Formalkorrekturen an Backk- und Diplomurkunde
2018-07-02 13:45:46 +02:00
9309aeb3ba
Merge branch 'master' into permissions
2018-06-29 12:32:36 +02:00
9ff3eeff75
- PermissionLib uses isEmptyArray, added comments
...
- Added requiredPermissions property to the navigation array in the config navigation.php
- Added constant PERMISSION_NAVIGATION_METHOD to NavigationLib
- Added parameter and array element requiredPermissions to method oneLevel of NavigationLib
- Renamed method _sortArray to _sortNavigationArray in NavigationLib
- Added private method _rmNotAllowedEntries to NavigationLib to remove menu entries that the logged user is not allow to use
2018-06-29 12:31:45 +02:00
845975ebfe
Method hasAtLeastOne of PermissionLib can check permissions with a fixed given permission type
...
or retrive the permission type from each element of the requiredPermissions array
2018-06-29 12:02:05 +02:00
2cba129076
- Added method hasAtLeastOne to the library PermissionLib
...
- Adapted the method isAllowed of the library FiltersLib to use hasAtLeastOne
- Corrected/added comments
2018-06-29 11:51:16 +02:00
2b15c88410
- Moved the loading of the fhcauth from Filters controller to the library FiltersLib
...
- Added comments
2018-06-29 11:24:50 +02:00
a61e350705
Script zum Holen der Matrikelnummer Clearingdaten hinzugefügt
2018-06-29 09:08:16 +02:00
9822e07ac8
Neue Spalte bpk zu Tabelle public.tbl_person hinzugefügt
...
Cronjob für automatische Abfrage von Matrikelnummern hinzugefügt
Script für import der Matriklenummer Clearing Daten hinzugefügt
2018-06-28 18:55:55 +02:00
99292f93a7
PermissionLib->isEntitled is NOT checking anymore if the HTTP method to access to the
...
controller method is POST or GET to define what permission type (RW/SUID) is needed
2018-06-28 16:34:26 +02:00
8f566e0499
Auth_Controller is now able to display a better message if the user is unauthorized
...
This message contains:
- the name of the called controller
- the name of the called method of the called controller
- all the possible permissions and related modes needed to acces to this content
2018-06-28 16:09:12 +02:00
46e85a2317
Merge branch 'master' into permissions
2018-06-28 14:52:09 +02:00
01ca9d61ce
Klammerung korrigiert
2018-06-28 10:06:55 +02:00
7900c39c61
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-06-28 08:31:11 +02:00
3c3ed7e46b
Konfiguration für Datenverbund Services hinzugefügt
...
Testclient für Datenverbund erweitert für manuelle Abfrage und Meldung
einzelner Personen und Logging von Datenverbund Requests
2018-06-28 08:29:25 +02:00
25e66bf9dd
- Added function isEmptyString to fhc_helper
...
- Added function isEmptyArray to fhc_helper
- Adapted the code in application/* to use as much as possible this two new functions
- Removed the php function empty almost everywhere
2018-06-27 15:06:04 +02:00
d04b0450da
- AuthLib is loaded only in fhcauth_helper, PermissionLib and REST_Controller
...
- Removed all the NOT usefull loads of helpers and libraries
- Fixed undefined index in controllers/system/UDF and model system/UDF_model
- APIv1_Controller now loads helper fhcauth
- FHC_Controller now loads ithe fhc and session helpers too
- Added/Fixed comments
- PermissionLib does NOT use anymore the getAuthUID function from the fhcauth helper, now relies on AuthLib directly
- REST_Controller loads directly the AuthLib when is needed
2018-06-27 13:12:46 +02:00
2f0048c0c3
- Removed load->helper->('message') from the remaining libraries
...
- Removed AuthLib from the autoload config file
2018-06-27 11:35:58 +02:00
d4e6027c7c
Removed load->helper->('message') from libs
2018-06-27 11:26:42 +02:00
d8bcc25ac2
Now the helper message is loaded only by these controllers and models:
...
- APIv1_Controller
- FHC_Controller
- MessageToken_model
2018-06-27 11:10:40 +02:00
581cb69a6f
- FiltersLib: fixed typo that prevents to save custom filters
2018-06-27 10:45:57 +02:00
2a5e36021c
Added Sorting Attribute to Infocenter Menu Entries
2018-06-27 10:02:27 +02:00
2fed75f175
Fixed PHP compatibility issues
2018-06-26 18:10:21 +02:00
dbb420bcac
Optimized Sancho images for the web
...
. reduced size of sancho images for better performance
2018-06-26 17:34:36 +02:00
737c9fa07e
Merge branch 'master' into permissions
2018-06-26 14:02:54 +02:00
22a8e91e15
Fixed broken Navigation when Extensions are installed
2018-06-26 13:57:38 +02:00
fb07ffcea0
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-06-26 13:43:40 +02:00
bd0979a096
PHP Version compatibility Fixes
2018-06-26 13:42:54 +02:00
bd101e154c
Merge branch 'master' into permissions
2018-06-26 13:38:12 +02:00
945d439426
- Added method _getNavigationArray to NavigationLib
...
- Adapted getMenuArray and getHeaderArray to use this new method
- Added comments
2018-06-26 13:35:21 +02:00
c26289cff6
Tippfehler bei Zurück Button behoben
2018-06-26 11:22:15 +02:00
51ab4feeea
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-06-26 10:55:28 +02:00
70d865a703
- Better error message in method saveCustomFilter of Filters controller
...
- NavigationWidget.css: added margin-right to icons in the header menu
- FilterWidget.js: function sideMenuHook now calls the renamed refreshSideMenuHook function
- NavigationWidget.js:
- Added comments
- Renamed function _printNavItem to _buildLeftMenuStructure
- Added funtion _buildHeaderMenuStructure to build the header menu
- Added function refreshSideMenuHook to call a controller that will refresh the left menu array and GUI
- infocenterPersonDataset.js:
- Renamed function refreshSideMenu to refreshSideMenuHook
- Now this function calls the NavigationWidget -> refreshSideMenuHook function
2018-06-26 10:45:20 +02:00
fc0a68c168
Adapted Sancho Popup (mandatory Ampeln) to new Sancho Design
...
. popup for mandatory notifications in CIS has now same design like eMails
. added bootstrap to popup
. added title "Aktuelle Ampeln" to CIS Ampelsystem
2018-06-26 10:38:54 +02:00
2adb4c91df
Merge remote-tracking branch 'origin/master'
2018-06-25 18:15:02 +02:00
20e5e84ea8
Adapted Vorlage Bescheid
2018-06-25 18:13:55 +02:00
1b3d41cd50
Changed :hover background color of tablesorter
2018-06-25 18:13:38 +02:00
d161f94614
Function getAkten without "Bescheid" and "Diplomasupplement"
2018-06-25 18:11:48 +02:00
edbaf8d414
Infocenter Mail Notizen as list and with insertvon-user
2018-06-25 18:10:09 +02:00
10740a22ef
Bugfix Ampelinfomail wenn Vorlaufzeit oder Verfallszeit Null ist
...
Pfad zu Ampelverwaltung korrigiert
Anzeige des Ampel Popup überarbeitet
2018-06-25 16:13:26 +02:00
5bb23d4357
Merge remote-tracking branch 'origin/master'
2018-06-25 15:10:14 +02:00
b776b52f0c
Updated ampel_details css and js paths
2018-06-25 15:10:04 +02:00
eef3d2f441
Adaption dms.php an FHTW
...
An der FHTW wird das vorläufige ZGV Dokument verlangt und kann somit auch heruntergeladen werden
2018-06-25 14:49:48 +02:00
94563d379f
Merge branch 'master' into permissions
2018-06-21 15:19:59 +02:00
b65521199d
- Navigation header array structure now is the same as the structure of the navigation menu array
...
- Implemented the sort logic and added the "sort" attribute to sort menu and header entries for the NavigationWidget
- Added the private method _sortArray to the NavigationLib to sort menu and header entries
- Added the "target" attribute to be used with the attribute "link" to build the link of a menu or header entry
- Now the header menu supports icons on the left side of the entry description
2018-06-20 18:12:38 +02:00
3542ff539f
Fehler behoben wodurch bereits vorhandene Reihungstestanmeldungen nicht immer zusammengeführt
...
wurden beim Zusammenlegen von Personen
Fehlenden ForeignKey bei public.tbl_rt_person.person_id hinzugefügt
2018-06-20 16:42:14 +02:00
df04e43ad0
Added Sancho Mail cronjob (CI)
...
. jobs/AmpelMail.php:
-- generates ampel mails for new and for overdue mails
-- this script is run by the cronjob
. sancho_helper.php:
-- generates and sends Sancho Mails with Sancho Design and Layout using Sancho-mail-templates
. Ampel_model.php: functions to retrieve correct ampeln
. Sancho pictures:
-- sancho_header_neue_nachrichten_in_ampelsystem: is set by default
-- sancho_header_TEMPLATE.xcf: template to quickly reproduce new sancho header images (change the text and export as jpg)
2018-06-20 14:48:28 +02:00
3b4fcc801d
Merge remote-tracking branch 'origin/master'
2018-06-20 09:25:36 +02:00
9a33e44491
- Replaced "index.ci.php" with $this->config->item('index_page')
...
- Replaced base_url that contains "index.ci.php" with site_url
- Replaced APP_ROOT with base_url or site_url where needed
- InfoCenter controller added comments and improved the code
2018-06-19 16:34:23 +02:00
c043303d39
Merge branch 'master' into permissions
2018-06-19 10:44:35 +02:00
84a0db4483
Fixed PHP Version compatibility
2018-06-18 11:27:10 +02:00
08efaf840c
- Missing permissions in the InforCenter controller
...
- If filters are not present for the Freigegeben page, now the page does not crash
2018-06-18 10:49:34 +02:00
f86a895765
Merge remote-tracking branch 'origin/master'
2018-06-18 09:05:47 +02:00
53098c011c
Filter für Funktionen im FAS hinzugefügt
2018-06-15 15:08:05 +02:00
079ee7bfbd
Removed unnecessary permissions check from the InfoCenter controller
2018-06-15 11:50:06 +02:00
c5cce4d0a0
Fixed missing permissions on controller InfoCenter
2018-06-15 11:33:13 +02:00
cf0dedd15e
Fehler behoben wodurch Abschlusspruefungen nicht korrekt angezeigt
...
wurden
2018-06-15 11:23:34 +02:00
0dde3095b2
Merge branch 'master' into permissions
2018-06-15 11:13:16 +02:00
264ec9be9e
InfoCenter: fixed relative URLs and HTTP GET parameters
2018-06-15 11:04:24 +02:00
bf4829f324
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-06-15 10:01:39 +02:00
0f798faab5
- Removed navigation left menu entry for page system/infocenter/InfoCenter/showDetails from navigation config
...
- Changed URI of path from system/infocenter/InfoCenter/infocenterFreigegeben to system/infocenter/InfoCenter/freigegeben in navigation config
- Moved the logic from Navigation controller to NavigationLib
- Added private method _loadNavigationLib to Navigation controller to load the NavigationLib with parameters
- Navigation controller now extends FHC_Controller
- Added NavigationLib to collect all the logic used by the NavigationWidget components
- Remove the handle of the fhc_controller_id from the NavigationWidget.js
- NavigationWidget.js now uses better tools that came from the AjaxLib
- Adapted InfoCenter controller to work with the new tools from NavigationWidget
- infocenterPersonDataset.js->refreshSideMenu now uses the parameter navigation_page in the ajax call
- Renamed InfoCenter controller method from infocenterFreigegeben to freigegeben
- Now methods index, freigegeben and showDetails generates their own left menu
- showDetails generate a left menu based on the origin page (index or freigegeben)
- freigegeben uses its own filters now
- Added view infocenterFreigegebenData.php
2018-06-14 18:36:21 +02:00
5b4d882bdb
- PHP Notice behoben bei Studiengängen ohne Leerzeichen
...
- PHP Notice behoben bei Prüfern ohne geschlecht
2018-06-14 18:22:34 +02:00
8837083f10
- Added helper session_helper to add utility functions to manage the php session
...
- Adapted the library FiltersLib to use the session_helper
2018-06-14 16:59:14 +02:00
2d123bb3df
Merge remote-tracking branch 'origin/master'
2018-06-14 09:31:42 +02:00
fbcefcbd51
Schnittstelle zum Datenverbund für Abfrage und Vergabe von Matrikelnummern
...
inkl. Testclient für manuelle Abfrage der Daten
2018-06-13 18:40:07 +02:00
2cbda912e3
- FiltersLib bugfix: now method generateDatasetQuery always build a query with no filters (no where clause) if the filters array is empty
...
- Added comments to Filters_model methods
- Removed method deleteCustomFilter from Filters_model
- Method getFilterList changed to load all the filters, removed default_filter = false from the where clause
2018-06-13 16:50:39 +02:00
34296a436e
Changed the menu entry for the left menu from "Züruck" to "Home" for the page system/infocenter/InfoCenter/infocenterFreigegeben
2018-06-13 16:45:36 +02:00
fda0db329e
Database update uses a different file for filters
...
- Added system/filtersupdate.php to collect all the filters and to perform an insert or an update in the database
- Removed filters from system/dbupdate_3.3.php
- Updated system/checksystem.php to call system/filtersupdate.php
2018-06-13 16:41:08 +02:00
11f54d1e5f
Merge remote-tracking branch 'origin/master'
2018-06-13 09:24:14 +02:00
a3401922bf
Merge remote-tracking branch 'origin/master'
2018-06-12 18:05:08 +02:00
e0bf5a084f
Bakkurkunde und Diplomurkunde archivierbar
2018-06-12 18:04:37 +02:00
249f273091
- beautified reply page
...
- added bootstrap "messageSent" page
- layout changes in messageWrite views
2018-06-12 17:24:24 +02:00
dd8452958b
Changed Sancho Mail Layout & Design
...
. added new and adapted header- and footer images from corporate graphic designer
. adapted chronjob script to display new layout for different devices and eMail clients
2018-06-12 14:58:09 +02:00
61dcf61e9e
exclude Abgewiesene ohne Status bestätigt beim INteressenten, damit noch nicht
...
abgeschickte Bewerbungen wieder in Liste sind
2018-06-12 11:47:48 +02:00
b795fe098b
Merge branch 'master' into permissions
2018-06-12 11:43:35 +02:00
eaa454b063
Prüfungsverwaltung aktualisiert
...
- Einrückungen korrigiert
- Anpassungen an aktuelle JQuery/JQueryUI Version
- Anpassungen an neuen Tablesorter
- GUI Fehler bei der Anzeige von Prüfungen behoben
- Fehler behoben beim Bewerten von Lehrveranstaltungen mit Hochkomma im
Namen
- Index mit Links zu den einzelnen Modulen erstellt
2018-06-11 18:35:55 +02:00
c04126d4d5
Merge branch 'master' into permissions
2018-06-11 14:08:20 +02:00
9f7dd9d394
FilterWidget: fixed authentication failure because the required permission was missing in the session
2018-06-11 14:07:21 +02:00
db7d508d12
Cleaned code in getPhrasesByCategoryAndPhrasesAndLanguage
2018-06-11 13:47:03 +02:00
3bc9062515
Fixed query in method getPhrasesByCategoryAndPhrasesAndLanguage of model Phrase_model
2018-06-11 13:44:18 +02:00
abcdd37e90
- Now the FilterWidget always store the required permissions into the session to let the Filters controller to provide data even if the dataset is empty
...
- Now the _renderDropDown method of the FilterWidget.js checks the parameter to avoid errors
2018-06-08 18:28:40 +02:00
81e4f2968e
Merge branch 'master' into permissions
...
- Added new core controller called Auth_Controller that extends FHC_Controller and manage the authentication
- All the controllers that were extending the CI_Controller now they extend the FHC_Controller
- All the controllers that were extending the FHC_Controller now they extend the Auth_Controller
- Added the method isAllowed to the FiltersLib to check if the authenticated user has the required permissions
- FilterWidget and controller Filters are using the method isAllowed from the FiltersLib
2018-06-08 17:53:12 +02:00
936cca98e6
Removed backup files
2018-06-08 15:28:29 +02:00
8b312dcaf2
Merge branch 'master' into FilterWidget
2018-06-08 15:25:27 +02:00
7d836a0147
- Added FiltersLib to contain all the shared logic of a FilterWidget
...
- Adapted Filters controller and FilterWidget to use this new lib
- Better memory usage in FilterWidget
- PhrasesLib now checks if categories is an empty array, it it is then avoid to call the method to load phrases (avoids an ugly error)
- Renamed the class FHC_PhraseLib to FHC_PhrasesLib (like the filename)
2018-06-08 15:17:38 +02:00
d6578277c2
FilterWidget: extended the functionality of the default_filter flag
...
If only the "app" and "dataset_name" parameters are given, at the first loading of the FilterWidget:
1. Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
2. Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
3. Do not load anything to avoid to retrive too many data from DB
2018-06-08 15:17:28 +02:00
3c863a448a
Problem behoben wodurch Projektbetreuer nicht angelegt werden konnten
...
wenn kein Vorname eingetragen ist
2018-06-08 09:51:05 +02:00
99095920ed
Fixed FHC-Header parameters includes in InfoCenter views
2018-06-07 10:11:26 +02:00
c00f6d2675
Fixed Pruefungsanmeldung
2018-06-07 07:58:30 +02:00
dbd25d98bd
FilterWidget: fixes and improvements
2018-06-06 17:50:28 +02:00
5f2b02c441
- persondatasetjs works with ajaxlib
...
- added js object to persondatasetjs
- no locking when details accessed from freigegeben
- tablesorter filter remains when getting back from details page
2018-06-06 15:54:39 +02:00
96be91f78e
Merge branch 'phrases'
2018-06-06 15:14:33 +02:00
7facb7ab78
Improved PhrasesLib and Phrase_model
...
. optimized code in PhrasesLib.php
. secured method in Phrase_model with bindings
2018-06-06 15:12:42 +02:00
894dc51e13
Enhancements
2018-06-06 14:53:24 +02:00
20b824b816
Changes to the FilterWidget IV
2018-06-06 13:45:33 +02:00
d63a092287
Changes to the FilterWidget III
2018-06-06 11:46:26 +02:00
efebfddd58
Added fallback to default language for phrases
...
. added fallback to default language in PhrasesLib.php
. fixed small issues concerning right translation in PhrasesLib.php
. all other files: adding translation for Infocenter overview + details page (client- and serverside)
2018-06-06 10:00:17 +02:00
b9a1ad6b6c
Mehrfach-Export von Archivdokumenten
...
- Nach Rechtsklick auf Studierenden gibt es die Auswahl "Archivdokument exportieren"
- Derzeit nur für Bescheid
- Mehrfachmarkierung von Studierenden möglich
2018-06-05 17:37:05 +02:00
2b8782afe8
Funktion getAkten mit neuen Parametern $returnInhalt und $order
...
- Wenn $returnInhalt true ist, wird auch der Inhalt der Akte geladen. Default false
- $order: Sortierreihenfolge der Spalten im SQL
2018-06-05 17:31:07 +02:00
9a6a420cb1
Bescheid Tabelle statt Spalten im oberen Teil
2018-06-05 17:28:56 +02:00
20bffadbc4
Changes to the FilterWidget II
2018-06-04 17:23:40 +02:00
850aa2820e
Merge remote-tracking branch 'origin/master'
2018-06-04 15:19:21 +02:00
9ae236a8e1
FAS Bescheid Englisch entfernt
...
Bescheid gibt es nur Zweisprachig
2018-06-04 15:17:15 +02:00
855be4abe5
Zeitaufzeichnung Anpassung Link ins Moodle
2018-06-04 15:15:43 +02:00
0a71bce547
Changes to the FilterWidget
2018-05-29 18:05:22 +02:00
dc580c9526
controllerid is also passed when freigegeben or abgesagt (important to keep filter!)
2018-05-29 17:44:58 +02:00
7c5995c318
Code and comments improved
2018-05-29 15:57:10 +02:00
865eea2245
Added PHRASES translation for javascript
...
added:
. PhrasesLib.js: translate method for retreiving phrasentexte in users language with JS
. PhrasesLib.php: methods to retrieve data from Phrase_model and return as JSON
. Phrase_model: method to perform query for categories AND phrases-array AND language
. FHC-Header.php:
-- included js lib
-- generate global FHC_JS_PHRASES_STORAGE_OBJECT
Changes of other files: loading libs, inits,...
2018-05-29 14:13:00 +02:00
11ca6fb0cf
Changed restart Option of Systemd Service
2018-05-29 08:18:06 +02:00
79bef79ae8
Auslandssemester werden jetzt nicht mehr doppelt am Diplomasupplement
...
angezeigt.
Projektarbeiten die im Ausland absolviert wurden werden jetzt korrekt
beim Auslandssemester angezeigt
2018-05-29 08:12:55 +02:00
eb496e1701
Added Config for Signature Server
...
Removed deprecated Option PDF_CREATE_FUNCTION
2018-05-28 15:37:55 +02:00
5dccb8f6a7
Im CIS-Profil sind nun auch zukünftige Funktionen von Personen sichtbar
2018-05-25 17:01:50 +02:00
282b822b63
- adapted infocenterdetails to work with new ajaxlib
...
- layout change infocenter dataset
- wrapping objects around javascript code
2018-05-25 15:10:50 +02:00
505c15f558
Adapted base-sql
2018-05-24 15:13:32 +02:00
15e350ea3a
FilterWidget: extended the functionality of the default_filter flag
...
If only the "app" and "dataset_name" parameters are given, at the first loading of the FilterWidget:
1. Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
2. Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
3. Do not load anything to avoid to retrive too many data from DB
2018-05-24 12:37:50 +02:00
45677d0ec4
Reversed order of list
2018-05-24 10:31:51 +02:00
e691dc8578
- Removed _setControllerId method from controller InfoCenter
...
- InfoCenter controller now uses setControllerId and getControllerId from FHC_Controller
- Fixed URL query string character in method FHC_Controller->setControllerId
2018-05-23 18:57:39 +02:00
27e9b55d35
fixed bootstrap responsive problems with messagefields
2018-05-23 17:49:56 +02:00
9f1ea4c882
PHP Version Bugfix
2018-05-23 17:27:14 +02:00
5c9c78c8f4
Converted Short open tags to php open tags
2018-05-23 16:35:45 +02:00
b3c81cf2c7
FilterWidget can display the name of the filter using phrases system
2018-05-23 15:44:03 +02:00
ed5ee67cc0
Quickfix multiple Prestudent-Verwendung
2018-05-23 15:39:21 +02:00
f9346a37fb
PHP Version fix
2018-05-23 15:28:01 +02:00
f14ef08491
Merge remote-tracking branch 'origin/master'
2018-05-23 10:15:54 +02:00
98f25028eb
Rechte-Fix Mailverteiler
...
Funktion Hochschulvertretung hinzugefügt
Rechte-Abfrage in open_grp.php
2018-05-23 10:07:51 +02:00
77c8144e40
Datenschutz-Text in Incoming Tool
2018-05-23 10:06:45 +02:00
cd005940cf
Delete-Berechtigungen fuer web User auf system.tbl_log
2018-05-23 10:05:34 +02:00
9925ff738a
Löschrechte für Vilesci User auf system.tbl_log erteilt zum Ausparken
...
von Bewerbern
2018-05-23 08:17:45 +02:00
4775908685
Filter hidden Contacts from FAS
2018-05-23 07:55:08 +02:00
32b63b39f7
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-05-22 18:14:13 +02:00
3c7fc4bdbd
- AjaxLib.css: better veil
...
- AjaxLib.js:
- Renamed object FHC_Ajax_Client to FHC_AjaxClient
- Removed REMOTE_CONTROLLER property from object data used as ajax call parameter
- Adapted FilterWidget.js to use AjaxLib.js
- Adapted NavigationWidget.js to use AjaxLib.js
- Introduced fhc_controller_id in method _printNavItem of NavigationWidget.js
- Adapted infocenterDetails.js and infocenterPersonDataset.js to use changed libraries
2018-05-22 18:08:54 +02:00
ae052ec212
updated phrases for infocenter, layoutchanges phrasesupdate
2018-05-22 17:17:09 +02:00
cecda9e512
added alternative Text to Freigabemail (e.g. when not viewed as HTML)
2018-05-22 15:57:48 +02:00
459f1a3be1
error is now not shown if no documents to accept during freigabe
2018-05-22 14:46:23 +02:00
95e18e1ef1
possible to answer to messages with token without login
2018-05-18 19:28:27 +02:00
4b1eacff21
Added includes for ajaxlib and navigationwidget into home.php
2018-05-18 14:07:11 +02:00
a1b9e4e8b1
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-05-18 13:11:24 +02:00
13beae23cc
- Added public/css/FilterWidget.css and public/css/NavigationWidget.css to define CSS for Filter and Navigation widgets
...
- Added public/js/FilterWidget.js and public/js/NavigationWidget.js to collect all the JS for Filter and Navigation widgets
- Added filterwidget and navigationwidget paramaters to FHC-Header to include the new CSS and JS for Filter and Navigation widgets
- Removed all CSS and JS from the views used from Filter and Navigation widgets
- Added method _getFilterUniqueId to controller Filters to generate a unique id for a filter based on fhc_controller_id and the current page
- Adapted the code in controller Filters to use _getFilterUniqueId
- Added method _getFilterUniqueId to widget FilterWidget to generate a unique id for a filter based on fhc_controller_id and the current page
- Adapted the code in widget FilterWidget to use _getFilterUniqueId
- Removed fhc_controller_id from menu generation in InfoCenter controller
- InfoCenter controller now gives as parameter fhc_controller_id to view infocenterDetails
- InfoCenter controller now gives as parameter fhc_controller_id to various redirect
- Views infocenter, infocenterData, infocenterDetails and infocenterFreigegeben:
- including new JS and CSS to work with Navigation and Filter widgets
- including AjaxLib (required by FilterWidget.js and NavigationWidget.js)
- using fhc_controller_id in Details and unlockPerson links
- fhc_controller_id in not anymore a parameter for FilterWidget, adapted the code where FilterWidget is called
- AjaxLib: renamed method _getUrlParameter to getUrlParameter
- Removed function getUrlParameter from public/js/infocenter/infocenterDetails.js, now uses the method from AjaxLib
- Added fhc_controller_id where needed into public/js/infocenter/infocenterDetails.js
- public/js/infocenter/infocenterPersonDataset.js now uses getUrlParameter from AjaxLib
- Added paramater filter_page in infocenterPersonDataset.js when calling Filters/rowNumber
2018-05-18 12:10:14 +02:00
45c3aad94d
Adapted query for infocenter parking, replaced null in parkdate with -, set min and max size for messages, increased msglist size, pager counts now only trs in tbody
2018-05-17 17:46:00 +02:00
6a67183738
added Parking feauture to infocenter
2018-05-16 20:00:19 +02:00
24d4c316e4
Merge remote-tracking branch 'origin/master'
2018-05-16 15:44:24 +02:00
58950d581d
Merge remote-tracking branch 'origin/master'
2018-05-16 13:39:21 +02:00
ebab4c64c8
Rechte BugFix
2018-05-16 13:38:13 +02:00
c6693bbc71
Merge remote-tracking branch 'origin/master'
2018-05-16 11:52:52 +02:00
024bb06b0f
improved currgeschaeftsjahrquery
2018-05-16 11:52:37 +02:00
087299cf84
Added Unoconv 0.6 switch because converting text documents to pdf fails
2018-05-16 08:48:37 +02:00
748ab6fac3
Unique ID for each call to a controller
...
- Added constant FHC_CONTROLLER_ID to FHC_Controller
- Added private property _controllerId to FHC_Controller
- Added protected method setControllerId to FHC_Controller
- Added protected method getControllerId to FHC_Controller
2018-05-15 19:19:29 +02:00
a075cc26b3
- Removed place holders where not needed
...
- Added public/js/AjaxLib.js to perform Ajax calls via JS
- Added public/css/AjaxLib.css to configure the veil used in AjaxLib via CSS
- Added public/images/loader.gif to be used with the veil in AjaxLib
- Added to FHC-Header the possibility to include the AjaxLib (ajaxlib = true)
2018-05-15 18:33:01 +02:00
6f57c46cc3
bei Anzeige der vergebenen Lehraufträge werden Lehrgänge exkludiert
2018-05-15 17:15:03 +02:00
37650f4d30
BugFix Function getStudiengaengeDokument
...
Added db_num_rows before while-loop
2018-05-15 16:30:47 +02:00
499e8d200b
Merge remote-tracking branch 'origin/master'
2018-05-15 13:54:44 +02:00
5a10eada1d
Studiengang_edit
...
Nur berechtigte Studiengänge im DropDown
2018-05-15 13:53:23 +02:00
f7196a7c60
Funktion deleteParked geändert
...
- Logtype ist nun "Processstate"
- json-name ist "parked"
2018-05-15 13:52:31 +02:00
8b89131502
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-05-14 14:05:27 +02:00
4aa0f81278
Document Conversion Bugfix
2018-05-14 14:05:11 +02:00
4f993b06f4
Merge branch 'master' into permissions
2018-05-14 13:44:03 +02:00
7ec82cf8ad
Merge remote-tracking branch 'origin/master'
2018-05-11 16:59:19 +02:00
6d4b2f5629
BugFix in system_check_sql.php
2018-05-11 16:59:09 +02:00
7af995dbe5
Added Function "deleteParked" to personlog.class
2018-05-11 16:55:23 +02:00
3a9882d034
BugFix in Funktion getStudiengaengeDokument
2018-05-11 16:54:49 +02:00
7e1ddbf634
PrestudentID-Spalte nach Studienplan-Spalte sortiert
2018-05-11 16:53:54 +02:00
257c833d45
'Interessent rejected' ignored in list
2018-05-11 15:43:39 +02:00
84ba892dc1
Added missing Permission to infocenter role
2018-05-11 15:01:40 +02:00
bdf03efa35
Added Config Subfolder Production and Testing to ignore List
2018-05-11 15:01:10 +02:00
26600dac05
added kurzbz to zgv info, optimized responsiveness of panel headers, whole notizenrow clickable
2018-05-11 14:14:16 +02:00
eafa89ce10
Added phrases update script called by checksystem
...
. assoc array of phrases
. new phrases are inserted into system.phrase_tbl
. new phrasen-texte in different languages are inserted into system.phrasentext_tbl
2018-05-09 16:33:11 +02:00
03b298f1f5
Added translation fallback
...
. fallback 1:
if no entry or empty entry in user's language --> fallback to default language
. fallback 2:
if empty entry at all (even in default langage) --> fallback to phrasename
2018-05-09 12:39:19 +02:00
1254e8d618
Added translation using phrases
...
. added translation functionality by
-- adding loadPhrases-method in Controllers
-- replacing hardcoded html-text with $this->p->t(...)
2018-05-09 12:36:35 +02:00
8c00fb7be5
Improved the code in fhcauth_helper
2018-05-09 12:02:31 +02:00
aa278e89f0
Infocenter details changes: popup for ZGV info, show Bewerbungsfriste(n), optimized mobile responsiveness, set dokumente to "akzeptiert" when freigegeben
2018-05-08 14:13:47 +02:00
81473929a3
Added primary key to system.tbl_extensions using column extension_id
2018-05-07 15:52:35 +02:00
c4e83ccc02
Fehler behoben wodurch nicht alle Projekte geladen wurden wenn auf den
...
Filter alle geklickt wird
2018-05-07 15:23:18 +02:00
1550c856f4
Bugfix: fixed Infocenter details page to be compatible with the fhc_controller_id parameter
2018-05-03 17:25:36 +02:00
e4cdac1acb
moved infocenter and sb admin js and css from include to public, get inactive parents/children oe is possible
2018-05-03 13:33:08 +02:00
928fe549bb
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-05-03 13:14:37 +02:00
060e6fa8e9
Changed length of Column oe_kurzbz in system.tbl_filter
2018-05-03 13:05:24 +02:00
a2e109a1eb
Reactivated Freigegeben Page
2018-05-03 13:04:56 +02:00
dba08d4d9e
- Added the feature to the Infocenter controller to generate a unique identifier for each call of itself, and to keep using the identifier for the next calls in the same browser/tab
...
- Added the feature to the FilterWidget to use this identifier to create a different session for each FilterWidget
2018-05-03 12:33:01 +02:00
4e90523ccc
Removed var_dumps and error_logs where not needed or placed a comment where they are needed
2018-05-03 12:31:56 +02:00
c4baa454aa
Added comment to application/helpers/fhc_helper.php
2018-05-03 12:26:50 +02:00
9ef544fe23
Merge remote-tracking branch 'origin/master'
2018-05-02 12:15:37 +02:00
47e7742b4e
BugFix
...
Berechtigungsproblem bei Funktion getAllOe()
2018-05-02 12:15:28 +02:00
83a29142b3
added jQuery treetable to composer
2018-04-30 18:09:27 +02:00
9e743089c2
table footer line e.g. for sums
2018-04-30 17:58:48 +02:00
ea58df568f
table footer line e.g. for sums
2018-04-30 17:58:25 +02:00
89e724de0e
added Kostenstellen retrievers by geschaeftsjahr
2018-04-30 17:57:48 +02:00
0f8847593a
renamed budget tables (permissions)
2018-04-30 17:56:00 +02:00
18ef284aca
Merge remote-tracking branch 'origin/master'
2018-04-30 17:32:22 +02:00
3b33e52df4
added getChild and getParents methods to CI model
2018-04-30 17:32:08 +02:00
a8b4b51b0d
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-04-30 09:45:37 +02:00
ecaaa3cd19
Cronjob für Korrektur des Studienplanes korrigiert nun auch den
...
Studienplan der Reihungstestanmeldung
2018-04-30 09:44:40 +02:00
c98b1d1f78
Merge remote-tracking branch 'origin/master'
2018-04-27 18:59:34 +02:00
50fedfb889
FAS Studentenoverlay
...
- Columns Prestudent_ID and Person_ID shown as default
- Inactive Students marked grey
2018-04-27 18:59:22 +02:00
b3e57e422f
Problem behoben wodurch in der CIS Seite Redirect Seiten nicht korrekt
...
geoeffnet wurden wenn ein relativer Pfad verwendet wurde
2018-04-27 16:32:47 +02:00
72459f1227
Revert "Coodle Farbcodierung"
...
This reverts commit 097218884c
2018-04-27 16:15:38 +02:00
c7535f92c8
Merge remote-tracking branch 'origin/master'
2018-04-27 16:02:50 +02:00
ecf17a180b
Neues File system_check_sql
...
Wenn im Ordner system/sql .sql-Files vorhanden sind, werden diese Ausgeführt und das Ergebnis per Mail an den Administrator geschickt. Dies soll als Check für systemkritische Abfragen, Checks, Inkonsistenzen, etc. dienen
2018-04-27 16:00:12 +02:00
e58c8110ce
Trim auf Leerzeichen in Addon-Constructor
2018-04-27 15:57:45 +02:00
120169ab37
Anzeige Vertretung in Urlaubsfreigabe-Übersicht
2018-04-27 15:56:54 +02:00
6cb82ae911
BugFix Ersthelfer.php
2018-04-27 15:56:24 +02:00
15180bd6f5
Notenverwaltung
...
- Hinweis an LektorInnen, wenn geänderte, nicht freigegebene Noten vorhanden sind
- Attribute "offiziell" und "bezeichung_mehrsprachig" in Klasse eingebaut
2018-04-27 15:55:48 +02:00
e527c9f6d7
Mlist_Generate
...
Initiales Löchen von inaktiven BenutzerInnen berücksichtigt lehre-Atrribut statt Studiengang=0
2018-04-27 15:52:01 +02:00
6b20891d97
Neue Vorlagen Ausbildungsvertrag
2018-04-27 15:50:16 +02:00
5a39ae11f4
Studienordnung GUI
...
- Nächstes Studiensemester wird selected
- Gesetzte Studiensemester sind disabled
2018-04-27 15:48:49 +02:00
e2a542391a
Studienplan Gültigkeit GUI
...
- Select für OrgForm
2018-04-27 15:48:26 +02:00
32fb5efa59
Messagin-Tabellen in Personen-Zusammenlegen berücksichtigt
2018-04-27 15:44:23 +02:00
097218884c
Coodle Farbcodierung
2018-04-27 15:37:15 +02:00
51f6d4545f
Added sancho ampel-erinnerungsmail
2018-04-25 11:24:40 +02:00
999b4040a4
Moved JS function refreshSideMenu from views/widgets/filter/filter.php to include/js/infocenter/infocenterPersonDataset.js and adapted the code
2018-04-24 18:34:07 +02:00
b7160b00fb
Adapted curser pointer for notices
...
cursor changes now to pointer-symbol when hovering a notice
2018-04-23 14:58:29 +02:00
5f3225588f
Merge branch 'master' into permissions
2018-04-19 16:58:50 +02:00
a38db44a13
Merge branch 'signatur'
2018-04-19 14:32:57 +02:00
ce3307bcf0
Merge remote-tracking branch 'origin/master'
2018-04-19 13:23:46 +02:00
0acf6b84d7
moved permission checks for budget to extension
2018-04-19 13:23:33 +02:00
0d7464c541
Merge branch 'master' into signatur
2018-04-19 13:22:01 +02:00
9d5c9b443e
Merge branch 'master' into permissions
2018-04-18 17:35:33 +02:00
5b68f54328
ExtensionsLib:
...
- Private property SOFTLINK_TARGET_DIRECTORIES is now a two dimentional associative array
- The first index of this array is used to select the destination partial path where to link the given directory from the second index
- The second index is used to select all the target directories to be linked
- Adapted methods _delSoftLinks and _addSoftLinks to work with this new structure of SOFTLINK_TARGET_DIRECTORIES
- Added to SOFTLINK_TARGET_DIRECTORIES the entry DOC_ROOT => array('public')
2018-04-18 16:32:29 +02:00
eb70a8675c
added Permissions for Verwalten and Genehmigen of Budgetanträge
2018-04-18 15:20:33 +02:00
fcaa447877
Merge remote-tracking branch 'origin/master'
2018-04-18 14:49:46 +02:00
17bacc48c6
kostenstellen are retrieved only for permitted users, easier SQL statement, Geschaeftsjahr nex and current retrievement
2018-04-18 14:49:28 +02:00
daab764a14
Added Notice-Update functionality
...
. added notice updates functionality by clicking on a row in the notice-table
. log "Notice updated" is set into log-table when note was updated successfully
2018-04-18 14:34:36 +02:00
4b58ed44ab
Schnittstelle für Stipendienstelle löst die Organisationsform zusätzlich
...
über den Studienplan auf sofern keine direkte Organisationsform
eingetragen ist
2018-04-18 08:53:37 +02:00
db759fc72e
PhrasesLib:
...
- Better code
- Added private method _extend_construct to extend the constructor
- Now is possible to instantiate the object PhrasesLib giving other parameters (like a second constructor)
- The new parameters are categories and language, used to retrive phrases from the DB
- Added new method 't' used to print out a phrase using the following parameters: category, phrase, replacement parameters, orgeinheit_kurzbz, orgform_kurzbz
- This method uses the CodeIgniter parser to replace parameters inside the phrase
2018-04-17 16:06:18 +02:00
08c5733298
- Added method loadPhrases to FHC_Conroller as a wrapper to load phrases
...
- Added method getLanguage to Person_model to load the language for a user by the given UID
- Added comments to method getPhrasesByCategoryAndLanguage of system/Phrase_model, ORDER BY and more fields to SQL statement
2018-04-17 16:00:19 +02:00
794fb7f6ac
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-04-17 13:13:11 +02:00
874cbc9b92
Added method getPhrasesByCategoryAndLanguage to system/Phrase_model
...
It's used to retrived Phrases from DB using category and sprache as keys
2018-04-17 13:12:15 +02:00
ae3815fafd
Added unique index uidx_phrasestext_phrase_id_sprache_orgeinheit_kurzbz_orgform_kurzbz on system.tbl_phrasetext,
...
using phrase_id, sprache, orgeinheit_kurzbz and orgform_kurzbz
2018-04-17 13:11:08 +02:00
898b15a6b6
Added view for "Freigegebene Bewerber" - not active yet
...
added
. view for freigegebene bewerber
. controller calling the view
. navigation icons / text
-- navigation item "Freigegeben" DEACTIVATED UNTIL FILTER is revised (filter should return ALL freigegebene Bewerber)
2018-04-17 11:35:16 +02:00
63a56932e8
Adapted Freigabe-Button at ZGV Prüfung
...
Freigabe-button is now disabled:
. as long the application was not sent by the bewerber
. for all study programs that are not bachelor
2018-04-16 16:35:50 +02:00
94d2fb14b2
Changed View public.tbl_prestudentstatus to get anmeldungzumreihungstest
...
from new Table tbl_rt_person
2018-04-13 14:37:47 +02:00
0ea5d53b0a
Replaced base_url with site_url
2018-04-13 14:10:09 +02:00
1b11ed75db
- Moved Menu collapse Item to the bottom of the Menu
...
- Added Tooltip to collapse Icons
2018-04-13 14:09:21 +02:00
280fb62b01
Changed the global JS object FHC_JS_DATA_STORAGE_OBJECT, called path and called method have been separeted into two different properties
2018-04-13 13:41:25 +02:00
f41d845df4
Merged system/dbupdate_3.3.php
2018-04-13 13:36:39 +02:00
edba85f540
Merge branch 'master' into signatur
2018-04-12 18:52:16 +02:00
7d554be22f
Removed NOT NULL Constraint ON public.tbl_student.matrikelnr
2018-04-12 18:51:21 +02:00
3d42622490
- Better code in controller system/Phrases
...
- Added new folder views/system/phrases
- Moved views phraseinhaltEdit.php, phrases.php, phrasesEdit.php, phrasesList.php and phrasesinhaltList.php from views/system/ to views/system/phrases/
- Adapted the code to work with this change
2018-04-12 18:14:01 +02:00
2a71c4387f
- Added new column category to system.tbl_phrase
...
- Added UNIQUE INDEX uidx_filters_app_dataset_name_filter_kurzbz
- Added comment to system.tbl_phrase.category
2018-04-12 18:12:08 +02:00
83e4d6dc69
Added public/extensions/ to gitignore
2018-04-12 16:51:13 +02:00
3e418e0d1d
Created filesystem structure for public static content
2018-04-12 16:49:02 +02:00
c29c83efb0
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-04-12 16:39:28 +02:00
fa795feee4
Kostenstellen can be retrieved by geschaeftsjahr (valid Kostenstellen), last Geschaeftsjahr can be retrieved
2018-04-12 16:03:28 +02:00
5992cedd9e
FHC_Header:
...
- Added global variable called calledFrom that contains the URL path of the called controller + controller method
- Added function _generateJSDataStorageObject to generate the global JS object FHC_JS_DATA_STORAGE_OBJECT
- The global JS object is renamed from FHC_ADDON_DATA_STORAGE_OBJECT to FHC_JS_DATA_STORAGE_OBJECT
- Added funtion _generateAddonsJSsInclude to generate all the includes needed by the Addons
2018-04-12 13:21:57 +02:00
ec12fb21f2
InfoCenter:
...
- Renamed button Apply to "Apply filter"
- Button "Apply filter" same width of button "Save filter"
2018-04-12 12:24:16 +02:00
3505b13bcf
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-04-12 12:13:03 +02:00
baf6503f2f
Updated BaseSQL
2018-04-12 12:12:25 +02:00
307c8a44f1
- Removed parameters hideHeader and hideSave from system/infocenter/infocenterData (they do not REALLY need)
...
- Now the JS function renderSelectedFilterFields can recognize the metadata text type
- Filter options panel beautified
2018-04-12 11:58:10 +02:00
9c14dc9774
Modified Site Navigation to Support Wildcard Entries
2018-04-12 11:53:51 +02:00
77a31aed2d
Merge remote-tracking branch 'origin/master'
2018-04-11 13:50:33 +02:00
e97a8cd761
added geschaeftsjahrvon and geschaeftsjahrbis to kostenstelle, excluded extension tables from checksystem check
2018-04-11 13:49:50 +02:00
f9ac16e7b9
FilterWidget bugfix
...
- Now is possible to remove selected filters in "Filter options"
- Changed the class of the delte button from remove-filter (already used) to remove-selected-filter
- Added click event to remove-selected-filter class and the ajax call
2018-04-11 13:45:53 +02:00
8411786fce
asterisk for labels for required fields
2018-04-11 11:40:22 +02:00
0da929dd4f
Konten can be retrieved by Kostenstelle
2018-04-11 10:54:17 +02:00
161d814472
added permissions for Budgetantragsverwaltung
2018-04-11 10:53:03 +02:00
38f084eebe
enabled arrow for bootstrap panels
2018-04-10 16:11:56 +02:00
a4ff2d6285
Eintragung Ersatzruhe
2018-04-10 13:05:30 +02:00
3ff9ce208a
Anzahl der Interessenten mit RT Anmeldung korrigiert in der Rückschau
...
für das vorherige Semester
2018-04-10 12:45:10 +02:00
167ee461bd
Problem behoben wodurch nicht alle Studiengänge in der Bewerberstatistik
...
sichtbar waren
2018-04-10 08:54:26 +02:00
558b6106c0
Changed method getPersonFromStatus of Person_model to retrive also the UID(s) of the prestudent
2018-04-09 17:41:22 +02:00
cdac13c33f
Removed Extension Menu Entry from Core
2018-04-09 12:47:11 +02:00
b56e728f49
Extensions can now extend the standard Navigation
2018-04-09 07:42:23 +02:00
88a7228555
- Parameter requiredPermissions of FilterWidget now can be also an array
...
- All the permissions of this array will be checked until a valid one is found
2018-04-06 17:47:17 +02:00
cd82baf075
Problem behoben wodurch getStgKz nicht immer korrekte Daten
...
zurücklieferte wenn Berechtigungen über Rollen und Funktionen zugeteilt
sind
Berechtigungen für diverse Seiten angepasst
2018-04-06 09:45:49 +02:00
7c195b5b90
Adapted style for Ampelsystem
...
small adaptions fitting to CIS
2018-04-05 13:16:52 +02:00
fe3ff38c92
Added phrases for Ampelsystem
...
phrases for no current notifications in Ampelsystem
2018-04-04 09:41:38 +02:00
351f83ea71
Added issue date for access card
...
by the moment the access card was handed out to a person, the issue date is shown now on CIS > profile.
(If more access cards where handed out, the latest issue date will be displayed)
2018-04-04 09:22:16 +02:00
b979cd210c
Added panel for no notifications in Ampelsystem
...
the panel is shown only when there are no currently notifications for the user
2018-04-04 09:13:59 +02:00
d72dfb1d52
Merge remote-tracking branch 'origin/master'
2018-04-03 11:11:16 +02:00
6f6929e55f
CIS-Suche optimiert
...
Redirects auf interne Seiten werden nicht im Suchergebnis angezeigt. Solche auf externe Seiten werden in einem neuen Fenster geöffnet.
OE-Suche optimiert
2018-04-03 11:11:08 +02:00
49e24b0431
- Controller system/Filters now extends CI_Controller
...
- Added private method _isAllowed to controller system/Filters
- The method _isAllowed is called in the controller constructor and checks if the caller has the permission to read data with this instance of the FilterWidget
- The permission is given as parameter when calling the FilterWidget, the parameter is called requiredPermissions
- Updated the view system/infocenter/infocenterData to give the infocenter permission to the FilterWidget
- Changed the logic into the FilterWidget to manage the requiredPermissions parameter
2018-03-29 16:53:38 +02:00
537f6a5c49
Added order by version DESC in method loadVorlagetext of VorlageLib
2018-03-29 14:44:23 +02:00
dda27c7d6e
- Removed method isEntitled from PermissionLib
...
- Renamed method checkPermissions to isEntitled
- isEntitled: if the controller is called from the command line, then is always trusted
- Adapted controllers application/core/APIv1_Controller.php and application/core/FHC_Controller.php
2018-03-29 12:23:05 +02:00
042f187818
Removed config entry fhc_acl from application/config/fhcomplete.php
2018-03-29 12:19:53 +02:00
bdafffbb1f
Removed permission system from application/core/FS_Model.php
2018-03-29 12:18:55 +02:00
4152a67d8f
- Removed permission system from DB_Model and FHC_Model
...
- Removed method _isEntitled from DB_Model
- Removed method isEntitled from DHC_Model
2018-03-29 12:15:12 +02:00
d9b80b790d
Removed permission system from models
2018-03-29 12:13:08 +02:00
0906f5bc85
- No permission type is needed anymore in controllers CallerLibrary and CallerModel
...
- No permission type is anymore given as parameter to library CallerLib
- Removed method checkLibraryPermission from library CallerLib
- Adapted code in library CallerLib
2018-03-29 11:52:41 +02:00
0183cfd03e
CIS-Suche an neue DMS-Spalten angepasst
...
- CIS-Suche sucht nun nach Schlagworten
- Funktion search sucht nun auch direkt nach DMS-ID wenn erstes Zeichen im Suchstring "#" ist.
2018-03-29 11:15:10 +02:00
e8bf6ad747
Changed the required permission to controllers CallerLibrary and CallerModel.
2018-03-28 18:41:38 +02:00
5c429e9990
Merge remote-tracking branch 'origin/master'
2018-03-28 16:58:11 +02:00
8f12394f0a
DMS-Changes
...
New Attributes:
- cis_suche: Defines if file is searchable via CIS
- schlagworte: Semikolon-Separated Text for CIS-Search
- kategorie_oe_kurzbz: Organisational Unit defines rights for viewing, uploading and changing documents in DMS
- berechtigung_kurzbz: Controls visibility for categories in DMS
Access to categories can now be restricted with oe_kurzbz and rights. If an Organisational Unit is added to a category, only users with the according rights can access, upload and change documents in this category.
If a right is saved to a category it is only accessible for users with this right. Use the right to restrict access to sensible DMS-Categories (e.g. FAS-Documents)
!! Downloading of documents via dms.php is still controlled only with the group assigned to the category !!
New right "basis/dmsAdmin" needed for accessing DMS-Administration (Editing categories)
2018-03-28 16:57:56 +02:00
1fcc878cb5
Added permissions array to every controller that extends APIv1_Controller
...
CheckUserAuth and Test controllers now extends directly the REST_Controller
2018-03-28 12:09:54 +02:00
350eae5985
Merge remote-tracking branch 'origin/master'
2018-03-27 13:44:33 +02:00
8493638605
Added Studiengang and Orgform to Subject of Freigabemail
2018-03-27 13:44:09 +02:00
6f08f637e9
Vilesci Notification GUI optimized
...
- tooltips added to explain some fields
- textareas only for languages which are set to true
- datepicker now html5 input type=date
2018-03-27 09:31:36 +02:00
f52b7772ff
Merge remote-tracking branch 'origin/master'
2018-03-26 11:58:31 +02:00
b39dd6a3fc
BugFix
...
Typ numeric (6,2) was out of range.
Changed to numeric (8,2)
2018-03-26 11:58:17 +02:00
b6cd5b9208
Bugfix (use function instead of class method)
2018-03-26 11:30:38 +02:00
0e35872f81
Bugfix (use function instead of class method)
2018-03-26 10:19:10 +02:00
d10f58b495
Merge remote-tracking branch 'origin/master'
2018-03-23 17:56:50 +01:00
4376db69a2
Bugfix Support < PHP5
2018-03-23 17:56:30 +01:00
175a10a8d1
Breite, Spaltenreihenfolge und Standardspalten geändert
2018-03-23 17:55:53 +01:00
10f69bae67
Statusgründe werden alphabetisch sortiert
2018-03-23 17:54:53 +01:00
766f1d8148
Wenn vorhanden wird "Titel intern" neben Dokumentbezeichnung angezeigt
2018-03-23 17:54:39 +01:00
3d75c7e0f2
Locales zu Freischaltung gesperrte Mailverteiler
2018-03-23 17:53:13 +01:00
2e90718469
Person ID wird angezeigt, Spalte "AbgeschicktAm" wird default angezeigt
2018-03-23 17:52:49 +01:00
2dcf4dd09f
Updateamum und -von bei Änderung von Dokumenttyp
2018-03-23 17:51:00 +01:00
afeb3c1e5c
Freischaltung gesperrte Mailverteiler
...
Der generierte Verteiler wird automatisch ins BCC-Feld übernommen.
Ein Hinweis wird angezeigt, dass man bei manuellem kopieren des Verteilers, diesen ins BCC-Feld schreiben soll
- GUI Behübschung
2018-03-23 17:50:17 +01:00
31a467ac57
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-03-23 11:33:17 +01:00
24c54c6b3c
Index fuer system.tbl_log added
2018-03-23 11:32:28 +01:00
546b3bfef3
Bugfix: removed redundant event binding for element remove-filter in view selecteFilters
2018-03-23 11:03:46 +01:00
a1c4537540
Filter Infocenter angepasst
2018-03-23 09:57:01 +01:00
e4a254a284
Fixed permissions: now all the controllers that extend FHC_Controller and need the write permission, have added the read permission
...
It it a workaroud for GET/POST checks
2018-03-22 17:13:12 +01:00
00c94778c1
Fixed Problem with Personal Filters
2018-03-22 10:03:06 +01:00
e8bec1ebf5
Added a permissions array to all the controllers that extends FHC_Controller
2018-03-21 15:33:39 +01:00
1f2450cf17
- Moved _checkPermissions from FHC_Controller to PermissionLib (now is public and it's renamed checkPermissions)
...
- Added include of PermissionLib in APIv1_Controller
- Added method _isAllowed to APIv1_Controller to call checkPermissions from PermissionLib
- Now the APIv1_Controller constructor requires an array of permissions as parameter
2018-03-20 13:00:35 +01:00
10cb2129a8
Archivierte Dokumente werden ab sofort mit dem Mimetype application/pdf
...
archiviert
2018-03-20 10:54:27 +01:00
89af37bc10
Beim Bescheid wird nur die zuletzt eingetragene Abschlusspruefung
...
berücksichtigt
2018-03-20 10:53:40 +01:00
c7c18b83ac
Zeugnisvorlage für Spezialstudiengänge angepasst
2018-03-19 18:25:34 +01:00
54208d20b9
New columns in tbl_dms_version and tbl_dms_kategorie
...
New columns oe_kurzbz and berechtigung_kurzbz in tbl_dms_kategorie
New columns cis_suche (boolean) and schlagworte in tbl_dms_version
2018-03-19 17:17:44 +01:00
e96ea40978
New right "basis/dmsAdmin"
...
For administrators to edit DMS-Categories
2018-03-19 17:16:15 +01:00
06d02e0f0c
Merge remote-tracking branch 'origin/master'
2018-03-19 16:12:08 +01:00
497b10f8c5
Benutzerberechtigung Option "Nur User"
...
Zeigt heruntergebrochen auf User, welche User welche Berechtiung haben
2018-03-19 16:11:59 +01:00
0d2ca75c70
GUI-Behübschung
2018-03-19 16:10:07 +01:00
32e881390b
Download von Archivierten Dokumenten im CIS
2018-03-19 09:51:14 +01:00
f3d5a1e3b3
Fehler behoben wodruch stud_selfservice nicht korrekt gespeichert wurde
2018-03-19 08:50:07 +01:00
8ab2523df1
Added electronic Signature Option
2018-03-19 08:42:44 +01:00
5a735d3987
Fixed Error handling
2018-03-19 08:41:53 +01:00
a5fbd45357
Spalte Nation hinzgrfügt, Login with code wird für Liste ignoriert
2018-03-16 17:54:33 +01:00
fc96790c36
Writing Log when deleting DMS entry
2018-03-16 16:17:10 +01:00
15c4c1af24
- Removed application/core/VileSci_Controller.php
...
- Controllers now don't extend VileSci_Controller but FHC_Controller
2018-03-16 15:22:34 +01:00
34f7d335ed
Added a check of the user permissions in the FHC_Controller
...
- FHC_Controller includes PermissionLib
- Added new method _isAllowed to FHC_Controller
- Added permission _checkPermissions to FHC_Controller
- Added new constants to PermissionLib
2018-03-16 15:18:19 +01:00
fc1bbd540b
Web User Insert for public.tbl_log granted
2018-03-16 11:19:27 +01:00
4593072d17
Merge remote-tracking branch 'origin/master'
2018-03-16 11:13:13 +01:00
8799d60472
Minor Code and Phrase fixes
2018-03-16 11:13:04 +01:00
5ff3d5f108
Löschen von Dokumenten und Akten wird nun geloggt
2018-03-16 11:11:52 +01:00
48e8d0cc02
Incoming-Plattform Phrasenänderung
...
"Adresse" statt "Straße"
2018-03-16 11:10:55 +01:00
5f9abccaeb
Merge branch 'master' into signatur
2018-03-15 17:47:25 +01:00
7060459e44
Menüpunkt Wartung ist nur noch sichtbar wenn Berechtigungen für
...
Unterpunkte vorhanden sind
2018-03-15 16:44:12 +01:00
65f1992d13
Fehler behoben wodurch Nationen nicht korrekt geladen wurden wenn die
...
Sperre auf false gesetzt war
2018-03-15 10:30:41 +01:00
3eebd1f3ed
Extension Permission is now needed to see installed Extensions
2018-03-15 07:00:30 +01:00
68f934a5d0
Removed Budget Tables from Core -> moved to Extension
...
Fixed Problem during Extension installation
2018-03-15 06:53:50 +01:00
3126791c20
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-03-14 15:27:34 +01:00
fb56a694cd
Fehler behoben wodurch der Excel Export für Reihungstests nicht
...
funktionierte wenn kein Studienplan zugeteilt ist
2018-03-14 15:27:00 +01:00
55c5f87832
Changed the server name in config/fhcomplete for addons_aufnahme_url
2018-03-14 12:24:01 +01:00
16631d7ad9
quickfix for collapsing menu - add click events only after ajax call execution (asynchronity can be a bitch...)
2018-03-14 11:28:57 +01:00
95663c42aa
added ZGV and document info to freigabe mail
2018-03-14 09:45:26 +01:00
73131756db
Removed useless Data
2018-03-13 16:59:55 +01:00
e8f6bfc4e6
Betreuungen in der Anzeige der zu erfassenden Stunden inkludiert
2018-03-13 13:47:47 +01:00
74a36682b8
Phrasen für Notebookregistrierung angepasst
2018-03-12 14:51:26 +01:00
dd610c83d9
- Added navigation.php in application/config to configure menus used by NavigationWidget
...
- Addded controller system/Navigation to retrive menus via ajax
- Renamed method _setNavigationMenuArray to setNavigationMenuArray and set as public in system/infocenter/InfoCenter
- Now the InfoCenter menu is stored in the session
- The menu is generated by the widget NavigationWidget via JS
- No need anymore to give as parameters to the views the menu arrays
2018-03-09 15:14:16 +01:00
fee5211c43
Merge remote-tracking branch 'origin/master'
2018-03-09 12:16:36 +01:00
2724d54cd6
Vorlagen are now order Descending by Version
2018-03-09 12:15:50 +01:00
e038d1d2c5
PHP Error behoben wenn das Laden von FreeBusy Einträgen nicht
...
funktioniert
2018-03-09 10:07:55 +01:00
babb13687e
Konstante aus Incoming Phrasen entfernt
2018-03-08 16:46:49 +01:00
c525a85d45
Testtool Abfragen korrigiert
2018-03-08 16:42:37 +01:00
c5a9e642bb
sancho notification popup - size corrected
2018-03-08 15:35:02 +01:00
4444da13d9
Diverse Sicherheitslücken geschlossen
2018-03-08 09:26:34 +01:00
f0f29be54b
Jahresplan - Deprecated functions entfernt
...
Problem bei der Suche nach Einträgen behoben
2018-03-08 09:22:53 +01:00
d9b05ddfce
Cleanup
2018-03-07 18:11:58 +01:00
e0a0b4029a
Merge branch 'master' into signatur
2018-03-07 12:24:24 +01:00
fb6e586bf9
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2018-03-07 00:21:57 +01:00
203876f104
DB Tabellen für Budgetantrag hinzugefügt
2018-03-07 00:21:28 +01:00
b2fcb12936
Merge remote-tracking branch 'origin/master'
2018-03-06 17:04:20 +01:00
1db94711fa
Richtige Maxlength in Dokumentenverwaltung
2018-03-06 17:03:16 +01:00
a6947ce34f
Notiz-Karteireiter
...
- Die Anzahl der Notizen wird im Reiter angezeigt
- Notiz-Karteireiter nun an zweiter Stelle im FAS
- Kleine Phrasen und GUI-Korrekturen im Konto-Reiter
2018-03-06 17:02:39 +01:00
d9e05b5c53
Phrasenänderung
...
Info über Studiensemester in Phrase "Der Student $uid ist bereits in dieser Gruppe"
2018-03-06 17:00:39 +01:00
ebeb0ca491
Bild.php: Akte und Person vernünftig implementiert
...
- Bisher wurde der GET-Parameter "src" (akte oder person) nicht berücksichtigt und immer die Person geladen. Nun kommt mit src=akte das Bild aus der Akte
- Default-Bild ist nun Dummy-Bild aus skin/images
2018-03-06 16:59:32 +01:00
56d2686e72
Infocenter Notiz Button für Autotext
...
"Anmerkung zur Bewerbung"-Text wird automatisch eingefügt
- "Select..."-Option bei Preview nur wenn mehr als 1 Empfänger
2018-03-06 16:54:49 +01:00
3c7336a910
Infomails über neue Messages werden jetzt immer mit System-User versandt
2018-03-06 16:27:22 +01:00
9362f56b63
Modified Infocenter Filter
2018-03-06 15:44:33 +01:00
005739a093
Fehler behoben wodurch doppelte oder leere MessageVorlagen angezeigt
...
wurden
2018-03-05 18:56:06 +01:00
ab7ffcf686
Changelog angepasst
2018-03-05 08:21:15 +01:00
3fa86d9746
Added Default Filter for Infocenter
2018-03-02 16:39:46 +01:00
c534d101ae
Addon Update Permissions for Web User to Set Message Status
2018-03-02 16:22:38 +01:00
237f6530b6
FilterWidget bugfix: correct generation of array columnsAliases in method sortSelectedFields of controller system/Filters
2018-03-02 12:53:37 +01:00
a999c8bf01
FilterWidget bugfix: correct generation of selectedFiltersAliases in method selectFilters of controller system/Filters
2018-03-02 12:29:55 +01:00
99f075ee2f
Link zu Onlinebewerbung korrigiert
2018-03-02 11:44:55 +01:00
67d7deeffc
Infocenter Spalten angepasst
2018-03-02 11:35:42 +01:00
98011903d8
Merge branch 'master' into signatur
2018-03-02 08:34:53 +01:00
96e2648b06
Infocenter Übersicht
...
- Lock User hinzugefügt
- Bereits bestätigte Personen werden nicht angezeigt
- Es werden nur Personen angezeigt die nach dem 1.3.2018 18:00
abgeschickt haben
2018-03-02 08:03:24 +01:00
67dbca5be3
Click2Dial-Funktion auf InfocenterDetails
...
Addon-JS injection FHC-Header
2018-03-01 17:16:13 +01:00
a2864eb47a
added notizen (Anmerkungen) zur Bewerbung
2018-03-01 16:05:23 +01:00
3e990c620f
FilterWidget -> Header -> Dropdowns shows only the columns that are not displayed yet
2018-03-01 14:37:43 +01:00
e86a7f1e57
Merge remote-tracking branch 'origin/master'
2018-02-28 17:17:58 +01:00
6bbd87ad12
Bugfix Fotoliste
...
now shows correct picture for locked pictures
2018-02-28 17:17:33 +01:00
ffce4cb101
Merge remote-tracking branch 'origin/master'
2018-02-28 17:14:51 +01:00
6ca284b5a4
Fehler behoben wodurch der GS Karteireiter nicht mehr angezeigt wurde
2018-02-28 16:43:59 +01:00
73c4ad225e
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-28 15:12:48 +01:00
e2e7ead90b
Fixed commits
2018-02-28 15:10:38 +01:00
bd4c35f7ee
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-28 14:41:26 +01:00
db14c86a77
Merge after last Commit
2018-02-28 14:39:33 +01:00
9a3a33feb0
FilterWidget fixed drag&drop
2018-02-28 14:08:20 +01:00
7581ac05dd
replaced php requests with ajax requests
2018-02-28 12:56:14 +01:00
dc3d71fdfb
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-28 11:11:02 +01:00
ef331e1580
AMPELSYSTEM: new GUI with Sancho; new logic
...
. new GUI with Sancho and collapsable panel
. new logic:
1. popup only for notifications that are:
---- mandatory
---- unconfirmed
---- not expired
---- not before vorlaufszeit
2. overall display for all notifications that are
---- not before vorlaufszeit
-> confirmed and/or expired notifications are displayed serperately and only readable
2018-02-28 10:47:45 +01:00
b8e7599888
- Added method rowNumber to controller system/Filters
...
- Fixed JSs to count the number of record in InfoCenter and to send messages
2018-02-28 09:59:56 +01:00
c66ed6dd8f
FilterWidget header uses bootstrap CSS now
2018-02-27 19:31:36 +01:00
f9e3aeb021
FilterWidget bugfixes
2018-02-27 18:57:41 +01:00
7869113396
- FilterWidget: bugfixes
...
- Added column StgAbgeschickt to formatRaw in system/infocenter/infocenterData.php
2018-02-27 18:48:21 +01:00
bf46abdcc0
Removed columnsAliases parameter from views/system/infocenter/infocenterData.php
2018-02-27 18:38:48 +01:00
a5059f0d27
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-27 18:37:51 +01:00
b8c1aae251
Changed FilterWidget to be more responsive with Javascript
2018-02-27 18:37:16 +01:00
7f1108fe2f
Added Mail List
2018-02-27 15:03:25 +01:00
294c702c5d
Kompletter var_export im Undo-Befehl beim löschen von Reservierungen
...
Wenn eine Reservierung gelöscht wird, werden nun alle Daten der ursprünglichen Reservierung im SQL in der public.tbl_log dokumentiert
2018-02-27 14:30:23 +01:00
35b8c1f26d
CIS-Suche verlinkt Rauminformationen bei Räumen mit Content_ID
2018-02-27 14:17:36 +01:00
07a20257b4
Kommentare fuer Datenbanktabellen hinzugefügt
...
Nicht mehr zu verwendende Datenbanktabelle und Spalten als Deprecated
markiert
2018-02-27 11:34:54 +01:00
18cc4a3fe5
Merge branch 'master' into signatur
2018-02-27 08:19:55 +01:00
959b90ca68
Merge remote-tracking branch 'origin/master'
2018-02-26 17:53:55 +01:00
6f99a0ff0c
fixed bug with zgvdatum when datum null and infoonly
2018-02-26 17:53:46 +01:00
64663ed82b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-26 17:45:26 +01:00
3e92378922
Bestellnummer und Lieferfirma auf Übernahmebestätigung
2018-02-26 17:45:07 +01:00
34bc23b284
Bugfix für Text-Messages beim Versand von einzelnen Mails
2018-02-26 17:12:32 +01:00
5a4659c2b8
Merge remote-tracking branch 'origin/master'
2018-02-26 16:54:52 +01:00
8f6ee06b9d
added "zgv uebernehmen" for prefill of zgv with latest edited zgv, optimized sort of zgvs
2018-02-26 16:54:41 +01:00
ac1f55b19c
Web User fuer tbl_msg_status berechtigt damit der Message-Status gesetzt
...
werden kann
2018-02-26 15:37:23 +01:00
bf005a54a7
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-26 11:16:06 +01:00
526cacbe96
Adding "anrede" to CIS-search and profile
2018-02-26 11:15:26 +01:00
67ae79d4e0
Infocenter Spalte fuer abgeschickte Studiengaenge hinzugefügt
2018-02-26 10:40:55 +01:00
a07fa5e8ba
Problem behoben wodurch UDF bei Mitarbeitern nicht korrekt ausgeblendet wurden
2018-02-26 09:56:28 +01:00
1a15c134d1
Problem behoben beim Prüfen der Vertrags-Beträge wenn Stundensatz oder Semesterstunden NULL sind
2018-02-23 15:41:23 +01:00
d1acd76baa
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-23 11:22:09 +01:00
feb3a4be08
Funktion getStudiengaengeDokument ignoriert Abgewiesene und Abbrecher
2018-02-23 11:13:10 +01:00
74702d27ca
Termindauer wird auf Auswahlseite angezeigt
2018-02-23 11:04:26 +01:00
93a581e301
Merge remote-tracking branch 'origin/master'
2018-02-23 10:06:56 +01:00
53fcda3504
added infomail when interessent freigegeben
2018-02-23 10:06:46 +01:00
75d1a60401
- Removed parameter alternativeMarkRowClass from FilterWidget
...
- Now the parameter markRow must be a function that returns directly the class to mark records in FilterWidget
- Changed InfoCenter to mark locked record with the new markRow function
2018-02-22 13:54:30 +01:00
206725b491
Problem behoben beim Erstellen von Auslandssemesterzeugnissen wenn
...
Sonderzeichen im Ort oder in der Universität vorkommen
2018-02-22 08:13:16 +01:00
c48a3403e3
Fixed Error when Signature Server is not running
2018-02-22 00:03:28 +01:00
413ea90948
Merge branch 'master' into signatur
2018-02-22 00:00:43 +01:00
0a8285ed03
Messaging Mail Template can be overwritten in the Database
2018-02-21 23:53:50 +01:00
45485ee02a
Fixed Bug where wrong Messages are sent if they are not sent immediately
...
Messages are only sent with the Employee-Adress of the Sender instead of
the private Address. If the Sender is not an Employee, the Messages are
sent with the System-EMail
2018-02-21 23:27:24 +01:00
b86aaf735c
Added Permissions to Infocenter Role
2018-02-21 23:26:05 +01:00
983a73fa48
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-21 18:02:48 +01:00
72bb40e786
- Added method escapeLike to DB_Model to escape strings for LIKE operator
...
- Added JS include jqueryui to InfoCenter
- Added left join to system.tbl_person_lock in infocenterData.php
- Added field LockDate to InfoCenter filter
- Added parameter markRow to InfoCenter filter
- Added DragNDrop to FilterWidget to sort/remove the selected filter fields
- FilterWidget now display the name of the loaded filter if available
- Added the property "name" to the jsonb of filters to display the name of the loaded filter
- Added the static method displayFilterName to the FilterWidget to display the name of the loaded filter
- The collapsible panel in FilterWidget now shows/hides the fields selection, the filter operators and the inputs to save the custom filter
- The GUI remembers if the collapsible panel should be closed or open
- Added the "Apply" button to the filter operators
- Added the markRow parameter to the FilterWidget, used to mark a row if one or more conditions are matched
- Added the alternativeMarkRowClass to use a different class to mark a row
- Added the public static function markRow to the FilterWidget
2018-02-21 17:48:03 +01:00
cca4fee51e
mark header red if locked by other person, locking is possible either generally (app null) or only for certain apps.
2018-02-21 13:44:44 +01:00
30fd61b7a5
Bescheid Vorlage unterscheidet jetzt automatisch zwischen
...
Amtssignaturblock und manueller Signatur.
2018-02-21 11:43:00 +01:00
a2e3686d47
XML für Dokumentenvorlagen werden automatisch erweitert um die
...
Information ob das Dokument anschließend signiert wird.
2018-02-21 11:40:49 +01:00
03f679cf5f
GUI für Vorlagen angepasst
2018-02-21 08:41:19 +01:00
0903f37b89
Merge branch 'master' into signatur
2018-02-21 07:18:50 +01:00
f7593653ea
Maillib Added support for overriding the Mail FROM
2018-02-21 07:16:03 +01:00
dd70f02791
Added Permission to Infocenter-role
2018-02-21 07:14:53 +01:00
7c2445dc89
Messages im FAS werden nach Datum sortiert anstatt nach Betreff
2018-02-20 18:42:23 +01:00
695e7f60af
added lock mechanism for persons, outsourced infocenter code to javascript
2018-02-20 18:05:36 +01:00
d9f6bfb76b
statusgrund is shown for every status not only for abgewiesener
2018-02-20 18:00:37 +01:00
c987773f8f
removed line
2018-02-20 17:58:03 +01:00
eb4c7cda61
Merge remote-tracking branch 'origin/master'
2018-02-20 17:39:19 +01:00
4b4dcfff59
added lock tbl.person_lock for locking person
2018-02-20 17:39:00 +01:00
bd2318bd38
MailDebug now also "works" with invalid Mail
...
Fixed Typo and Intendation
2018-02-20 17:17:56 +01:00
f1b32cd00d
- Neue Booleans fuer archiv, signiert, stud_selfservice zu tbl_akte
...
hinzugefügt
- Archiv zeigt nun alle Dokumente an die auf archiv gesetzt sind anstatt
nur Zugnisse
- Bei Vorlagen kann definiert werden ob das dokument signiert, archiviert
oder heruntergeladen werden kann.
- Vorlagen koennen mit Dokumentarten verknüpft werden
2018-02-20 17:10:37 +01:00
6830e5f51d
renamed column in nachrichten
2018-02-19 13:02:14 +01:00
77d844c578
Wenn ein Master-Studierender ausgewählt ist, wird bei der Neuanlage von
...
Projetkarbeiten jetzt per Default Master Thesis vorgeschlagen anstatt
Bachelorarbeit
2018-02-16 19:23:12 +01:00
949fcdd28c
Toogle für erweitertes archivieren hinzugefügt
2018-02-16 19:00:55 +01:00
3c698036a2
Merge branch 'master' into signatur
2018-02-16 11:44:41 +01:00
1e4fc86be5
Fixed Broken Unit Tests
2018-02-16 11:43:59 +01:00
2ec77ad9bd
Fixed SQL Error in dbupdate
2018-02-15 18:38:30 +01:00
d1c3e63eda
Merge branch 'master' into signatur
2018-02-15 18:25:07 +01:00
c830f125e3
Removed unused Images
2018-02-15 18:24:03 +01:00
b833a02791
Archivierung von Signierten Dokumenten im FAS hinzugefuegt
2018-02-15 17:16:42 +01:00
e9b4b9063c
Merge remote-tracking branch 'origin/master'
2018-02-14 14:46:48 +01:00
b66aca0032
Anzeige von Zweitbetreuer in Übersichtsliste
2018-02-14 14:46:41 +01:00
aa48006604
Usability Verbesserungen
2018-02-14 14:46:13 +01:00
5bbfdc720c
Set Default Mimetype for new Templates
...
Removed unneeded Includes
2018-02-14 11:50:46 +01:00
65fca4b7e1
Merge branch 'master' into signatur
2018-02-14 11:28:35 +01:00
c2b328c69f
FilterWidget: if "is set" is chosen in the operation dropdown, then the operation value field and the option field will be hidden
2018-02-13 13:52:45 +01:00
abbad04188
Removed FOP and XSLFO2PDF
2018-02-12 15:16:50 +01:00
41f32a7d5e
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-12 14:54:25 +01:00
d5415773dd
FAS Bescheid English: title modified
2018-02-12 14:52:24 +01:00
fe8d5d3fc9
Bugfix Accountinfoblatt
2018-02-12 14:35:36 +01:00
d081d2d159
Zutrittskarten werden ueber dokument_export.class.php erstellt
2018-02-12 14:35:08 +01:00
0a3b546627
Added functionality to hide or display column selection and filter selection
...
in FilterWidget
2018-02-12 14:06:39 +01:00
2d5d1eb35e
Added Apply button to FilterWidget
2018-02-12 12:00:09 +01:00
e7bb72cd39
PDF Export angepasst damit Export Klasse verwendet wird
...
Support für PDF Erstellung mit XSLFO2PDF entfernt
Support für PDF Erstellung FOP entfernt
2018-02-12 11:56:42 +01:00
c5a8235598
Parameter style_xsl fuer PDF Export entfernt
2018-02-12 11:19:46 +01:00
dfe0460dbc
Merge branch 'master' into signatur
2018-02-12 11:19:04 +01:00
bc372a88e4
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-09 18:21:31 +01:00
3a067a9459
- Better code in fhc_herper
...
- Changed parameters in views/system/infocenter/infocenterData.php
2018-02-09 18:20:33 +01:00
182292e418
autoresize of message window, column widths
2018-02-09 17:27:22 +01:00
0920add048
added autoresize
2018-02-09 17:13:52 +01:00
63bd5eb71e
Merge remote-tracking branch 'origin/master'
2018-02-09 17:01:29 +01:00
fe5e5cc313
added lines with actions for multiple persons in infocenter uebersicht (send message, select all, number of rows), message with no sender sends from logged user, layout tweaks writemessage page
2018-02-09 17:00:16 +01:00
a6247c464f
Removed Model of legacy Table
2018-02-09 15:19:33 +01:00
c57c953eaa
- Added methods deleteCustomFilter and _fillCustomFilters to controller InfoCenter
...
- Added method deleteCustomFilter to model Filters_model
- Changed parameter filterId to filter_id in FilterWidget, infocenterData
- Changed CSS and JS in views/widgets/navigationMenu.php to allow two links in one menu item
- Changed NavigationMenuWidget to allow two links in one menu item
2018-02-09 15:18:44 +01:00
e2e4f03c59
Removed Model of legacy Table
2018-02-09 15:16:53 +01:00
d23e44643d
PHP compatibility fix
2018-02-08 19:37:58 +01:00
9f4f4909b9
Infocenter Rolle angepasst
2018-02-08 19:37:33 +01:00
b480ec30a2
Handled Errors if there are no Filters
2018-02-08 17:32:41 +01:00
781ba28b35
Removed FOP Generate Function
...
Removed XSLFO2PDF Generate Function
Added Signing Functionality for PDFs
2018-02-08 08:40:50 +01:00
4dec69ae63
Removed legacy Script
2018-02-07 20:06:34 +01:00
188c09d554
Removed Legacy Code
2018-02-07 20:01:23 +01:00
d93d464dcb
Fixed Warnings
2018-02-07 19:56:56 +01:00
2d81758698
FilterWidget now checks if the columnsAliases parameter contains a valid number of elements
2018-02-07 17:01:25 +01:00
1d0747827a
when sent to person, correct fields are shown in message preview, renamed message Date
2018-02-07 16:20:34 +01:00
be0b0705df
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-02-07 13:39:05 +01:00
7af890b44c
- Better code in NavigationMenuWidget::printNavItem
...
- Custom filters are now loaded in InfoCenter
- filter_kurzbz is automatically generated
- Now is saved the filter description
- filter description is the same for every language
- Added method getCustomFiltersList to system/Filters_model.php
2018-02-07 13:36:54 +01:00
3b168c912c
Fixed Warning if Image is missing
2018-02-07 12:10:31 +01:00
8d693b36f7
Fixed Warning if no entry is found
2018-02-07 11:48:45 +01:00
c64ef198b4
separated details page view in multiple views
2018-02-07 10:06:42 +01:00
629d8446f8
bootstrapped write message page, no error on showing first message in messageList
2018-02-07 09:59:02 +01:00
82f5584385
- Added a new parameter to FilterWidget called columnsAliases to specify aliases for the columns
...
- If this parameter is given to the FilterWidget than it is used to display the name of the columns
2018-02-06 17:07:54 +01:00
27a9722e9e
Für das Anlegen von Spezialgruppen und Lehrverbandsgruppen ist jetzt
...
auch mit den Rechten "lehre/gruppe". (vorher nur als Admin)
2018-02-05 17:36:18 +01:00
3fe7bd64b5
Option hinzugefügt für die Anzeige von allen Zeitsperren einer Person
2018-02-05 15:39:51 +01:00
20455d264c
added message table, added tinymce editor to header and messageList
2018-02-05 15:00:54 +01:00
5ccfb3a637
Merge remote-tracking branch 'origin/master'
2018-02-05 12:13:14 +01:00
e7eac3e4fc
New Function existsPrestudentstatus
2018-02-05 12:13:08 +01:00
590021a8e2
fixed typo
2018-02-02 16:34:14 +01:00
ad54f08a97
check if not abgewiesen or bestätigt before abweisen or bestätigen, removed Zustellung column, retrieve only zugestellte kontakte, log entrys starting uppercase
2018-02-01 16:53:19 +01:00
84bf884db7
write log entry when sending message
2018-02-01 16:16:32 +01:00
b9e7dc38cc
enabled sending messages with person ids as receivers, person data can be retrieved by uid, link in infocenter details to send message
2018-02-01 10:26:37 +01:00
77da816b5e
Removed Legacy Scripts
2018-02-01 08:09:55 +01:00
6b4e0953a6
Helper Tool to create Dummy Entries for Testing
2018-02-01 08:09:24 +01:00
674ae96597
FAS: LINES ADDED in Übernahmebestätigung
...
2 lines added:
. Bestellnummer
. Firma (only if firma is not null)
2018-01-31 10:54:54 +01:00
fbac4dfaf5
FAS: GS-TAB HIDED as long person is not a student
2018-01-31 10:53:19 +01:00
8eedae0df9
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-01-30 16:53:15 +01:00
c7008c9ccd
added Bewerbung Zugang, bewerbung abgeschickt, collapsible menu, Statusgrund entering is compulsory, restyled (button/text positions, colors, zebra widget of tablesorter)
2018-01-30 16:52:43 +01:00
458f78084c
Fixed Filter query
2018-01-30 16:03:25 +01:00
9e2a02acf7
Fixed Filter compare
2018-01-30 15:55:48 +01:00
ba90fe8072
FAS: BESCHEID generation & archiving
...
. generation and archiving bescheide in EN and DE
. adaptation of stg_art in xsl-forms and abschluesspruefung.rdf.php
. deletion of few Lehrgang-Zeugnis-xsl templates, which are not used anymore
2018-01-30 10:44:39 +01:00
1ed319db41
Removed Debug Output
2018-01-29 08:32:12 +01:00
947dc61f19
Added new FH-Complete Start Page
2018-01-26 16:01:52 +01:00
35e300ca75
Added permission check to InfoCenter Main page
2018-01-26 16:01:09 +01:00
cfb4c5ad74
Filter für Infocenter angepasst
2018-01-26 12:44:26 +01:00
c015d4dded
Berechtigungen zum Update der LogTabelle hinzugefügt für
...
Personenzusammenlegung
Neue Einträge in APP Tabelle hinzugefügt für core, infocenter und
bewerbung
2018-01-26 11:24:45 +01:00
3b07cdca73
added filter widget to tablesorter in Zeitsperren, replaced christianbach with mottie tablesorter
2018-01-25 17:10:16 +01:00
94abad155e
replaced scripts and stylesheet links with links to minified versions
2018-01-25 17:04:57 +01:00
f3be620e68
Fixed path for jquery-cookie
2018-01-25 12:56:53 +01:00
73c4c6c722
Changed the color of the stripes for tables
2018-01-24 18:10:18 +01:00
a768295db0
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-01-24 17:41:16 +01:00
fe8e5ed507
added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes
2018-01-24 17:29:12 +01:00
6c607b5364
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-01-24 17:24:50 +01:00
8ec02c7aaa
Merge remote-tracking branch 'origin/master'
2018-01-24 17:18:13 +01:00
785609584c
check for null of prestudentstatus, typing mistake
2018-01-24 17:17:40 +01:00
6456ad7b06
- Now composer install version >3 of components/jquery
...
- Added new entry in composer to install the version 2 of jquery
- Updated all the paths for jquery2
- Changed name of parameter jquery3 to jquery in FHC-Header
- Updated pages that use FHC-Header
- Removed components/bootstrap from composer
- Added twbs/bootstrap to composer
- Updated pages that use bootstrap with the correct path
2018-01-24 17:10:08 +01:00
f61ca3cc36
Anzeigefehler bei Start und Endedatum im Jahresplan behoben
2018-01-24 15:12:23 +01:00
1ad45e4802
- Renamed widget FHC_navheader as NavigationHeaderWidget
...
- Renamed widget FHC_navigation as NavigationMenuWidget
- Added new widget NavigationWidget to create header and menu
- Renamed view fhcnavheader as navigationHeader
- Renamed view fhcnavigation as navigationMenu
- Added new view navigation
- InfoCenter controller creates the header array
- NavigationHeaderWidget print the header items from an array
2018-01-24 15:04:08 +01:00
1bda0b6cad
Removed unused files
2018-01-24 15:03:28 +01:00
8b28b48ff9
- Merged controller system/infocenter/InfoCenter.php into system/infocenter/InfocenterDetails.php
...
- Removed controller application/controllers/system/infocenter/InfocenterDetails.php
- Removed method _getFilterList from controller system/infocenter/InfoCenter.php
- Added method _setNavigationMenuArray to controller system/infocenter/InfoCenter.php to generate the array for the left menu
- Added public method getFilterList to model Filters_model
- Removed view application/views/widgets/navigation.php
- Removed widget application/widgets/navigation.php
- Widget application/widgets/FHC_navigation.php now is usable to print any menu from an array
2018-01-23 18:49:09 +01:00
d0847dae7d
Merge remote-tracking branch 'origin/master'
2018-01-23 16:00:35 +01:00
304b37af0f
Add index to tbl_akte
2018-01-23 16:00:29 +01:00
03749d7890
Cleaning time gitignore
2018-01-23 12:16:07 +01:00
d2dbcabc01
Wenn der Schlagwortdienst beim Upload von Arbeiten nicht erreichbar ist,
...
wird jetzt ein Hinweistext angezeigt anstatt einer leeren Seite
2018-01-23 11:25:55 +01:00
bd5dfe7e4c
escaped HTML chars entered in textfields
2018-01-23 09:41:41 +01:00
14a7b0a921
added Statusgrund Bezeichnung for Logging, replaced array constant for backwards compatibility
2018-01-23 09:41:09 +01:00
8bfde2c4eb
bigger nation column for infoonly (if long Nation), check for not existent Statusgrund
2018-01-22 17:56:58 +01:00
5a0082ec11
added Studienplan Orgform and alternative Orgform (in "Anmerkung" field), Studienplansprache for display, Statusgrund Bezeichnung for Abgewiesener
2018-01-22 17:43:13 +01:00
5725cc2dfe
infocenter details page opening in same window
2018-01-22 17:39:09 +01:00
7235ce5f0a
Merge remote-tracking branch 'origin/master'
2018-01-22 17:38:22 +01:00
3a7b12a4ff
made table responsive, condensed
2018-01-22 17:38:10 +01:00
ff64b4dec9
Merge remote-tracking branch 'origin/master'
2018-01-22 13:37:19 +01:00
acacf35c47
BugFix Usability
2018-01-22 13:37:12 +01:00
bfd70c0ed3
Testtool Edit Gebiet verbesserte Usability
2018-01-22 13:36:45 +01:00
8ad1c5a166
improved logging (english, logs Verarbeitunstaetigkeit, shows all logs for a person
2018-01-19 16:53:08 +01:00
3ccd38540d
updated CI person logging for Verarbeitungstätigkeit (taetigkeit_kurzbz)
2018-01-19 16:50:36 +01:00
c268983785
added verarbeitunstätigkeit "datenwartung", Person zusammenlegen is logged in personlog
2018-01-19 16:46:31 +01:00
1cbba8bdaa
Lehrgänge aus Infocenter Filter ausgenommen
2018-01-19 16:22:37 +01:00
644d8941a2
Added missing permission
2018-01-19 16:20:47 +01:00
b51111c593
Zeitaufzeichnung gesperrt_bis in global_config ausgelagert
2018-01-19 15:49:10 +01:00
e93ce04889
DienstF-Eintragungen mit CaseTime synchronisieren
2018-01-19 14:31:30 +01:00
afc1a93db5
Interessenteneintraege im Verbandsbaum angepasst.
...
"ZGV erfuellt" Filter ist jetzt vor dem Filter "Status bestaetigt"
2018-01-19 10:04:46 +01:00
f47898ccf1
Added missing PrimaryKey
2018-01-18 20:31:19 +01:00
9419fe8c3d
Added widgets FHC navigation and FHC navheader (as seen in sb admin2 template), bootstrapped filter page, added filter widget to infocenter table
2018-01-18 16:20:59 +01:00
bcd2e7b0d8
replaced [] with array() (for old php version), removed comments
2018-01-18 15:55:46 +01:00
4faa1fbc5b
added greater than filter
2018-01-18 15:50:33 +01:00
6ae6940201
hidden filter header, simplified SQL statement: Studiensemester ende greater now
2018-01-18 15:37:33 +01:00
78df57044e
Resturlaubstage, Mehrarbeitsstunden und Urlaubsanspruch pro Jahr
...
entfernt. Diese können bei Mitarbeitern jetzt nicht mehr verwaltet
werden
2018-01-18 09:01:49 +01:00
f8cfab3c16
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-01-17 14:59:22 +01:00
979991fac0
small additions / modifications
2018-01-17 14:59:17 +01:00
b4f67ec0d3
Added property "message" to logtype "processstate"
2018-01-17 13:54:38 +01:00
8f0b4c3114
infocenter: added confirmation popup when student freigegeben/abgewiesen, non-interessent or prestudenten with interessentenstatus confirmed are view-only (infoonly), added Nation data to Prestudent and akte, bugfixes
2018-01-17 11:45:23 +01:00
2abdabd2e9
added sbadmin template as option in header
2018-01-17 11:18:30 +01:00
fb7e8f40fd
Added Permission to infocenter role
2018-01-17 11:16:18 +01:00
f28a590743
Neue Rollen werden automatisch angelegt wenn diese nicht vorhanden sind
2018-01-17 10:57:31 +01:00
4885fc1ac8
Berechtigungsrolle für Infocenter hinzugefügt
2018-01-17 10:48:46 +01:00
b1699a8120
Im Dokumentenkarteireiter wird bei den akzeptierten Dokumenten per
...
Default das Uploaddatum angezeigt anstatt dem Datum an dem das Dokument
akzeptiert wurde
2018-01-17 08:42:50 +01:00
5aafa2153b
Tabelle für Verarbeitungstaetigkeiten hinzugefügt zur Kategorisierung
...
von Logeinträgen
2018-01-16 17:59:19 +01:00
c54bb2303d
Fixed some PHP 5.3 incompatible Codeparts
2018-01-15 18:00:41 +01:00
75894104cc
Vereinheitlichung Titel/Bezeichnung
...
Der Filename wird nun als Titel gesetzt und die Dokumentbezeichung als Bezeichnung
2018-01-15 14:52:08 +01:00
39790a71f9
BugFix oe_kurzbz
2018-01-15 14:50:28 +01:00
398f8a6254
Merge remote-tracking branch 'origin/master'
2018-01-12 17:10:31 +01:00
d52c423bd9
Phrasenanpassung CIS
2018-01-12 17:07:24 +01:00
5d31312b97
PersonenLog Klasse für nicht-CI Code hinzugefügt
2018-01-12 16:30:16 +01:00
9669360b9a
Infocenter Filter angepasst damit die korrekten Personen angezeigt
...
werden
2018-01-12 15:52:20 +01:00
937eefcf37
Default PFAD für Bugtracking Link korrigiert damit die TicketNumber
...
statt der TicketID verwendet wird
2018-01-12 15:51:49 +01:00
42a4bbe2a4
Warning entfernt bei Personen die kein Foto hochgeladen haben
2018-01-11 15:24:07 +01:00
9e2030f06e
Problem behoben wodurch das CIS Menü nicht mehr korrekt angezeigt wurde.
2018-01-11 14:15:27 +01:00
55121cc259
log table personid updated bei Personenzusammenlegung
2018-01-10 09:59:12 +01:00
fc45e90c9d
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2018-01-10 09:53:51 +01:00
0e6e6ab8ea
added bootstrap datepicker, dokumente nachgereicht in separate table, zgv panels collapsible and Interessenten come first, made columns more responsive
2018-01-10 09:53:34 +01:00
299d5f528d
Problem behoben beim Verschieben von Stundenblöcken mit Kollision.
...
Wenn bei einer Stundenverschiebung eine der geblockten Stunden
kollidiert wird nun keine Verschiebung durchgeführt. Bisher wurden die
Stunden die zu keiner kollision führten dennoch durchgeführt. Die
Kollidierende Stunde blieb am Ursprung.
2018-01-09 17:50:00 +01:00
978934d22a
Merge remote-tracking branch 'origin/master'
2018-01-08 19:15:35 +01:00
c457b129c4
Function cutString mit Multibyte Unterstuetzung
2018-01-08 19:15:19 +01:00
6919255d01
Fehler behoben wodurch das laden der Studienpläne im IE und Seamonkey nicht korrekt funktionierte
2018-01-08 15:44:05 +01:00
2b186d0c45
improved infocenter details, added bootstrap and admin theme (sb admin 2) , added zgv pruefung Status, Studiensemester and Ausbildungssemester, contacts in one table, nachzureichen and nachgereicht am columns
2018-01-08 09:55:13 +01:00
a8a5b5e1ad
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# application/views/templates/FHC-Header.php
2018-01-05 12:46:56 +01:00
00dbedc040
added jqueryui, bootstrap, fontawesome, datatables (new tablesorter)
2018-01-05 12:45:58 +01:00
e6d78d6d8d
- Changed query to retrive data about persons & logs
...
- Added operator "set" and "not set" to FilterWidget for timestamp type
- FilterWidget store filterId into session
- FilterWidget load a filter from DB only if a different filter is required
2018-01-04 18:14:52 +01:00
f820fdf040
Correct CSS order in new FHC-Header
2018-01-03 11:30:51 +01:00
017c6c24ec
added multilanguage support for Projektliste and CSV Export
2017-12-22 15:04:06 +01:00
628908b9e8
- FilterWidget now loads filter from DB only the first time
...
- Changed the query statement to load data from logs and person data
2017-12-21 16:26:23 +01:00
ada1108095
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-12-20 14:55:27 +01:00
c0f9b31409
Fixed Bug that lines are not continuious in some excel versions, projecttime now added up also if second time entry is starting at same time as last project entry ends, converting to date is done only once at begin of projectline iteration
2017-12-20 14:54:11 +01:00
92999ae93e
Retrive and display the list of available filters from DB
2017-12-20 12:22:34 +01:00
0763b11649
Funktion cutString bereinigt
...
Alle Skripte mit eigener Funktion "cutString" verwenden nun diese Funktion aus functions.inc.php
2017-12-20 11:51:24 +01:00
3e7a6e6534
Merge remote-tracking branch 'origin/master'
2017-12-20 10:38:57 +01:00
c7914a678d
BugFix Usability
2017-12-20 10:36:19 +01:00
b3fc9c4a1c
DISTINCT bei Funktion getAllForOnlinebewerbung entfernt
2017-12-20 10:35:46 +01:00
237f63b187
Neue Funktion getStudiengaengeDokument
...
Liefert die Studiengänge bei denen das übergebene Dokument benötigt wird
- Studiengang.class: DISTINCT bei Funktion getAllForOnlinebewerbung entfernt
2017-12-20 10:33:11 +01:00
89c638a54e
CIS-PersonenSuche nur aktive Benutzer
...
Die CIS-Personensuche liefert nur mehr aktive BenutzerInnen
2017-12-20 10:31:15 +01:00
94f91dd5c2
Phrasenkorrektur Incoming-Plattform
2017-12-20 10:27:24 +01:00
765ef66bb3
Fehler beim Anlegen der Noten entschuldigt und unentschuldigt gehoben
2017-12-20 09:58:34 +01:00
f9d106113f
Fehler beim Laden der Dokumente behoben
2017-12-20 09:43:47 +01:00
4c6da4f981
Doppelte Funktion CutString entfernt
2017-12-20 09:43:32 +01:00
1bb1bdf68b
Added Updateinfo Fotoliste
2017-12-19 16:09:52 +01:00
6aeb96818f
- Added new includes to FHC-Header.php
...
- Now FilterWidget is not rendering an entire page but only a div
- Added view infocenterData to show the filter itself
- FilterWidget now is using the new FHC-Header
2017-12-19 10:53:02 +01:00
fa3daa7a57
Created infocenter details page showing Person Stammdaten, Dokumente, Prestudent ZGVs, Logs and Notizen.
2017-12-18 14:01:42 +01:00
024035e890
- Added directory application/controllers/system/infocenter/
...
- Moved controller TestFilterWidget to system/infocenter/
- Renamed controller TestFilterWidget to InfoCenter
- Added directory application/views/system/infocenter/
- Added views system/infocenter/infocenter.php and system/infocenter/infocenterFilters.php
- Added new header views/templates/FHC-Footer
- Added new header views/templates/FHC-Header
- FHC-Header still using old JQuery and missing others includes
2017-12-15 17:06:11 +01:00
845c35f4f9
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-12-15 10:48:21 +01:00
fb1a55c47c
Rundung der SWS angepasst
2017-12-15 10:47:26 +01:00
73fcebeb70
Oeffnen der Mailverteiler prüft jetzt auch den Returnwert
2017-12-14 19:03:54 +01:00
482a90b305
modified colors (now violet comes before dark red), fixed bug with non-continuous lines in excel versions
2017-12-14 16:32:05 +01:00
588561b716
Problem behoben wodurch bei langlaufenden Cronjobs diese mehrmals
...
gestartet wurden
2017-12-13 17:53:22 +01:00
aeae34f4e0
- Added parameter hideSave to hide save button and fields
...
- Correctly saves personal filters
2017-12-13 13:51:38 +01:00
0bb1d62c46
Fehlermeldung behoben beim Erstellen der Fotoliste als Nicht-Admin
2017-12-13 09:27:31 +01:00
dbf643cb8d
Fixed export Bug with PHP5.4
2017-12-11 17:43:25 +01:00
9bb368302f
Fehler behoben beim Anlegen von StudienplanLehrveranstaltungszuordnungen
...
wodurch booleans nicht korrekt gespeichert wurden
2017-12-11 17:34:39 +01:00
e94076b451
UTF8 Control Characters werden bei der XML Generierung ersetzt da diese sonst Probleme machen
2017-12-11 16:54:25 +01:00
47cd9d4137
By default the FilterWidget shows all the columns
2017-12-11 15:44:03 +01:00
ec58b3eea1
Added full date filter support
2017-12-11 15:12:51 +01:00
a8b86031af
Merge branch 'filters'
2017-12-06 11:02:33 +01:00
543e4a8fed
TicketIDs können im Jahresplan mit #1234 verlinkt werden
2017-12-06 08:03:33 +01:00
a7582c8868
- Method execReadOnlyQuery of DB_Model has a less strict check about the query statement
...
- Added a first management of the type date
2017-12-05 17:39:31 +01:00
5d7477c494
Öffnen von gesperrten Verteiler überarbeitet
2017-12-05 17:01:11 +01:00
e6aba9a3e2
- Renamed controllers/system/Test.php to controllers/system/TestFilterWidget.php
...
- Fixed problem with table sorter in views/templates/header.php
- Added checkboxes functionality to FilterWidget to render automatically the select column
- Added additionalColumns functionality to add additional columns to the dataset table
- Added formatRaw functionality to give an anonymous function as parameter to format every single raw of the dataset table
- The filter can be loaded from DB also by filter_id
2017-12-05 15:04:07 +01:00
9a61e91489
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-12-05 10:10:00 +01:00
7344ec63ce
"inofficial" grades like "entschuldigt", "unentschuldigt" are now not shown on official documents (Studienerfolgsbestätigung, Zeugnis, Diplomasupplement, Lehrveranstaltungszeugnis, Zertifikat)
2017-12-05 10:07:19 +01:00
4d18dbc83d
check auch auf ext_id bei der suche, ob content eingepflegt
2017-12-04 15:05:37 +01:00
443dc9a7e7
Added method _loadFilter to FilterWidget
2017-12-04 11:15:23 +01:00
3f144dd290
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-12-04 10:32:27 +01:00
749aa4525a
beautified links (links are only on words) CSV Export, Import...
2017-12-04 10:03:34 +01:00
e2908cc1d7
- Sets correctly the selected filter operation
...
- Use enter to set a filter
- Replaced submit buttons with buttons
2017-12-01 16:57:18 +01:00
8c06036a46
Links in der Bezeichnung des Eventkalenders werden extra nochmals
...
angezeigt und sind anklickbar (Für Verlinkung mit Tickets, etc)
2017-12-01 15:50:20 +01:00
54f1403054
- Better Js
...
- Better HTML structure
- Correct dynamic build of the SQL statement
- Stores filters and filters operations in session
- Boolean values are converted as strings inside the table
2017-12-01 15:45:59 +01:00
ec00c93d04
Better check if a table contains data before using the tablesorter
2017-12-01 15:15:16 +01:00
34329edb74
- Better code style
...
- Clened views structure
- Use session to store the filter state
2017-11-29 18:26:43 +01:00
80b954365e
Bugfix tablesorter, if a table is empty jquery not works anymore
2017-11-29 18:24:54 +01:00
d4d1f26c3f
Merge remote-tracking branch 'origin/master'
2017-11-29 16:27:07 +01:00
552e42f51a
Added Projektexport to Zeitaufzeichnung, moved CSV Import and CSV Export Form on a more visible spot
2017-11-29 16:26:36 +01:00
13ddee4748
Darstellung Services optimiert, wenn ext_id vorhanden wird ein link zum
...
Moodle-Kurs dargestellt
2017-11-29 16:10:52 +01:00
3f3479abaa
Fixed Problem when adding Grades
2017-11-28 16:43:51 +01:00
6c62196acb
Added Library for document conversion and merging
...
Added function for loading documents of Akte
2017-11-28 14:08:29 +01:00
a4a9bcda46
Added errormessage when extension permission is missing on installation
2017-11-24 18:56:41 +01:00
5b54217733
Added new Logging System for Persons
...
Added a Wrapper to call CI functions from outside Codeigniter
2017-11-24 18:45:51 +01:00
d3d4e01afc
isBerechtigt is now a Public Method of PermissionLib
2017-11-24 17:11:18 +01:00
1b2cc47efd
Inkonsistenz beim Trennzeichen für EMailversand behoben
2017-11-24 16:04:51 +01:00
ef418e70f8
Filterfunktion für Vilesci Statistiken hinzugefügt
2017-11-24 14:59:22 +01:00
289eb39aae
Merge remote-tracking branch 'origin/master'
2017-11-24 14:34:00 +01:00
73ae230cf0
Added "Notenspiegel_erweitert" excel export for color highlighting of negative marks and Nachprüfungen.
2017-11-24 14:31:43 +01:00
1638bfdff2
Mitarbeiter mit negativer Personalnummer werden nicht mehr im Verteiler tw_lkt aufgenommen
2017-11-24 14:22:24 +01:00
c105363fd0
First preview completed
2017-11-22 15:33:44 +01:00
ee3998f62e
- Changed system/dbupdate_3.3.php to create table system.tbl_filters and what its needed
...
- Added model system/Filters_model to manage system.tbl_filters
- Removed method execQuery from model system/UDF_model
- Added property executedQueryMetaData to DB_Model
- Added property executedQueryListFields to DB_Model
- Added method getExecutedQueryListFields to DB_Model
- Added method getExecutedQueryMetaData to DB_Model
- Added method execReadOnlyQuery to DB_Model to execute read only queries from outside a model
- Changed DB_Model method _toPhp to store infos about an executed query into properties executedQueryMetaData and executedQueryListFields
- Updated library UDFLib to use execReadOnlyQuery
- Added widget FilterWidget to render and manage a filter into VileSci
- Added views widgets/filter/selectFields, widgets/filter/selectFilters and widgets/filter/tableDataset used by FilterWidget
2017-11-22 12:08:54 +01:00
7185275325
Merge remote-tracking branch 'origin/master'
2017-11-20 20:10:47 +01:00
91dc7f0446
GUI-Redesign, Rechte besser implementiert
...
- Rechte werden nun bei allen Aktionen (Speichern, toggeln, löschen) richtig abgefragt
- WYSIWYG-Editor für Beschreibungstexte
- Beschreibungen werden in den Spalten angezeigt
2017-11-20 20:10:41 +01:00
f203956688
Added new DB-Fields to class
...
tbl_akte: ausstellungsnation, formal_geprueft_amum
tbl_dokument: ausstellungsdetails
2017-11-20 20:06:58 +01:00
0512b39ec3
Bugfix Function cutString
2017-11-20 20:06:03 +01:00
ddfe8ea65d
Removed strange Code
2017-11-20 18:52:24 +01:00
4550b0f355
BugFix tbl_akte.ausstellungsdetails
2017-11-20 18:40:57 +01:00
25030993cd
Merge remote-tracking branch 'origin/master'
2017-11-20 18:32:44 +01:00
33d1afa8f4
tbl_akte.ausstellungsnation, tbl_akte.formal_geprueft_amum
...
ADD COLUMN ausstellungsnation and formal_geprueft_amum to public.tbl_akte
CREATE FUNCTION campus.get_highest_content_version(bigint)
2017-11-20 18:29:47 +01:00
1f0e58d6c2
Add funktion cutString
...
Cuts the string to the given limit minus the stringlength of the placeholderSign and adds the placeholderSign at the end of the string
2017-11-20 18:28:18 +01:00
4e94776c6a
Funktion getAllForBewerbung mit Studiengangsnamen
...
Ursprüngliche Variante der Funktion getAllForBewerbung MIT studiengangsnamen wiederhergestellt um abwärtskompatibel zu bleiben
2017-11-20 18:27:53 +01:00
359e3fada6
Added missing constants for Account Generation
2017-11-20 17:16:17 +01:00
e76508307b
Added extension Folders to ignore List
2017-11-20 16:00:22 +01:00
9859a498ca
Added new Function SearchPerson
2017-11-20 15:59:55 +01:00
60a9afc4fb
Tabelle extensions zu Tabellenprüfung hinzugefügt
2017-11-17 09:24:15 +01:00
7d04f8a9b2
Fixed Typo
2017-11-17 09:13:35 +01:00
e839f07c0c
- Ausgabe optimiert
...
- Beschreibungstexte zu den Fehlerkategorien hinzugefügt
- Check für doppelte Verwendungen entfernt da diese bei der Erstellung
der Meldung zusammengeführt werden
- offene Verwendungen ohne Beginn und Endedatum werden jetzt zusätzlich
angezeigt
2017-11-17 08:39:29 +01:00
2b3f16d33c
Zusätzliche Hinweise bei Fehlermeldungen hinzugefügt
2017-11-16 18:24:02 +01:00
0fefdf9c58
Studiengangsleitungen werden nur noch an Verwendungen vom
...
Verwendungscode=5 (Studiengangsleitung) angehängt
Fehler behoben wodurch SWS manchmal mit , statt . ausgegeben wurden
2017-11-16 18:16:31 +01:00
7991e8cd25
Warning behoben bei Incoming/Outgoing die im Meldezeitraum keine Status
...
haben jedoch einen gültigen IO eintrag
2017-11-16 18:13:54 +01:00
12f32d5a29
SWS werden nun nicht mehr auf Karenzierte Verwendungen gehängt sofern
...
vorhanden
2017-11-16 18:12:01 +01:00
50b26ce762
Changed method getOERoot of MessageToken_model and method redirectByToken of controller to retrive the correct root of the organisation unit tree
2017-11-16 16:41:20 +01:00
8ca79b6657
Changed method getOERoot of MessageToken_model to retrive the correct root of the organisation unit tree
2017-11-16 16:27:14 +01:00
6b9875f5b9
Better SQL statements to create tbl_extensions in system/dbupdate_3.3.php
2017-11-15 15:09:13 +01:00
56e68f6809
Fixed ALTER SEQUENCE system.tbl_extensions_id_seq OWNED BY in system/dbupdate_3.3.php
2017-11-15 14:45:19 +01:00
8aaa7952f5
Merge remote-tracking branch 'origin/master'
2017-11-14 17:35:30 +01:00
1400041921
CIS-Suche verbessert
...
-Contents mit Titel-Übereinstimmung werden zuerst geliefert
- Leerzeichen werden aus Suchstring entfernt
2017-11-14 17:35:20 +01:00
783c98a909
Neue Funktion get_highest_content_version
2017-11-14 17:16:35 +01:00
1f6a0fc386
Messages: Bug-Report von STP: Berechtigung
...
Now the controller Redirect/redirectByToken doesn't use anymore the OrganisationseinheitLib,
therefore authentication is not required anymore
2017-11-14 15:01:36 +01:00
53da4b1f34
Added tbl_extension and related stuff to dbupdate_3.3
2017-11-14 14:19:47 +01:00
b28df3054a
Accidentally removed an usefull var_dump
2017-11-13 17:30:50 +01:00
31c7ab4465
Merge branch 'extensions'
2017-11-13 17:26:08 +01:00
a14c924f8c
Added comments
2017-11-13 17:25:25 +01:00
3735a0a7a8
Anpassung an BIS-Verordnung 6.5
...
Beendigungsdatum wird bei externen GS Studierenden nicht mehr gemeldet
2017-11-13 17:01:53 +01:00
5bd23b6dfd
Link für zusätzliche Informationen zur Passwortänderung hinzugefügt
2017-11-13 14:36:17 +01:00
98e3868f6a
BugFix Boolean Filter
2017-11-13 14:11:24 +01:00
d512f52e1f
- Bugfix: check if parameter dependencies is present in extension.json
...
- Bugfix: if it is a new installation all the SQLs will be executed, otherwise all the SQLs from version current + 1 will be executed
2017-11-13 13:36:24 +01:00
e68ab7add8
Merge remote-tracking branch 'origin/master'
2017-11-13 13:23:48 +01:00
04000775cb
Neuer parameter "sprache" bei getStudienplaeneFromSem
2017-11-13 13:23:32 +01:00
057d3cc6d2
Neue Funktion getAllForOnlinebewerbung
...
Gibt alle aktiven Studiengaenge und Lehrgaenge (mit Typ) zurueck, bei denen das Attribut onlinebewerbung true ist. Da beim join über den Studienplan doppelte Studiengänge ausgegeben werden können, wird hier darauf verzichtet.
2017-11-13 13:23:01 +01:00
cd41a8db4a
BugFix Gruppenverwaltung
...
Wenn ein vorhandener Benutzer hinzugefügt wird, erscheint nun eine HTML-Fehlermledung statt eines PHP-Fehlers
2017-11-13 13:20:10 +01:00
0bd3fbfacc
Filter für Raumübersicht
...
- Neue Funktion getOrte lädt alle Orte mit den entsprechenden Parametern
- Raumübersicht kann nun gefiltert werden.
- Außerdem wurde der Tablesorter mit Filter hinzugefügt.
2017-11-13 13:18:52 +01:00
0735880abb
Bugfix: now removes correctly the symlinks in extensions directories
2017-11-13 13:11:53 +01:00
89b9f5933f
- Added 'system.tbl_extensions' => 'system/extensions' to config/fhcomplete.php
...
- Added directory application/tmp/ with 775 as file system rights
- Changed ExtensionsLib to use application/tmp/ as temp directory
2017-11-13 13:00:17 +01:00
6f866ede38
Fixed paths
2017-11-13 11:13:12 +01:00
0bc0a09bf4
- Removed file system execute permission for all files (no directories)
...
- application/extensions file system permission now is 775
- application/logs file system permission now is 775
- Added extensions directory in application/: config, controllers, helpers, hooks, libraries, models, views and widgets
- Added view views/extensions/manage.php
- Added controller controllers/system/extensions/Manager.php
- Added library ExtensionsLib to manage extensions
- Added model models/system/Extensions_model.php
- Moved code related to print out info from MigrationLib to EPrintfLib
2017-11-13 10:45:49 +01:00
3c4ca2a9cc
anwesenheitsliste verplante räume können angezeigt werden, config ob fotolisten angezeigt werden
2017-11-10 01:25:44 +01:00
28f1cf80c6
Praktikanten aus dem TW_FIX Verteiler entfernt
2017-11-08 18:28:21 +01:00
0494173294
Hinweis ergänzt
2017-11-08 11:55:19 +01:00
5f68d3e735
Readded deleted function
2017-11-07 17:27:25 +01:00
bcfd08fcb8
Anzeigefehler in Ansicht für Administratoren korrigiert
2017-11-07 09:28:42 +01:00
17d62a7a78
Fixed typo
2017-11-03 16:52:00 +01:00
498430d6ef
Fixed typo
2017-11-03 16:51:37 +01:00
b891f442f7
Funktion getAllForBewerbung geändert
...
Aus der Funktion getAllForBewerbung wurde die studiengangbezeichnung (de und en) entfernt. Die Studiengangsbezeichnung kommt nun aus dem Studienplan.
2017-11-03 15:48:59 +01:00
7169b9f670
Reservierungen mit Spezialgruppen
...
Wenn eine Spezialgruppe bei Reservierungen eingetragen wird, erscheint diese nun auch bei LektorInnen, falls sie dieser Spezialgruppe zugeteilt sind. Dies ermöglicht zB auch das Verplanen von Mailgruppen.
2017-11-03 15:48:46 +01:00
6b46f3ba6a
Neue Verlinkung Eventanfrage im Eventkalender
2017-11-03 15:48:14 +01:00
77715da174
CSV Header angepasst
2017-11-03 11:33:00 +01:00
3d2df79c6d
Replacement of call check_infrastruktur by check of right "servicezeitaufzeichnung", input fields, Uebersichtstabelle and CSV export show only fields for Infrastruktur if user has the right, projects are shown after their end + 1 month + 1 day.
2017-11-03 10:32:13 +01:00
27879509ef
DB-columns added for Aufnahmetermin (tbl_rt_person)
...
. 4 DB columns added to tbl_rt_person (dbupdate_3.3.php)
--> insertamum, insertvon, updateamum, updatevon
. Class reihungstest adapted to new columns (reihungstest.class.php)
. All other files concerned adapted to pass appropriate data
2017-11-02 13:00:46 +01:00
06c3d9b9fe
VILESCI: Studienordnung GUI modified / js-script removed
...
. studienordnung-edit-icons removed (as the edit-format is automatically opened now by clicking the studienordnungs-link)
. js script removed, as not needed (datepicker translation)
2017-11-02 12:51:01 +01:00
f3412e75c7
Merge origin/master
...
Conflicts:
cis/testtool/login.php
vilesci/stammdaten/reihungstestverwaltung.php
2017-10-31 11:29:18 +01:00
1c12d72318
VILESCI: Studienordnung modified / REMOVE tbl_studienordnung_semester
...
. All affected files are adapted to work without tbl_studienordnung_semester
--> functions modified to use tbl_studienplan_semester INSTEAD OF tbl_studienordnung_semester
--> unnececary functions deleted
. VILESCI GUI in Lehre -> Studienordnung is modified
--> Extended Dropdown
--> No Matrix Studienordnung/Semester anymore
--> studienordnung- and studienplan-ICONS now presented correctly
2017-10-30 16:20:06 +01:00
9c83ee6b06
Coodle: optimized informations in infomail
...
Automatically generated feedback mails from each participant responding contains now:
. clear subject name
. name of participant and name of meeting
. linked URL goes to specific meeting overview
plus
. author doesn't get any redundant email anymore (after sending final date to all participants)
2017-10-30 15:58:53 +01:00
b3bbe2a7d1
Added missing subject and language to mail templates
2017-10-29 18:18:53 +01:00
5cf943d586
Corrected wrong default language constant
2017-10-29 17:11:54 +01:00
74b6379afc
PHP7 Bugfix
2017-10-28 17:31:01 +02:00
bb2472a04a
Fehler behoben wodurch Statusgründe bei Abgewiesenen nicht korrekt
...
angezeigt wurden
2017-10-27 17:22:33 +02:00
84a7df5ecb
Fixed display of errormsg when permissions are missing
2017-10-27 17:06:42 +02:00
898fabd7ee
Merge remote-tracking branch 'origin/master'
2017-10-25 17:48:33 +02:00
2273781fe6
project list for zeitaufzeichnung fixed: if project or project phase ends on current day, it is shown. If there is a project phase which has not ended, the corresponding project is shown regardless of whether the project has already ended.
2017-10-25 17:47:23 +02:00
3420f50c5e
Studentische Hilfskräfte werden nicht mehr in TW_FIX Verteiler
...
aufgenommen
2017-10-25 10:49:11 +02:00
bcf2c9e6d9
Plausibilitätscheck prüft nur noch die Organisationsform des Status, wenn diese nicht in den Studienplänen vorkommt
2017-10-24 15:41:36 +02:00
39392d7c18
- Added Cronjob for correcting Studienplan in Status
...
- Modified persmission lib to not check persmissions on CLI
- Modified Cronjobs to be able to start CI Jobs
2017-10-24 11:13:59 +02:00
9d3b286ecb
Plausibilitätscheck korrigiert wenn bereits Aufgenommene oder Wartende Prestudenten erneut aufgenommen werden in ein andere Ausbildungssemester als zuvor gewählt
2017-10-23 11:29:15 +02:00
888fba9a37
Bugfix: FAS employees export. Now if an address is not present the UDF are correctly displayed
2017-10-19 16:39:53 +02:00
c205a484a8
Fotoliste: new file using dokument_export.class / unoconv
...
. new php file using dokument_export.class
. new skin for fotoliste created with libre office
. dummy pictures for students who locked pictures
. access check: if admin or assistenz, then fotos are shown even if students locked them
2017-10-19 13:44:49 +02:00
c67fc2fd58
Mehrsprachigkeit Button 'Abschicken' gefixt
2017-10-18 21:54:46 +02:00
ffc778864a
Merge remote-tracking branch 'origin/master'
2017-10-18 15:27:06 +02:00
9191f7fef3
added csv export to Zeitaufzeichnung
2017-10-18 15:26:20 +02:00
014f063391
Fixed wrong comments in MessageLib
2017-10-18 15:04:52 +02:00
71c03dc945
tbl_lehrfach aus Statistik entfernt
2017-10-16 08:19:44 +02:00
f255403af2
Added jquery-archive/jquery-metadata in composer
2017-10-12 14:10:17 +02:00
f8c2f257b2
Added nicolaskruchten/pivottable to composer
2017-10-11 12:12:13 +02:00
7dd516756b
- Removed .gitmodules
...
- Removed directory submodules and content
- Removed wikimedia from composer
- Updated composer.json and composer.lock
2017-10-11 12:01:40 +02:00
28fe85077c
BugFix Distinct
2017-10-11 10:43:56 +02:00
9bc38fc48d
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-10-11 10:25:50 +02:00
8de1550db5
Removed redundant JS include
2017-10-10 17:37:01 +02:00
91e589df27
Fehlenden FK für testtool.tbl_pruefling hinzugefügt
2017-10-10 15:32:42 +02:00
433d6e334d
Script zum Kopieren von Masterarbeiten ins Opus aus dem Core entfernt
...
und ins Addon FHTW verschoben
2017-10-10 15:03:45 +02:00
da23548cf9
Logo wird jetzt über CSS angezeigt anstatt über default Ordner.
...
Custom Stylesheets müssen entsprechend erweitert werden um
div.header_logo, td.headerbar und div.cis_logo
2017-10-05 08:15:29 +02:00
60f306cafe
Neue Übersichtsseite für die Vorarbeiten zur Mitarbeitermeldung
...
Neue Prüfscripte zur automatischen Verlängerung von Verwendungen für
frei Lektoren
Neue Prüfscripte zur deaktivierung von freien Lektoren ohne Lehrauftrag
2017-10-04 11:12:33 +02:00
4f818ccb42
- Changed method getMessagesByPerson Message_model to use the given oe_kurzbz as root of the organisation unit tree
...
- Changed methods getStudiengangBewerbung and getAppliedStudiengangFromNowOE of model Message_model to use the given oe_kurzbz as root of the organisation unit tree
- Changed methods getMessagesByUID, getCountUnreadMessages and getMessagesByPerson of model Recipient_model to use the given oe_kurzbz as root of the organisation unit tree
2017-10-03 11:31:02 +02:00
503487734a
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-10-02 14:57:22 +02:00
5dbe7699d6
textfield for "Prestudent ID eingeben" visible in Chrome, fixed formatting (space between buttons)
2017-10-02 14:56:53 +02:00
70a12b74bd
Tippfehler in LVPlan sync behoben
2017-09-29 13:30:59 +02:00
bd5769622f
Orgformen for Bewerberstatistik "Aufsplittung Mischformen" are retrieved dynamically (incl. Dual)
2017-09-28 13:10:05 +02:00
23813c4f89
Phrase Type error
2017-09-28 11:21:32 +02:00
0c88d4ca33
Mlist generate
...
- Inaktive BenutzerInnen aus statischen Verteilern deren Account vor
mehr als 3 Wochen deaktiviert wurde, werden am beginn des Scripts
gelöscht
- moodle_lkt auskommentiert, da vermutlich nicht mehr benötigt
2017-09-27 19:16:58 +02:00
c3805aeff5
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-27 14:35:21 +02:00
3e7d541f00
Gruppen anlegen
...
- Granularere Rechteprüfung
- Attribut "Lehre" eingefügt (War in DB schon lange vorhanden)
-
2017-09-27 14:35:11 +02:00
ec3662bd47
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-27 12:23:06 +02:00
ba13f1147b
Method _getFinalUserBasicDataByPersonID of AuthLib now returns only the person_id
2017-09-27 12:22:34 +02:00
108f4dae6b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-27 11:30:05 +02:00
ed0d781836
Phrase CalDAV angepasst
2017-09-27 11:21:51 +02:00
67569dc603
Detailfenster im Tempus zeigt bei der Anzahl der Studierenden jetzt
...
zusätzlich die Studierendenzahlen exklusive Abbrecher/Unterbrecher und
Personen bei denen die LV bereits angerechnet wurde.
2017-09-26 19:07:06 +02:00
21f3188596
Problem bei der Sortierung von Studierenden nach Geburtsdatum behoben
2017-09-26 18:44:58 +02:00
3bd4c50f8b
Problem bei der Sortierung von Aufnahmeterminen nach Datum behoben
2017-09-26 18:44:24 +02:00
210a05bc18
Anpassung an BIS-Verordnung Version 6.5:
...
Bei der Meldung von Studierenden vom StudTyp = E (externe Studierende von gemeinsamen ordentlichen Studien) sind die Elemente „StudStatusCode“ und „Ausbildungssemester“ im Container „StudentIn“ nicht (mehr) zu melden – ebenso wie das Element „BeginnDatum“.
2017-09-26 18:30:46 +02:00
3ed42cd4ed
Eigener Verteiler für BIF Dual Lektoren
2017-09-26 17:13:22 +02:00
0ce164f49e
BugFix Type Error gruppe.class
...
BugFix Type Error gruppe.class
2017-09-26 11:53:24 +02:00
2ba2c628e8
Problem behoben wodurch die Studierenden im FAS nicht angezeigt wurden
...
wenn nur eine Anzeigesprache definiert ist
2017-09-26 09:19:34 +02:00
ff233e3f16
Added AuthLib
2017-09-25 17:16:52 +02:00
3cf42c4545
- Moved all the code related to authentication to AuthLib
...
- Changed configuration files autoload.php and rest.php to use AuthLib
- Added new method getCheckUserAuth to controller CheckUserAuth.php
- Removed libraries/FHC_Auth.php
- Removed models/CheckUserAuth_model.php
- Removed include/AddonAuthentication.php
2017-09-25 17:11:44 +02:00
ec62250b41
Fehlende Tabellenspalten hinzugefügt
...
Tabellenspalten sind im Check jetzt in doppelten Hochkomma damit die Spalte "table" korrekt abgefragt wird
2017-09-25 08:10:39 +02:00
feb2154b08
Phrase Termine im LV-Plan
...
Phrase Termine im LV-Plan
2017-09-22 17:58:50 +02:00
d1671fbe65
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-22 17:41:09 +02:00
c4a27c2112
news.php sortierung alphabetisch
...
Sortiert die Funktionen alphabetisch nach uid
2017-09-22 17:40:48 +02:00
383a28e6e8
GUI-Verbesserungen Gruppenverwaltung
...
Beim bearbeiten und anlegen neuer Gruppen werden nun die Attribute
beschrieben und einige Save-Checks durchgeführt
2017-09-22 17:39:00 +02:00
1bd6e1c707
Using DMS Path instead of hardcoded Path
2017-09-22 17:02:14 +02:00
39544f95ef
Fixed broken Drag&Drop
...
Fixed broken styling
2017-09-22 16:57:41 +02:00
8c722f46d7
Studiengangskennzahl zu News XML hinzugefügt damit dies bei der Anzeige der Studiengangsleitungen beruecksichtigt werden kann
2017-09-22 15:07:39 +02:00
30bf994063
Beim Anlegen von Nachprüfungen übers CIS werden jetzt bevorzugt Prüfungslehreinheiten zugeordnet
2017-09-22 11:20:00 +02:00
923eae0048
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-21 20:30:24 +02:00
677389b191
Mlist_generate
...
- Check of string lenght of bezeichnung and beschreibung
- new mlist tw_academy_std
2017-09-21 20:30:11 +02:00
76dc935117
Fixed wrong JQuery Include Path
...
Fixed broken HTML Tags
2017-09-21 16:25:15 +02:00
a8c5f52566
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-21 11:57:55 +02:00
59722d7c3b
Reihungstool: Table "Mit Raumzuteilung" corrected
...
- column "bereits absovlierte Verfahren": correct data & percentages
- column "Ergebnisse": correct result by Prestudent
- table "Mit Raumzuteilung": position corrected
2017-09-21 11:57:49 +02:00
903e296bcb
Studierendenstatistik angepasst damit dynamisch alle Organisationsformen bei Mischformstudiengängen angezeigt werden
2017-09-21 10:24:43 +02:00
35e35b4110
- Now UDFLib->_popUDFParameters returns the result without storing it in UDFs property
...
- UDFs property has been removed
2017-09-20 17:58:46 +02:00
e623b3ad0b
relative URL set
...
change static to relative URL
2017-09-20 13:27:54 +02:00
750fcfd6a7
Merge origin/master
...
Conflicts:
cis/testtool/login.php
vilesci/stammdaten/reihungstestverwaltung.php
2017-09-20 13:09:17 +02:00
51a5bda923
Spalte für "bereits absolvierte Verfahren" korrigiert
2017-09-20 13:01:37 +02:00
81864b14b7
Now by default the RESTful web services accept calls only from localhost (127.0.0.1)
2017-09-20 12:00:07 +02:00
1d1ca17dc1
Now the organisation unit parameter for methods:
...
- getMessagesByPersonID
- getMessagesByUID
- getSentMessagesByPerson
- getCountUnreadMessages
of controller system/Message must be the root of the organisation unit tree
2017-09-20 11:33:41 +02:00
a456c0838d
- Added property UDFs to UDFLib
...
- UDFLib constructor initialize UDFs property as an empty array
2017-09-20 10:55:20 +02:00
6fca6e45eb
- Added optional parameter oe_kurzbz to method getStudiengangBewerbung of controller organisation/Studiengang2
...
- Added optional parameter oe_kurzbz to method getStudiengangBewerbung of model organisation/Studiengang_model
2017-09-20 10:41:20 +02:00
7c25d6474c
Changed methods:
...
- getMessagesByPersonID
- getMessagesByUID
- getSentMessagesByPerson
- getCountUnreadMessages
of controller system/Message to get messages also with a given organisation unit
2017-09-19 19:02:55 +02:00
f7153aa6f5
- Changed config entry addons_aufnahme_url in fhcomplete.php. Now it's an array having an entry for each organisation unit root
...
- Changed redirectByToken method in controllers/Redirect, now:
- Loads the root of the organisation unit tree using the oe_kurzbz present in the message, loaded using a token
- Redirect to the related aufnahme using the organisation unit previously found
- Changed method send in system/Messages, now retrives the oe_kurzbz of the recipients/prestudents to store these oe_kurzbz in the table tbl_msg_message (used by FAS)
- Added method getRoot to library OrganisationseinheitLib to retrive the root of an organisation unit by the given oe_kurzbz
- Added method getOrganisationunits to model crm/Prestudent_model, retrives the oe_kurzbz using the given prestudent/s id/s
- Added some comments here and there
2017-09-19 17:34:00 +02:00
0f68237b9b
Phrases it-IT
2017-09-18 10:24:36 -03:00
030a40fac7
update to IT phrases
2017-09-18 10:07:36 -03:00
5ff875917c
Added method getAppliedStudiengangFromNowOE to get all the applied study courses for one person
...
- Starting from the current study semester
- For an organisation unit present in the organisation units tree that has as root the given parameter
2017-09-15 14:15:04 +02:00
5594c2dccf
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-15 12:51:57 +02:00
36412b8308
Wochenplan.class: Anzeige der LV-Bezeichnung
...
Wenn der typ==lva dann wird in der Titelleiste die Bezeichnung der LV
angezeigt
2017-09-15 12:51:43 +02:00
88cb088016
- Updated CHANGELOG.md
...
- Updated composer.json
- Updated composer.lock
2017-09-14 18:13:05 +02:00
ff2808399d
Institut wird am Lehrauftrag jetzt korrekt angezeigt wenn eine
...
Betreuung an einer kompatiblen Lehrveranstaltung hängt
2017-09-14 15:49:15 +02:00
2b4a736a0e
Merge branch 'master' into cleanjs
2017-09-14 14:40:28 +02:00
aedaf05735
JS bugfix
2017-09-14 12:35:45 +02:00
dffbf566fe
Better code commentation
2017-09-14 11:49:52 +02:00
b1a8c71ea4
Removed a wrong Js include, ordered JS and CSS includes
2017-09-14 11:29:20 +02:00
a1d6cb68b2
Wrong JS include
2017-09-14 11:15:49 +02:00
f8dc6f0d83
colopicker.js and colorpicker.css were modified, we keep them
2017-09-14 10:43:47 +02:00
12becbeaf0
JS bugfix
2017-09-13 16:10:24 +02:00
f7efce273c
XML compliant
2017-09-13 15:34:52 +02:00
feada15766
XUL files still using old jQuery because of an incompatibility
2017-09-13 15:28:27 +02:00
46142f80cd
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-13 14:22:07 +02:00
84eba8f06e
Wochenplan: Anzeige der Gruppen wenn lva
...
Wenn der Parameter "lva" gesetzt ist, werden im Wochenraster auch die
Gruppenbezeichnungen angezeigt
2017-09-13 14:22:01 +02:00
6cbd48003e
FAS Pruefungszeugnis entfernt
...
- Das Prüfungszeugnis wurde aus dem Dokumente-Menü entfernt. Im
Kontextmenü des Tabreiters Abschlussprüfung ist es noch abrufbar.
- BugFix Dokumenterstellung im Kontextmenü des Tabreiters
Abschlussprüfung
2017-09-13 14:20:09 +02:00
6c920c9e3e
FAS BCC-Mailversand mit ctrlKey
...
Wenn im FAS mit rechter Maustaste bei "E-Mail senden intern" die
Strg-Taste gedrückt wird, werden die Mails mit BCC verschickt.
2017-09-13 14:04:04 +02:00
1685836b0a
Changed to the new tabs jQueryUI plugin syntax
2017-09-13 14:03:22 +02:00
a294a44b2c
Mlists_generate Optimierung
...
Einfache Verteiler, deren Erstellung ohne PHP-Schleifen-Logik moeglich
ist, werden ueber ein Array erstellt.
2017-09-13 13:50:17 +02:00
b39a6ca85e
JS bugfix
2017-09-13 13:50:07 +02:00
1ae2816608
JS bugfix
2017-09-13 13:11:26 +02:00
01c1356c32
Closed echo quotes
2017-09-13 12:53:31 +02:00
6ef17867e1
Closed echo quotes
2017-09-13 12:52:12 +02:00
e3d94a1202
Removed console.log
2017-09-13 12:17:02 +02:00
2a183ce3f5
Bei Anzeige des LVPlans auf Lehrveranstaltungsebene werden jetzt keine
...
Reservierungen mehr angezeigt
2017-09-12 17:09:20 +02:00
1e28e681cb
Neue Seite hinzugefügt um Zutrittskarten zurückzunehmen (auszutragen)
2017-09-12 11:48:19 +02:00
9b1df1e4af
Fehler behoben wodurch das Löschen von Incominggruppen nicht funktioniert
2017-09-12 11:22:16 +02:00
bcd84512f5
Second commit
2017-09-11 16:06:56 +02:00
b0806f263b
First commit
2017-09-08 19:15:21 +02:00
25d8656c7c
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-07 22:16:03 +02:00
51d065b4fb
Studienplan LV-Planlink anzeigen konfigurierbar
2017-09-07 22:15:27 +02:00
f72a484a1e
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2017-09-07 19:10:43 +02:00
df34c6c202
Einfachere GUI zur Aktivierung von FH-Ausweisen hinzugefügt
2017-09-07 19:09:50 +02:00
cd81bac7eb
Added foreign keys for columns sprache, orgeinheit_kurzbz and orgform_kurzbz to table system.tbl_phrasentext
2017-09-07 14:05:45 +02:00
3e74029552
If the recipient is an employee and has a UID then send the email to UID@Domain
2017-09-07 13:43:56 +02:00
3a3656139b
Added UserDefinedFields to Changelog
2017-09-06 08:00:51 +02:00
5436b44fea
Fixed broken Schedule Export
2017-09-05 07:56:16 +02:00
a72022950a
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-09-01 14:55:35 +02:00
eb4f4a0efb
anmerkungen von stp_dev nach stp syncen wenn config eintrag aktiviert
2017-09-01 14:53:16 +02:00
e45e7b02fa
Codeception test updated
2017-09-01 14:11:39 +02:00
16f1a3365f
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2017-08-31 10:29:32 +02:00
247418cbf7
Problem behoben wodurch der Login zum Reihungstest nicht möglich ist
...
wenn das Semester bereits gestartet hat für das sich der Bewerber
beworben hat
2017-08-31 10:28:22 +02:00
fc3864f713
Zustelladresse zu Studierendenexport wieder hinzugefügt
2017-08-30 15:27:01 +02:00
fceb9a8b09
Forgot an error_log in dbupdate_3.3.php :P
2017-08-29 15:07:26 +02:00
e908be8021
dbupdate_3.3.php: added foreign key tbl_phrasentext_sprache_fkey on
...
system.tbl_phrasentext.sprache that references to public.tbl_sprache.sprache
2017-08-29 15:05:00 +02:00
c826e76e8f
Beim bestätigen des Status im FAS wird das Updateamum/Updatevon und Bestaetigtvon gesetzt
2017-08-28 16:56:50 +02:00
e46c090bc2
- Added method encodeToString to udf.class.php
...
- Using method encodeToString in mitarbeiterexport.xls.php and studentenexportextended.xls.php
- Method encodeToString now takes care also about booleans and null values
2017-08-28 15:23:57 +02:00
d2acf19b70
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-08-28 12:45:09 +02:00
72b3e9adc1
- Replaced DEFAULT_LEHREINHEIT_SPRACHE with DEFAULT_LANGUAGE in UDFLib
...
- Method _setAttributesWithPhrases now sets by default all the attributes to null
- Method _setValidationAttributes now sets also MIN_LENGTH and MAX_LENGTH attributes
2017-08-28 12:42:19 +02:00
9853af4e1f
Tippfehler bei Semesterplan behoben
2017-08-28 11:17:13 +02:00
0895c171a5
Default Status when creating new Studienordnung set to "in Bearbeitung" in drop down
2017-08-28 10:58:56 +02:00
672c452860
Fehlermeldung behoben beim Anzeigen der Gesamtnote wenn noch keine Personen zu der Lehrveranstaltung zugeordnet sind
2017-08-28 09:34:34 +02:00
add7ebb15d
Removed unused files from include directory
2017-08-25 14:46:25 +02:00
10f263aaa5
Renamed widget vorlage_widget.php into Vorlage_widget.php
2017-08-25 14:17:35 +02:00
2beba613e6
- Renamed parameter jquery into jquery19 in file application/views/templates/header.php
...
- Fixed includes in prestudentMultiAssign.php and messageWrite.php
- Fixed new lines in prestudentMultiAssign.php and messageWrite.php
2017-08-25 14:13:46 +02:00
fbb4a492b5
Added jquery/jquery1.9 to composer requirements (composer.json)
2017-08-25 12:58:07 +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
921bdd1242
- beautified composer.json
...
- added borgar/textile-js to composer requirements (composer.json)
- removed textile.min.js from include directory
- replaced old textile js path with the new one in header.php
- changed the call of js textile in application/views/system/phraseinhaltEdit.php
2017-08-25 11:27:41 +02:00
d1fa93a2b6
DB_model bugfix:
...
- update method now is using _manageUDFs instead of directly UDFLib->manageUDFs
- _manageUDFs method now accept the id as third parameter
- if the third parameter of _manageUDFs is null the getUDFs is not
called
- If id parameter of method load is null now a correct parameter is given to
get_where
2017-08-23 10:47:12 +02:00
3181d3741e
fixed Typo
2017-08-22 23:25:56 +02:00
809d65a62e
Der Mitarbeiterexport im FAS exportiert nun nicht mehr die Mitarbeiter
...
des Ausgewählten Filters sondern die markierten Mitarbeiter. Wenn keine
Mitarbeiter markiert wurden werden alle angezeigten Mitarbeiter
exportiert
2017-08-22 23:23:58 +02:00
d8cd786079
- application/core/* -> CS compliant
...
- application/libraries/* -> CS compliant
- FHC_Model isEntitled method now return error() or success()
- Updated all code that uses isEntitled method from FHC_Model
- Removed Squiz.PHP.DisallowSizeFunctionsInLoops from CS ruleset
- Removed depracated method replace from DB_Model
- Removed unused method pgArrayPhp from DB_Model
- Renamed method arrayMergeIndex to _arrayCombine in DB_Model and set as private
- Added method _manageUDFs to DB_Model (a wrapper for UDFLib->manageUDFs)
2017-08-22 16:24:51 +02:00
36ab348951
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-08-22 10:56:44 +02:00
36b881b0c8
Lehrveranstaltungsverwaltung: Suche Bezeichnung
...
- In der Lehrveranstaltungsverwaltung kann nun auch nach Bezeichnung der
LV (Deutsch/Englisch) gesucht werden. % und _ als Platzhalter sind
möglich
2017-08-22 10:56:34 +02:00
1afe6c00a1
Removed check of size functions in loop statements in CS
2017-08-22 10:32:11 +02:00
17acfa3945
Codesniffer FHComplete rules: underscores before protected and private methods are not checked anymore
2017-08-21 12:22:56 +02:00
0317c5314a
Removed ruleset.xml from tests directory
2017-08-21 12:11:54 +02:00
b50aab2d33
- Moved all code related to UDF from DB_Model to UDFLib
...
- Changed method getUDFs in DB_Model
- Removed method getUDF
- Moved method _getUDFsDefinitions to UDF_model and renamed to getUDFsDefinitions
- Updated model UDF_model
- Updated controller system/UDF
- Updated DB_Model to be more CS compliant
2017-08-18 15:50:59 +02:00
44c52abd21
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-08-18 12:55:02 +02:00
1a2c663e72
Funktion für Änderungen bei Firmen innerhalb KW
2017-08-18 10:48:48 +02:00
b47776ac24
Modified function check_infrastruktur
2017-08-18 10:38:58 +02:00
cf19284132
updated function to get infrastructure-ma
2017-08-18 09:38:31 +02:00
1a2fce8d1c
- Moved property $htmlParameters from HTMLWidget to DropdownWidget
...
- Moved all the UDF related code from UDFWidget to UDFLib
- UDFWidget is now using UDFLib
2017-08-17 16:33:45 +02:00
35a4861abf
Bugfix in system/aufnahme/PrestudentMultiAssign:
...
- Converting strings 'null' to null values
- Better error messages in case of invalid parameters
2017-08-17 12:49:41 +02:00
e4160088e8
- Added headers where they were missing
...
- Added comments where needed
- Beautified the code where needed, more readable and more compliant to CS
- loadResource function in helper fhc_helper.php is not using anymore CI
- Moved all constants from UDFWidget to UDFLib
- Added constant SORT to UDFLib
- Renamed constant REGEX_LANGUAGE to FE_REGEX_LANGUAGE in UDFLib
- Better formatting and indentation of the code of WidgetLib (more compliant to CS)
- Added missing validation attributes to HTML widgets
- Added constant HTML_DEFAULT_VALUE to CheckboxWidget
- Unset parameter multiple in DropdownWidget constructor
- Changed value of constant REQUIRED in widget HTMLWidget
- Added protected property $htmlParameters to widget HTMLWidget
(it works as alias to $this->_args[HTMLWidget::HTML_ARG_NAME] -> better code)
- Replaced $this->_args[HTMLWidget::HTML_ARG_NAME] with $this->htmlParameters in the widgets
- Changed the CSS class label[udf-required=true]::after to label[required-field=true]::after in widgets.css
- Better use of constants in UDFWidget: constants from HTMLWidget are used only for the HTML parameters,
while constants from UDFLib are used only for UDF parameters
2017-08-17 11:51:40 +02:00
31e21acd67
New columns in tbl_service
...
- Added columns design_uid, betrieb_uid and operativ_uid to tbl_service
2017-08-17 11:38:16 +02:00
a18c6816a6
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-08-16 15:00:13 +02:00
d9207e5364
Added static Verbaende to Select
2017-08-16 15:00:00 +02:00
74d3a89688
Add column "bewerbung_abgeschicktamum" to FAS GUI
...
- Added to Tab Prestudentstatus. Optional culumn. Default invisible
2017-08-16 14:59:28 +02:00
f126bca708
- New directory application/widgets/html/ for widgets to render HTML
...
elements
- All the widgets classes to render HTML elements moved from WidgetLib
to application/widgets/html/
- New directory application/widgets/udf/ for widgets to render UDF
- All the UDF widgets classes moved from WidgetLib to
application/widgets/udf/
- HTMLWidget is now the main class to render HTML widget
- UDFWidget is now the mail class to render UDF
- Removed UDFWidgetTpl
- Added function loadResource to fhc helper
- Changed method widget of WidgetLib (using loadResource)
- Moved UDFWidget method from WidgetLib to UDFLib
- Slimmed down class Widget present in WidgetLib
- Controller system/UDf now uses UDFLib
- View application/views/system/udf.php now uses UDFLib
- Updated udf and html widgets to adapt them to the new libs
2017-08-11 18:41:21 +02:00
d7bed89869
- Added class label[udf-required=true]::after to skin/widgets.class
...
- Added attribute udf-required to tag label in the HTML components widges
2017-08-09 17:10:10 +02:00
226eda73e5
- Added comments to DB_Model
...
- Method _manageUDFs using a temp variable to store result from _validateUDFs
2017-08-09 16:20:10 +02:00
973b74ce7e
$validate variable reset on every loop
2017-08-09 15:55:32 +02:00
9ee1820ac3
- Not to check the required attribute for them all together, but only if the UDF is present in the given parameters.
...
Update of UDF should work in the same way as the update of regular columns.
- Required rules:
- If required === false && value to be saved == (null || false) => validation avoided
- If required == false && value to be saved != null => validation performed
- If required == true => validation performed && value cannot be null
- If required == true && value to be saved == (null || false) => raise error: required field
- If raised error required field => validation is not performed
2017-08-09 15:21:19 +02:00
c351ef781a
Changed method getAppliedStudiengangFromNow in Studiengang_model.
...
Now also takes into consideration the current semester
2017-08-08 11:17:33 +02:00
a56412d687
Merge branch 'udf'
2017-08-07 16:44:03 +02:00
35e8df3b22
Added method getAppliedStudiengangFromNow to controller Studiengang.
...
This method can retrive all the applied studiengang for a person from
the current studiensemester
2017-08-07 15:15:08 +02:00
a3e63a99b8
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-08-07 11:34:16 +02:00
ed1d7ae0b0
lehrauftrag.xml.php $fb_arr wird nun auch mit oe_kurzbz befüllt
2017-08-07 11:32:04 +02:00
db63dd1dd0
- Added method dropdownListValuesToString to udf.class.php
...
- Added enum element to UDF definition in method _getUDFDefinition
- Exports now show the values of dropdowns and not the id
2017-08-07 11:18:41 +02:00
2edcfae0af
- Added method existsUDF
...
- Added comments
2017-08-04 15:12:36 +02:00
f5d3f20ec7
Merge branch 'master' into udf
2017-08-03 15:37:37 +02:00
d7d550d53f
- Multipledropdown: fixed problem to see and to save more selected
...
elements
- Dropdown: reset selected element to null
2017-08-03 15:20:32 +02:00
9e14e39b66
Added Comments in Controllers
...
called html_escape function for all textfields before saving (against html injection)
Reformatted
Fixed Studienjahr Dropdown prefill in Studiensemester view
2017-08-03 13:48:10 +02:00
68189bb7a5
- If required == false and a null value is given for a UDF, then no
...
validation is performed
- No validation is performed for checkboxes
- Better workaround in UDF_Model
2017-08-02 17:02:39 +02:00
dda920dd58
Fixed URL without double slashes
2017-08-02 16:56:51 +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
65be806e91
Merge branch 'master' into udf
2017-08-01 18:31:30 +02:00
66de1e18f8
- Removed /core from URL
...
- If UDf are not set in DB UDF view will not display them
- Removed placeholder from multiple dropdown widget
- Dropdown widget has null value as placeholder
- Added permission system/udf to checksystem
2017-08-01 18:25:23 +02:00
5d0dcb6e4a
Kommentar ergänzt
2017-08-01 16:54:43 +02:00
afd1667645
GUI für Studiensemester und Studienjahr hinzugefügt
2017-08-01 14:50:19 +02:00
b7da7b86f9
PHP7 compatibility fix
2017-08-01 10:45:00 +02:00
bba27f75e0
Merge branch 'master' into udf
2017-07-28 18:41:35 +02:00
59045e1136
Added private method _fillMissingChkboxUDF to UDF_model.
...
It checks if UDF checkboxes are NOT posted and sets theirs values to
false
2017-07-28 18:36:08 +02:00
0ff635f5ea
- Added Zusatzfelder tab for UDF in FAS, students and employees
...
- UDF for person and prestudent only
- Added CSS for widgets
- Fixed checkbox
- Improved aesthetics of widgets
2017-07-28 17:25:27 +02:00
994c4e1d36
If a UDF is of type checkbox, convert the string value to a boolean
2017-07-28 17:21:01 +02:00
0d9e5cc7a0
It checks in the index if $person_id and $prestudent_id parameters are
...
given. If they are given it loads the respective data.
2017-07-28 17:07:01 +02:00
28be99c952
In case a table is updated and UDF are present in that table,
...
the method _manageUDFs will preserve the UDF values that
are NOT given as parameters.
Updates only the wanted UDF, without overwriting the others.
2017-07-28 17:00:42 +02:00
6afd71876f
Added UDF to FAS -> export
2017-07-28 16:08:36 +02:00
0bd66c37b4
Problem beim Erstellen von Dokumenten mit alten unoconv Versionen
...
behoben bei denen es zu Berechtigungsproblemen bei der Erstellung der
Dokumente kommt
2017-07-28 09:33:27 +02:00
dfe476799b
Berechtigungspruefung korrigiert
2017-07-28 09:30:22 +02:00
b538b82946
SD-Tools Link im Vilesci aus Core entfernt
2017-07-28 08:31:30 +02:00
cd89b8ce75
Addons koennen jetzt Menuepunkte im Vilesci hinzufuegen und aendern
2017-07-28 08:25:59 +02:00
61b86f06e7
Anzeige bei fehlendem CI_ENV optimiert
2017-07-26 16:30:10 +02:00
ad99ba9044
Environment check erweitert
2017-07-26 16:16:44 +02:00
4ad335dc9a
Funktion erweitert zur Suche nach Berechtigungen zu Organisationseinheit
2017-07-24 15:30:57 +02:00
7859b07e70
Use extended studens export for both student export commands
2017-07-24 14:25:21 +02:00
4ce104a738
Fehler behoben wodurch temporäre Dateien nach der Dokumentenerstellung
...
nicht korrekt aufgeräumt wurden
2017-07-21 15:46:46 +02:00
fa7115d880
Beim Erstellen von Moodle Kursen wird nun automatisch das Ende Datum
...
gesetzt (=Semesterende) damit in der neuen Kursübersicht vergangene und
aktuelle Kurse korrekt angezeigt werden
2017-07-21 15:26:27 +02:00
6573d46525
Merge branch 'master' into udf
2017-07-21 15:08:50 +02:00
dab6515038
- Added widgets.css
...
- Better widgets HTML format
- Changed required attribute to udf-required
2017-07-21 15:02:04 +02:00
df7f9d926a
Beim Eintragen des Urlaubs wird vor dem Speichern geprüft ob eine
...
gültige Vertretung eingetragen wurde und ggf eine Fehlermeldung
angezeigt.
2017-07-20 10:40:43 +02:00
6957051c3b
Infoscreen umbenannt auf Informationsbildschirm da es sich um einen
...
geschützten Begriff handelt
2017-07-19 15:28:15 +02:00
b8b5b95251
Added additional parameter checks
2017-07-19 15:25:17 +02:00
88befdee6c
Added google.php to gitignore
2017-07-18 17:23:06 +02:00
4603befefc
Added API calls to get Prestudents according to its status
2017-07-18 17:19:53 +02:00
b9c846f18f
FAS UDF tab
2017-07-18 12:48:47 +02:00
de2c9703de
UDF bugfixes
2017-07-18 12:48:20 +02:00
0a7fc53568
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-07-14 11:47:27 +02:00
63f39b1404
Gesamtnote: Check for valid grades on xls-import
2017-07-14 11:46:45 +02:00
e8b6f8c9ba
Neuer Notenschlüssen Bachelor- und Masterarbeiten
2017-07-14 11:44:47 +02:00
1e7188dc75
kleiner BugFix
2017-07-14 11:43:05 +02:00
39e47ee6d9
FH-Ausweis
...
- Vergrößerte Bilder beim Fotocheck
- Automatischer Refresh nach Fotoupload
- DMS-Link wird nur mehr angezeigt, wenn er nicht NULL ist
- EAS zu Spezialfällen hinzugefügt
2017-07-14 11:39:02 +02:00
a378fa777c
Leitungsaktivierung/deaktivierung für BIF ermöglicht
2017-07-13 11:12:09 +02:00
8f8339eb49
Added Script to check FH-Complete Environment for missing Configuration
2017-07-13 10:51:49 +02:00
62cc6613c2
UDF checkbox bugfix
2017-07-12 11:52:26 +02:00
5d16a79cd3
- Added UDF tab in fas
...
- Added global constant FAS_UDF
2017-07-07 19:14:15 +02:00
df51fb2988
Added method postUDF to controller system/UDF/UDF
2017-07-06 11:17:12 +02:00
a530cd22b4
- Bugfix UDF dropdown, wrong check for selected value
...
- UDF checkbox now is only one value, no multiple checkbox anymore
- Added method saveUDFs to model UDF_model
- Added new constants to resolve json schema parameters
2017-07-06 11:07:43 +02:00
4dd46fc55f
Fixed incorrect handling of microtime
2017-07-03 18:31:48 +02:00
a06f54ca8a
Problem beim Laden von SOAP Requests mit neueren Apache Versionen
...
behoben
2017-07-03 17:36:06 +02:00
3ccac21136
Removed Debug Colors
2017-07-03 10:22:09 +02:00
4c95ee4d58
Fixed Codesniffer test files according to FHComplete Style
2017-07-02 18:37:55 +02:00
5f47ce6e30
Changelog erweitert
2017-06-30 14:24:40 +02:00
9ec2756977
Erweiterte Suchoptionen bei Berechtigungen sind jetzt ein-/ausblendbar
2017-06-30 14:00:12 +02:00
3abfcbc429
- Better naming convention for variables
...
- Method toPhp has a more strict check about UDF
- Added constant UDF_FIELD_JSON_DESCRIPTION
- Added new code comments and improved the old ones
- Improved code formatting
- UDF validation now checks also the required fields
- UDF validation now checks also if the UDF value is an array or an
object and discard them
- Method _getUDFs renamed to _getUDFsDefinitions
2017-06-30 13:31:21 +02:00
e2f87534ff
- Added new constants that represent the exit codes for the UDF validation
...
- Added new error messages for the UDF validation
2017-06-30 13:28:24 +02:00
8f9897d063
Bilder entfernt und angepasst um die Dateigroesse des Diplomasupplements
...
zu reduzieren
2017-06-30 13:04:14 +02:00
a63563c9ce
Alias im FAS ist Readonly wenn im Config GENERATE_ALIAS_STUDENT=false
...
gesetzt ist. Mit dem Recht student/alias kann dieses Feld dennoch
geändert werden
2017-06-29 08:18:26 +02:00
27203cb334
Im FAS werden die Aufnahmetermine farblich markiert die zur Berechnung
...
der Gesamtpunkte herangezogen werden.
2017-06-28 19:07:25 +02:00
a1d247eb40
Notice beim Erstellen des Diplomasupplement behoben die in seltenen
...
Fällen im Log angzeigt wurde
2017-06-28 19:04:15 +02:00
2c0ca4be98
Bug fix dbupdate_3.3
2017-06-28 12:41:57 +02:00
9eb2ea854d
Merge branch 'master' into udf
2017-06-28 12:07:41 +02:00
d3a675bf52
Testing phase
2017-06-28 12:04:41 +02:00
75f4a7db58
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-06-27 17:08:58 +02:00
fff073f701
BugFix Reihungstest Excel-Auswertung
...
Wenn Reihungstest ID im $GET gesetzt ist, diesen Test zusaetzlich laden,
um auch jene außerhalbs des Datumszeitraums zu erwischen
2017-06-27 17:08:45 +02:00
6016bf8257
Berechtigungsprüfung beim Laden vom Messages behoben
2017-06-27 16:10:18 +02:00
ac438c1b94
Added parameter no_file to API content/Dms/AktenAcceptedDms
2017-06-27 11:32:59 +02:00
3e0b3aecd0
php7-fix
2017-06-27 10:27:25 +02:00
4279d2c13c
Unschöne Fehlermeldung behoben wenn ein Ersatzkennzeichen gespeichert
...
wird das bereits bei einer anderen Person eingetragen ist
2017-06-27 07:59:10 +02:00
95613bd921
Phrase für LVevaluierung CMS Link korrigiert
2017-06-26 18:36:26 +02:00
7cf9a401f0
Studienplan Sortierung hinzugefügt für Anzeige in STGV Addon
2017-06-26 08:14:37 +02:00
be9fc8121e
- Added exit codes for udf validation to constants.php
...
- Added messages for udf validation to fhc_model_lang
- Added MAX_LENGTH and MIN_LENGTH to UDFWidgetTpl in WidgetLib
- UDF validation second version in DB_Model
2017-06-23 18:54:34 +02:00
463b2df52c
Neuer Mailverteiler für Studiengangsleiter von offiziellen Studiengängen
2017-06-23 17:10:01 +02:00
c0cf8a4fe9
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-06-23 15:40:53 +02:00
b901bc1b83
BugFix insert Studienplatz
2017-06-23 15:40:40 +02:00
aa47faaf15
Changed function getTab in person.class
...
Filterstring wird getrimmt und mittels generateSpecialCharacterString
umgewandelt um auch Namen mit Sonderzeichen zu finden
2017-06-23 15:40:22 +02:00
167f97e96a
BugFix Vorlagen DS
...
Textkorrektur Zeugnis
2017-06-23 15:39:11 +02:00
f7df9b030e
Lehrveranstaltungsverwaltung
...
- Add Search for Lehrveranstaltung ID
- Add new Tablesorter with FilterWidget
- Add Column for Bezeichnung English
2017-06-23 15:37:40 +02:00
a7d3214dd6
fixed return value of method '_manageUDFs'
2017-06-22 11:32:56 +02:00
1a9d6de487
changed api method to return status 'Interessent'
2017-06-22 08:33:25 +02:00
c026aecfbe
changed api method to return status 'Interessent'
2017-06-22 08:29:51 +02:00
67b2d39c21
Es können jetzt auch noch nicht genehmigte Studienpläne zu Reihungstests
...
zugeordnet werden. Zusätzlich wird im Dropdown der Status der
Studienordnung angezeigt
2017-06-21 19:03:36 +02:00
2675820271
DIV bei Lehrveranstaltungsseite hinzugefügt um per Addon Informationen
...
hinzufügen zu können
2017-06-21 18:36:51 +02:00
2e12295ede
Migration script 3.3:
...
- Creates table system.tbl_udf
- Adds column udf_values to tables tbl_person and tbl_prestudent in public
schema
2017-06-21 17:41:25 +02:00
26c4865c43
- Property bb of PermissionLib is now static and is initialized in the
...
constructor, to have better performance.
- Method isBerechtigt has been renamed to _isBerechtigt
- Removed logs debug from _isBerechtigt
2017-06-21 14:02:24 +02:00
5e3c8d8421
Replaced global constant FCPATH with FHCPATH
2017-06-21 11:30:45 +02:00
950da84cf3
- Added constant EXIT_VALIDATION_UDF into constants.php
...
- Added message 'fhc_'.EXIT_VALIDATION_UDF into fhc_model_lang
- Added method _validateUDFs into DB_Model
- Renamed _manageUDF to _manageUDFs into DB_Model
- Renamed _getUDFParamters to _getUDFs into DB_Model
- Introduced first version of UDF validation
2017-06-21 11:05:20 +02:00
0be96175bb
Frist für das Anlegen von Prüfungsterminen konfigurierbar
2017-06-20 09:32:19 +02:00
b73bf1dd32
- Added method listFields to DB_Model
...
- Added method fieldExists to DB_Model
2017-06-19 12:39:08 +02:00
3ac8d7d604
- Added parameter decode to API /system/UDF/UDF to decode json
...
- UDF bugfix: now it checks if a table has the column udf_values before
performing an insert or update
2017-06-19 12:15:28 +02:00
e8d395f4f1
UDF update and insert bug fix
2017-06-14 16:18:43 +02:00
86a1eb876e
UDF update bug fix
2017-06-14 15:24:08 +02:00
236cf4ec3d
Better log debug output for the name of the called web service
2017-06-13 12:43:42 +02:00
daa08ea30c
Added the query of the restful web service call to the log debug
2017-06-13 12:33:44 +02:00
085fed5284
Added a log debug to the constructor of controller APIv1_Controller to
...
undestand what is the called restful web service
2017-06-13 12:00:24 +02:00
8dcc407c99
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-06-13 00:19:02 +02:00
4c1669a01a
Rechnungsadresse
2017-06-13 00:18:32 +02:00
3706131ed7
Use udf_ as prefix
2017-06-12 13:53:57 +02:00
294c65a9bf
Added controller UDF to read UDFs definitions
...
UDFs update&insert second version
2017-06-09 15:45:33 +02:00
8f2cb9be03
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-06-09 15:30:23 +02:00
d14730df35
Adresse.class: Corrected lenght-validation of plz
2017-06-09 15:30:02 +02:00
df5df5da57
Die Anwesenheitsübersicht für Lektoren zeigt zusätzlich die Lehrform der Lehreinheit im
...
Dropdown an damit zwischen Prüfungs-LVs und normalen LVs unterschieden
werden kann
2017-06-09 09:04:33 +02:00
30c31211aa
Added insert and update for UDFs, first version
2017-06-08 18:26:32 +02:00
6a26d82de5
Function getBewerbungstermine um studienplan_id erweitert
2017-06-08 14:20:57 +02:00
094166f992
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-06-08 10:03:25 +02:00
7b88e7052f
Neues Attribut Onlinebewerbung im Studienplan
2017-06-08 10:03:09 +02:00
bff6e480f8
Fixed PHP7 Constructor
2017-06-07 18:43:31 +02:00
60ab8fdd1b
Fixed PHP7 Depecated Warnings
2017-06-07 18:16:11 +02:00
45b4c84764
Task #1355 :
...
- If the sender of a message is an admin: show all the vorlage with
mimetype = text/html
- If the sender of a message is NOT an admin: show all the
vorlage that belongs to the organisation units of the user
and the parents of those organisation units until the root
of the organisation unit tree
Changes:
- Added method isAdminByPersonId to model Benutzerrolle_model
- Added method _getAllHTMLVorlage to Vorlage_widget
- Added method _getUserVorlage to Vorlage_widget
2017-06-06 15:21:22 +02:00
02320f9388
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-06-02 11:08:19 +02:00
5bda14c4b6
Coodle Update
2017-06-02 11:08:01 +02:00
77d1708b51
Textfehler in Prüfungsprotokoll behoben
2017-06-02 11:05:32 +02:00
3135c5de9d
fixed bug for string which contain character '
2017-06-01 14:09:19 +02:00
8a675f268e
Cleanup Script an Replace addslashes
2017-05-31 11:03:57 +02:00
8b0d52d4ad
Removed PHP7 Lint Error
2017-05-29 17:03:43 +02:00
b5a4ab502f
Studiensemester kann als zusätzliche Spalte bei Lehrveranstaltungen im FAS und Tempus eingeblendet werden
2017-05-29 10:46:57 +02:00
44b01ba6f8
Fehler behoben wodurch nach dem Sortieren der Lektorennoten falsche Noten zur Übernahme markiert waren
2017-05-29 10:28:54 +02:00
35bfc0e69a
Bei Eingabe des Prüfungshonorares unter Lehrveranstaltungen->Noten kann zusätzlich das Vertragsdatum eingetragen werden
2017-05-27 07:36:06 +02:00
03b9e40e7e
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-05-26 17:43:27 +02:00
90fdedebda
Filter Widget Added
2017-05-26 17:43:00 +02:00
a3884206f9
Tablesorter PHP: Added Widgets-Link
2017-05-26 17:41:25 +02:00
ad11447789
Gruppe Class
...
New function searchGruppen
2017-05-26 17:40:49 +02:00
e7d8cec1d5
Notizen werden per Default nach dem Startdatum sortiert
2017-05-26 15:06:06 +02:00
b840352377
- Vorlage widget now works with oe_kurzbz
...
- Added method getByPersonId to model Benutzerfunktion_model
- Added method treeSearchEntire to library OrganisationseinheitLib
- Added method getOneLevelAlias to model Organisationseinheit_model
2017-05-23 17:00:03 +02:00
2286d47b69
Task #1353 : First solution, to be refined
2017-05-16 18:52:38 +02:00
d6c5cb2267
Problem behoben bei dem die letzte Woche in der Semesteransicht nicht angezeigt wurde wenn das Semester zb an einem Freitag startet statt am Montag
2017-05-16 14:35:18 +02:00
ffe662be11
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2017-05-12 17:27:00 +02:00
4a82d2f36f
Personen scheinen jetzt nicht mehr doppelt im DropDown des Reihungstest Login auf wenn Onlinetest und Interview am selben Tag stattfinden
2017-05-12 17:25:43 +02:00
27f28b524d
Addon Casetime-Aufruf mit Berechtigung zur XLS-Generierung
2017-05-12 15:50:21 +02:00
b835e1a6b5
CSV Export der Studierenden für ÖH hinzugefügt
2017-05-11 11:33:57 +02:00
bbcb337c2c
dbupdate 3.3 mini-bugfix
2017-05-10 10:08:21 +02:00
f092867602
2nd preview
2017-05-10 09:54:23 +02:00
e143aa8815
1st preview
2017-05-09 18:14:18 +02:00
d22cc76ad5
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-05-09 17:38:19 +02:00
a7bf08af11
DB-Update Coodle und Studienplan
...
Coodle: Neue Spalten mailversand, teilnehmer_anonym und termine_anonym;
Studienplan: Neue Spalte onlinebewerbung_studienplan
2017-05-09 17:37:59 +02:00
a5aea17fa6
UDF fields are present in json output as other fields
2017-05-08 18:46:38 +02:00
7312a4afe1
Tast #1342 : Messages: root-url of link to ViewMsgByToken-Seite in Info-Email configurable
2017-05-08 14:17:35 +02:00
57a09b7467
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-05-08 14:12:35 +02:00
8c7146ab5c
TW_BAMA-Verteiler in mlist_generate
2017-05-08 14:12:19 +02:00
5c1dfc4f64
New Feature "number_displayed_past_studiensemester"
...
Definiert, wie viele vergangene Studiensemester im FAS-Tree angezeigt
werden sollen
2017-05-08 14:11:35 +02:00
51ccee4d16
8th release
2017-05-08 11:39:21 +02:00
6a11cc09cf
7th release
2017-05-05 18:45:28 +02:00
d7771da74e
- Added utility function var_dump_to_error_log to the fhc_helper
...
- Added method checkAvailability to model Reihungstest_model
- Added method checkAvailability to library ReihungstestLib
- Added a validation for the test in the method insertPersonReihungstest
of the library ReihungstestLib
2017-05-05 11:06:35 +02:00
bc4ff5c8e9
6th release
2017-05-04 15:09:06 +02:00
dcedac9617
6th release
2017-05-04 15:08:39 +02:00
0456c2c059
5th release
2017-05-02 18:55:54 +02:00
a6a6592db0
4th release
2017-04-28 17:17:31 +02:00
07dc2e8bc0
Funktionsbezeichnung in News xml eingefuegt
...
Anzeige der Bezeichnung im CIS-Pinboard bei Assistenz
2017-04-28 12:22:33 +02:00
d396958322
BugFix Studierendensuche im FAS
2017-04-28 12:03:56 +02:00
c910000a9a
Erweiterte Filter Benutzerberechtigung
2017-04-28 12:03:20 +02:00
c47dfef9bc
New function generateSpecialCharacterString
2017-04-28 11:59:50 +02:00
7ca5e3bde5
Diplomasupplement mit Bundesadler
2017-04-28 10:26:07 +02:00
0fd34807ca
3rd release
2017-04-27 19:06:36 +02:00
b3c03aaa76
Leervorlage für Studienblatt für Spezialstudiengänge
2017-04-27 11:27:15 +02:00
870f088549
Added Permission Logging in Debug Mode
2017-04-27 09:01:52 +02:00
61a0a51bfa
Spalte für PersKZ auf Fotoliste vergrößert für STG mit längerer Kennzahl
2017-04-26 15:48:20 +02:00
e936c76556
- Wenn mehrere Moodle Kurse zu einer LV vorhanden sind, werden die Kurse zu denen der eingeloggte User zugeteilt ist getrennt dargestellt um leichter erkennen zu können welche die eigenen Kurse sind
...
- Wenn die Moodle Verbindung nicht klappt wird nun stattdessen die Kurs ID als Linkname angezeigt da sonst der Link nicht sichtbar ist
2017-04-25 15:56:20 +02:00
4b315aec07
Fehler behoben wodurch im Tempus keine Details zu Reservierungen angezeigt werden konnten wenn Sonderzeichen im Titel der Reservierung vorkommen
2017-04-25 15:18:53 +02:00
dbff27b6b9
Messages Karteireiter angepasst damit die Vorschau neben der Liste ist. Formatiermöglichkeit entfernt
2017-04-25 15:11:55 +02:00
0f1f568a6e
Matrikelnummer im xls-export (FAS)
2017-04-23 23:29:03 +02:00
ebd892e333
2nd release
2017-04-21 19:03:20 +02:00
7dd20eee2f
Lehrgangsgebühr zur OEH Beitragsliste hinzugefügt
2017-04-21 08:35:29 +02:00
11d3d7d7c0
1st release
2017-04-20 18:28:20 +02:00
3a82b36715
Bugfix für GS Absolventen die im Vorsemester Absolviert haben
2017-04-19 14:32:23 +02:00
0d348512d7
Bei Absolventen von Gemeinsamen Studien wird das Sponsionsdatum nicht geprüft
2017-04-19 11:32:55 +02:00
e5d483caba
Bugfix: relationmessage_id was missing in case of reply
2017-04-11 12:23:00 +02:00
de0ed58ba6
- Removed method index, inbox, view and outbox from controller
...
system/Messages
- Removed views messageReply, messageView, messages, messagesInbox and
messagesOutbox
- Removed menu item "Nachrichten" from VileSci->Admin
- Controller system/Messages: method write also works for replying to a
message
- View system/messageWrite also worki for replying to a message
- Updated content/messages.js.php to call the system/Messages controller
with the new parameters
2017-04-11 12:03:15 +02:00
7d4486d34a
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-04-06 16:02:26 +02:00
6e44dd67c8
Benutzerberechtigung.class neue Funktionen
...
- getBenutzerFromBerechtigung: Laedt die Benutzer zu einer Berechtigung.
- getBenutzerFromRolle: Laedt die Benutzer zu einer Rolle.
2017-04-06 15:58:16 +02:00
511abeb362
BugFix LEFT JOIN diplomasupplement.xml
...
Textkorrktur Ausbildungsvertrag
Textkorrektur Reihungstestverwaltung
2017-04-06 15:55:52 +02:00
ff5bf6138d
Phrasen DMS-Link
...
DOC-Block corrected
2017-04-06 15:53:32 +02:00
a092e1e358
FAS-Studierendensuche erweitert
...
- Findet nun auch Namen mit Sonderzeichen, egal wie sie in der Suche
geschrieben werden
- DropDown-Auswahl für Suchkriterien
- Neues Suchkriterium #email: Sucht nach Mailadressen
- Neues Suchkriterium #name: Sucht nach exakter Namensübereinstimmung
- Neues Suchkriterium #pid: Sucht nach Person ID
- Neues Suchkriterium #preid: Sucht nach Prestudent ID
- Neues Suchkriterium #tel: Sucht nach Telefonnummern
Kontakt.class.php: Neue Funktion searchKontakt
2017-04-06 15:51:44 +02:00
811f5d395d
- Escaped all the parameters concatenated to a query
...
- Added parameter titel to Studiengang2->getAppliedStudiengang
- Added parameter titel to Studiengang_model->getAppliedStudiengang
2017-04-06 11:13:16 +02:00
a2d2296f33
- Added method addGroupBy to DB_Model
...
- Changed the query present in method getPrestudentMultiAssign of Prestudent_model
2017-04-05 16:58:23 +02:00
4806b4f0e4
Zeugnisse, Zertifikate, Diplomasupplement, etc liefern jetzt die direkt eingetragenen SWS der LV zusätzlich zu den SWS die aus den Semesterstunden berechnet werden.
...
Die berechneten SWS sollten in Zukunft nicht mehr verwendet werden
2017-04-05 11:31:22 +02:00
996b6d2464
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-04-04 18:33:47 +02:00
4984b69366
- DB_Model: workaround for CI_DB_driver->_list_columns (if there are two
...
tables with the same name in two different schemas, it returns a list of
fields from the two tables)
- DB_Model: changed loadTree to use the new method _list_columns
- DB_Model: added the method getSchemaAndTable
- Updated Studiengang_model to specify the schema when using the
loadTree method
- Studiengang_model: removed the titel parameter from method getAppliedStudiengang
- Studiengang2 controller removed the titel parameter from method getAppliedStudiengang
2017-04-04 18:27:31 +02:00
262e3eaab3
Cleanup
2017-04-04 17:05:47 +02:00
fb059e98bb
Englischen Beschreibungstext für Parneruniversitäten angepasst
2017-04-04 11:33:08 +02:00
70a1b16bd8
Introduced sender-alias for system-mail-sender
2017-04-04 11:19:46 +02:00
7594cf82a0
Infotext für Partnerhochschulen angepasst
2017-04-04 09:38:55 +02:00
a99cf431fb
Datum der geplanten Nachreichung von Dokumenten kann im FAS als Spalte bei den Dokumenten eingeblendet werden
2017-04-03 13:21:18 +02:00
5e4c078841
Changelog aktualisiert
2017-03-31 17:47:20 +02:00
6655c190ae
Berechtigungsprüfung prüft jetzt zusätzlich ob der Benutzer aktiv ist
2017-03-31 17:44:34 +02:00
8e9c10a5bc
FAS->messages tab:
...
- get all the messages (sent and received)
- status column visible by default
2017-03-31 16:03:23 +02:00
d9781e99c8
Comments correction
2017-03-31 10:53:27 +02:00
5df981d32c
Bugfix: if there are more statuses for a message, it's showed the last
...
one
2017-03-30 18:27:44 +02:00
33c73e7c3c
FAS -> Messages tab -> Added column status to check the status of the
...
message (unread, read, ...)
2017-03-30 18:11:13 +02:00
559b1b4cdf
- ViewMessage: checks if the receiver is an employee or not. If an
...
employee then hides the reply link
- Added isEmployee method to MessageToken_model
2017-03-30 17:44:43 +02:00
d08de4b22b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
...
Also the data of the message sender are not taken anymore via
the Person_model, but via the MessageToken_model, to avoid that
the login will be prompted
2017-03-30 16:43:35 +02:00
a0eb6b0eba
- Added method setReadMessageStatusByToken to MessageToken_model
...
- Now the method toHTML of the controller ViewMessage is calling also
the method setReadMessageStatusByToken of model MessageToken_model
2017-03-30 16:27:14 +02:00
3ecb3907cf
MsgView styled, display Name of Sender
2017-03-30 13:56:51 +02:00
f25cfc3fb1
Message viewer by token updated with standard CSS
2017-03-29 18:45:32 +02:00
9dc9a712c4
- Moved file to manage vorlage into subdir vorlage
...
- Updated sprache, orgform, organisationseinheit and vorlage to the new
widget
- Changed method getRecursiveList of model Organisationseinheit_model
- Updated vilesci_menu_main.inc.php
- Changed method loadDropDownView of WidgetLib: if a selected value is
not given, by default it is set as HTML_DEFAULT_VALUE
- Updated all the affectd files
2017-03-29 16:57:29 +02:00
58734e9248
Cleanup and Remove Legacy Scripts
2017-03-29 10:54:42 +02:00
bc9e513e2d
Pruefungsanmeldung: add insertamum, display on Document
2017-03-29 02:53:38 +02:00
90e7969317
Cleanup and replace legacy Code
2017-03-28 11:31:58 +02:00
43c0a0bd30
Added Usage Comment
2017-03-28 11:31:04 +02:00
be4cab8230
PhrasesLib bugfix: getPhrases method now checks if the textile parser
...
has added the 'p' tags to the phrase before removing them
2017-03-28 11:18:40 +02:00
61317978ce
- Added class DropdownWidget
...
- Extended functionalities to Widget class
- Only one view for the dropdown html element
- Updated system/aufnahme/prestudentMultiAssign.php
- Updated affected widgets
2017-03-27 17:23:20 +02:00
7bcaccee84
Reservierungen im CIS sind nicht mehr möglich wenn die Stunde bereits in tbl_stundenplandev belegt ist
2017-03-27 16:38:19 +02:00
46829c366b
Code Cleanup
2017-03-27 15:24:56 +02:00
ee827983b0
Fixed widgets to show if data are not present
2017-03-27 10:48:12 +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
1f65f7737c
- Splitted Usersfilters_widget in:
...
- Aufnahmegruppe_widget
- Reihungstest_widget
- Studiengang_widget
- Studiensemester_widget
- Stufe_widget
- Renamed /system/Users controller to system/aufnahme/PrestudentMultiAssign
- Added method getPrestudentMultiAssign to Prestudent_model
- Changed WidgetLib to allow to set the name and the id html attributes
of a widget
2017-03-24 16:39:50 +01:00
60ff6d145d
- Lehrgangsteilnehmer werden nun im OEH Waehlerverzeichnis geführt
...
- Temporär wird zusätzlich auf die Lehrgangsgebühr geprüft da diese derzeit den ÖH Beitrag inkludiert
2017-03-24 12:17:25 +01:00
2711430eb9
- Renamed TemplateLib to WidgetLib
...
- Updated controllers and views to use WidgetLib
- Removed TempleteLib from autoload config file
- Removed loading of session library from FHC_Controller (already
present in the autoload configuration file)
2017-03-23 12:25:58 +01:00
2c4595005b
DB_Model->_isEntitled: now if the user is not entitled to perform an
...
operation the query is reset
2017-03-23 11:51:18 +01:00
e7db3a45ca
Fehlende DEFAULT_LANGUAGE in Default Config hinzugefügt
2017-03-23 07:56:43 +01:00
50f7531fa6
system/Users: saving stufe and gruppe via ajax
2017-03-22 17:21:10 +01:00
4fea6b1149
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-03-22 16:01:31 +01:00
cbb05c7228
Fehlende englischphrasen lehre.php
2017-03-22 15:58:17 +01:00
1bb2937bf4
Reihungstestverwaltung BugFix
...
- BugFix Fehlermeldung wenn Ergebnisspalte ausgeblendet
2017-03-22 15:57:06 +01:00
8a9b41f425
Set the subject from the vorlage
2017-03-22 15:46:54 +01:00
d4225b715b
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-03-22 14:16:45 +01:00
70ba8cabed
- system/Users: better GUI
...
- added new css and js to templates/header
2017-03-22 14:16:08 +01:00
9f9477e543
Minimale Treehöhe bei Abschlussprüfungen gesetzt
2017-03-22 13:43:34 +01:00
2fc38f7eb0
Übersetzung aktualisiert
2017-03-22 13:25:19 +01:00
d9afd486ce
Wenn Benotung deaktiviert ist, dann wird der Gesamtnote Menüpunkt im CIS deaktiviert
2017-03-22 13:21:36 +01:00
09637ce159
/system/Messages/write: better GUI
2017-03-22 11:28:19 +01:00
6977f9c09d
Fourth VileSci interface that allows easily to add more prestudent
...
to a group or change their stufe
2017-03-22 10:11:11 +01:00
1615470a8f
Third version of the VileSci interface that allows easily to add more prestudent
...
to a group or change their stufe
2017-03-21 18:29:25 +01:00
8d50b16413
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-03-21 17:36:27 +01:00
8e0009573f
FAS Prestudenten löschen
...
Wenn der letzte PreStudentStatus-Eintrag gelöscht wird, wird der ganze
Prestudent-Datensatz geloescht (nach vorherigen Hinweis) und ins Log
geschrieben (Außer, es hängen noch Verknüpfungen in der DB dran)
2017-03-21 17:29:22 +01:00
b0a7a660eb
Reihungstestverwaltung löschen von Terminen
...
Mit dem Recht "lehre/reihungstest" mit "suid" können Reihungstesttermine
gelöscht werden, wenn keine Person-, Studienplan- oder Raumzuteilungen
vorhanden sind.
2017-03-21 17:19:33 +01:00
efedcf3883
Testtool und Testtool Administration
...
- Mehrsprachige Gebietsbezeichnung wird richtig im Menü angezeigt
- Löschen von Bildern und Audiofiles bei Fragen
- In der Ablauf-Verwaltung können nun auch die Sprache, Sprachwahl und
die Content-ID gepflegt werden
2017-03-21 17:07:15 +01:00
88d9f3ae1c
Rechteprüfung Anwesenheitsliste
...
Wenn eine Person das Recht "lehre" auf die OE der LV besitzt, darf die
Anwesenheitsliste auch erstellt werden.
2017-03-21 16:54:54 +01:00
b76279ea0b
Neue ODT-Vorlagen Prüfungsprotokolle
2017-03-21 16:51:26 +01:00
a709301a56
Neues Attribut Final bei Projektarbeiten. Dieses definiert die letztgültige Projektarbeit die auch auf den Prüfungsprotokollen angedruckt werden soll. (Falls merere Semester zum fertigstellen der Arbeit benötigt wurden)
2017-03-21 08:27:40 +01:00
780aeb8711
Fehler beim Zusammenlegen von Firmen behoben
2017-03-20 18:35:46 +01:00
7b49930af9
Leere Vorlagen für Inskriptionsbestätigung und Studienerfolg zur Deaktivierung für einzelne Studiengänge
2017-03-20 14:04:05 +01:00
2cb5e3757d
load_lva akzeptiert nun auch optionalen Studiengang
2017-03-20 12:06:31 +01:00
b8830667cd
Second version of the VileSci interface that allows easily to add more prestudent
...
to a group or change their stufe
2017-03-17 17:31:52 +01:00
eb46a7534b
Cleanup CI Header Template
2017-03-17 16:18:46 +01:00
7f4ba23f6c
Fixed CIS Rendering Bug in IE11
2017-03-17 13:44:51 +01:00
e4151e0905
First version of the VileSci interface that allows easily to add more prestudent
...
to a group or change their stufe
2017-03-17 11:54:02 +01:00
25441df044
Erstellen der Lektorenverteiler angepasst damit diese richtig erstellt werden wenn die Postgresql Option "standard_conforming_strings=off" gesetzt ist
2017-03-15 17:35:10 +01:00
3fc7554941
Fehler beim Erstellen der Lektorenverteiler behoben
2017-03-15 14:33:57 +01:00
eedc2674ab
Der Upload von Abgaben wird nun verhindert wenn das Formular vor Ablauf der Frist geöffnet wird jedoch erst nach Ablauf der Frist abgeschickt wird
2017-03-14 20:28:43 +01:00
17be7f0dc8
- Warning beim Editieren von Projektarbeitsterminen behoben
...
- Debug Ausgaben entfernt
2017-03-14 17:52:50 +01:00
7e3bf14daa
Fehler bei der Übernahme der Reihungstestpunkte ist FAS behoben
2017-03-14 14:47:03 +01:00
129eeb69a8
- Changes in view vw_msg_vars: added orgform, typ and switched anrede
...
- Before sending a message it checks if the subject and the body are
present
2017-03-13 17:42:24 +01:00
14aab3dd56
- Vorlage widget now add an empty element to the beginning of the drop
...
down box
- Bugfix message write controller:
- JS function getVorlageText was missing
- Wrong URL in form action
2017-03-13 16:39:38 +01:00
39d63d287a
Berechtigungsabfrage korrigiert
2017-03-13 08:44:13 +01:00
309c0909f4
SQL Fehler in der Firmensuche im Vilesci behoben
2017-03-13 08:21:07 +01:00
261df66d7b
Reihungstestlogin zeigt nur noch Personen an die Statuseinträge mit Studiensemesterbeginn nach dem Reihungstestdatum haben damit keine doppelten Personen mit unterschiedlichen PrestudentIDs angzeigt werden wenn diese bereits einen Reihungstest in vorherigen Semestern besucht haben.
2017-03-10 16:35:58 +01:00
1d32a44fcf
Performance Verbesserung beim Suchen von Projektbetreuern/Prüfern
2017-03-09 14:20:06 +01:00
34d7ce20ea
Studienordnung Verwaltung: Bei Auswahl des Akademischen Grad wird zusätzlich zur Kurzbezeichnung der Titel angezeigt
2017-03-09 14:05:33 +01:00
599e57dd4f
User story #893 : Set correct link from FAS
2017-03-08 18:26:50 +01:00
faed608435
- Gesamtpunkte berechnen bei Aufnahmeterminen summiert nur noch die Punkte des Studiengangs des Prestudenten
...
- Gesamtpunkte berechnen bei Aufnahmeterminen zieht nur die Reihungstests des jüngsten Studiensemesters der zugeordneten Reihungstests zur Berechnung der Gesamtpunkte mit ein
2017-03-08 17:51:07 +01:00
c8fa540840
- Punkteübernahme aus Vilesci setzt automatisch das Hackerl "zum Reihungstest angetreten"
...
- Bugfix wodurch Reihungstest als nicht absolviert angezeigt wurde wenn die Person genau 0 Punkte erreicht hat beim Test
2017-03-08 16:53:32 +01:00
8872d1915a
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2017-03-08 15:07:26 +01:00
9a8121e74e
Wenn index_login.php unverschlüsselt aufgerufen wird und der APP_ROOT auf https gesetzt ist, dann wird auf HTTPS umgeleitet damit ein sicherer Login erfolgt
2017-03-08 15:06:23 +01:00
b14b1d6eec
Bugfix: get the organisation unit from DB
2017-03-08 14:24:23 +01:00
b4337f538e
Bewerberstatistik an neue Reihungstestanmeldung angepasst
2017-03-08 13:31:29 +01:00
6c9d649ebb
phpci fix
2017-03-06 17:13:22 +01:00
3415b0833c
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-03-06 14:49:59 +01:00
f7e0898cf4
Migration scripts updated and fixed
2017-03-06 14:49:30 +01:00
ee56570913
Vertragsermittlung angepasst für Verträge die vor Semesterstart erstellt werden
2017-03-06 14:26:02 +01:00
3183936715
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-03-06 14:02:31 +01:00
b6ee7d97e6
View public.vw_msg_vars
2017-03-06 14:01:58 +01:00
ca2fe59e9c
fixed method to get all available reihungstests lower than the specified
...
rt_stufe
2017-03-06 11:16:10 +01:00
a5ee17a6ae
- Studiengang wird bei Aufnahmeterminen fix angezeigt
...
- Breite des Reihungstest DropDown fixiert
2017-03-03 16:11:15 +01:00
d9db422d40
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-03-03 11:33:18 +01:00
8a26b44e23
Testtool Redesign
2017-03-03 11:33:02 +01:00
3862e94bc2
Zutrittskarte.php ermitteln der OE-Vorlage
2017-03-03 11:01:01 +01:00
fde026dd98
Funktion getAkadgradStudent ORDER BY geschlecht
2017-03-03 11:00:15 +01:00
e7be37708d
- Bug fix in MessageLib
...
- Now is possible to send a message to more recipients from FAS
- Can be used the variables substitution from FAS
2017-03-02 15:47:17 +01:00
d8bb1ae500
Bugfix für Anwesenheitsliste mit Bildern
2017-03-02 11:34:23 +01:00
1390888d94
cis/private/pdfexport
...
Ermitteln der Vorlage durch übergebene stg_kz, UID oder prestudent_id
2017-03-02 11:21:31 +01:00
f2d7e89b76
Anwesenheitsliste Bilder neues Logo
...
- Addslashes zu db_add_param
2017-03-02 11:15:26 +01:00
0169ad91b3
Filter "Interessenten"->"Reihungstest angemeldet" prüft ob jetzt zusätzlich das Studiensemester
2017-03-01 18:12:13 +01:00
586acf790e
- Tippfehler in Funktionsnamen behoben
...
- Nicht mehr verwendetes RDF entfernt
2017-03-01 18:07:53 +01:00
75b8ae7288
Aliqoute Reduktion an neue Reihungstestpunkte angepasst
2017-03-01 18:00:50 +01:00
b37753bbe6
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2017-03-01 16:17:42 +01:00
0048d458b1
Fehlerhafte HTTP Header korrigiert damit FAS mit Apache 2.4.10-10+deb8u8 funktioniert
2017-03-01 16:15:49 +01:00
1c8a5bc836
- Removed message_model_old.php
...
- Bug fix in MessageLib
- Now is possible to send a message to more recipients from FAS
- Can be used the variables substitution from FAS
2017-03-01 16:12:56 +01:00
db5ea6a3a0
AusbVertrag Lehrgänge prüfung auf benötigte Daten
2017-03-01 15:43:52 +01:00
ae9557fb25
Im Profil wird das Personenkennzeichen bei Dummy Studiengängen (stgkz > 10000) nicht mehr angezeigt da es sich hierbei um kein offizielles Perskz handelt
2017-03-01 15:12:36 +01:00
c3d2ca0cf0
AusbVertrag Lehrgänge BugFix AkadGrad
2017-03-01 14:44:23 +01:00
a4ff144329
Kartenverwaltung.php
...
Filer für Spezialfälle
2017-02-27 18:16:22 +01:00
9d2af0629b
Tabellen der Ersthelfer werden nur angezeigt, wenn Daten vorhanden sind
...
Tabellen der Ersthelfer werden nur angezeigt, wenn Daten vorhanden sind
2017-02-27 17:29:55 +01:00
c8b4f56b40
Corrected Addon Template Install permissions
2017-02-27 16:44:45 +01:00
56d590d2ad
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2017-02-27 13:32:47 +01:00
8578ee8ace
Reihungstests:
...
- Punkteingabe bei Gesamtpunkte und RTPunkte mit , möglich statt mit .
- Punkteübernahme rundet die Punkte auf 2 Nachkommastellen
Prüfung:
- Punkteeingabe mit , statt . möglich
2017-02-27 13:31:36 +01:00
04038a09a6
Additional Funcion for Bewerbertool-Notiz: Ausbildung
2017-02-26 17:57:38 +01:00
4a4e79b295
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2017-02-24 17:25:29 +01:00
72f4a22c9a
Reihungstest.class.php
...
Neue Funktion getOrteByUid liefert die Raeume mit den Aufsichtspersonen
2017-02-24 17:25:20 +01:00
4f410dc57a
Reihungstestverwaltung.php
...
- Javascript pruefung ob localStorage unterstützt wird.
- BugFix Seamonkey 1.1.19
2017-02-24 17:24:44 +01:00
9aa5da7604
Ueberarbeitung div. XSL-Vorlagen FHTW
2017-02-24 17:20:05 +01:00
3eabc72e27
OrderBy Param in Function load_persKontakttyp
2017-02-24 17:19:03 +01:00
2ca83fa260
BugFix Incoming Platform und partnerhochschulen.php
...
- Studiensemester wird nun stsemAktOrNext geladen
- partnerhochschulen.php lädt nur aktive
2017-02-24 17:17:46 +01:00
1896704cdf
Reihungstestdropdown wird jetzt korrekt refresht beim Editieren von Einträgen
2017-02-24 15:39:39 +01:00
b702fad024
- Spinner beim Refresh der Reihungstestliste hinzugefügt da es vorkommen kann dass die aktualisierung etwas länger dauert
...
- Studiensemester und Stufe wird in Reihungstestliste mit angezeigt
2017-02-24 14:52:18 +01:00
63b7da3d53
Problem bei der Punkteübernahme behoben
2017-02-24 13:01:21 +01:00
125bfb7d50
Fehler beim Speichern von Reihungstests behoben: Beim editieren von alten Reihungstests wurde das Studiensemester mit dem aktuellen Semester überschrieben.
2017-02-24 08:33:30 +01:00
a52bdda0d0
- Punkteeingabe bei Noten im FAS ist jetzt auch mit , möglich
...
- Lesbare Fehlermeldung beim Speichern von ungültigen Punkten
2017-02-24 07:58:25 +01:00
63f3a05739
Studiensemester, Stufe und Datum werden jetzt bei Aufnahemterminen angezeigt und nach Datum und Stufe sortiert
2017-02-23 19:02:17 +01:00
faf368de46
Statusgrund wird im Statustree als Spalte angezeigt
2017-02-23 18:49:48 +01:00
e100fde3a9
fixed Typo
2017-02-22 18:34:46 +01:00
8e32a41fc6
Changelog erweitert
2017-02-22 18:32:18 +01:00
3c8e815e5a
- Anmerkung bei Adressen im FAS auf Name geändert damit dies mit der DB konform ist
...
- Anmerkung zu Adressen hinzugefügt
- Attribut Rechnungsadresse zu Adressen hinzugefügt
2017-02-22 18:25:07 +01:00
0155d21574
Berechtigungen für Web User für testtool.tbl_gebiet erteilt damit Gebiete erstellt werden können
2017-02-22 14:51:18 +01:00
4cb1f3ffa0
Fixed Typo
2017-02-22 14:39:48 +01:00
3eb1af18d2
Dateinamen beim Download der Anwesenheitsliste enthaelt jetzt Studiengang, Semester, Kuerzel und Lektor
2017-02-22 14:32:14 +01:00
082a981da7
Problem behoben wodurch keine neuen Fragen gespeichert werden konnten
2017-02-21 10:09:20 +01:00
7ec316ca30
- Problem beim Wechseln der Sprache behoben
...
- StudienplanID bei Ablauf nicht verpflichtend
2017-02-21 09:51:57 +01:00
5ddf21aaae
- Fehler behoben beim manuellen hinzufügen von Statuseinträgen der dazu führen konnte das eine Fehlermeldung angezeigt wurde wenn der Studierende Studenteneinträge in nachfolgenden Semestern hat.
...
- Studentlehrverband Einträge beim manuellen hinzufügen von Statuseinträgen werden nicht mehr bei allen Statuseinträgen angelegt sondern nur noch bei Student, Diplomand, etc und nicht bei Interessent, Bewerber...
2017-02-20 17:19:23 +01:00
fcbb2e39d4
Cleanup
2017-02-20 16:46:04 +01:00
5f2cb0cda6
Wenn ein Status gelöscht wird, dann wird der Studentlehrverband-Eintrag nur entfernt wenn im selben Studiensemester kein anderer Status vorhanden ist da sonst die Studierenden im FAS nicht mehr sichtbar sind
2017-02-20 16:06:20 +01:00
34b20f70fb
Fehlermeldung angepasst beim Erstellen des Studienblattes wenn die Person im gewählten Studiensemester keinen Status hat. Bisher wurde die Meldung angezeigt dass kein Studienplan eingetragen ist wenn der Status nicht vorhanden war
2017-02-20 15:45:14 +01:00
862ee62dbc
Wenn Personen zu Studierenden gemacht werden, wird ab sofort die Organisationsform des Aufgenommenen übernommen anstatt des Bewerber-Status wenn diese unterschiedlich sind.
2017-02-20 15:34:52 +01:00
327cbd130a
- Beim ändern des Passwortes muss sich das neue Passwort vom alten unterscheiden
...
- Wenn das Passwort länger als ein Jahr nicht geändert wurde, kann jetzt automatisch nach dem CIS Login auf die Passwort-Ändern-Seite umgeleitet werden
2017-02-20 13:39:36 +01:00
286bf4f0cc
Statusgründe können im FAS beim Statuswechsel angegeben werden
2017-02-17 16:38:47 +01:00
d25829fe18
Method getAvailableReihungstestByPersonId of model Studiengang now is
...
working with the groups
2017-02-17 15:23:55 +01:00
e6f3e5cb59
Beim manuellen anlegen von neuen Status einträgen wird der Statusgrund abhängig vom gewählten Status geladen
2017-02-16 10:59:26 +01:00
91eadd4d53
fixed bug; loading existing registrations for exams are now loaded for
...
all semester and not only for the current one
2017-02-16 09:18:59 +01:00
bf677f717e
Added method addForm to DB_Model
2017-02-15 12:50:50 +01:00
57520c1ae4
- Versionsnummer korrigert
...
- Neues DB Update File erstellt
- Statusgrund bei Prestudentstatus hinzugefügt
- Editieren des Statusgrund im FAS hinzugefügt
2017-02-14 18:58:47 +01:00
80479f1d0b
Beim Statuswechsel von Interessent zu Bewerber wird nun nicht mehr geprüft ob ein Reihungstesttermin zugeordnet ist sonder nur noch ob das Reihungstestverfahren abgeschlossen wurde.
...
(Weil es "Studiengänge" gibt die keine Reihungstests haben)
2017-02-14 14:19:43 +01:00
27b1921820
Fixed intentation
2017-02-14 11:03:26 +01:00
d63c8ac8da
Removed warning if no statistics are present
2017-02-14 08:19:41 +01:00
a16b1a7fa8
Allow DBTools only from CLI
2017-02-13 11:48:15 +01:00
c70920ef42
Warning behoben wenn Studienplan keine Sprache eingetragen hat
2017-02-10 15:55:32 +01:00
Johann Hoffmann