Sauberen Merge durchgeführt!

GreenTree.Nachtragsmanagement.Web/Extensions/GridViewSettingsHelper.cs

@@ -128,7 +128,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Extensions
                 column.FieldName = "CustomNumber";
                 column.SettingsHeaderFilter.Mode = GridHeaderFilterMode.CheckedList;
                 column.MinWidth = 100;
-                column.Width = new Unit(8, UnitType.Percentage);                
+                column.Width = new Unit(8, UnitType.Percentage);
             });
             s.Columns.Add(column =>
             {
@@ -159,6 +159,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Extensions
             {
                 column.Caption = "Offene VA";
                 column.FieldName = "DeviationDescription";
+                column.Visible = false;
                 column.MinWidth = 150;
                 column.Width = new Unit(12, UnitType.Percentage);
                 column.SetDataItemTemplateContent(c =>
@@ -186,6 +187,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Extensions
                 column.Caption = "VA-Summe";
                 column.FieldName = "DeviationValue";
                 column.PropertiesEdit.DisplayFormatString = "c2";
+                column.Visible = false;
                 column.MinWidth = 120;
                 column.Width = new Unit(10, UnitType.Percentage);
             });
@@ -254,6 +256,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Extensions
                 });
                 column.MinWidth = 120;
                 column.Width = new Unit(15, UnitType.Percentage);
+                column.Visible = false;
             });
 
             s.TotalSummary.Add(new ASPxSummaryItem

GreenTree.Nachtragsmanagement.Web/Models/Appendix/AppendixDataModel.cs

@@ -80,8 +80,8 @@ namespace GreenTree.Nachtragsmanagement.Web.Models.Appendix
                 Id = appendixEntity.Id,
                 CustomNumber = appendixEntity.CustomNumber,
                 Description = appendixEntity.Description,
-                Percentage = appendixEntity.Percentage.HasValue 
-                    ? appendixEntity.Percentage.Value 
+                Percentage = appendixEntity.Percentage.HasValue
+                    ? appendixEntity.Percentage.Value
                     : (decimal)0.5,
                 PercentageValue = appendixEntity.Value.HasValue && appendixEntity.Percentage.HasValue
                     ? appendixEntity.Value.Value * appendixEntity.Percentage.Value
@@ -92,9 +92,9 @@ namespace GreenTree.Nachtragsmanagement.Web.Models.Appendix
                 RelationOfferingToDeviations =
                     appendixEntity.Value.HasValue && appendixEntity.Deviations.Any()
                         ? (decimal?)Convert.ToDecimal(
-                            appendixEntity.Value / 
+                            appendixEntity.Value /
                                 (appendixEntity.Deviations
-                                    .Sum(r => r.Value.HasValue && r.Percentage.HasValue ? r.Value.Value * r.Percentage.Value : 0) != 0 
+                                    .Sum(r => r.Value.HasValue && r.Percentage.HasValue ? r.Value.Value * r.Percentage.Value : 0) != 0
                                         ? appendixEntity.Deviations
                                             .Sum(r => r.Value.HasValue && r.Percentage.HasValue ? r.Value.Value * r.Percentage.Value : 0)
                                         : 1))
@@ -110,7 +110,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Models.Appendix
                 OrderDate = appendixEntity.OrderDate,
                 Comment = appendixEntity.Comment,
                 OrderInvoiceCreated = appendixEntity.OrderInvoiceCreated,
-                OrderInvoiceCreatedDescription = 
+                OrderInvoiceCreatedDescription =
                     appendixEntity.OrderInvoiceCreated
                         ? "Ja"
                         : "Nein",
@@ -167,7 +167,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Models.Appendix
                     appendixEntity.Deviations
                         .Select(r => r.CustomNumber)
                         .ToList(),
-                DeviationDescription = 
+                DeviationDescription =
                     String.Join(", ",
                         appendixEntity.Deviations
                             .Select(d => d.CustomNumber)),