Browse Source

Inbox Improvements

Benjamin Harris 2 tháng trước cách đây
mục cha
commit
fea434400e

+ 0 - 59
dashboard/crop-analysis/compost-test-data/compost-test-data.php

@@ -1,59 +0,0 @@
-<?php
-require_once __DIR__ . '/../../../config/database.php';
-require_once __DIR__ . '/../../../lib/auth.php';
-require_once __DIR__ . '/../../../lib/csrf.php';
-
-if (session_status() === PHP_SESSION_NONE) {
-    session_start();
-}
-
-requireLogin();
-
-$pageTitle = 'Compost Test Analysis';
-$siteName  = 'Crop Monitor';
-
-include __DIR__ . '/../../../layouts/header.php';
-include __DIR__ . '/../../../layouts/navbar.php';
-?>
-
-<div id="layoutSidenav">
-    <div id="layoutSidenav_nav">
-        <?php include __DIR__ . '/../../../layouts/sidebar.php'; ?>
-    </div>
-    <div id="layoutSidenav_content">
-        <main>
-            <div class="container-fluid px-4">
-                <h1 class="mt-4"><?= htmlspecialchars($pageTitle, ENT_QUOTES, 'UTF-8') ?></h1>
-                <ol class="breadcrumb mb-4">
-                    <li class="breadcrumb-item"><a href="/dashboard/dashboard.php">Dashboard</a></li>
-                    <li class="breadcrumb-item active">Compost Test Analysis</li>
-                </ol>
-
-                <div class="row">
-                    <div class="container">
-                        <h3>Compost Test Details</h3>
-                        <span class="text-danger small">* required fields.</span>
-
-                        <?php include __DIR__ . '/../../../components/clientDetailsForm.php'; ?>
-                        <?php include __DIR__ . '/../../../components/newClientModal.php'; ?>
-
-                        <form method="post" action="/controllers/compostTestSubmit.php" id="compostForm">
-                            <input type="hidden" name="csrf_token" value="<?= htmlspecialchars(generateCsrfToken(), ENT_QUOTES, 'UTF-8') ?>">
-
-                            <div class="alert alert-info mt-3">
-                                <i class="fas fa-info-circle me-1"></i>
-                                Compost analysis form — pending full field migration.
-                                Contact your administrator for the current compost test spreadsheet.
-                            </div>
-
-                            <button type="submit" class="btn btn-success mt-2">Submit</button>
-                        </form>
-
-                    </div>
-                </div>
-            </div>
-        </main>
-
-        <?php include __DIR__ . '/../../../layouts/footer.php'; ?>
-    </div>
-</div>

+ 59 - 0
dashboard/crop-analysis/compost-test-data/index.php

@@ -0,0 +1,59 @@
+<?php
+require_once __DIR__ . '/../../../config/database.php';
+require_once __DIR__ . '/../../../lib/auth.php';
+require_once __DIR__ . '/../../../lib/csrf.php';
+
+if (session_status() === PHP_SESSION_NONE) {
+    session_start();
+}
+
+requireLogin();
+
+$pageTitle = 'Compost Test Analysis';
+$siteName  = 'Crop Monitor';
+
+include __DIR__ . '/../../../layouts/header.php';
+include __DIR__ . '/../../../layouts/navbar.php';
+?>
+
+<div id="layoutSidenav">
+    <div id="layoutSidenav_nav">
+        <?php include __DIR__ . '/../../../layouts/sidebar.php'; ?>
+    </div>
+    <div id="layoutSidenav_content">
+        <main>
+            <div class="container-fluid px-4">
+                <h1 class="mt-4"><?= htmlspecialchars($pageTitle, ENT_QUOTES, 'UTF-8') ?></h1>
+                <ol class="breadcrumb mb-4">
+                    <li class="breadcrumb-item"><a href="/dashboard/dashboard.php">Dashboard</a></li>
+                    <li class="breadcrumb-item active">Compost Test Analysis</li>
+                </ol>
+
+                <div class="row">
+                    <div class="container">
+                        <h3>Compost Test Details</h3>
+                        <span class="text-danger small">* required fields.</span>
+
+                        <?php include __DIR__ . '/../../../components/clientDetailsForm.php'; ?>
+                        <?php include __DIR__ . '/../../../components/newClientModal.php'; ?>
+
+                        <form method="post" action="/controllers/compostTestSubmit.php" id="compostForm">
+                            <input type="hidden" name="csrf_token" value="<?= htmlspecialchars(generateCsrfToken(), ENT_QUOTES, 'UTF-8') ?>">
+
+                            <div class="alert alert-info mt-3">
+                                <i class="fas fa-info-circle me-1"></i>
+                                Compost analysis form — pending full field migration.
+                                Contact your administrator for the current compost test spreadsheet.
+                            </div>
+
+                            <button type="submit" class="btn btn-success mt-2">Submit</button>
+                        </form>
+
+                    </div>
+                </div>
+            </div>
+        </main>
+
+        <?php include __DIR__ . '/../../../layouts/footer.php'; ?>
+    </div>
+</div>

