diff --git a/Data/Entities/ValidationMessage.cs b/Data/Entities/ValidationMessage.cs index 4d7e81f3f..703130e84 100644 --- a/Data/Entities/ValidationMessage.cs +++ b/Data/Entities/ValidationMessage.cs @@ -12,6 +12,8 @@ namespace BeWo.Data.Entities public static string PropertyName_EmployeeOid = "EmployeeOid"; public static string PropertyName_SupportConceptOid = "SupportConceptOid"; public static string PropertyName_CustomerName = "CustomerName"; + public static string PropertyName_ServiceCategory = "ServiceCategory"; + public static string PropertyName_ServiceDescription = "ServiceDescription"; public static string PropertyName_ServiceRecordStart = "ServiceRecordStart"; public static string PropertyName_ServiceRecordEnd = "ServiceRecordEnd"; public static string PropertyName_ServiceRecordValidationResult = "ServiceRecordValidationResult"; @@ -21,6 +23,8 @@ namespace BeWo.Data.Entities private long? _EmployeeOid; private long? _SupportConceptOid; private string _CustomerName; + private string _ServiceCategory; + private string _ServiceDescription; private DateTime? _ServiceRecordStart; private DateTime? _ServiceRecordEnd; private int _ServiceRecordValidationResult; @@ -99,7 +103,31 @@ namespace BeWo.Data.Entities } } } + public virtual string ServiceCategory + { + get => _ServiceCategory; + set + { + if (AreDifferent(_ServiceCategory, value)) + { + _ServiceCategory = value; + } + } + } + + public virtual string ServiceDescription + { + get => _ServiceDescription; + + set + { + if (AreDifferent(_ServiceDescription, value)) + { + _ServiceDescription = value; + } + } + } public virtual DateTime? ServiceRecordStart { get diff --git a/Data/Mappings/ValidationMessage.hbm.xml b/Data/Mappings/ValidationMessage.hbm.xml index 73a215cb0..cc767bd92 100644 --- a/Data/Mappings/ValidationMessage.hbm.xml +++ b/Data/Mappings/ValidationMessage.hbm.xml @@ -12,6 +12,8 @@ + + diff --git a/Model/Changes_2023_08_28_ValidationMessage.txt b/Model/Changes_2023_08_28_ValidationMessage.txt new file mode 100644 index 000000000..8797c8a13 --- /dev/null +++ b/Model/Changes_2023_08_28_ValidationMessage.txt @@ -0,0 +1,3 @@ +ALTER TABLE `validationmessage` +ADD COLUMN `ServiceCategory` VARCHAR(512) NULL DEFAULT NULL AFTER `SupportConceptOid`, +ADD COLUMN `ServiceDescription` VARCHAR(512) NULL DEFAULT NULL AFTER `ServiceCategory`; diff --git a/Report/DefaultReports/ValidationMessagesReport.Designer.cs b/Report/DefaultReports/ValidationMessagesReport.Designer.cs index 18b68cd48..eb69c6b11 100644 --- a/Report/DefaultReports/ValidationMessagesReport.Designer.cs +++ b/Report/DefaultReports/ValidationMessagesReport.Designer.cs @@ -40,6 +40,8 @@ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -52,11 +54,13 @@ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -84,7 +88,7 @@ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel1, this.xrTable1}); - this.ReportHeader.HeightF = 86.29173F; + this.ReportHeader.HeightF = 86.29174F; this.ReportHeader.Name = "ReportHeader"; // // xrLabel1 @@ -103,7 +107,7 @@ this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1094.833F, 25.00001F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1580.792F, 25.00001F); // // xrTableRow1 // @@ -111,6 +115,8 @@ this.xrTableCell1, this.xrTableCell2, this.xrTableCell3, + this.xrTableCell17, + this.xrTableCell19, this.xrTableCell4, this.xrTableCell5, this.xrTableCell6, @@ -160,6 +166,32 @@ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell3.Weight = 1D; // + // xrTableCell17 + // + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UseFont = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "Kategorie"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell17.Weight = 2.268379519808577D; + // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.Text = "Leistung"; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell19.Weight = 2.2446699886607036D; + // // xrTableCell4 // this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -171,7 +203,7 @@ this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Zeitstempel"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 1D; + this.xrTableCell4.Weight = 1.0592715705136697D; // // xrTableCell5 // @@ -186,7 +218,7 @@ this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Eintrag von"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 1D; + this.xrTableCell5.Weight = 1.8890499422882825D; // // xrTableCell6 // @@ -201,7 +233,7 @@ this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "Eintrag für"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell6.Weight = 1D; + this.xrTableCell6.Weight = 2.09057140669284D; // // xrTableCell7 // @@ -216,7 +248,7 @@ this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "Logkategorie"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell7.Weight = 2.231176238212619D; + this.xrTableCell7.Weight = 2.39713010668273D; // // xrTableCell8 // @@ -232,7 +264,7 @@ this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "Lognachricht"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell8.Weight = 4.2278599898788247D; + this.xrTableCell8.Weight = 3.0401017664828593D; // // DetailReport // @@ -256,7 +288,7 @@ this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1094.833F, 25.00001F); + this.xrTable2.SizeF = new System.Drawing.SizeF(1580.791F, 25.00001F); // // xrTableRow2 // @@ -264,6 +296,8 @@ this.xrTableCell9, this.xrTableCell10, this.xrTableCell11, + this.xrTableCell18, + this.xrTableCell20, this.xrTableCell12, this.xrTableCell13, this.xrTableCell14, @@ -291,27 +325,41 @@ // this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceRecordStart", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceRecordStart", "{0:HH:mm\' Uhr\'}")}); this.xrTableCell10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.StylePriority.UseFont = false; this.xrTableCell10.StylePriority.UseTextAlignment = false; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 1D; + this.xrTableCell10.Weight = 0.9999989581438864D; // // xrTableCell11 // this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceRecordEnd", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceRecordEnd", "{0:HH:mm\' Uhr\'}")}); this.xrTableCell11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBorders = false; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 1D; + this.xrTableCell11.Weight = 0.99999999999999956D; + // + // xrTableCell18 + // + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceCategory")}); + this.xrTableCell18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "xrTableCell18"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell18.Weight = 2.2683778591568258D; // // xrTableCell12 // @@ -324,7 +372,7 @@ this.xrTableCell12.StylePriority.UseFont = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 1D; + this.xrTableCell12.Weight = 1.0355627044573836D; // // xrTableCell13 // @@ -338,7 +386,7 @@ this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "[User.Employee.LastName], [User.Employee.FirstName]"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell13.Weight = 1D; + this.xrTableCell13.Weight = 1.8890505504096953D; // // xrTableCell14 // @@ -353,7 +401,7 @@ this.xrTableCell14.StylePriority.UsePadding = false; this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell14.Weight = 1D; + this.xrTableCell14.Weight = 2.0905698327870987D; // // xrTableCell15 // @@ -368,7 +416,7 @@ this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell15.Weight = 2.231176238212619D; + this.xrTableCell15.Weight = 2.39712898386384D; // // xrTableCell16 // @@ -384,7 +432,21 @@ this.xrTableCell16.StylePriority.UsePadding = false; this.xrTableCell16.StylePriority.UseTextAlignment = false; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell16.Weight = 4.2278599898788247D; + this.xrTableCell16.Weight = 3.0400974839511146D; + // + // xrTableCell20 + // + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ValidationMessagesForMonth.ServiceDescription")}); + this.xrTableCell20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseBorders = false; + this.xrTableCell20.StylePriority.UseFont = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell20.Weight = 2.2683778591568258D; // // objectDataSource1 // @@ -403,9 +465,9 @@ this.objectDataSource1}); this.DataSource = this.objectDataSource1; this.Margins = new System.Drawing.Printing.Margins(10, 33, 21, 53); - this.PageHeight = 827; - this.PageWidth = 1169; - this.PaperKind = System.Drawing.Printing.PaperKind.A4Rotated; + this.PageHeight = 1169; + this.PageWidth = 1654; + this.PaperKind = System.Drawing.Printing.PaperKind.A3Rotated; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); @@ -442,5 +504,9 @@ private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; } } diff --git a/Report/ReportObjects/ValidationMessageListRO.cs b/Report/ReportObjects/ValidationMessageListRO.cs index a836bea98..dd54ab14e 100644 --- a/Report/ReportObjects/ValidationMessageListRO.cs +++ b/Report/ReportObjects/ValidationMessageListRO.cs @@ -41,6 +41,8 @@ namespace BeWo.Report.ReportObjects ro.TimeStamp = message.InsTs; ro.Message = message.Message; ro.Customer = message.CustomerName; + ro.ServiceCategory = message.ServiceCategory; + ro.ServiceDescription = message.ServiceDescription; ro.ServiceRecordStart = message.ServiceRecordStart; ro.ServiceRecordEnd = message.ServiceRecordEnd; @@ -77,6 +79,8 @@ namespace BeWo.Report.ReportObjects public EmployeeDC Employee { get; set; } public string Customer { get; set; } public SupportConceptDC SupportConcept { get; set; } + public string ServiceCategory { get; set; } + public string ServiceDescription { get; set; } public DateTime? ServiceRecordStart { get; set; } public DateTime? ServiceRecordEnd { get; set; } public string ValidationResult { get; set; } diff --git a/Service/Plugins/ServiceRecordValidator.cs b/Service/Plugins/ServiceRecordValidator.cs index a1ed00385..ed61e2aa8 100644 --- a/Service/Plugins/ServiceRecordValidator.cs +++ b/Service/Plugins/ServiceRecordValidator.cs @@ -527,6 +527,8 @@ namespace BeWo.Service.Plugins validationMessage.EmployeeOid = newServiceRecord.Employee?.EmployeeOid; validationMessage.SupportConceptOid = newServiceRecord.SupportConcept?.SupportConceptOid; validationMessage.CustomerName = r.CustomerName; + validationMessage.ServiceCategory = newServiceRecord.ServiceDescription.CategoryName; + validationMessage.ServiceDescription = newServiceRecord.ServiceDescription.Name; validationMessage.ServiceRecordStart = newServiceRecord.Start; validationMessage.ServiceRecordEnd = newServiceRecord.End; validationMessage.ServiceRecordValidationResult = (int)r.ResultType;