Andreas Österreicher
|
07194cfaff
|
- Index für lehre.tbl_anrechnungen hinzugefügt um Ladezeiten zu verbessern
- Bugfix fuer Detailseite der Lehrenden
|
2025-01-30 14:54:16 +01:00 |
|
Cristina
|
3eb1f7b06b
|
Added array 'display_infobox' to config file anrechnung.php and adapted code to display only if set to true
|
2025-01-30 12:08:28 +01:00 |
|
Harald Bamberger
|
e068abd124
|
rename functions since they manipulate data for using it in a chart
|
2025-01-28 18:35:25 +01:00 |
|
Harald Bamberger
|
d7cbe475bf
|
Merge branch 'master' into feature-5534/Gehaltsgraph_Valorisierung
|
2025-01-28 17:39:19 +01:00 |
|
Harald Bamberger
|
6a2a4c22b3
|
Merge branch 'master' into feature-53903/PV21_Valorisierungs_akutelle_Liste_ausgeben_ohne_Valorisierungskonfiguration
|
2025-01-28 16:14:39 +01:00 |
|
Harald Bamberger
|
4258e60b8b
|
Merge branch 'master' into feature-18073/No-Reply-for-Sanchomails
|
2025-01-28 13:03:53 +01:00 |
|
Harald Bamberger
|
7f6744047f
|
check in ci mail config if constants in global config are defined
|
2025-01-28 11:26:01 +01:00 |
|
Harald Bamberger
|
39c2e44719
|
sancho default sender konfigurierbar machen
|
2025-01-28 10:22:30 +01:00 |
|
Harald Bamberger
|
c5d79f750e
|
add parameter withvalorisationhistory to use valorisation history or not
|
2025-01-23 15:31:17 +01:00 |
|
Harald Bamberger
|
af79090de0
|
modify to consider valorisation history, TODO cleanup valorisation tables dependency on FHC-Core-Personalverwaltung Extension
|
2025-01-22 17:18:22 +01:00 |
|
Harald Bamberger
|
8ce4b452ec
|
use encryption parameters in lamda function and return replacement string
|
2025-01-22 17:16:47 +01:00 |
|
Harald Bamberger
|
4c46a5f5c7
|
modify regex to match optional table alias and ignore column alias equal to column name
|
2025-01-22 15:09:20 +01:00 |
|
Harald Bamberger
|
d9532d7607
|
Merge branch 'master' into feature-54841/DVs_Abhaengigkeit_zu_SAP_Extension_beseitigen
|
2025-01-21 13:40:26 +01:00 |
|
Werner Masik
|
1853e44cf3
|
add valorized data for chart display
|
2025-01-21 12:58:09 +01:00 |
|
Alexei Karpenko
|
e65322965f
|
sancho mail: added config for haeder/footer image path, renamed custom mail config entries to sancho mail config entries, images are always attached inline (when using Code Igniter)
|
2025-01-20 16:24:56 +01:00 |
|
Harald Bamberger
|
899c36c52c
|
default sancho image comes from global config now
|
2025-01-20 15:10:52 +01:00 |
|
Harald Bamberger
|
71d1a808f8
|
Merge branch 'master' into feature-18073/No-Reply-for-Sanchomails
|
2025-01-20 13:36:17 +01:00 |
|
Alexei Karpenko
|
ece4f4a8b5
|
sancho mails: enabled removing of header/footer and custom header/footer images in code igniter code, legacy code: global ids for images are created only if config is set
|
2025-01-15 16:52:11 +01:00 |
|
Harald Bamberger
|
0770ec2bd8
|
Merge branch 'master' into feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen
|
2025-01-15 09:03:41 +01:00 |
|
Andreas Österreicher
|
a802e67faf
|
Merge branch 'pep_deploy'
|
2024-12-16 13:57:15 +01:00 |
|
Harald Bamberger
|
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 |
|
ma0048
|
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 |
|
Harald Bamberger
|
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 |
|
SimonGschnell
|
a3840d4c77
|
update(Searchbar/Student):shows dummy image if the student has foto_spere true
|
2024-12-13 10:47:34 +01:00 |
|
SimonGschnell
|
9a1777d1aa
|
fix(_student searchfunction):fixes the sql logic for non active students
|
2024-12-12 15:35:56 +01:00 |
|
Harald Bamberger
|
80222b7186
|
Merge branch 'master' into feature-25999/SearchbarStudent
|
2024-12-12 14:55:41 +01:00 |
|
Harald Bamberger
|
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 |
|
SimonGschnell
|
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 |
|
SimonGschnell
|
85d59f18be
|
refactor(searchbar/Student): studiengang/verband/email are queried for the display in the searchbar component
|
2024-12-11 15:30:41 +01:00 |
|
ma0048
|
8127091e2e
|
- tags werden im fas nicht angezeigt
- class für tags hinzugefuegt
- prop confirmLimit hinzugefuegt
|
2024-12-11 13:25:38 +01:00 |
|
SimonGschnell
|
a357001648
|
feature(Searchbar/StudentenSuche): adds student to the searchbar options and adds shadow to the searchbar
|
2024-12-11 12:34:58 +01:00 |
|
Harald Bamberger
|
bfc6e86f05
|
Merge branch 'master' into feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen
|
2024-12-11 11:54:23 +01:00 |
|
Harald Bamberger
|
3c8bb37a36
|
Merge branch 'master' into feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen
|
2024-12-11 11:52:50 +01:00 |
|
Andreas Österreicher
|
034e1397e8
|
Merge branch 'feature-52814/infocenter_infocentermitarbeiter_spalte_beim_loeschen_des_dokuments'
|
2024-12-11 08:36:27 +01:00 |
|
Alexei Karpenko
|
cc99d2b378
|
Gruppenmanagement: added checks so only Gruppenmanager can edit groups
|
2024-12-10 12:03:58 +01:00 |
|
Alexei Karpenko
|
ce2d69fc82
|
Vertragsbestandteil Model: check if sap sync table present before executing select for sap organisationseinheit
|
2024-12-06 13:05:35 +01:00 |
|
Harald Bamberger
|
1b445005af
|
remove addMeta debug info
|
2024-12-04 09:28:59 +01:00 |
|
Harald Bamberger
|
d30ba24d2f
|
add config cis_send_profil_update_mails, use it in profil update controllers
|
2024-12-04 09:15:44 +01:00 |
|
Harald Bamberger
|
6f69046b71
|
use regex with word boundaries to be more specific when replacing
|
2024-12-03 13:44:24 +01:00 |
|
ma0048
|
19b56ff252
|
- tags
- phrases
- stundensatzbydatum
- filter nur count
|
2024-12-03 12:36:54 +01:00 |
|
Johann Hoffmann
|
1ca0f35d29
|
news widget template carousel with menu update;
|
2024-11-29 15:24:33 +01:00 |
|
Johann Hoffmann
|
1346466f79
|
Merge branch 'master' into feature-25999/C4_anwesenheiten_widget
|
2024-11-28 10:43:57 +01:00 |
|
Johann Hoffmann
|
beb40cfcc9
|
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_anwesenheiten_widget
|
2024-11-28 10:22:57 +01:00 |
|
Johann Hoffmann
|
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 |
|
Andreas Österreicher
|
fd91a4cb85
|
Merge branch 'master' into feature-8482/Pruefungsprotokoll_zur_Einsicht_exportieren
|
2024-11-27 13:44:24 +01:00 |
|
SimonGschnell
|
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 |
|
SimonGschnell
|
8983af4aef
|
refactor(Stundenplan_model/getStundenplanQuery):removes wrong comments
|
2024-11-25 19:59:39 +01:00 |
|
Harald Bamberger
|
290da9f2c0
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-11-25 17:09:53 +01:00 |
|
Harald Bamberger
|
766bec887a
|
check if constant CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN is defined
|
2024-11-25 16:29:41 +01:00 |
|
SimonGschnell
|
90bdb68175
|
fix(Stundenplan_model/getStundenplanQuery):changes how the OR sql statments are added to the query
|
2024-11-25 15:24:36 +01:00 |
|