+ 11 - 11
dashboard/inbox.php

@@ -77,33 +77,33 @@ include __DIR__ . '/../layouts/navbar.php';
 
                         <div class="alert alert-danger py-0"><h4>Reports</h4></div>
 
-                        <div class="d-flex align-items-start list-group" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-                            <a id="soil-reports-tab" data-bs-toggle="pill" data-bs-target="#soil-reports"
-                               type="button" role="tab"
+                        <div class="list-group" id="v-pills-tab" role="tablist">
+                            <a id="soil-reports-tab" data-bs-toggle="list" href="#soil-reports"
+                               role="tab" aria-controls="soil-reports"
                                class="text-secondary list-group-item list-group-item-action list-group-item-light active">
                                 <i class="fas fa-icicles fa-rotate-180"></i> Soil Analysis
                                 <span class="badge bg-secondary float-end"><?= $counts['soil'] ?></span>
                             </a>
-                            <a id="plant-reports-tab" data-bs-toggle="pill" data-bs-target="#plant-reports"
-                               type="button" role="tab"
+                            <a id="plant-reports-tab" data-bs-toggle="list" href="#plant-reports"
+                               role="tab" aria-controls="plant-reports"
                                class="text-secondary list-group-item list-group-item-action list-group-item-light">
                                 <i class="fab fa-pagelines"></i> Plant Analysis
                                 <span class="badge bg-success float-end"><?= $counts['plant'] ?></span>
                             </a>
-                            <a id="water-reports-tab" data-bs-toggle="pill" data-bs-target="#water-reports"
-                               type="button" role="tab"
+                            <a id="water-reports-tab" data-bs-toggle="list" href="#water-reports"
+                               role="tab" aria-controls="water-reports"
                                class="text-secondary list-group-item list-group-item-action list-group-item-light">
                                 <i class="fa fa-tint"></i> Water Analysis
                                 <span class="badge bg-primary float-end"><?= $counts['water'] ?></span>
                             </a>
-                            <a id="dietary-reports-tab" data-bs-toggle="pill" data-bs-target="#dietary-reports"
-                               type="button" role="tab"
+                            <a id="dietary-reports-tab" data-bs-toggle="list" href="#dietary-reports"
+                               role="tab" aria-controls="dietary-reports"
                                class="text-secondary list-group-item list-group-item-action list-group-item-light">
                                 <i class="fas fa-dog"></i> Animal Dietary Balance
                                 <span class="badge bg-warning text-dark float-end"><?= $counts['animal'] ?></span>
                             </a>
-                            <a id="compost-reports-tab" data-bs-toggle="pill" data-bs-target="#compost-reports"
-                               type="button" role="tab"
+                            <a id="compost-reports-tab" data-bs-toggle="list" href="#compost-reports"
+                               role="tab" aria-controls="compost-reports"
                                class="text-secondary list-group-item list-group-item-action list-group-item-light">
                                 <i class="fas fa-cloud"></i> Compost Test Data
                                 <span class="badge bg-secondary float-end">0</span>

+ 75 - 0
dashboard/irrigation/index.php

