Commit Graph

337 Commits

Author SHA1 Message Date
1ebc41e40e ServerUtils -> Kein Merged Config, Sicherheit
TextJson bei ServerUtils
2025-11-28 14:54:24 +01:00
2832bb9c5e Merge branch 'master' into feature_rene_18_ai - kein kommentar...
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/BeWoApp.xaml.cs
#	BeWo/ServiceProxy/GeneratedAiEnhancedService.cs
#	BeWo/Services/BeWoControlFactory.cs
#	BeWo/Services/BeWoWindowFactory.cs
#	BeWo/Services/BeWoWindowService.cs
#	BeWo/Services/IControlFactory.cs
#	BeWo/Services/IWindowFactory.cs
#	BeWo/Services/IWindowService.cs
#	BeWo/View/BeWoFileView.xaml
#	BeWo/View/Detail/Report/AbwesenheitsView.xaml
#	BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
#	BeWo/app.config
#	BeWoAllReports.sln
#	BeWoPlanerMobil.sln
#	BeWoPlanerMobil/.vs/BeWoPlanerMobil.csproj.dtbcache.json
#	BeWoTests.sln
#	Dakota/DakotaUtils.cs
#	Dakota/Logic/DakotaInfoCreator.cs
#	Dakota/Models/DakotaFile.cs
#	Data/Access/GenericDAO.cs
#	Data/Access/SearchDAO.cs
#	Data/Data.csproj
#	Host/Web.config
#	Server/Components/ServerUtils/ApiFacade/WebClientFacade.cs
#	Service/BeWoServiceEnums.cs
#	Service/Core/ServiceHelper.cs
#	Service/Core/ServiceValidator.cs
#	Service/Extensions/ServiceEnumExtension.cs
#	Service/Service.csproj
#	Service/ServiceContracts/Enhanced/IAiEnhancedService.cs
#	Service/ServiceContracts/Enhanced/IOperationsEnhancedService.cs
#	Service/ServiceImplementations/EmployeeServiceImp.cs
#	Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
#	Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs
#	Service/ServiceProxy/OpenWebUIFacade.cs
#	Service/ServiceProxy/ServiceFacade.cs
#	Service/ServiceUtils/DistanceCalculator/GoogleDistanceMatrixAPI.cs
#	Shared/BeWoEntityEnums.cs
#	Shared/Core/AppError.cs
#	Shared/Core/Facade/WebClientFacade.cs
#	Shared/Core/WebClientFacade.cs
#	Shared/Shared.csproj
2025-11-28 12:07:35 +01:00
eb47416362 Aufteilung 2025-11-24 15:47:45 +01:00
e182a655ff Rechte aktiviert 2025-11-24 12:21:51 +01:00
4322adee8d Information sammeln (Zwischenstand) 2025-11-24 12:20:26 +01:00
789950987b Dakota -> Data Verweis entfernt 2025-11-07 14:54:55 +01:00
35bde88577 Änderungen - Fehler in der View 2025-10-27 08:32:36 +01:00
fa4d3fcbd7 Diverse Kleinigkeiten
- Sortierung von Dateien,
- Text "Nicht bewilligt" im Hilfeplanauswahlfenster in Zeiterfassung anzeigen
- Demo Dialog auch für Testversion für Fortis
2025-10-24 02:05:01 +02:00
9d08c20e99 AiPromptbaustein erster Wurf 2025-10-20 12:06:25 +02:00
dc56abcdc3 Konflikte gelöst 2025-10-09 13:01:44 +02:00
eeca1ad7fa Merge-Commit 2025-10-09 12:56:32 +02:00
71d1bfd2c2 Merge branch 'feature_rene_17_xrechnung'
# Conflicts:
#	Data/Data.csproj
#	Data/Entities/InvoiceBase.cs
#	Host/Web.Secrets.config.template
#	Host/Web.config
#	Service/ServiceBehavior/AdminServiceMessageInspector.cs
#	Service/ServiceContracts/IAdminService.cs
#	Shared/BeWoEntityEnums.cs
#	Shared/DataContracts/InvoiceBaseDC.cs
2025-09-27 19:41:52 +02:00
06c88afd7d Merge branch 'master' into feature_rene_18_ai 2025-09-23 16:08:19 +02:00
0e5db358ab Gkv Detail Mapping vollständig 2025-09-23 12:27:13 +02:00
7d3ab82ec7 GetGkvSum Detail optional 2025-09-23 10:44:27 +02:00
6e918ee97c test 2025-09-18 16:59:24 +02:00
b635f3ee00 temp 2 2025-07-25 14:27:57 +02:00
3aba7250d0 Conversation Rename 2025-07-09 10:24:06 +02:00
bb812665db XRechung StoredFileVM + StoredFileVM.Data
XRechnung wird nach dem Runterladen im Arbeitsspeicher gespiechert
2025-06-25 11:49:36 +02:00
78360c91c8 Refactor: Attribute
Weniger Unklarheit bzgl Abfragen bei jeweiligen Service Endpunkten
2025-06-17 15:46:04 +02:00
e2f72fbea0 Merge branch 'master' into feature_rene_17_xrechnung
# Conflicts:
#	BeWo/ServiceProxy/Generated.cs
#	BeWo/Services/BeWoWindowService.cs
#	BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
#	BeWo/View/Windows/BeWoWindowBuilder.cs
#	Data/Data.csproj
#	Host/ServiceRecordPage.aspx.cs
#	Service/Core/ServiceHelper.cs
#	Service/Security/SecurityContextInitializer.cs
#	Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
2025-06-17 13:07:41 +02:00
29830ddcdd Fix: GkvAbrechnungLight Logik
+ OrganisationView: GkvAbschnitt
2025-06-17 11:25:03 +02:00
df29a2d41a IPAddress Listen Filterung 2025-06-13 11:37:19 +02:00
3ec64dfc86 temp 2025-06-10 14:29:34 +02:00
ed4dc8fa75 LocalFileStorage 2025-06-05 14:03:55 +02:00
d964150770 Download Tests 2025-06-04 10:58:06 +02:00
031d3472ba WebConfigKeys als Enum 2025-06-03 15:46:41 +02:00
185299d22e BeWoFault in BS.Shared + neue Script Logik 2025-06-02 12:33:14 +02:00
1e1bd2e53e temp 2025-06-02 11:16:35 +02:00
ec1174f581 TextViewer Fix -> Nice zum Debuggen :)
BeWoApp.MainControl.WindowService.ShowTextViewer
2025-05-27 13:27:31 +02:00
03946856d8 BeWoWindowBuilder umgezogen, erste Version für app5 2025-05-27 13:04:52 +02:00
e971f075e6 Methoden mit eigenen keys 2025-05-27 10:32:21 +02:00
7fe4697e01 Admin Service in ApiService und ApiStreamService ausgelagert 2025-05-27 09:24:37 +02:00
375ba4b36b Merge branch 'master' into feature_rene_17_xrechnung
# Conflicts:
#	.gitignore
#	BeWo/DebugConfig.cs
#	BeWo/ServiceProxy/Generated.cs
#	Data/ASPHibernateSessionManager.cs
#	Host/Web.config
#	Service/Service.csproj
#	Service/ServiceContracts/IAccountingService.cs
#	Service/ServiceImplementations/AccountingServiceImp.cs
#	Shared/Core/Utils.cs
#	Shared/DataContracts/InvoiceBaseDC.cs
#	Shared/Shared.csproj
2025-05-26 13:05:25 +02:00
69af04742b Merge branch 'feature_rene_13_dakota'
# Conflicts:
#	BeWo/ServiceProxy/Generated.cs
2025-05-26 12:19:12 +02:00
Christian
eb03353b8c - Neues Feld bei Vermittlung gemeinnütziger Arbeit
- Beta Version Vorlagen Editor fertiggestellt
2025-05-22 10:21:19 +02:00
9e5a6c7822 Merge branch 'master' into feature_rene_13_dakota
# Conflicts:
#	Dakota/Logic/DakotaManager.cs
#	Shared/Shared.csproj
2025-05-14 11:01:04 +02:00
45e512d7e0 Neuer Chat direkt beim Start 2025-05-13 11:10:24 +02:00
dcc9ed782d Merge branch 'master' into feature_rene_13_dakota
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/ServiceProxy/Generated.cs
#	BeWo/ServiceProxy/ServiceFacade.cs
#	Data/Access/GenericDAO.cs
#	Data/Access/SearchDAO.cs
#	Data/Data.csproj
#	Service/DCEntityMapper/Compact/CompactCustomerDC_Customer.cs
#	Service/DCEntityMapper/Compact/CompactEmployeeDC_Employee.cs
#	Service/DCEntityMapper/Compact/CompactOrganisationDC_Organisation.cs
#	Service/DCEntityMapper/Compact/CompactPersonDC_Person.cs
#	Service/DCEntityMapper/Compact/CompactSupportConceptDC_SupportConcept.cs
#	Shared/Shared.csproj
2025-05-12 12:21:33 +02:00
28681b1b42 Merge branch 'feature_rene_18_ai'
# Conflicts:
#	BeWo/BeWoApp.xaml.cs
#	BeWo/View/Detail/EmployeeView.xaml
2025-05-08 09:53:28 +02:00
9934f3e98f Eigenes Recht zum Klonen 2025-05-06 10:32:44 +02:00
1a3521a531 Customer werden nochmal gefiltert 2025-05-05 13:08:09 +02:00
58cdbf6d89 Delete Conversation 2025-04-24 16:02:13 +02:00
fd8d9c43a0 Klonen Feature 2025-04-22 14:05:51 +02:00
Christian
f74a26cf89 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo 2025-04-17 01:11:38 +02:00
1620ad2099 Revert "Temporär doppelte Endpunkte -> Client hat noch kein Update"
This reverts commit 566fd2e677.
2025-04-16 17:02:39 +02:00
Christian
23605a1e41 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo 2025-04-15 00:51:31 +02:00
Christian
396bbeb6f8 - Erweiterungen Vermittlung gemeinnütziger Arbeit
- Erweiterungen Vorlagen Modul
2025-04-15 00:51:19 +02:00
4878abaa20 Merge branch 'feature_rene_18_ai'
# Conflicts:
#	Data/Data.csproj
#	Shared/BeWoEntityEnums.cs
2025-04-14 15:17:27 +02:00
b122048ea1 service client ausgelagert 2025-04-14 13:04:13 +02:00