ma0048
ab20943493
- filter aus dem defaultfilter entfernt
...
- tagfilter hinzugefuegt
- clear filter hinzugefuegt
- persistence default auf false gesetzt
2025-02-24 08:58:35 +01:00
ma0048
df685133b5
- date filter
2025-02-11 08:58:00 +01:00
Andreas Österreicher
40d2a657c6
Merge branch 'feature-28394/zeiterfassung_50_tage_ansicht_als_vorgesetzter_fuer_mitarbeiter'
2025-02-05 14:07:44 +01:00
Andreas Österreicher
a1841a0071
Merge branch 'Monika70-AnzahlStudenten'
2025-02-04 17:05:17 +01:00
Andreas Österreicher
1436d12a53
Added Default Config NICHT_ZUGELASSENE
2025-02-04 17:03:19 +01:00
Andreas Österreicher
b177420cb1
Merge branch 'AnzahlStudenten' of https://github.com/Monika70/FHC-Core into Monika70-AnzahlStudenten
2025-02-04 16:56:44 +01:00
Andreas Österreicher
faeb0fbf4b
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2025-02-04 16:48:27 +01:00
Andreas Österreicher
749c147f8e
Phrase für Unruly angepasst
2025-02-04 16:48:01 +01:00
ma0048
c56c71a508
- fixed bug
2025-02-04 12:05:15 +01:00
kindlm
0059bc11f3
Merge remote-tracking branch 'origin/master'
2025-02-03 10:42:06 +01:00
kindlm
fbd02e02f1
Rufzeichen bei Phrase entfernt
2025-02-03 10:41:41 +01:00
Andreas Österreicher
ecbc1c8d09
Merge branch 'sonstiges-55231/bfi-anrechnung-infobox-ausblenden'
2025-01-30 14:56:24 +01:00
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
Cristina
f2917b9ed7
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2025-01-30 10:23:56 +01:00
Szabo Mónika
51ba1d3fb9
Update lehrstunde.rdf.php
...
Studenten mit den in der vilesci.config.inc.php hinterlegten Noten sollten nicht zur AnzahlStudenten im Tempus gezählt werden.
Config Eintrag:
//Studierende mit diesen Noten werden von der AnzahlStudenten im Tempus abgezogen
define('NICHT_ZUGELASSENE',serialize(array(6, 20, NULL)));
2025-01-30 09:35:06 +01:00
Harald Bamberger
5b12e5eea7
Merge branch 'feature-5534/Gehaltsgraph_Valorisierung'
2025-01-28 18:37:18 +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
402691b5cd
Merge branch 'feature-53903/PV21_Valorisierungs_akutelle_Liste_ausgeben_ohne_Valorisierungskonfiguration'
2025-01-28 16:40:35 +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
Cristina
9a4211c980
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2025-01-28 13:58:14 +01:00
Harald Bamberger
4cd1bc3d63
Merge branch 'feature-18073/No-Reply-for-Sanchomails'
2025-01-28 13:05:53 +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
d6abfbbc23
fix typo
2025-01-23 16:33:03 +01:00
Harald Bamberger
87220e1789
move tbl_valorisierung_* to core since they are used in vertragsbestandteillib and gehaltsbestandteillib
2025-01-23 16:13:47 +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
781e2dbd15
Merge branch 'feature-54841/DVs_Abhaengigkeit_zu_SAP_Extension_beseitigen'
2025-01-21 14:29:05 +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
Andreas Österreicher
1489706027
Merge branch 'Monika70-Export'
2025-01-16 13:22:51 +01:00
Andreas Österreicher
103df5afe5
Merge branch 'Export' of https://github.com/Monika70/FHC-Core into Monika70-Export
2025-01-16 13:21:14 +01:00
Andreas Österreicher
ba2b41f63a
Merge branch 'feature-55289/pep_fine_tuning'
2025-01-16 13:12:26 +01:00
ma0048
f381ef229e
- index tbl_lehrveranstaltung_faktor_lvid hinzugefuegt
...
- sortierung gleichgezogen
2025-01-16 10:38:01 +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
Szabo Mónika
f1234c0b99
Update studentenexportextended.xls.php
...
Zusätzliche Spalte Person_id hinzufügen
2025-01-15 14:37:06 +01:00
Harald Bamberger
fd67974d55
fix typo
2025-01-15 13:35:58 +01:00
Harald Bamberger
a1a9e96bc0
permission basis/gehaelter
2025-01-15 13:34:16 +01:00
Andreas Österreicher
aab0f339ab
Merge branch 'feature-55316/international_skills_credits_entfernen_neue_massnahmen'
2025-01-15 13:06:04 +01:00
Harald Bamberger
d4bb06c4f6
Merge branch 'feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen'
2025-01-15 09:20:54 +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
Alexei Karpenko
13d86edcfc
sancho mails: added CUSTOM_MAIL_USE_IMAGES config for sending mails without header/footer, removed option to hide mail html
2025-01-14 17:24:40 +01:00