@@ -0,0 +1,75 @@
+<?php
+require_once __DIR__ . '/../../../config/database.php';
+require_once __DIR__ . '/../../../lib/auth.php';
+require_once __DIR__ . '/../../../lib/csrf.php';
+
+if (session_status() === PHP_SESSION_NONE) {
+    session_start();
+}
+
+requireLogin();
+
+$pageTitle = 'Irrigation Management';
+$siteName  = 'Crop Monitor';
+
+include __DIR__ . '/../../layouts/header.php';
+include __DIR__ . '/../../layouts/navbar.php';
+?>
+
+<div id="layoutSidenav">
+    <div id="layoutSidenav_nav">
+        <?php include __DIR__ . '/../../layouts/sidebar.php'; ?>
+    </div>
+    <div id="layoutSidenav_content">
+        <main>
+            <div class="container-fluid px-4">
+                <h1 class="mt-4"><?= htmlspecialchars($pageTitle, ENT_QUOTES, 'UTF-8') ?></h1>
+                <ol class="breadcrumb mb-4">
+                    <li class="breadcrumb-item"><a href="/dashboard/dashboard.php">Dashboard</a></li>
+                    <li class="breadcrumb-item active">Compost Test Analysis</li>
+                </ol>
+
+                <div class="row">
+                    <div class="container">
+                        <ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">
+                            <li class="nav-item">
+                                <a class="nav-link active" id="irrigation-controller-tab" data-toggle="pill" href="#irrigation-controller" role="tab" aria-controls="irrigation-controller" aria-selected="true">Irrigation Controller</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" id="irrigation-zones-tab" data-toggle="pill" href="#irrigation-zones" role="tab" aria-controls="irrigation-zones" aria-selected="false">Irrigation Zones</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" id="irrigation-schedule-tab" data-toggle="pill" href="#irrigation-schedule" role="tab" aria-controls="irrigation-schedule" aria-selected="false">Irrigation Schedule</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" id="irrigation-manual-tab" data-toggle="pill" href="#irrigation-manual" role="tab" aria-controls="irrigation-manual" aria-selected="false">Irrigation Manual</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" id="irrigation-adaptive-tab" data-toggle="pill" href="#irrigation-adaptive" role="tab" aria-controls="irrigation-adaptive" aria-selected="false">Irrigation Adaptive</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" id="irrigation-adjustments-tab" data-toggle="pill" href="#irrigation-adjustments" role="tab" aria-controls="irrigation-adjustments" aria-selected="false">Irrigation Adjustments</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" id="irrigation-settings-tab" data-toggle="pill" href="#irrigation-settings" role="tab" aria-controls="irrigation-settings" aria-selected="false">Irrigation Settings</a>
+                            </li>
+                        </ul>
+
+                        <div class="tab-content" id="pills-tabContent">
+                            <div class="tab-pane fade show active" id="irrigation-controller" role="tabpanel" aria-labelledby="irrigation-controller-tab">[[$irrigation-controller]]</div>
+                            <div class="tab-pane fade" id="irrigation-zones" role="tabpanel" aria-labelledby="irrigation-zones-tab">[[$irrigation-zones]]</div>
+                            <div class="tab-pane fade" id="irrigation-schedule" role="tabpanel" aria-labelledby="irrigation-schedule-tab">[[$irrigation-schedule]]</div>
+                            <div class="tab-pane fade" id="irrigation-manual" role="tabpanel" aria-labelledby="irrigation-manual-tab">[[$irrigation-manual]]</div>
+                            <div class="tab-pane fade" id="irrigation-adaptive" role="tabpanel" aria-labelledby="irrigation-adaptive-tab">[[$irrigation-adaptive]]</div>
+                            <div class="tab-pane fade" id="irrigation-adjustments" role="tabpanel" aria-labelledby="irrigation-adjustments-tab">[[$irrigation-adjustments]]</div>
+                            <div class="tab-pane fade" id="irrigation-settings" role="tabpanel" aria-labelledby="irrigation-settings-tab">[[$irrigation-settings]]</div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </main>
+
+        <?php include __DIR__ . '/../../layouts/footer.php'; ?>
+    </div>
+</div>