Continuing work on profile and subsequent pages

assets/js/calendar.js

@@ -7,8 +7,9 @@ export { initializeCalendar }
 const htmlTag = document.getElementsByTagName('html')[0];
 const lang = htmlTag.attributes['lang'].value;
 
-const minimumAge = dayjs().subtract(18, 'year');
-const maximumAge = minimumAge.subtract(122, 'year');
+const now = dayjs()
+const minimumAge = now.subtract(18, 'year');
+const maximumAge = now.subtract(120, 'year');
 
 const options = {
     inputMode: true,

assets/scss/bewelcome.scss

@@ -261,6 +261,7 @@ a.active .metric .value {
 }
 
 .community-news-wrapper img,
+.accommodation img,
 figure > img {
   max-width: 100%;
   height: auto;

build/gallery/gallery.model.php

@@ -368,7 +368,7 @@ public function getLatestItems($userId = false, $galleryId = false, $numRows = f
     a.`title` AS album,
     a.`id` AS albumId
 FROM `gallery_items` AS i
-LEFT JOIN `members` AS `m` ON
+LEFT JOIN `member` AS `m` ON
     m.`id` = i.`user_id_foreign`
 LEFT JOIN `gallery_items_to_gallery` AS `g` ON
     g.`item_id_foreign` = i.`id`
@@ -414,7 +414,7 @@ public function getNextItems($imageId,$limit = 1,$userId = false,$galleryId = fa
     i.`title`,
     i.`created`
 FROM `gallery_items` AS i
-LEFT JOIN `members` AS `m` ON
+LEFT JOIN `member` AS `m` ON
     m.`id` = i.`user_id_foreign`
 WHERE i.`id` > '.(int)$imageId.'
         ';
@@ -448,7 +448,7 @@ public function getPreviousItems($imageId,$limit = 1,$userId = false,$galleryId
     i.`title`,
     i.`created`
 FROM `gallery_items` AS i
-LEFT JOIN `members` AS `m` ON
+LEFT JOIN `member` AS `m` ON
     m.`id` = i.`user_id_foreign`
 WHERE i.`id` < '.(int)$imageId.'
         ';
@@ -517,7 +517,7 @@ public function imageData($itemId)
     i.`description`,
     i.`created`
 FROM `gallery_items` AS i,
-members as m
+member as m
 WHERE i.`id` = ". (int)$itemId . "
 AND m.id = i.user_id_foreign
 AND m.Status IN ('Active', 'ChoiceInactive', 'Pending', 'OutOfRemind')

build/search/search.model.php

@@ -601,12 +601,12 @@ private function getDetailsForMembers()
                 ) c ON c.IdToMember = m.id
             LEFT JOIN (
                 SELECT
-                    COUNT(*) As photoCount, IdMember
+                    COUNT(*) As photoCount, member_id
                 FROM
-                    membersphotos
+                    member_photo
                 GROUP BY
-                    IdMember
-                ) mp ON mp.IdMember = m.id
+                    member_id
+                ) mp ON mp.member_id = m.id
             WHERE
                 {$this->maxGuestCondition}
                 {$this->statusCondition}
@@ -792,13 +792,13 @@ public function prepareQuery($vars, $adminUnits = [], $country = false)
             $this->joins .= "
                 LEFT JOIN (
                     SELECT
-                        COUNT(*) As photoCount, IdMember
+                        COUNT(*) As photoCount, member_id
                     FROM
-                        membersphotos
+                        member_photo
                     GROUP BY
-                        IdMember) mp
+                        member_id) mp
                     ON
-                        mp.IdMember = m.id
+                        mp.member_id = m.id
             ";
         }
         if (!empty($this->commentsCondition)) {

composer.json

@@ -47,7 +47,7 @@
         "nelmio/security-bundle": "3.*",
         "nesbot/carbon": "3.*",
         "pagerfanta/pagerfanta": "^v4.4.0",
-        "phpdocumentor/reflection-docblock": "^6.0",
+        "phpdocumentor/reflection-docblock": "^5.2",
         "phpstan/phpdoc-parser": "^2.3",
         "ramsey/uuid-doctrine": "2.*",
         "stof/doctrine-extensions-bundle": "^1.7",