@@ -514,8 +596,272 @@
loadTicketTags();
}
- // Load tags on page load
- document.addEventListener('DOMContentLoaded', loadTicketTags);
+ // ============================================
+ // CONTACTS MANAGEMENT
+ // ============================================
+
+ async function loadContacts() {
+ try {
+ const response = await fetch('/api/v1/ticket/tickets/{{ ticket.id }}/contacts');
+ if (!response.ok) throw new Error('Failed to load contacts');
+
+ const data = await response.json();
+ const container = document.getElementById('contactsList');
+
+ if (!data.contacts || data.contacts.length === 0) {
+ container.innerHTML = `
+
+
+
Ingen kontakter tilføjet endnu
+
+ `;
+ return;
+ }
+
+ container.innerHTML = data.contacts.map(contact => `
+
+ `).join('');
+ } catch (error) {
+ console.error('Error loading contacts:', error);
+ document.getElementById('contactsList').innerHTML = `
+
+ Kunne ikke indlæse kontakter
+
+ `;
+ }
+ }
+
+ function getRoleLabel(role) {
+ const labels = {
+ 'primary': '⭐ Primær',
+ 'requester': '📝 Anmoder',
+ 'assignee': '👤 Ansvarlig',
+ 'cc': '📧 CC',
+ 'observer': '👁 Observer',
+ 'ekstern_it': '💻 Ekstern IT',
+ 'third_party': '🤝 3. part',
+ 'electrician': '⚡ Elektriker',
+ 'consultant': '🎓 Konsulent',
+ 'vendor': '🏢 Leverandør'
+ };
+ return labels[role] || ('📌 ' + role.replace(/_/g, ' ').replace(/\b\w/g, l => l.toUpperCase()));
+ }
+
+ async function showAddContactModal() {
+ // Fetch all contacts for selection
+ try {
+ const response = await fetch('/api/v1/contacts?limit=1000');
+ if (!response.ok) throw new Error('Failed to load contacts');
+
+ const data = await response.json();
+ const contacts = data.contacts || [];
+
+ // Check if this ticket has any contacts yet
+ const ticketContactsResp = await fetch('/api/v1/ticket/tickets/{{ ticket.id }}/contacts');
+ const ticketContacts = await ticketContactsResp.json();
+ const isFirstContact = !ticketContacts.contacts || ticketContacts.contacts.length === 0;
+
+ // Create modal content
+ const modalHtml = `
+
+ `;
+
+ // Remove old modal if exists
+ const oldModal = document.getElementById('addContactModal');
+ if (oldModal) oldModal.remove();
+
+ // Append and show new modal
+ document.body.insertAdjacentHTML('beforeend', modalHtml);
+ const modal = new bootstrap.Modal(document.getElementById('addContactModal'));
+
+ // Show notice and disable role selector if first contact
+ if (isFirstContact) {
+ document.getElementById('firstContactNotice').style.display = 'block';
+ document.getElementById('roleSelect').value = 'primary';
+ document.getElementById('roleSelect').disabled = true;
+ }
+
+ modal.show();
+ } catch (error) {
+ console.error('Error:', error);
+ alert('Fejl ved indlæsning af kontakter');
+ }
+ }
+
+ function toggleCustomRole() {
+ const roleSelect = document.getElementById('roleSelect');
+ const customDiv = document.getElementById('customRoleDiv');
+ const customInput = document.getElementById('customRoleInput');
+
+ if (roleSelect.value === '_custom') {
+ customDiv.style.display = 'block';
+ customInput.required = true;
+ } else {
+ customDiv.style.display = 'none';
+ customInput.required = false;
+ }
+ }
+
+ async function addContact() {
+ const contactId = document.getElementById('contactSelect').value;
+ let role = document.getElementById('roleSelect').value;
+ const notes = document.getElementById('contactNotes').value;
+
+ if (!contactId) {
+ alert('Vælg venligst en kontakt');
+ return;
+ }
+
+ // If custom role selected, use the custom input
+ if (role === '_custom') {
+ const customRole = document.getElementById('customRoleInput').value.trim();
+ if (!customRole) {
+ alert('Indtast venligst en custom rolle');
+ return;
+ }
+ role = customRole.toLowerCase().replace(/\s+/g, '_').replace(/-/g, '_');
+ }
+
+ try {
+ const url = `/api/v1/ticket/tickets/{{ ticket.id }}/contacts?contact_id=${contactId}&role=${role}${notes ? '¬es=' + encodeURIComponent(notes) : ''}`;
+ const response = await fetch(url, { method: 'POST' });
+
+ if (!response.ok) {
+ const error = await response.json();
+ throw new Error(error.detail || 'Failed to add contact');
+ }
+
+ // Close modal and reload
+ bootstrap.Modal.getInstance(document.getElementById('addContactModal')).hide();
+ await loadContacts();
+ } catch (error) {
+ console.error('Error adding contact:', error);
+ alert('Fejl: ' + error.message);
+ }
+ }
+
+ async function editContactRole(contactId, currentRole, currentNotes) {
+ const newRole = prompt(`Ændr rolle (primary, requester, assignee, cc, observer):`, currentRole);
+ if (!newRole || newRole === currentRole) return;
+
+ const notes = prompt(`Noter (valgfri):`, currentNotes);
+
+ try {
+ const url = `/api/v1/ticket/tickets/{{ ticket.id }}/contacts/${contactId}?role=${newRole}${notes ? '¬es=' + encodeURIComponent(notes) : ''}`;
+ const response = await fetch(url, { method: 'PUT' });
+
+ if (!response.ok) throw new Error('Failed to update contact');
+ await loadContacts();
+ } catch (error) {
+ console.error('Error updating contact:', error);
+ alert('Fejl ved opdatering af kontakt');
+ }
+ }
+
+ async function removeContact(contactId, contactName) {
+ if (!confirm(`Fjern ${contactName} fra ticket?`)) return;
+
+ try {
+ const response = await fetch(`/api/v1/ticket/tickets/{{ ticket.id }}/contacts/${contactId}`, {
+ method: 'DELETE'
+ });
+
+ if (!response.ok) throw new Error('Failed to remove contact');
+ await loadContacts();
+ } catch (error) {
+ console.error('Error removing contact:', error);
+ alert('Fejl ved fjernelse af kontakt');
+ }
+ }
+
+ // Load tags and contacts on page load
+ document.addEventListener('DOMContentLoaded', () => {
+ loadTicketTags();
+ loadContacts();
+ });
// Override global tag picker to auto-reload after adding
if (window.tagPicker) {
diff --git a/main.py b/main.py
index cc7f953..8661e2f 100644
--- a/main.py
+++ b/main.py
@@ -30,6 +30,7 @@ from app.vendors.backend import views as vendors_views
from app.timetracking.backend import router as timetracking_api
from app.timetracking.frontend import views as timetracking_views
from app.contacts.backend import views as contacts_views
+from app.contacts.backend import router_simple as contacts_api
from app.tags.backend import router as tags_api
from app.tags.backend import views as tags_views
@@ -95,6 +96,7 @@ app.include_router(system_api.router, prefix="/api/v1", tags=["System"])
app.include_router(prepaid_api.router, prefix="/api/v1", tags=["Prepaid Cards"])
app.include_router(ticket_api.router, prefix="/api/v1/ticket", tags=["Tickets"])
app.include_router(vendors_api.router, prefix="/api/v1", tags=["Vendors"])
+app.include_router(contacts_api.router, prefix="/api/v1", tags=["Contacts"])
app.include_router(timetracking_api, prefix="/api/v1", tags=["Time Tracking"])
app.include_router(tags_api.router, prefix="/api/v1", tags=["Tags"])
diff --git a/migrations/029_ticket_contacts.sql b/migrations/029_ticket_contacts.sql
new file mode 100644
index 0000000..28195a4
--- /dev/null
+++ b/migrations/029_ticket_contacts.sql
@@ -0,0 +1,69 @@
+-- Ticket Contacts - Many-to-many relation med roller
+-- Tillader flere kontakter per ticket med forskellige roller (primary, cc, observer, etc.)
+
+-- Junction tabel mellem tickets og contacts
+CREATE TABLE IF NOT EXISTS tticket_contacts (
+ id SERIAL PRIMARY KEY,
+ ticket_id INTEGER NOT NULL REFERENCES tticket_tickets(id) ON DELETE CASCADE,
+ contact_id INTEGER NOT NULL REFERENCES contacts(id) ON DELETE CASCADE,
+ role VARCHAR(50) NOT NULL DEFAULT 'observer', -- primary, cc, observer, assignee
+ added_by_user_id INTEGER REFERENCES users(user_id),
+ added_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ notes TEXT, -- Valgfri noter om kontaktens rolle
+
+ -- Forhindre dubletter
+ UNIQUE(ticket_id, contact_id)
+);
+
+-- Indices for performance
+CREATE INDEX IF NOT EXISTS idx_tticket_contacts_ticket ON tticket_contacts(ticket_id);
+CREATE INDEX IF NOT EXISTS idx_tticket_contacts_contact ON tticket_contacts(contact_id);
+CREATE INDEX IF NOT EXISTS idx_tticket_contacts_role ON tticket_contacts(role);
+
+-- Check constraint for valide roller
+ALTER TABLE tticket_contacts
+ADD CONSTRAINT tticket_contacts_role_check
+CHECK (role IN ('primary', 'cc', 'observer', 'assignee', 'requester'));
+
+-- Migrer eksisterende contact_id til ny tabel (hvis der er data)
+INSERT INTO tticket_contacts (ticket_id, contact_id, role)
+SELECT id, contact_id, 'primary'
+FROM tticket_tickets
+WHERE contact_id IS NOT NULL
+ON CONFLICT (ticket_id, contact_id) DO NOTHING;
+
+-- Kommentar på tabellen
+COMMENT ON TABLE tticket_contacts IS 'Many-to-many relation mellem tickets og contacts med roller';
+COMMENT ON COLUMN tticket_contacts.role IS 'Kontaktens rolle: primary (hovedkontakt), cc (carbon copy), observer (følger med), assignee (assigned kontakt), requester (oprindelig anmoder)';
+
+-- Views til at få kontakter grouped by role
+CREATE OR REPLACE VIEW vw_tticket_contacts_summary AS
+SELECT
+ t.id as ticket_id,
+ t.ticket_number,
+ json_agg(
+ json_build_object(
+ 'contact_id', c.id,
+ 'first_name', c.first_name,
+ 'last_name', c.last_name,
+ 'email', c.email,
+ 'phone', c.phone,
+ 'role', tc.role,
+ 'added_at', tc.added_at
+ ) ORDER BY
+ CASE tc.role
+ WHEN 'primary' THEN 1
+ WHEN 'requester' THEN 2
+ WHEN 'assignee' THEN 3
+ WHEN 'cc' THEN 4
+ WHEN 'observer' THEN 5
+ ELSE 6
+ END,
+ tc.added_at
+ ) as contacts
+FROM tticket_tickets t
+LEFT JOIN tticket_contacts tc ON t.id = tc.ticket_id
+LEFT JOIN contacts c ON tc.contact_id = c.id
+GROUP BY t.id, t.ticket_number;
+
+COMMENT ON VIEW vw_tticket_contacts_summary IS 'Oversigt over alle kontakter per ticket med roller, sorteret efter rolle prioritet';
diff --git a/migrations/030_ticket_contacts_flexible_roles.sql b/migrations/030_ticket_contacts_flexible_roles.sql
new file mode 100644
index 0000000..eff981f
--- /dev/null
+++ b/migrations/030_ticket_contacts_flexible_roles.sql
@@ -0,0 +1,28 @@
+-- Gør ticket contact roller fleksible
+-- Fjern CHECK constraint og tillad custom roller
+
+-- Drop den eksisterende constraint
+ALTER TABLE tticket_contacts
+DROP CONSTRAINT IF EXISTS tticket_contacts_role_check;
+
+-- Tilføj index for bedre performance på rolle-søgninger
+CREATE INDEX IF NOT EXISTS idx_tticket_contacts_role_lower ON tticket_contacts(LOWER(role));
+
+-- Opdater eksisterende roller til at følge naming convention (lowercase med underscore)
+UPDATE tticket_contacts SET role = LOWER(REPLACE(role, ' ', '_'));
+
+-- Kommentar på kolonnen med eksempler
+COMMENT ON COLUMN tticket_contacts.role IS 'Kontaktens rolle på ticket. Standard roller: primary, requester, assignee, cc, observer. Custom roller: ekstern_it, third_party, electrician, consultant, etc.';
+
+-- View til at få oversigt over alle brugte roller
+CREATE OR REPLACE VIEW vw_ticket_contact_roles AS
+SELECT
+ role,
+ COUNT(*) as usage_count,
+ COUNT(DISTINCT ticket_id) as tickets_count,
+ MAX(added_at) as last_used
+FROM tticket_contacts
+GROUP BY role
+ORDER BY usage_count DESC;
+
+COMMENT ON VIEW vw_ticket_contact_roles IS 'Oversigt over alle brugte roller på tickets med statistik';