More work on Dashboard, Positions

This commit is contained in:
Rick Falkvinge
2017-01-14 03:56:18 +01:00
parent d345b1ba7b
commit 53e388197a
7 changed files with 13 additions and 7 deletions
+6 -1
View File
@@ -33,7 +33,12 @@ namespace Swarmops.Common.Enums
/// <summary>
/// Totally customized and not stock localized - look up in PositionTitlesCustom table
/// </summary>
Custom
Custom,
/// <summary>
/// These titles are not actual positions, but UX elements (categories, etc)
/// </summary>
UxElement
// Expand with various title names
}
+2 -2
View File
@@ -459,9 +459,9 @@ namespace Swarmops.Logic.Resources {
/// <summary>
/// Looks up a localized string similar to Geographic Subleaders.
/// </summary>
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);
}
}
+1 -1
View File
@@ -249,7 +249,7 @@
<data name="Position_Geographic_Deputy_Plural" xml:space="preserve">
<value>Deputies</value>
</data>
<data name="Position_Geographic_ExpandingSubleaderNode" xml:space="preserve">
<data name="Position_Geographic_ExpandingSubleaderNode_UxElement" xml:space="preserve">
<value>Geographic Subleaders</value>
<comment>Leaders for geographies below the one displayed</comment>
</data>
+1 -1
View File
@@ -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";
+1 -1
View File
@@ -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<Position> expandingNode = treeResult.RootNodes[0].AddChild(expandingSubleaderNode);
ForOrganizationGeographyRecurse (geoTree.RootNodes[0], expandingNode, geographyLeaderTemplate, 2);
@@ -154,6 +154,7 @@ namespace Swarmops.Frontend.Automation
if (localizedPositionName == null)
{
localizedPositionName = @"NULL (" + position.PositionType.ToString() + ")";
string test = position.Localized();
}
if (assignments.Count > 0)
+1 -1
View File
@@ -24,7 +24,7 @@
</div></div>
<div class="box" style="background-image: url(/Images/Other/coins-background-istockphoto.jpg); background-size: 700px"><div class="content">
<div class="odometer-wrapper"><div class="elementFloatFar odometer odometer-currency" id="odoProfitLossToDate">500.001</div><div class="odometer-label">Annual Profit To Date (Testing new code)</div>
<div class="odometer-wrapper"><div class="elementFloatFar odometer odometer-currency" id="odoProfitLossToDate">0.001</div><div class="odometer-label">Annual Profit To Date (Testing new code)</div>
</div></div></div>
<div class="box"><div class="content">