diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx index 599b8f9f..45884918 100644 --- a/Site5/App_GlobalResources/Global.resx +++ b/Site5/App_GlobalResources/Global.resx @@ -674,4 +674,25 @@ No urgent action items. Yay! + + Min / Max + note the spaces + + + Assigned Person + + + Expires + The date a position assignment autoterminates + + + Assign one more person... + To an existing position that accepts multiple people (like "assistants") + + + Assign person... + + + Position + \ No newline at end of file diff --git a/Site5/Automation/Json-PositionsTree.aspx.cs b/Site5/Automation/Json-PositionsTree.aspx.cs index bb000dac..bbbcb74c 100644 --- a/Site5/Automation/Json-PositionsTree.aspx.cs +++ b/Site5/Automation/Json-PositionsTree.aspx.cs @@ -43,14 +43,14 @@ namespace Swarmops.Frontend.Automation string expires = string.Empty; - string assignedName = Resources.Global.Swarm_Vacant + "
Testing line 2
Testing line 3"; + string assignedName = Resources.Global.Swarm_Vacant + " " + Resources.Global.Swarm_AssignPerson + "" ; if (assignments.Count > 0) { assignedName = assignments[0].Person.Canonical; } - string element = string.Format("\"id\":\"{0}\",\"positionTitle\":\"{1}\",\"assignedName\":\"{2}\",\"expires\":\"{3}\"", - position.Identity, JsonSanitize (localizedPositionName), JsonSanitize (assignedName), JsonSanitize (expires)); + string element = string.Format("\"id\":\"{0}\",\"positionTitle\":\"{1}\",\"assignedName\":\"{2}\",\"expires\":\"{3}\",\"minMax\":\"{4} / {5}\"", + position.Identity, JsonSanitize (localizedPositionName), JsonSanitize (assignedName), JsonSanitize (expires), position.MinCount, position.MaxCount == 0? @"∞" : position.MaxCount.ToString()); // TODO: Add all assignments after the first one right here diff --git a/Site5/Controls/v5/Swarm/TreePositions.ascx b/Site5/Controls/v5/Swarm/TreePositions.ascx index 541177c3..197f9bbb 100644 --- a/Site5/Controls/v5/Swarm/TreePositions.ascx +++ b/Site5/Controls/v5/Swarm/TreePositions.ascx @@ -26,13 +26,11 @@ idField="id" treeField="positionTitle"> - - - - - - - + + + + + diff --git a/Site5/Controls/v5/Swarm/TreePositions.ascx.cs b/Site5/Controls/v5/Swarm/TreePositions.ascx.cs index 485c965e..187fd430 100644 --- a/Site5/Controls/v5/Swarm/TreePositions.ascx.cs +++ b/Site5/Controls/v5/Swarm/TreePositions.ascx.cs @@ -18,6 +18,16 @@ namespace Swarmops.Frontend.Controls.v5.Swarm protected void Page_Load (object sender, EventArgs e) { + Localize(); + } + + private void Localize() + { + this.LiteralHeaderAction.Text = Resources.Global.Global_Action; + this.LiteralHeaderName.Text = Resources.Global.Swarm_AssignedPerson; + this.LiteralHeaderPosition.Text = Resources.Global.Swarm_Position; + this.LiteralHeaderExpires.Text = Resources.Global.Swarm_AssignmentExpires; + this.LiteralHeaderMinMax.Text = Resources.Global.Global_MinMax; } public RoleLevel Level { get; set; }