From 53e388197a2c358d6c435bab8e916decfbae1f71 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 14 Jan 2017 03:56:18 +0100 Subject: [PATCH] More work on Dashboard, Positions --- Common/Enums/PositionTitle.cs | 7 ++++++- Logic/Resources/Logic.Swarm.Position.Designer.cs | 4 ++-- Logic/Resources/Logic.Swarm.Position.resx | 2 +- Logic/Swarm/Position.cs | 2 +- Logic/Swarm/Positions.cs | 2 +- Site/Automation/Json-PositionsTree.aspx.cs | 1 + Site/Default.aspx | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Common/Enums/PositionTitle.cs b/Common/Enums/PositionTitle.cs index 1daaca0b..38586d1a 100644 --- a/Common/Enums/PositionTitle.cs +++ b/Common/Enums/PositionTitle.cs @@ -33,7 +33,12 @@ namespace Swarmops.Common.Enums /// /// Totally customized and not stock localized - look up in PositionTitlesCustom table /// - Custom + Custom, + + /// + /// These titles are not actual positions, but UX elements (categories, etc) + /// + UxElement // Expand with various title names } diff --git a/Logic/Resources/Logic.Swarm.Position.Designer.cs b/Logic/Resources/Logic.Swarm.Position.Designer.cs index dd17caf6..029afcf0 100644 --- a/Logic/Resources/Logic.Swarm.Position.Designer.cs +++ b/Logic/Resources/Logic.Swarm.Position.Designer.cs @@ -459,9 +459,9 @@ namespace Swarmops.Logic.Resources { /// /// Looks up a localized string similar to Geographic Subleaders. /// - internal static string Position_Geographic_ExpandingSubleaderNode { + internal static string Position_Geographic_ExpandingSubleaderNode_UxElement { get { - return ResourceManager.GetString("Position_Geographic_ExpandingSubleaderNode", resourceCulture); + return ResourceManager.GetString("Position_Geographic_ExpandingSubleaderNode_UxElement", resourceCulture); } } diff --git a/Logic/Resources/Logic.Swarm.Position.resx b/Logic/Resources/Logic.Swarm.Position.resx index 3dc05527..58fc3ff3 100644 --- a/Logic/Resources/Logic.Swarm.Position.resx +++ b/Logic/Resources/Logic.Swarm.Position.resx @@ -249,7 +249,7 @@ Deputies - + Geographic Subleaders Leaders for geographies below the one displayed diff --git a/Logic/Swarm/Position.cs b/Logic/Swarm/Position.cs index d746af12..d2e134bb 100644 --- a/Logic/Swarm/Position.cs +++ b/Logic/Swarm/Position.cs @@ -196,7 +196,7 @@ namespace Swarmops.Logic.Swarm string titleStringUntyped = type.ToString(); string titleStringTyped = titleStringUntyped + "_" + title.ToString(); - if (plural) + if (plural && title != PositionTitle.UxElement) { titleStringUntyped += "_Plural"; titleStringTyped += "_Plural"; diff --git a/Logic/Swarm/Positions.cs b/Logic/Swarm/Positions.cs index d7112820..413a0744 100644 --- a/Logic/Swarm/Positions.cs +++ b/Logic/Swarm/Positions.cs @@ -63,7 +63,7 @@ namespace Swarmops.Logic.Swarm Position expandingSubleaderNode = Position.FromBasic(new BasicPosition(0, PositionLevel.GeographyDefault, organization.Identity, geography.Identity, 0, 0, 0, DateTime.Today, - "Geographic_ExpandingSubleaderNode", "Default", false, true, false, false, false, 0, 0, 0, 0)); // UX element, not real position + "Geographic_ExpandingSubleaderNode", "UxElement", false, true, false, false, false, 0, 0, 0, 0)); // UX element, not real position TreeNode expandingNode = treeResult.RootNodes[0].AddChild(expandingSubleaderNode); ForOrganizationGeographyRecurse (geoTree.RootNodes[0], expandingNode, geographyLeaderTemplate, 2); diff --git a/Site/Automation/Json-PositionsTree.aspx.cs b/Site/Automation/Json-PositionsTree.aspx.cs index 1e505c08..b2a64771 100644 --- a/Site/Automation/Json-PositionsTree.aspx.cs +++ b/Site/Automation/Json-PositionsTree.aspx.cs @@ -154,6 +154,7 @@ namespace Swarmops.Frontend.Automation if (localizedPositionName == null) { localizedPositionName = @"NULL (" + position.PositionType.ToString() + ")"; + string test = position.Localized(); } if (assignments.Count > 0) diff --git a/Site/Default.aspx b/Site/Default.aspx index 4e20f75f..df31ebff 100644 --- a/Site/Default.aspx +++ b/Site/Default.aspx @@ -24,7 +24,7 @@
-
500.001
Annual Profit To Date (Testing new code)
+
0.001
Annual Profit To Date (Testing new code)