diff --git a/Logic/Swarm/Person.cs b/Logic/Swarm/Person.cs
index ab284b79..eb8b4a46 100644
--- a/Logic/Swarm/Person.cs
+++ b/Logic/Swarm/Person.cs
@@ -1212,6 +1212,24 @@ namespace Swarmops.Logic.Swarm
return false;
}
+ public Position GetPrimaryPosition (Organization organization)
+ {
+ PositionAssignments personAssignments = PositionAssignments.ForPerson (this);
+
+ foreach (PositionAssignment assignment in personAssignments)
+ {
+ if (assignment.OrganizationId == 0 || assignment.OrganizationId == organization.Identity)
+ {
+ // TODO: If "acting" is false, and no delegation, then...
+ return assignment.Position;
+ }
+ }
+
+ // No hit. This is a totally valid case, so don't throw but return null.
+
+ return null;
+ }
+
// A couple of special cases
public const int OpenLedgersIdentity = -1;
diff --git a/Logic/Swarm/PositionAssignment.cs b/Logic/Swarm/PositionAssignment.cs
index 5d0bed32..18e0e84d 100644
--- a/Logic/Swarm/PositionAssignment.cs
+++ b/Logic/Swarm/PositionAssignment.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
using NBitcoin;
@@ -97,5 +98,19 @@ namespace Swarmops.Logic.Swarm
return FromIdentityAggressive (positionAssignmentId);
}
+ public void Terminate (Person terminatingPerson, Position terminatingPosition, string terminationNotes)
+ {
+ // TODO: ADD ACCESS CONTROL AT LOGIC LAYER
+
+ SwarmDb.GetDatabaseForWriting()
+ .TerminatePositionAssignment (this.Identity, terminatingPerson.Identity, terminatingPosition.Identity,
+ terminationNotes);
+
+ base.TerminatedByPersonId = terminatingPerson.Identity;
+ base.TerminatedByPositionId = terminatingPosition.Identity;
+ base.Active = false;
+ base.TerminationNotes = terminationNotes;
+ base.TerminatedDateTimeUtc = DateTime.UtcNow; // may differ by milliseconds from actual value set, but shouldn't matter for practical purposes
+ }
}
}
diff --git a/Site5/App_GlobalResources/Controls.Swarm.resx b/Site5/App_GlobalResources/Controls.Swarm.resx
index 79647be0..aa800410 100644
--- a/Site5/App_GlobalResources/Controls.Swarm.resx
+++ b/Site5/App_GlobalResources/Controls.Swarm.resx
@@ -125,7 +125,7 @@
", assignments[0].Identity, _customCookieClass, assignments[0].PersonId == CurrentUser.Identity? "self='true'": string.Empty);
}
- string element = string.Format("\"id\":\"{0}-1\",\"positionTitle\":\"{1}\",\"assignedName\":\"{2}\",\"expires\":\"{3}\",\"minMax\":\"{4} / {5}\",\"iconType\":\"{6}\"",
+ string element = string.Format("\"id\":\"{0}-1\",\"positionTitle\":\"{1}\",\"assignedName\":\"{2}\",\"expires\":\"{3}\",\"minMax\":\"{4} / {5}\",\"iconType\":\"{6}\",\"actions\":\"{7}\"",
position.Identity, JsonSanitize (localizedPositionName), JsonSanitize (assignedName), JsonSanitize (expires), position.MinCount,
position.MaxCount == 0? @"∞" : position.MaxCount.ToString(CultureInfo.InvariantCulture),
- position.MaxCount == 1? "Person" : "Group");
+ position.MaxCount == 1? "Person" : "Group",
+ action);
// TODO: Add all assignments after the first one right here
@@ -71,6 +74,8 @@ namespace Swarmops.Frontend.Automation
elements.Add ("{" + element + "}");
expires = string.Empty;
+ action = String.Format("
", assignments[assignmentCount].Identity, _customCookieClass, assignments[0].PersonId == CurrentUser.Identity ? "self='true'" : string.Empty);
+
int expireYear = assignments[assignmentCount].ExpiresDateTimeUtc.Year;
if (expireYear > 2000 && expireYear < 3000) // as in, "is defined"
{
@@ -78,8 +83,8 @@ namespace Swarmops.Frontend.Automation
}
element =
String.Format (
- "\"id\":\"{0}-{1}\",\"iconType\":\"Hidden\",\"positionTitle\":\" \",\"assignedName\":\"{2}\",\"expires\":\"{3}\"",
- position.Identity, assignmentCount+1, assignments[assignmentCount].Person.Canonical, expires);
+ "\"id\":\"{0}-{1}\",\"iconType\":\"Hidden\",\"positionTitle\":\" \",\"assignedName\":\"{2}\",\"expires\":\"{3}\",\"actions\":\"{4}\"",
+ position.Identity, assignmentCount+1, assignments[assignmentCount].Person.Canonical, expires, action);
assignmentCount++;
}
@@ -129,6 +134,11 @@ namespace Swarmops.Frontend.Automation
return "[" + String.Join(",", elements.ToArray()) + "]";
}
+ private bool HasHiringFiringPrivileges (Position position)
+ {
+ return false;
+ }
+
private string _customCookieClass;
private class JsonPosition
diff --git a/Site5/Automation/SwarmFunctions.aspx.cs b/Site5/Automation/SwarmFunctions.aspx.cs
index 63ba889a..1a9ece21 100644
--- a/Site5/Automation/SwarmFunctions.aspx.cs
+++ b/Site5/Automation/SwarmFunctions.aspx.cs
@@ -66,7 +66,56 @@ namespace Swarmops.Frontend.Automation
return new AjaxCallResult {Success = false, DisplayMessage = Resources.Global.Error_DatabaseConcurrency};
}
- return new AjaxCallResult() {Success = true};
+ return new AjaxCallResult {Success = true};
+ }
+
+
+ [WebMethod]
+ public static AjaxCallResult TerminatePositionAssignment (int assignmentId)
+ {
+ AuthenticationData authData = GetAuthenticationDataAndCulture();
+
+ PositionAssignment assignment = PositionAssignment.FromIdentity (assignmentId);
+
+ if (assignment.OrganizationId == 0)
+ {
+ if (!authData.CurrentUser.HasAccess (new Access (AccessAspect.Administration))) // System-wide admin
+ {
+ throw new UnauthorizedAccessException();
+ }
+ }
+ else // Org-specific assignment
+ {
+ if (assignment.GeographyId == 0)
+ {
+ if (!authData.CurrentUser.HasAccess (new Access(authData.CurrentOrganization, AccessAspect.Administration)))
+ {
+ throw new UnauthorizedAccessException();
+ }
+ }
+ else // Org- and geo-specific assignment
+ {
+ if (
+ !authData.CurrentUser.HasAccess (new Access (authData.CurrentOrganization,
+ assignment.Position.Geography, AccessAspect.Administration)))
+ {
+ throw new UnauthorizedAccessException();
+ }
+ }
+ }
+
+ // Ok, go ahead and terminate
+
+ try
+ {
+ assignment.Terminate(authData.CurrentUser, authData.CurrentUser.GetPrimaryPosition(authData.CurrentOrganization), string.Empty);
+ }
+ catch (DatabaseConcurrencyException)
+ {
+ return new AjaxCallResult {Success = false, DisplayMessage = Resources.Global.Error_DatabaseConcurrency};
+ }
+
+ return new AjaxCallResult {Success = true};
}
public class AvatarData : AjaxCallResult
diff --git a/Site5/Controls/v5/Swarm/TreePositions.ascx b/Site5/Controls/v5/Swarm/TreePositions.ascx
index 9df54d83..e820780d 100644
--- a/Site5/Controls/v5/Swarm/TreePositions.ascx
+++ b/Site5/Controls/v5/Swarm/TreePositions.ascx
@@ -2,7 +2,16 @@
<%@ Register TagPrefix="Swarmops5Workaround" TagName="ComboPeople" src="~/Controls/v5/Swarm/ComboPeople.ascx" %>
@@ -76,7 +147,7 @@