@@ -337,46 +366,72 @@ const AuditAdminHomeScreen = ({ user }: { user: IAuditAdmin }) => {
const ListAuditsWrapper = styled.div`
padding: 30px 30px 30px 0;
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
`
+const JurisdictionAuditList = ({
+ auditJurisdictions,
+}: {
+ auditJurisdictions: [string, IJurisdictionAdmin['jurisdictions']][]
+}) => {
+ return (
+
+ {sortBy(auditJurisdictions, ([_, jurisdictions]) =>
+ new Date(jurisdictions[0].election.createdAt).valueOf()
+ )
+ .reverse()
+ .flatMap(([electionId, jurisdictions]) =>
+ sortBy(jurisdictions, j => j.name).map(jurisdiction => (
+
+ {jurisdiction.name} — {jurisdiction.election.auditName}
+
+ ))
+ )}
+
+ )
+}
+
const ListAuditsJurisdictionAdmin = ({
user,
}: {
user: IJurisdictionAdmin
}) => {
const jurisdictionsByAudit = groupBy(user.jurisdictions, j => j.election.id)
+ const [activeAuditJurisdictions, completedAuditJurisdictions] = partition(
+ Object.entries(jurisdictionsByAudit),
+ ([_, jurisdictions]) => !jurisdictions[0].election.isComplete
+ )
+
return (
- {Object.entries(jurisdictionsByAudit).length === 0 ? (
-
- You don't have any available audits at the moment
-
- ) : (
- sortBy(
- Object.entries(jurisdictionsByAudit),
- ([_, jurisdictions]) => jurisdictions[0].election.auditName
- ).map(([electionId, jurisdictions]) => (
-
-
Jurisdictions - {jurisdictions[0].election.auditName}
- {sortBy(jurisdictions, j => j.name).map(
- ({ id, name, election }) => (
-
- {name}
-
- )
- )}
-
- ))
+
+
Active Audits
+ {activeAuditJurisdictions.length === 0 ? (
+
You have no active audits at this time.
+ ) : (
+
+ )}
+
+
Completed Audits
+
+
)}
)
diff --git a/client/src/components/UserContext.tsx b/client/src/components/UserContext.tsx
index 38139b56b..069080fe0 100644
--- a/client/src/components/UserContext.tsx
+++ b/client/src/components/UserContext.tsx
@@ -12,6 +12,8 @@ export interface IElection {
auditName: string
electionName: string
state: string
+ createdAt: string
+ isComplete: boolean
}
export interface IOrganization {
diff --git a/client/src/components/_mocks.ts b/client/src/components/_mocks.ts
index 582dc5e00..e5ee3a09e 100644
--- a/client/src/components/_mocks.ts
+++ b/client/src/components/_mocks.ts
@@ -1543,6 +1543,8 @@ export const jaApiCalls = {
electionName: 'election one',
state: 'AL',
organizationId: 'org-id',
+ createdAt: '2024-10-30T00:00:00.000Z',
+ isComplete: false,
},
numBallots: 100,
},
@@ -1555,6 +1557,8 @@ export const jaApiCalls = {
electionName: 'election two',
state: 'AL',
organizationId: 'org-id',
+ createdAt: '2024-10-29T00:00:00.000Z',
+ isComplete: true,
},
numBallots: 200,
},
@@ -1567,6 +1571,22 @@ export const jaApiCalls = {
electionName: 'election one',
state: 'AL',
organizationId: 'org-id',
+ createdAt: '2024-10-30T00:00:00.000Z',
+ isComplete: false,
+ },
+ numBallots: 300,
+ },
+ {
+ id: 'jurisdiction-id-4',
+ name: 'Jurisdiction Four',
+ election: {
+ id: '3',
+ auditName: 'audit three',
+ electionName: 'election three',
+ state: 'AL',
+ organizationId: 'org-id',
+ createdAt: '2024-11-01T00:00:00.000Z',
+ isComplete: false,
},
numBallots: 300,
},
@@ -1860,6 +1880,8 @@ export const mockOrganizations = {
auditName: 'November Presidential Election 2020',
electionName: '',
state: 'CA',
+ createdAt: '2020-10-30T00:00:00.000Z',
+ isComplete: true,
},
],
},
@@ -1869,11 +1891,29 @@ export const mockOrganizations = {
id: 'org-id',
name: 'State of California',
elections: [
+ {
+ id: '2',
+ auditName: 'May Primary Election 2020',
+ electionName: '',
+ state: 'CA',
+ createdAt: '2020-05-05T00:00:00.000Z',
+ isComplete: true,
+ },
{
id: '1',
auditName: 'November Presidential Election 2020',
electionName: '',
state: 'CA',
+ createdAt: '2020-10-30T00:00:00.000Z',
+ isComplete: false,
+ },
+ {
+ id: '3',
+ auditName: 'Most Recent Audit',
+ electionName: '',
+ state: 'CA',
+ createdAt: '2020-11-01T00:00:00.000Z',
+ isComplete: false,
},
],
},
diff --git a/server/api/elections.py b/server/api/elections.py
index a37f97367..789b7cfb0 100644
--- a/server/api/elections.py
+++ b/server/api/elections.py
@@ -21,6 +21,9 @@
record_activity,
)
from ..util.get_json import safe_get_json_dict
+from ..util.isoformat import isoformat
+from .rounds import is_audit_complete
+from .shared import get_current_round
ELECTION_SCHEMA = {
"type": "object",
@@ -143,6 +146,10 @@ def list_organizations_and_elections(audit_admin_id: str):
"auditName": election.audit_name,
"electionName": election.election_name,
"state": election.state,
+ "createdAt": isoformat(election.created_at),
+ "isComplete": bool(
+ is_audit_complete(get_current_round(election))
+ ),
}
for election in org.elections
if election.deleted_at is None
diff --git a/server/api/rounds.py b/server/api/rounds.py
index b955da766..d24fc3d79 100644
--- a/server/api/rounds.py
+++ b/server/api/rounds.py
@@ -1,6 +1,7 @@
import uuid
from typing import (
List,
+ Optional,
Tuple,
Dict,
)
@@ -175,8 +176,8 @@ def is_round_ready_to_finish(election: Election, round: Round) -> bool:
return num_jurisdictions_without_results == 0
-def is_audit_complete(round: Round):
- if not round.ended_at:
+def is_audit_complete(round: Optional[Round]):
+ if not (round and round.ended_at):
return None
if is_enabled_automatically_end_audit_after_one_round(round.election):
return True
diff --git a/server/auth/auth_routes.py b/server/auth/auth_routes.py
index 3eae382a9..0cccd3280 100644
--- a/server/auth/auth_routes.py
+++ b/server/auth/auth_routes.py
@@ -10,7 +10,6 @@
from authlib.integrations.flask_client import OAuth, OAuthError
from werkzeug.exceptions import BadRequest, Conflict
from xkcdpass import xkcd_password as xp
-from server.api.rounds import get_current_round
from . import auth
from ..models import * # pylint: disable=wildcard-import
@@ -44,6 +43,7 @@
)
from .. import config
from ..util.get_json import safe_get_json_dict
+from ..api.rounds import get_current_round, is_audit_complete
SUPPORT_OAUTH_CALLBACK_URL = "/auth/support/callback"
AUDITADMIN_OAUTH_CALLBACK_URL = "/auth/auditadmin/callback"
@@ -80,6 +80,8 @@ def serialize_election(election):
"electionName": election.election_name,
"state": election.state,
"organizationId": election.organization_id,
+ "createdAt": isoformat(election.created_at),
+ "isComplete": bool(is_audit_complete(get_current_round(election))),
}
diff --git a/server/tests/api/test_elections.py b/server/tests/api/test_elections.py
index 15cf1fc05..5d3e31299 100644
--- a/server/tests/api/test_elections.py
+++ b/server/tests/api/test_elections.py
@@ -411,21 +411,26 @@ def test_list_organizations(client: FlaskClient):
election_id = create_election(client, "Test Audit Org List", organization_id=org_id)
org_id_2, _ = create_org_and_admin("Test Org List 2", aa_email)
rv = client.get(f"/api/audit_admins/{aa_id}/organizations")
- assert json.loads(rv.data) == [
- {
- "name": "Test Org List",
- "id": org_id,
- "elections": [
- {
- "id": election_id,
- "auditName": "Test Audit Org List",
- "electionName": None,
- "state": None,
- }
- ],
- },
- {"name": "Test Org List 2", "id": org_id_2, "elections": []},
- ]
+ compare_json(
+ json.loads(rv.data),
+ [
+ {
+ "name": "Test Org List",
+ "id": org_id,
+ "elections": [
+ {
+ "id": election_id,
+ "auditName": "Test Audit Org List",
+ "electionName": None,
+ "state": None,
+ "createdAt": assert_is_date,
+ "isComplete": False,
+ }
+ ],
+ },
+ {"name": "Test Org List 2", "id": org_id_2, "elections": []},
+ ],
+ )
def test_list_organizations_not_authorized(
diff --git a/server/tests/api/test_rounds.py b/server/tests/api/test_rounds.py
index 2cd43eec3..458407c0b 100644
--- a/server/tests/api/test_rounds.py
+++ b/server/tests/api/test_rounds.py
@@ -218,6 +218,30 @@ def test_rounds_complete_audit(
rounds = json.loads(rv.data)
compare_json(rounds, expected_rounds)
+ # Test that the audit is marked as complete in the audit admin's home screen
+ set_logged_in_user(client, UserType.AUDIT_ADMIN, DEFAULT_AA_EMAIL)
+ rv = client.get("/api/me")
+ user_id = json.loads(rv.data)["user"]["id"]
+ rv = client.get(f"/api/audit_admins/{user_id}/organizations")
+ orgs = json.loads(rv.data)
+ election = next(
+ election
+ for org in orgs
+ for election in org["elections"]
+ if election["id"] == election_id
+ )
+ assert election["isComplete"] is True
+
+ # Test that the audit is marked as complete in the jurisdiction admin's home screen
+ set_logged_in_user(
+ client, UserType.JURISDICTION_ADMIN, default_ja_email(election_id)
+ )
+ rv = client.get("/api/me")
+ assert (
+ json.loads(rv.data)["user"]["jurisdictions"][0]["election"]["isComplete"]
+ is True
+ )
+
def test_rounds_round_2_required_if_all_blanks(
client: FlaskClient,
diff --git a/server/tests/test_auth.py b/server/tests/test_auth.py
index fef362bee..e33b8d011 100644
--- a/server/tests/test_auth.py
+++ b/server/tests/test_auth.py
@@ -1193,27 +1193,32 @@ def test_auth_me_jurisdiction_admin(
db_session.expunge(election)
rv = client.get("/api/me")
- assert json.loads(rv.data) == {
- "user": {
- "type": UserType.JURISDICTION_ADMIN,
- "email": ja_email,
- "jurisdictions": [
- {
- "id": jurisdiction_id,
- "name": "Test Jurisdiction",
- "election": {
- "id": election_id,
- "auditName": election.audit_name,
- "electionName": None,
- "state": None,
- "organizationId": election.organization_id,
- },
- "numBallots": None,
- }
- ],
+ compare_json(
+ json.loads(rv.data),
+ {
+ "user": {
+ "type": UserType.JURISDICTION_ADMIN,
+ "email": ja_email,
+ "jurisdictions": [
+ {
+ "id": jurisdiction_id,
+ "name": "Test Jurisdiction",
+ "election": {
+ "id": election_id,
+ "auditName": election.audit_name,
+ "electionName": None,
+ "state": None,
+ "organizationId": election.organization_id,
+ "createdAt": assert_is_date,
+ "isComplete": False,
+ },
+ "numBallots": None,
+ }
+ ],
+ },
+ "supportUser": None,
},
- "supportUser": None,
- }
+ )
def test_auth_me_audit_board(