Änderungen vom 11.10. übernommen!

GreenTree.Nachtragsmanagement.Web/Extensions/GridViewSettingsHelper.cs

@@ -55,6 +55,12 @@ namespace GreenTree.Nachtragsmanagement.Web.Extensions
 
             s.Toolbars.Add(t =>
             {
+                t.Items.Add(i =>
+                {
+                    i.Text = "Baustelle hinzufügen";
+                    i.Name = "AddSite";
+                    i.Image.IconID = IconID.ActionsAdd16x16;
+                });
                 var refreshItem = t.Items.Add(GridViewToolbarCommand.Refresh);
                 refreshItem.Text = "Aktualisieren";
                 var expandItem = t.Items.Add(GridViewToolbarCommand.FullExpand);
@@ -94,12 +100,7 @@ namespace GreenTree.Nachtragsmanagement.Web.Extensions
                             html.ViewContext.Writer.Write(
                                 "<br /><a href=\"#\" onclick=\"confirmDelete(" + DataBinder.Eval(c.DataItem, "Id") + ")\">Löschen</a>");
                     });
-                    column.SetHeaderTemplateContent(c =>
-                    {
-                        if (_userContext.CurrentUser.HasFunction("Site-Sites-Edit"))
-                            html.ViewContext.Writer.Write(
-                                "<a href=\"#\" onclick=\"editSite(-1)\">Neu</a>&nbsp;");
-                    });
+                    column.Caption = "#";
                     column.Settings.AllowDragDrop = DefaultBoolean.False;
                     column.Settings.AllowSort = DefaultBoolean.False;
                     column.Width = new Unit(100, UnitType.Pixel);

GreenTree.Nachtragsmanagement.Web/Models/Site/SiteTreeDataModel.cs

@@ -44,19 +44,22 @@ namespace GreenTree.Nachtragsmanagement.Web.Models.Site
             if (siteEntity == null)
                 return result;
 
+            var openDeviations = siteEntity.Deviations
+                .Where(d => d.Appendix == null);
+
             var emptyAppendix = new SiteTreeDataModel
             {
                 Id = 0,
                 TreeKey = "a_0",
                 TreeParentKey = String.Empty,
-                CustomNumber = "Offene VA"
+                CustomNumber = "Offene VA",
+                Description = openDeviations.Count() > 0
+                    ? String.Format("{0} offene VAs", openDeviations.Count())
+                    : "Keine offenen VAs"
             };
 
             result.Add(emptyAppendix);
 
-            var openDeviations = siteEntity.Deviations
-                .Where(d => d.Appendix == null);
-
             foreach (var openDeviation in openDeviations)
             {
                 result.Add(new SiteTreeDataModel

GreenTree.Nachtragsmanagement.Web/Views/Sites/View.cshtml

@@ -49,6 +49,8 @@
 					parent.exportFormat = "pdf";
 				}
 			});
+		} else if (e.item.name == "AddSite") {
+			editSite(-1);
 		} else if (e.item.name == "ToggleColumnChooser") {
 			if (devGridViewSite.IsCustomizationWindowVisible())
 				devGridViewSite.HideCustomizationWindow();

GreenTree.Nachtragsmanagement.Web/Views/Sites/_SiteEditPartial.cshtml

@@ -334,7 +334,7 @@
 		s.HeaderText = "\"" + Model.CustomNumber + "\" bearbeiten";
 
 	s.Modal = true;
-	s.Width = new Unit(1000, UnitType.Pixel);
+	s.Width = new Unit(100, UnitType.Percentage);
 	s.CloseAction = CloseAction.CloseButton;
 	s.PopupHorizontalAlign = PopupHorizontalAlign.WindowCenter;
 	s.PopupVerticalAlign = PopupVerticalAlign.TopSides;

GreenTree.Nachtragsmanagement.Web/Views/Sites/_SiteEditTreePartial.cshtml

@@ -43,8 +43,6 @@
 			}
 			else if (treeKey.StartsWith("a"))
 			{
-				ViewContext.Writer.Write(
-					"<a href=\"#\" onclick=\"addDeviationToAppendix(" + DataBinder.Eval(c.DataItem, "Id") + ")\">Neue VA</a><br />");
 				ViewContext.Writer.Write(
 					"<a href=\"#\" onclick=\"editAppendix(" + DataBinder.Eval(c.DataItem, "Id") + ")\">Bearbeiten</a><br />");
 				ViewContext.Writer.Write(
@@ -126,21 +124,32 @@
 		});
 	});
 
+	t.PreRender = (s, e) =>
+	{
+		var tl = s as MVCxTreeList;
+		tl.ExpandAll();
+	};
+
 	t.HtmlRowPrepared = (sender, e) =>
 	{
 		var hexColor = e.GetValue("StatusColor");
 		var defaultState = ViewData["DefaultAppendixState"] as GreenTree.Nachtragsmanagement.Core.Domain.Appendix.State;
 		var statusDescription = e.GetValue("StatusDescription");
+		var treeKey = e.GetValue("TreeKey").ToString();
 
 		if (hexColor == null ||
 			(defaultState != null && statusDescription != null && statusDescription.ToString() == defaultState.Description))
 		{
-			var treeKey = e.GetValue("TreeKey");
-			if (treeKey.ToString().StartsWith("a"))
-				e.Row.BackColor = System.Drawing.ColorTranslator.FromHtml("#fff2f2");
+			if (treeKey.StartsWith("a"))
+				e.Row.BackColor = System.Drawing.ColorTranslator.FromHtml("#96C8FF");
 		}
 		else
 			e.Row.BackColor = System.Drawing.ColorTranslator.FromHtml(hexColor.ToString());
+
+		if (treeKey == "a_0")
+		{
+			e.Row.BackColor = System.Drawing.ColorTranslator.FromHtml("#FFAB4C");
+		}
 	};
 
 	t.ControlStyle.CssClass += "siteTreeList";