Feature/dashboard improvements

src/api/routes/people/people-families.php

@@ -176,14 +176,15 @@ function getFamiliesWithAnniversaries(Request $request, Response $response, arra
     // Get anniversaries for 14-day range: 7 days before to 7 days after today
     $today = new \DateTime();
     $conditions = [];
-    
+
     for ($i = -7; $i <= 7; $i++) {
         $date = (clone $today)->modify("{$i} days");
         $month = (int)$date->format('m');
         $day = (int)$date->format('d');
+        // Values are safe: cast to int from DateTime::format()
         $conditions[] = "(MONTH(" . FamilyTableMap::COL_FAM_WEDDINGDATE . ") = {$month} AND DAY(" . FamilyTableMap::COL_FAM_WEDDINGDATE . ") = {$day})";
     }
-    
+
     $families = FamilyQuery::create()
         ->filterByDateDeactivated(null)
         ->filterByWeddingdate(null, Criteria::NOT_EQUAL)

src/skin/js/MainDashboard.js

@@ -266,14 +266,16 @@ function initializeMainDashboard() {
                             " " +
                             diff +
                             " " +
-                            i18next.t("days") +
+                            (diff === 1 ? i18next.t("day") : i18next.t("days")) +
                             "</span>";
                     } else {
                         badge =
                             '<span class="badge badge-secondary ml-2">' +
                             Math.abs(diff) +
                             " " +
-                            i18next.t("days ago") +
+                            (Math.abs(diff) === 1 ? i18next.t("day") : i18next.t("days")) +
+                            " " +
+                            i18next.t("ago") +
                             "</span>";
                     }
                     return data + badge;

src/v2/templates/root/dashboard.php

@@ -234,7 +234,6 @@
         </div>
     </div>
 </div>
-</div>
 
 <script src="<?= SystemURLs::getRootPath() ?>/skin/js/MainDashboard.js"></script>
 <?php