diff --git a/expense_files.php b/expense_files.php new file mode 100644 index 0000000..4c61839 --- /dev/null +++ b/expense_files.php @@ -0,0 +1,88 @@ +prepare(" + SELECT a.*, ex.entry_date, s.name as supplier_name, p.name as project_name + FROM attachments a + JOIN expenses ex ON a.entity_id = ex.id + JOIN suppliers s ON ex.supplier_id = s.id + JOIN projects p ON ex.project_id = p.id + WHERE a.tenant_id = ? AND a.entity_type = 'expense' + ORDER BY a.created_at DESC +"); +$stmt->execute([$tenant_id]); +$files = $stmt->fetchAll(); + +function formatBytes($bytes, $precision = 2) { + $units = ['B', 'KB', 'MB', 'GB', 'TB']; + $bytes = max($bytes, 0); + $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); + $pow = min($pow, count($units) - 1); + $bytes /= pow(1024, $pow); + return round($bytes, $precision) . ' ' . $units[$pow]; +} + +$pageTitle = "SR&ED Manager - Expense Files"; +include __DIR__ . '/includes/header.php'; +?> + +
+
+

Expense Files

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
FilenameSizeUploaded ByCreated AtLinked EntryActions
No expense files found.
+ + + +
+
+ +
+ +
+ 		+
+
+ - +
+ 		+ View +
+
+
+
+ + diff --git a/expenses.php b/expenses.php index 1065698..5558ce2 100644 --- a/expenses.php +++ b/expenses.php @@ -32,7 +32,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_expense'])) { if (!is_dir('uploads')) mkdir('uploads', 0775, true); if (move_uploaded_file($tmp_name, $file_path)) { - $stmt = db()->prepare("INSERT INTO attachments (tenant_id, entity_type, entity_id, file_name, file_path, file_size, mime_type) VALUES (?, 'expense', ?, ?, ?, ?, ?)"); + $stmt = db()->prepare("INSERT INTO attachments (tenant_id, entity_type, entity_id, file_name, file_path, file_size, mime_type, uploaded_by) VALUES (?, 'expense', ?, ?, ?, ?, ?, 'John Manager')"); $stmt->execute([$tenant_id, $expense_id, $file_name, $file_path, $file_size, $mime_type]); } } diff --git a/files.php b/files.php new file mode 100644 index 0000000..64d4c0a --- /dev/null +++ b/files.php @@ -0,0 +1,97 @@ +prepare(" + SELECT a.*, + CASE + WHEN a.entity_type = 'labour_entry' THEN (SELECT CONCAT(le.entry_date, ' - ', e.name, ' - ', p.name) FROM labour_entries le JOIN employees e ON le.employee_id = e.id JOIN projects p ON le.project_id = p.id WHERE le.id = a.entity_id) + WHEN a.entity_type = 'expense' THEN (SELECT CONCAT(ex.entry_date, ' - ', s.name, ' - ', p.name) FROM expenses ex JOIN suppliers s ON ex.supplier_id = s.id JOIN projects p ON ex.project_id = p.id WHERE ex.id = a.entity_id) + ELSE 'Other' + END as linked_entry_info + FROM attachments a + WHERE a.tenant_id = ? + ORDER BY a.created_at DESC +"); +$stmt->execute([$tenant_id]); +$files = $stmt->fetchAll(); + +function formatBytes($bytes, $precision = 2) { + $units = ['B', 'KB', 'MB', 'GB', 'TB']; + $bytes = max($bytes, 0); + $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); + $pow = min($pow, count($units) - 1); + $bytes /= pow(1024, $pow); + return round($bytes, $precision) . ' ' . $units[$pow]; +} + +$pageTitle = "SR&ED Manager - All Files Report"; +include __DIR__ . '/includes/header.php'; +?> + +
+
+

