+ {section.label && (
+ <>
+ {sIdx > 0 && 0 ? 4 : 0}>
+ {section.label}
+
+
+ )}
+ {section.items.map((item: any) =>
+ item.children ? (
navigate(child.path)}
+ key={item.label}
+ label={item.label}
+ leftSection={ navigate(child.path)}
+ />
+ ))}
+
+ ) : (
+
- ) : (
-
+ ))}
{user?.isSuperadmin && (
<>
diff --git a/frontend/src/pages/admin/AdminPage.tsx b/frontend/src/pages/admin/AdminPage.tsx
index 2f386ea..07e28ae 100644
--- a/frontend/src/pages/admin/AdminPage.tsx
+++ b/frontend/src/pages/admin/AdminPage.tsx
@@ -1,11 +1,14 @@
import { useState } from 'react';
import {
Title, Text, Card, Table, SimpleGrid, Group, Stack, Badge, Loader, Center,
- ThemeIcon, Tabs, ActionIcon, Switch, TextInput, Avatar,
+ ThemeIcon, Tabs, Switch, TextInput, Avatar, Modal, Button, PasswordInput,
+ Select, NumberInput, Menu, Divider,
} from '@mantine/core';
+import { useDisclosure } from '@mantine/hooks';
import {
IconUsers, IconBuilding, IconShieldLock, IconSearch,
- IconCrown, IconUser,
+ IconCrown, IconPlus, IconArchive, IconChevronDown,
+ IconCircleCheck, IconBan, IconArchiveOff,
} from '@tabler/icons-react';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import api from '../../services/api';
@@ -19,10 +22,61 @@ interface AdminUser {
interface AdminOrg {
id: string; name: string; schema_name: string; status: string;
email: string; phone: string; member_count: string; created_at: string;
+ contract_number: string; plan_level: string;
}
+interface CreateTenantForm {
+ orgName: string;
+ email: string;
+ phone: string;
+ addressLine1: string;
+ city: string;
+ state: string;
+ zipCode: string;
+ contractNumber: string;
+ planLevel: string;
+ fiscalYearStartMonth: number | '';
+ adminEmail: string;
+ adminPassword: string;
+ adminFirstName: string;
+ adminLastName: string;
+}
+
+const initialFormState: CreateTenantForm = {
+ orgName: '',
+ email: '',
+ phone: '',
+ addressLine1: '',
+ city: '',
+ state: '',
+ zipCode: '',
+ contractNumber: '',
+ planLevel: 'standard',
+ fiscalYearStartMonth: 1,
+ adminEmail: '',
+ adminPassword: '',
+ adminFirstName: '',
+ adminLastName: '',
+};
+
+const planBadgeColor: Record
- Platform Administration
- SuperUser Admin Panel — Manage tenants and users
-
+
+ Platform Administration
+ SuperUser Admin Panel — Manage tenants and users
+
+ }
+ onClick={openCreateModal}
+ >
+ Create Tenant
+
+
@@ -98,6 +191,17 @@ export function AdminPage() {
+
+
+
+
+
+
Organization
Schema
Status
+ Contract #
+ Plan
Members
Contact
Created
@@ -206,13 +312,61 @@ export function AdminPage() {
{o.schema_name}
-
- {o.status}
-
+
+
+
+ {o.contract_number || '\u2014'}
+
+
+ {o.plan_level ? (
+
+ {o.plan_level}
+
+ ) : (
+ {'\u2014'}
+ )}
{o.member_count}
@@ -233,6 +387,178 @@ export function AdminPage() {
)}
+
+ {/* Create Tenant Modal */}
+ { closeCreateModal(); setForm(initialFormState); }}
+ title="Create New Tenant"
+ size="lg"
+ >
+
+ Organization Details
+ updateField('orgName', e.currentTarget.value)}
+ />
+
+ updateField('email', e.currentTarget.value)}
+ />
+ updateField('phone', e.currentTarget.value)}
+ />
+
+ updateField('addressLine1', e.currentTarget.value)}
+ />
+
+ updateField('city', e.currentTarget.value)}
+ />
+ updateField('state', e.currentTarget.value)}
+ />
+ updateField('zipCode', e.currentTarget.value)}
+ />
+
+
+ updateField('contractNumber', e.currentTarget.value)}
+ />
+
+
+ Admin User
+
+ updateField('adminEmail', e.currentTarget.value)}
+ />
+ updateField('adminPassword', e.currentTarget.value)}
+ />
+
+
+ updateField('adminFirstName', e.currentTarget.value)}
+ />
+ updateField('adminLastName', e.currentTarget.value)}
+ />
+
+
+
+
+
+
+
+
+
+ {/* Status Change Confirmation Modal */}
+ setStatusConfirm(null)}
+ title="Confirm Status Change"
+ size="sm"
+ centered
+ >
+ {statusConfirm && (
+
+
+ Are you sure you want to change {statusConfirm.orgName} status
+ to {statusConfirm.newStatus} ?
+
+ {statusConfirm.newStatus === 'archived' && (
+
+ Archiving an organization will disable access for all its members.
+
+ )}
+ {statusConfirm.newStatus === 'suspended' && (
+
+ Suspending an organization will temporarily disable access for all its members.
+
+ )}
+
+
+
+
+
+ )}
+
);
}
diff --git a/frontend/src/pages/assessment-groups/AssessmentGroupsPage.tsx b/frontend/src/pages/assessment-groups/AssessmentGroupsPage.tsx
index e3a6832..138f42d 100644
--- a/frontend/src/pages/assessment-groups/AssessmentGroupsPage.tsx
+++ b/frontend/src/pages/assessment-groups/AssessmentGroupsPage.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import {
Title, Text, Card, Table, SimpleGrid, Group, Stack, Badge, Loader, Center,
- ThemeIcon, Button, Modal, TextInput, NumberInput, Textarea, Switch, ActionIcon,
+ ThemeIcon, Button, Modal, TextInput, NumberInput, Textarea, Select, ActionIcon,
} from '@mantine/core';
import { useForm } from '@mantine/form';
import { useDisclosure } from '@mantine/hooks';
@@ -19,6 +19,7 @@ interface AssessmentGroup {
regular_assessment: string;
special_assessment: string;
unit_count: number;
+ frequency: string;
actual_unit_count: string;
monthly_operating_income: string;
monthly_reserve_income: string;
@@ -34,6 +35,18 @@ interface Summary {
total_units: string;
}
+const frequencyLabels: Record = {
+ monthly: 'Monthly',
+ quarterly: 'Quarterly',
+ annual: 'Annual',
+};
+
+const frequencyColors: Record = {
+ monthly: 'blue',
+ quarterly: 'teal',
+ annual: 'violet',
+};
+
export function AssessmentGroupsPage() {
const [opened, { open, close }] = useDisclosure(false);
const [editing, setEditing] = useState(null);
@@ -56,6 +69,7 @@ export function AssessmentGroupsPage() {
regularAssessment: 0,
specialAssessment: 0,
unitCount: 0,
+ frequency: 'monthly',
},
validate: {
name: (v) => (v.length > 0 ? null : 'Required'),
@@ -99,6 +113,7 @@ export function AssessmentGroupsPage() {
regularAssessment: parseFloat(group.regular_assessment || '0'),
specialAssessment: parseFloat(group.special_assessment || '0'),
unitCount: group.unit_count || 0,
+ frequency: group.frequency || 'monthly',
});
open();
};
@@ -112,6 +127,14 @@ export function AssessmentGroupsPage() {
const fmt = (v: string | number) =>
parseFloat(String(v || '0')).toLocaleString('en-US', { style: 'currency', currency: 'USD' });
+ const freqSuffix = (freq: string) => {
+ switch (freq) {
+ case 'quarterly': return '/qtr';
+ case 'annual': return '/yr';
+ default: return '/mo';
+ }
+ };
+
if (isLoading) return
Assessment Groups
- Manage property types with different assessment rates
+ Manage property types with different assessment rates and frequencies
} onClick={handleNew}>
Add Group
@@ -152,7 +175,7 @@ export function AssessmentGroupsPage() {
@@ -163,7 +186,7 @@ export function AssessmentGroupsPage() {
@@ -179,10 +202,10 @@ export function AssessmentGroupsPage() {
Group Name
Units
+ Frequency
Regular Assessment
Special Assessment
- Monthly Operating
- Monthly Reserve
+ Monthly Equiv.
Status
@@ -208,14 +231,24 @@ export function AssessmentGroupsPage() {
{g.actual_unit_count || g.unit_count}
- {fmt(g.regular_assessment)}
+
+
+ {frequencyLabels[g.frequency] || 'Monthly'}
+
+
+
+ {fmt(g.regular_assessment)}{freqSuffix(g.frequency)}
+
{parseFloat(g.special_assessment || '0') > 0 ? (
- {fmt(g.special_assessment)}
+ {fmt(g.special_assessment)}{freqSuffix(g.frequency)}
) : '-'}
- {fmt(g.monthly_operating_income)}
- {fmt(g.monthly_reserve_income)}
+ {fmt(g.total_monthly_income)}
{g.is_active ? 'Active' : 'Archived'}
@@ -246,16 +279,26 @@ export function AssessmentGroupsPage() {
= {
planned: 'blue', approved: 'green', in_progress: 'yellow',
completed: 'teal', deferred: 'gray', cancelled: 'red',
@@ -34,6 +36,8 @@ const priorityColor = (p: number) => (p <= 2 ? 'red' : p <= 3 ? 'yellow' : 'gray
const fmt = (v: string | number) =>
parseFloat(String(v || '0')).toLocaleString('en-US', { style: 'currency', currency: 'USD' });
+const yearLabel = (year: number) => (year === FUTURE_YEAR ? 'Future' : String(year));
+
// ---------------------------------------------------------------------------
// Kanban card
// ---------------------------------------------------------------------------
@@ -129,7 +133,7 @@ function KanbanColumn({
onDrop={(e) => onDrop(e, year)}
>
- {year}
+ {yearLabel(year)}
{fmt(totalEst)}
@@ -152,6 +156,21 @@ function KanbanColumn({
);
}
+// ---------------------------------------------------------------------------
+// Print styles - hides kanban and shows the table view when printing
+// ---------------------------------------------------------------------------
+
+const printStyles = `
+@media print {
+ .capital-projects-kanban-view {
+ display: none !important;
+ }
+ .capital-projects-table-view {
+ display: block !important;
+ }
+}
+`;
+
// ---------------------------------------------------------------------------
// Main page component
// ---------------------------------------------------------------------------
@@ -159,8 +178,10 @@ function KanbanColumn({
export function CapitalProjectsPage() {
const [opened, { open, close }] = useDisclosure(false);
const [editing, setEditing] = useState(null);
- const [viewMode, setViewMode] = useState('table');
+ const [viewMode, setViewMode] = useState('kanban');
+ const [printMode, setPrintMode] = useState(false);
const [dragOverYear, setDragOverYear] = useState(null);
+ const printModeRef = useRef(false);
const queryClient = useQueryClient();
// ---- Data fetching ----
@@ -172,6 +193,16 @@ export function CapitalProjectsPage() {
// ---- Form ----
+ const currentYear = new Date().getFullYear();
+
+ const targetYearOptions = [
+ ...Array.from({ length: 6 }, (_, i) => ({
+ value: String(currentYear + i),
+ label: String(currentYear + i),
+ })),
+ { value: String(FUTURE_YEAR), label: 'Future (Beyond 5-Year)' },
+ ];
+
const form = useForm({
initialValues: {
name: '', description: '', estimated_cost: 0, actual_cost: 0,
@@ -213,6 +244,21 @@ export function CapitalProjectsPage() {
},
});
+ // ---- Print mode effect ----
+
+ useEffect(() => {
+ if (printMode) {
+ printModeRef.current = true;
+ // Wait for the table to render before printing
+ const timer = setTimeout(() => {
+ window.print();
+ setPrintMode(false);
+ printModeRef.current = false;
+ }, 300);
+ return () => clearTimeout(timer);
+ }
+ }, [printMode]);
+
// ---- Handlers ----
const handleEdit = (p: CapitalProject) => {
@@ -235,7 +281,13 @@ export function CapitalProjectsPage() {
};
const handlePdfExport = () => {
- window.print();
+ // If already in table view, just print directly
+ if (viewMode === 'table') {
+ window.print();
+ return;
+ }
+ // Otherwise, trigger printMode which renders the table for printing
+ setPrintMode(true);
};
// ---- Drag & Drop ----
@@ -270,7 +322,17 @@ export function CapitalProjectsPage() {
// ---- Derived data ----
- const years = [...new Set(projects.map((p) => p.target_year))].sort();
+ // Always show current year through current+4, plus FUTURE_YEAR if any projects have it
+ const baseYears = Array.from({ length: 5 }, (_, i) => currentYear + i);
+ const projectYears = [...new Set(projects.map((p) => p.target_year))];
+ const hasFutureProjects = projectYears.includes(FUTURE_YEAR);
+
+ // Merge base years with any extra years from projects (excluding FUTURE_YEAR for now)
+ const regularYears = [...new Set([...baseYears, ...projectYears.filter((y) => y !== FUTURE_YEAR)])].sort();
+ const years = hasFutureProjects ? [...regularYears, FUTURE_YEAR] : regularYears;
+
+ // Kanban columns: always current..current+4 plus Future
+ const kanbanYears = [...baseYears, FUTURE_YEAR];
// ---- Loading state ----
@@ -287,11 +349,12 @@ export function CapitalProjectsPage() {
) : (
years.map((year) => {
const yearProjects = projects.filter((p) => p.target_year === year);
+ if (yearProjects.length === 0) return null;
const totalEst = yearProjects.reduce((s, p) => s + parseFloat(p.estimated_cost || '0'), 0);
return (
- {year}
+ {yearLabel(year)}
{fmt(totalEst)} estimated
@@ -312,10 +375,17 @@ export function CapitalProjectsPage() {
+ Archived
+ {archivedCount}
+
+
- Monthly Operating
+ Monthly Equiv. Operating
{fmt(summary?.total_monthly_operating || '0')}
- Monthly Reserve
+ Monthly Equiv. Reserve
{fmt(summary?.total_monthly_reserve || '0')}