Kleinere Fehlerbehebungen durchgeführt!

GreenTree.Nachtragsmanagement.Web/Controllers/AppendixController.cs

@@ -177,6 +177,8 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                             settings.TotalSummary["Percentage"].DisplayFormat = "{0:p2}";
                             settings.TotalSummary["PercentageValue"].DisplayFormat = "{0:c2}";
                             settings.TotalSummary["NegotiationValue"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["RelationOfferingToNegotiation"].DisplayFormat = "{0:p2}";
+                            settings.TotalSummary["RelationOfferingToDeviations"].DisplayFormat = "{0:n2}";
                             settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
                             return GridViewExtension.ExportToXlsx(settings, appendixModels);
                         case "xls":
@@ -184,6 +186,8 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                             settings.TotalSummary["Percentage"].DisplayFormat = "{0:p2}";
                             settings.TotalSummary["PercentageValue"].DisplayFormat = "{0:c2}";
                             settings.TotalSummary["NegotiationValue"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["RelationOfferingToNegotiation"].DisplayFormat = "{0:p2}";
+                            settings.TotalSummary["RelationOfferingToDeviations"].DisplayFormat = "{0:n2}";
                             settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
                             return GridViewExtension.ExportToXls(settings, appendixModels);
                         case "pdf":

GreenTree.Nachtragsmanagement.Web/Controllers/SiteController.cs

@@ -212,12 +212,18 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                     switch (exportformat.ToLower())
                     {
                         case "xlsx":
-                            settings.TotalSummary["DeviationValue"].DisplayFormat = "{0:c2}";
                             settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
+                            settings.TotalSummary["DeviationValue"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["SiteDeviationValue"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["AppendixValueRemaining"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["AppendixValueNegotiated"].DisplayFormat = "{0:c2}";
                             return GridViewExtension.ExportToXlsx(settings, siteModels);
                         case "xls":
-                            settings.TotalSummary["DeviationValue"].DisplayFormat = "{0:c2}";
                             settings.TotalSummary["Description"].DisplayFormat = "Anzahl = {0:n0}";
+                            settings.TotalSummary["DeviationValue"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["SiteDeviationValue"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["AppendixValueRemaining"].DisplayFormat = "{0:c2}";
+                            settings.TotalSummary["AppendixValueNegotiated"].DisplayFormat = "{0:c2}";
                             return GridViewExtension.ExportToXls(settings, siteModels);
                         case "pdf":
                             report.Name = "Baustellenliste";
@@ -231,8 +237,11 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                 return new EmptyResult();
         }
 
-        private decimal accumulatedCustomSummaryDeviationValue = 0;
         private decimal accumulatedCustomSummaryCount = 0;
+        private decimal accumulatedCustomSummaryDeviationValue = 0;
+        private decimal accumulatedCustomSummarySiteDeviationValue = 0;
+        private decimal accumulatedCustomSummaryAppendixValueRemaining = 0;
+        private decimal accumulatedCustomSummaryAppendixValueNegotiated = 0;
 
         /// <summary>
         /// Set custom summary result for page
@@ -243,16 +252,34 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
         {
             var label = (XRLabel)source;
 
+            if (label.Tag.ToString() == "Description")
+            {
+                accumulatedCustomSummaryCount += e.CalculatedValues.Count;
+                e.Result = accumulatedCustomSummaryCount;
+            }
+
             if (label.Tag.ToString() == "DeviationValue")
             {
                 accumulatedCustomSummaryDeviationValue += e.CalculatedValues.OfType<decimal>().Sum();
                 e.Result = accumulatedCustomSummaryDeviationValue;
             }
 
-            if (label.Tag.ToString() == "Description")
+            if (label.Tag.ToString() == "SiteDeviationValue")
             {
-                accumulatedCustomSummaryCount += e.CalculatedValues.Count;
-                e.Result = accumulatedCustomSummaryCount;
+                accumulatedCustomSummarySiteDeviationValue += e.CalculatedValues.OfType<decimal>().Sum();
+                e.Result = accumulatedCustomSummarySiteDeviationValue;
+            }
+
+            if (label.Tag.ToString() == "AppendixValueRemaining")
+            {
+                accumulatedCustomSummaryAppendixValueRemaining += e.CalculatedValues.OfType<decimal>().Sum();
+                e.Result = accumulatedCustomSummaryAppendixValueRemaining;
+            }
+
+            if (label.Tag.ToString() == "AppendixValueNegotiated")
+            {
+                accumulatedCustomSummaryAppendixValueNegotiated += e.CalculatedValues.OfType<decimal>().Sum();
+                e.Result = accumulatedCustomSummaryAppendixValueNegotiated;
             }
 
             e.Handled = true;
@@ -274,7 +301,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
                 if (column.FieldName == "AppendixDescription") { column.ColumnWidth = 60; }
                 if (column.FieldName == "DeviationValue") { column.ColumnWidth = 70; }
                 if (column.FieldName == "UserDescription") { column.ColumnWidth = 120; }
-                if (column.FieldName == "Comment") { column.ColumnWidth = 100; }
+                if (column.FieldName == "Comment") { column.IsVisible = false; column.IsDetail = true; }
             }
         }
 
@@ -283,8 +310,11 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
         /// </summary>
         private void generator_CustomizeGroupColumnSummary(object source, ColumnSummaryCreationEventArgs e)
         {
-            if (e.FieldName == "DeviationValue") { e.Summary.FormatString = "VA-Wert ∑ = {0:c2}"; }
             if (e.FieldName == "Description") { e.Summary.FormatString = "Alle = {0:n0}"; }
+            if (e.FieldName == "DeviationValue") { e.Summary.FormatString = "VA-Wert ∑ = {0:c2}"; }
+            if (e.FieldName == "SiteDeviationValue") { e.Summary.FormatString = "Off.VA ∑ = {0:c2}"; }
+            if (e.FieldName == "AppendixValueRemaining") { e.Summary.FormatString = "Off.NT ∑ {0:c2}"; }
+            if (e.FieldName == "AppendixValueNegotiated") { e.Summary.FormatString = "Verh.NT ∑ {0:c2}"; }
         }
 
         /// <summary>
@@ -292,8 +322,11 @@ namespace GreenTree.Nachtragsmanagement.Web.Controllers
         /// </summary>
         private void generator_CustomizeTotalColumnSummary(object source, ColumnSummaryCreationEventArgs e)
         {
-            if (e.FieldName == "DeviationValue") { e.Summary.FormatString = "{0:c2}"; }
             if (e.FieldName == "Description") { e.Summary.FormatString = "Alle = {0:n0}"; }
+            if (e.FieldName == "DeviationValue") { e.Summary.FormatString = "{0:c2}"; }
+            if (e.FieldName == "SiteDeviationValue") { e.Summary.FormatString = "{0:c2}"; }
+            if (e.FieldName == "AppendixValueRemaining") { e.Summary.FormatString = "{0:c2}"; }
+            if (e.FieldName == "AppendixValueNegotiated") { e.Summary.FormatString = "{0:c2}"; }
         }
 
         /// <summary>

GreenTree.Nachtragsmanagement.Web/Views/Admin/Roles/_RoleEditPartial.cshtml

@@ -123,6 +123,7 @@
 						}
 
 						tv.ClientSideEvents.CheckedChanged = "function (s, e) { synchronizeTreeViewValues(s, e); }";
+						tv.ClientSideEvents.Init = "function (s, e) { getCheckedNodesText(s.GetRootNode()); }";
 					}).Render();
 					ViewContext.Writer.Write("</div>");
 				});