System Files Report

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeFilenameSizeUploaded ByCreated AtLinked EntryActions
No files found in the system.
+ + Labour + + Expense + + + + + + + + + + + View +
+
+
+
+ + + + diff --git a/includes/header.php b/includes/header.php index 5e7f483..8c9c0d4 100644 --- a/includes/header.php +++ b/includes/header.php @@ -41,17 +41,35 @@ $currentPage = basename($_SERVER['PHP_SELF']);
  • Projects
    • -
  • - Labour +
  • + + Labour + +
    • -
  • - Expenses +
  • + + Expenses + +
  • Employees
    • -
  • - Reports +
  • + + Reports + +
  • Settings diff --git a/labour.php b/labour.php index b5c0e58..2414f8b 100644 --- a/labour.php +++ b/labour.php @@ -32,7 +32,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_labour'])) { if (!is_dir('uploads')) mkdir('uploads', 0775, true); if (move_uploaded_file($tmp_name, $file_path)) { - $stmt = db()->prepare("INSERT INTO attachments (tenant_id, entity_type, entity_id, file_name, file_path, file_size, mime_type) VALUES (?, 'labour_entry', ?, ?, ?, ?, ?)"); + $stmt = db()->prepare("INSERT INTO attachments (tenant_id, entity_type, entity_id, file_name, file_path, file_size, mime_type, uploaded_by) VALUES (?, 'labour_entry', ?, ?, ?, ?, ?, 'John Manager')"); $stmt->execute([$tenant_id, $labour_entry_id, $file_name, $file_path, $file_size, $mime_type]); } } diff --git a/labour_files.php b/labour_files.php new file mode 100644 index 0000000..c77b63c --- /dev/null +++ b/labour_files.php @@ -0,0 +1,88 @@ +prepare(" + SELECT a.*, le.entry_date, e.name as employee_name, p.name as project_name + FROM attachments a + JOIN labour_entries le ON a.entity_id = le.id + JOIN employees e ON le.employee_id = e.id + JOIN projects p ON le.project_id = p.id + WHERE a.tenant_id = ? AND a.entity_type = 'labour_entry' + ORDER BY a.created_at DESC +"); +$stmt->execute([$tenant_id]); +$files = $stmt->fetchAll(); + +function formatBytes($bytes, $precision = 2) { + $units = ['B', 'KB', 'MB', 'GB', 'TB']; + $bytes = max($bytes, 0); + $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); + $pow = min($pow, count($units) - 1); + $bytes /= pow(1024, $pow); + return round($bytes, $precision) . ' ' . $units[$pow]; +} + +$pageTitle = "SR&ED Manager - Labour Files"; +include __DIR__ . '/includes/header.php'; +?> + +
    +
    +

    Labour Files

    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FilenameSizeUploaded ByCreated AtLinked EntryActions
    No labour files found.
    + + + +
    +
    + +
    + +
    +     		+
    +
    + - +
    +     		+ View +
    +
    +
    +
    + + diff --git a/settings.php b/settings.php index 4e9cc01..4f6eb12 100644 --- a/settings.php +++ b/settings.php @@ -10,28 +10,83 @@ $tenant_id = 1; // Handle Form Submissions if ($_SERVER['REQUEST_METHOD'] === 'POST') { $action = $_POST['action'] ?? ''; + $id = (int)($_POST['id'] ?? 0); $name = $_POST['name'] ?? ''; + $error = ''; if ($action === 'add_labour_type' && $name) { $stmt = db()->prepare("INSERT INTO labour_types (tenant_id, name) VALUES (?, ?)"); $stmt->execute([$tenant_id, $name]); - } elseif ($action === 'add_evidence_type' && $name) { + } elseif ($action === 'edit_labour_type' && $id && $name) { + $stmt = db()->prepare("UPDATE labour_types SET name = ? WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$name, $id, $tenant_id]); + } elseif ($action === 'delete_labour_type' && $id) { + $check = db()->prepare("SELECT COUNT(*) FROM labour_entries WHERE labour_type_id = ? AND tenant_id = ?"); + $check->execute([$id, $tenant_id]); + if ($check->fetchColumn() > 0) { + $error = "Cannot delete: Labour type is used in labour entries."; + } else { + $stmt = db()->prepare("DELETE FROM labour_types WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$id, $tenant_id]); + } + } + + elseif ($action === 'add_evidence_type' && $name) { $stmt = db()->prepare("INSERT INTO evidence_types (tenant_id, name) VALUES (?, ?)"); $stmt->execute([$tenant_id, $name]); - } elseif ($action === 'add_expense_type' && $name) { - $stmt = db()->prepare("INSERT INTO expense_types (tenant_id, name) VALUES (?, ?)"); - $stmt->execute([$tenant_id, $name]); - } elseif ($action === 'add_team' && $name) { - $stmt = db()->prepare("INSERT INTO teams (tenant_id, name) VALUES (?, ?)"); - $stmt->execute([$tenant_id, $name]); - } elseif ($action === 'add_supplier' && $name) { - $type = $_POST['type'] ?? 'supplier'; - $contact = $_POST['contact_info'] ?? ''; - $stmt = db()->prepare("INSERT INTO suppliers (tenant_id, name, type, contact_info) VALUES (?, ?, ?, ?)"); - $stmt->execute([$tenant_id, $name, $type, $contact]); + } elseif ($action === 'edit_evidence_type' && $id && $name) { + $stmt = db()->prepare("UPDATE evidence_types SET name = ? WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$name, $id, $tenant_id]); + } elseif ($action === 'delete_evidence_type' && $id) { + $check = db()->prepare("SELECT COUNT(*) FROM labour_entries WHERE evidence_type_id = ? AND tenant_id = ?"); + $check->execute([$id, $tenant_id]); + if ($check->fetchColumn() > 0) { + $error = "Cannot delete: Evidence type is used in labour entries."; + } else { + $stmt = db()->prepare("DELETE FROM evidence_types WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$id, $tenant_id]); + } } - header("Location: settings.php?success=1"); + elseif ($action === 'add_expense_type' && $name) { + $stmt = db()->prepare("INSERT INTO expense_types (tenant_id, name) VALUES (?, ?)"); + $stmt->execute([$tenant_id, $name]); + } elseif ($action === 'edit_expense_type' && $id && $name) { + $stmt = db()->prepare("UPDATE expense_types SET name = ? WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$name, $id, $tenant_id]); + } elseif ($action === 'delete_expense_type' && $id) { + $check = db()->prepare("SELECT COUNT(*) FROM expenses WHERE expense_type_id = ? AND tenant_id = ?"); + $check->execute([$id, $tenant_id]); + if ($check->fetchColumn() > 0) { + $error = "Cannot delete: Expense type is used in expense logs."; + } else { + $stmt = db()->prepare("DELETE FROM expense_types WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$id, $tenant_id]); + } + } + + elseif ($action === 'add_team' && $name) { + $stmt = db()->prepare("INSERT INTO teams (tenant_id, name) VALUES (?, ?)"); + $stmt->execute([$tenant_id, $name]); + } elseif ($action === 'edit_team' && $id && $name) { + $stmt = db()->prepare("UPDATE teams SET name = ? WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$name, $id, $tenant_id]); + } elseif ($action === 'delete_team' && $id) { + $check = db()->prepare("SELECT COUNT(*) FROM employee_teams WHERE team_id = ? AND tenant_id = ?"); + $check->execute([$id, $tenant_id]); + if ($check->fetchColumn() > 0) { + $error = "Cannot delete: Team has assigned employees."; + } else { + $stmt = db()->prepare("DELETE FROM teams WHERE id = ? AND tenant_id = ?"); + $stmt->execute([$id, $tenant_id]); + } + } + + if ($error) { + header("Location: settings.php?error=" . urlencode($error)); + } else { + header("Location: settings.php?success=1"); + } exit; } @@ -52,10 +107,6 @@ $teams = db()->prepare("SELECT * FROM teams WHERE tenant_id = ? ORDER BY name"); $teams->execute([$tenant_id]); $teamList = $teams->fetchAll(); -$suppliers = db()->prepare("SELECT * FROM suppliers WHERE tenant_id = ? ORDER BY name"); -$suppliers->execute([$tenant_id]); -$supplierList = $suppliers->fetchAll(); - $pageTitle = "SR&ED Manager - Settings"; include __DIR__ . '/includes/header.php'; ?> @@ -65,9 +116,14 @@ include __DIR__ . '/includes/header.php';

    System Settings & Datasets

    - - Dataset updated successfully - +
    + + Dataset updated successfully + + + + +
    @@ -80,10 +136,16 @@ include __DIR__ . '/includes/header.php';
    - + - + + + +
    Name
    NameActions
    + + +
    @@ -100,10 +162,16 @@ include __DIR__ . '/includes/header.php';
    - + - + + + +
    Name
    NameActions
    + + +
    @@ -120,10 +188,16 @@ include __DIR__ . '/includes/header.php';
    - + - + + + +
    Name
    NameActions
    + + +
    @@ -140,39 +214,15 @@ include __DIR__ . '/includes/header.php';
    - + - - - -
    Name
    NameActions
    -
    -
    - - - -
    -
    -
    - Suppliers & Contractors - -
    -
    - - - - - - - - - - - - - + + @@ -185,6 +235,48 @@ include __DIR__ . '/includes/header.php'; + + + + + + + + + - -
    NameTypeContact Info
    + + +