From 9e114bf896c80f5da738a0f492d91db9bf656ba8 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 9 May 2025 10:01:14 +0200 Subject: [PATCH 01/21] Mehr Farben -> Customer fertig --- BeWo/Styles/Colors/Colors.xaml | 14 +++- BeWo/Styles/Features/AIChatStyles.xaml | 70 +++++++++++++------ .../Detail/AI/AiConversationChatView.xaml | 8 ++- Host/Host.csproj.user | 4 +- 4 files changed, 66 insertions(+), 30 deletions(-) diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml index d4d28f236..35c1e2624 100644 --- a/BeWo/Styles/Colors/Colors.xaml +++ b/BeWo/Styles/Colors/Colors.xaml @@ -102,9 +102,15 @@ + + + + #ffaaaaaa #FFD7DADB #FF92A9B3 + #FFF00000 + #FF00F000 #FFC80000 #FFD7DADB @@ -115,8 +121,12 @@ #FF92A9B3 #FF19485C - #FFD7DADB - #FF92A9B3 + #FF3B7799 + #FF19485C + #FFD2D2D2 + #FFA0A0A0 + #FF9E3D02 #FFD7DADB diff --git a/BeWo/Styles/Features/AIChatStyles.xaml b/BeWo/Styles/Features/AIChatStyles.xaml index 8ebd2383b..bf05e24d1 100644 --- a/BeWo/Styles/Features/AIChatStyles.xaml +++ b/BeWo/Styles/Features/AIChatStyles.xaml @@ -14,14 +14,19 @@ + + - - - - - - @@ -122,7 +141,7 @@ Width="auto" Margin="0,0,0,0" HorizontalAlignment="Stretch" - Background="#44000000" + Background="#30000000" BorderBrush="Black" BorderThickness="1" CornerRadius="10, 10, 10, 10"> @@ -133,22 +152,25 @@ + Text="{Binding Created, StringFormat=Erstellt: {0:dd.MM.yy HH:mm}}" /> + Text="{Binding Updated, StringFormat=Aktualisiert: {0:dd.MM.yy HH:mm}}" /> - + - - + + + diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 5ee002517..361b57e4b 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -1,9 +1,9 @@ - + BeWo2.0 true - Release|Any CPU + Debug|Any CPU false From bfacb94992e6f61da599e120517de54c0be4bb04 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 9 May 2025 10:03:03 +0200 Subject: [PATCH 02/21] =?UTF-8?q?Titel=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/Services/BeWoWindowFactory.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/BeWo/Services/BeWoWindowFactory.cs b/BeWo/Services/BeWoWindowFactory.cs index c1fdcfae3..4ae304a18 100644 --- a/BeWo/Services/BeWoWindowFactory.cs +++ b/BeWo/Services/BeWoWindowFactory.cs @@ -15,13 +15,13 @@ namespace BeWo.Services { public Dictionary UIContext2Header { get; set; } = new Dictionary() { - {UIContext.ServiceRecord, "Zeiterfassung KI Chat" }, - {UIContext.Customer, "Klienten Übersicht KI Chat" }, - {UIContext.Person, "Personen Übersicht KI Chat" }, - {UIContext.Employee, "Mitarbeiter Übersicht KI Chat" }, - {UIContext.Organisation, "Organisation Übersicht KI Chat" }, - {UIContext.SupportConcept, "Hilfeplan Übersicht KI Chat" }, - {UIContext.CustomerSingle, "Klient KI Chat" }, + {UIContext.ServiceRecord, "KI Chat: Zeiterfassung" }, + {UIContext.Customer, "KI Chat: Klienten Übersicht" }, + {UIContext.Person, "KI Chat: Personen Übersicht" }, + {UIContext.Employee, "KI Chat: Mitarbeiter Übersicht" }, + {UIContext.Organisation, "KI Chat: Organisation Übersicht" }, + {UIContext.SupportConcept, "KI Chat: Hilfeplan Übersicht" }, + {UIContext.CustomerSingle, "KI Chat: Klient" }, }; public AnimatedBeWoWindow GetAiConversationWindow(UIContext uIContext, Control control, double height = 600, double width = 1200) From 5dcf18d1a0fa0173d4b7f0282865268c7c4fe18f Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 9 May 2025 10:26:22 +0200 Subject: [PATCH 03/21] =?UTF-8?q?R=C3=A4nder=20nicht=20mehr=20anzeigen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/Styles/Features/AIChatStyles.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BeWo/Styles/Features/AIChatStyles.xaml b/BeWo/Styles/Features/AIChatStyles.xaml index bf05e24d1..f607e13e2 100644 --- a/BeWo/Styles/Features/AIChatStyles.xaml +++ b/BeWo/Styles/Features/AIChatStyles.xaml @@ -143,7 +143,7 @@ HorizontalAlignment="Stretch" Background="#30000000" BorderBrush="Black" - BorderThickness="1" + BorderThickness="0" CornerRadius="10, 10, 10, 10"> From e7d3899df34e26a62fcf419efed516dabc4c4888 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 9 May 2025 10:26:34 +0200 Subject: [PATCH 04/21] Zeiterfassung --- BeWo/Styles/Colors/Colors.xaml | 16 +++++++++------- BeWo/Styles/Features/AIChatStyles.xaml | 10 ++++------ BeWo/View/Detail/AI/AiConversationChatView.xaml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml index 35c1e2624..a11997053 100644 --- a/BeWo/Styles/Colors/Colors.xaml +++ b/BeWo/Styles/Colors/Colors.xaml @@ -109,13 +109,11 @@ #ffaaaaaa #FFD7DADB #FF92A9B3 - #FFF00000 - #FF00F000 #FFC80000 - #FFD7DADB - #FF92A9B3 - + #FF993B3B + #FF5C1919 + #FF993B3B #FFD7DADB #FF92A9B3 @@ -123,8 +121,6 @@ #FF19485C #FF3B7799 #FF19485C - #FFD2D2D2 - #FFA0A0A0 @@ -140,6 +136,12 @@ #FFD7DADB #FF92A9B3 + #FFD2D2D2 + #FFA0A0A0 + + #FF111111 + #FF777777 + \ No newline at end of file diff --git a/BeWo/Styles/Features/AIChatStyles.xaml b/BeWo/Styles/Features/AIChatStyles.xaml index f607e13e2..197ad772d 100644 --- a/BeWo/Styles/Features/AIChatStyles.xaml +++ b/BeWo/Styles/Features/AIChatStyles.xaml @@ -24,8 +24,8 @@ @@ -74,8 +76,6 @@ - - @@ -160,14 +160,12 @@ diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml b/BeWo/View/Detail/AI/AiConversationChatView.xaml index aab0def13..cdc2c9464 100644 --- a/BeWo/View/Detail/AI/AiConversationChatView.xaml +++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml @@ -38,7 +38,7 @@ - + Date: Fri, 9 May 2025 10:36:31 +0200 Subject: [PATCH 05/21] Neue Farben - Alle Module fertig Speziell: Organisation hat hellere Schrift, da Gelb schlechten Kontrast bietet --- BeWo/Styles/Colors/Colors.xaml | 35 ++++++++++--------- BeWo/Styles/Features/AIChatStyles.xaml | 12 ++++--- .../Detail/AI/AiConversationChatView.xaml | 2 +- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml index a11997053..d3dc292ac 100644 --- a/BeWo/Styles/Colors/Colors.xaml +++ b/BeWo/Styles/Colors/Colors.xaml @@ -110,13 +110,13 @@ #FFD7DADB #FF92A9B3 - #FFC80000 + #FF5C1919 #FF993B3B #FF5C1919 - - #FF993B3B - #FFD7DADB - #FF92A9B3 + + #FF5C1919 + #FF993B3B + #FF5C1919 #FF19485C #FF3B7799 @@ -125,22 +125,25 @@ #FF92A9B3--> #FF9E3D02 - #FFD7DADB - #FF92A9B3 + #FFB5662D + #FF9E3D02 #FF205C19 - #FFD7DADB - #FF92A9B3 - + #FF45993B + #FF205C19 + #FFC8C000 - #FFD7DADB - #FF92A9B3 + #FFC8C000 + #FF706000 + + #FFFFFFFF + #FFD2D2D2 - #FFD2D2D2 - #FFA0A0A0 + #FFD2D2D2 + #FFA0A0A0 - #FF111111 - #FF777777 + #FF111111 + #FF777777 diff --git a/BeWo/Styles/Features/AIChatStyles.xaml b/BeWo/Styles/Features/AIChatStyles.xaml index 197ad772d..0a4de570b 100644 --- a/BeWo/Styles/Features/AIChatStyles.xaml +++ b/BeWo/Styles/Features/AIChatStyles.xaml @@ -24,8 +24,8 @@ @@ -115,6 +115,8 @@ + + @@ -141,7 +143,7 @@ Width="auto" Margin="0,0,0,0" HorizontalAlignment="Stretch" - Background="#30000000" + Background="#17000000" BorderBrush="Black" BorderThickness="0" CornerRadius="10, 10, 10, 10"> diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml b/BeWo/View/Detail/AI/AiConversationChatView.xaml index cdc2c9464..be7c4e569 100644 --- a/BeWo/View/Detail/AI/AiConversationChatView.xaml +++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml @@ -38,7 +38,7 @@ - + Date: Mon, 12 May 2025 18:03:57 +0200 Subject: [PATCH 06/21] InklusioElmarBauer: Bei Rechnungen an den LVR festen Erzeuger eintragen (Elmar Bauer) --- .../InvoiceCustomerReport.Designer.cs | 20 ++++++++-------- .../InvoiceCustomerReport.cs | 6 +++++ .../ServiceInvoiceReport.Designer.cs | 24 +++++++++---------- .../ServiceInvoiceReport.cs | 5 ++++ .../SettlementReport2.Designer.cs | 20 ++++++++-------- .../InklusioElmarBauer/SettlementReport2.cs | 7 +++++- 6 files changed, 49 insertions(+), 33 deletions(-) diff --git a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs index e63fffa9f..38d4faa20 100644 --- a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.Designer.cs @@ -83,7 +83,7 @@ namespace InklusioElmarBauer this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterzeichner = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -710,7 +710,7 @@ namespace InklusioElmarBauer this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel8, this.xrLabel10, - this.xrLabel12, + this.lblUnterzeichner, this.lblNotice, this.xrTable4}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); @@ -739,14 +739,14 @@ namespace InklusioElmarBauer this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Mit freundlichen Grüßen"; // - // xrLabel12 + // lblUnterzeichner // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.5417F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(292F, 17.00002F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorFirstName] [CreatorLastName]"; + this.lblUnterzeichner.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.5417F); + this.lblUnterzeichner.Name = "lblUnterzeichner"; + this.lblUnterzeichner.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterzeichner.SizeF = new System.Drawing.SizeF(292F, 17.00002F); + this.lblUnterzeichner.StylePriority.UseFont = false; + this.lblUnterzeichner.Text = "[CreatorFirstName] [CreatorLastName]"; // // lblNotice // @@ -921,7 +921,7 @@ namespace InklusioElmarBauer private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel lblUnterzeichner; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; diff --git a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs index 7d7cbc7f3..acba52804 100644 --- a/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs +++ b/ReportImp/InklusioElmarBauer/InvoiceCustomerReport.cs @@ -48,6 +48,12 @@ namespace InklusioElmarBauer } lblAddress.Text = sb.ToString(); + if (pRO.RecipientOrganisation.Contains("LVR")) + { + pRO.CreatorFirstName = "Elmar"; + pRO.CreatorLastName = "Bauer"; + } + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs index 92679c5de..898975665 100644 --- a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.Designer.cs @@ -75,7 +75,7 @@ namespace InklusioElmarBauer this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterzeichner = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -594,17 +594,17 @@ namespace InklusioElmarBauer this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.Weight = 3D; // - // xrLabel14 + // lblUnterzeichner // - this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.lblUnterzeichner.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 184.5833F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "[CreatorName]"; + this.lblUnterzeichner.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.lblUnterzeichner.LocationFloat = new DevExpress.Utils.PointFloat(0F, 184.5833F); + this.lblUnterzeichner.Name = "lblUnterzeichner"; + this.lblUnterzeichner.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterzeichner.SizeF = new System.Drawing.SizeF(225F, 17F); + this.lblUnterzeichner.StylePriority.UseFont = false; + this.lblUnterzeichner.Text = "[CreatorName]"; // // xrLabel9 // @@ -971,7 +971,7 @@ namespace InklusioElmarBauer this.xrLabel1, this.xrLabel9, this.xrTable4, - this.xrLabel14, + this.lblUnterzeichner, this.xrLabel15}); this.GroupFooter1.HeightF = 206.5833F; this.GroupFooter1.Name = "GroupFooter1"; @@ -1045,7 +1045,7 @@ namespace InklusioElmarBauer private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel lblUnterzeichner; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; diff --git a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs index 9ab85ed70..a38d837ad 100644 --- a/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs +++ b/ReportImp/InklusioElmarBauer/ServiceInvoiceReport.cs @@ -29,6 +29,11 @@ namespace InklusioElmarBauer SetzeAdresse(pRO); + if (pRO.RecipientOrganisation.Contains("LVR")) + { + pRO.CreatorName = "Elmar Bauer"; + } + this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs b/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs index dd8d4b6b5..08e99cb34 100644 --- a/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs +++ b/ReportImp/InklusioElmarBauer/SettlementReport2.Designer.cs @@ -88,7 +88,7 @@ namespace InklusioElmarBauer this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblUnterzeichner = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); @@ -553,7 +553,7 @@ namespace InklusioElmarBauer this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel10, this.xrTable3, - this.xrLabel12, + this.lblUnterzeichner, this.xrLabel11, this.lblNotice}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); @@ -691,14 +691,14 @@ namespace InklusioElmarBauer this.xrTableCell31.Text = "xrTableCell8"; this.xrTableCell31.Weight = 3D; // - // xrLabel12 + // lblUnterzeichner // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "[CreatorName]"; + this.lblUnterzeichner.LocationFloat = new DevExpress.Utils.PointFloat(0F, 187F); + this.lblUnterzeichner.Name = "lblUnterzeichner"; + this.lblUnterzeichner.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblUnterzeichner.SizeF = new System.Drawing.SizeF(225F, 17F); + this.lblUnterzeichner.StylePriority.UseFont = false; + this.lblUnterzeichner.Text = "[CreatorName]"; // // xrLabel11 // @@ -1275,7 +1275,7 @@ namespace InklusioElmarBauer private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel lblUnterzeichner; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; diff --git a/ReportImp/InklusioElmarBauer/SettlementReport2.cs b/ReportImp/InklusioElmarBauer/SettlementReport2.cs index e3c9e77af..70c6d082b 100644 --- a/ReportImp/InklusioElmarBauer/SettlementReport2.cs +++ b/ReportImp/InklusioElmarBauer/SettlementReport2.cs @@ -54,7 +54,12 @@ namespace InklusioElmarBauer } pRO.RateFactor = (double)rateFactor; - this.bindingSource1.DataSource = pRO; + if (pRO.RecipientOrganisation.Contains("LVR")) + { + pRO.CreatorName = "Elmar Bauer"; + } + + this.bindingSource1.DataSource = pRO; } } } From 45e512d7e081ce4d12eb3b3c8772595db9596c95 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Tue, 13 May 2025 11:10:24 +0200 Subject: [PATCH 07/21] Neuer Chat direkt beim Start --- BeWo/DebugConfig.cs | 6 +- .../GeneratedAiEnhancedService.cs | 14 +- BeWo/Styles/Colors/Colors.xaml | 4 +- .../Detail/AI/AiConversationChatView.xaml | 48 +- .../Detail/AI/AiConversationChatView.xaml.cs | 4 +- BeWo/ViewModel/AbstractDCMapperVM.cs | 5 + BeWo/ViewModel/AiConversationVM.cs | 11 + .../ListViewModel/AiConversationListVM.cs | 90 ++- .../Invoicing/SoziotherapieInvoiceCreation.cs | 618 +++++++++--------- .../ServiceContracts/IAiEnhancedService.cs | 5 + .../AiEnhancedServiceImp.cs | 36 +- 11 files changed, 497 insertions(+), 344 deletions(-) diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs index badf2fb8b..ad6d26b7f 100644 --- a/BeWo/DebugConfig.cs +++ b/BeWo/DebugConfig.cs @@ -147,9 +147,9 @@ namespace BeWo AutoLogin = true, //SelectView = UIContext.AiConversation, //SelectIndex = 8, - DefaultLoginUsername = "m1", - DefaultLoginPassword = "bewobewo", - DefaultProfilename = "5000000000", + //DefaultLoginUsername = "m1", + //DefaultLoginPassword = "bewobewo", + //DefaultProfilename = "5000000000", EnableAutoRemoteDebugging = true }); diff --git a/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs b/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs index 19d6241cc..f97d80268 100644 --- a/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs +++ b/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs @@ -28,12 +28,17 @@ namespace BeWo.ServiceProxy [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/GetAiConversations", ReplyAction="http://tempuri.org/IAiEnhancedService/GetAiConversationsResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/GetAiConversationsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] - System.Collections.Generic.List GetAiConversations(int uicontext, long? oid); + System.Collections.Generic.List GetAiConversations(int uicontext, System.Nullable oid); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CreateAiConversation", ReplyAction="http://tempuri.org/IAiEnhancedService/CreateAiConversationResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.Feature.AI.AiConversationDC CreateAiConversation(BS.Shared.DataContracts.Feature.AI.AiConversationDC conversation, long modell_oid); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationWithMessage", ReplyAction="http://tempuri.org/IAiEnhancedService/CreateAiConversationWithMessageResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CreateAiConversationWithMessageBeWoFaultFau" + + "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] + BS.Shared.DataContracts.Feature.AI.AiConversationDC CreateAiConversationWithMessage(BS.Shared.DataContracts.Feature.AI.AiConversationDC conversation, long modell_oid, string message); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CloneAiConversation", ReplyAction="http://tempuri.org/IAiEnhancedService/CloneAiConversationResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CloneAiConversationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")] BS.Shared.DataContracts.Feature.AI.AiConversationDC CloneAiConversation(long conversation_oid, System.Nullable message_oid); @@ -96,7 +101,7 @@ namespace BeWo.ServiceProxy return base.Channel.GetAiModels(); } - public System.Collections.Generic.List GetAiConversations(int uicontext, long? oid) + public System.Collections.Generic.List GetAiConversations(int uicontext, System.Nullable oid) { return base.Channel.GetAiConversations(uicontext, oid); } @@ -106,6 +111,11 @@ namespace BeWo.ServiceProxy return base.Channel.CreateAiConversation(conversation, modell_oid); } + public BS.Shared.DataContracts.Feature.AI.AiConversationDC CreateAiConversationWithMessage(BS.Shared.DataContracts.Feature.AI.AiConversationDC conversation, long modell_oid, string message) + { + return base.Channel.CreateAiConversationWithMessage(conversation, modell_oid, message); + } + public BS.Shared.DataContracts.Feature.AI.AiConversationDC CloneAiConversation(long conversation_oid, System.Nullable message_oid) { return base.Channel.CloneAiConversation(conversation_oid, message_oid); diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml index d3dc292ac..4b888ffa5 100644 --- a/BeWo/Styles/Colors/Colors.xaml +++ b/BeWo/Styles/Colors/Colors.xaml @@ -131,11 +131,11 @@ #FF205C19 #FF45993B #FF205C19 - + #FFC8C000 #FFC8C000 #FF706000 - + #FFFFFFFF #FFD2D2D2 diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml b/BeWo/View/Detail/AI/AiConversationChatView.xaml index be7c4e569..ff9cdecbc 100644 --- a/BeWo/View/Detail/AI/AiConversationChatView.xaml +++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml @@ -147,12 +147,14 @@ x:Name="listbox_messages" Grid.Column="1" Padding="3" + HorizontalAlignment="Stretch" Background="Transparent" BorderThickness="0" ItemTemplateSelector="{StaticResource AiConversationMessageTemplateSelector}" ItemsSource="{Binding SelectedVM.Messages.VMList, Converter={StaticResource AiConversationMessageSystemConverter}, UpdateSourceTrigger=PropertyChanged}" ScrollViewer.CanContentScroll="False" - ScrollViewer.HorizontalScrollBarVisibility="Disabled"> + ScrollViewer.HorizontalScrollBarVisibility="Disabled" + Visibility="{Binding IsNewConversationVisible, Converter={StaticResource BoolVisibilityConverter}, ConverterParameter=Reverse}">