Merge pull request #14 from mauricerenck/develop

imrpovement: stars - return rating
mauricerenck · Feb 19, 2021 · 7cbf689 · 7cbf689
2 parents 16effc5 + 9d90fe8
commit 7cbf689
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/assets/stars.js b/assets/stars.js
@@ -1,6 +1,7 @@
 const initStarRatings = () => {
     const ratingContainer = document.querySelector('.rate-page__stars');
     const stars = ratingContainer.querySelectorAll('.star');
+    const summary = ratingContainer.querySelector('.sum');
     const slug = ratingContainer.getAttribute('data-slug')
     const baseUrl = ratingContainer.getAttribute('data-base-url')
 
@@ -38,8 +39,9 @@ const initStarRatings = () => {
             },
             body: JSON.stringify(clientRating)
         })
-            .then(() => {
-                setUserRating()
+            .then(response => response.json())
+            .then((result) => {
+                setUserRating(result.avgRating)
                 loading = false
             })
             .catch(error => {
@@ -90,7 +92,7 @@ const initStarRatings = () => {
     }
 
 
-    const setUserRating = () => {
+    const setUserRating = (avgRating) => {
         const starDomElements = document.querySelectorAll('.rate-page__stars .rating .star');
         const currentRating = getRating();
 
@@ -106,6 +108,10 @@ const initStarRatings = () => {
                 element.classList.add('user');
             }
         });
+
+        if (avgRating) {
+            summary.innerHTML = avgRating.toString()
+        }
     }
 
     stars.forEach((thumb) => {

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "mauricerenck/ratepage",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Let your visitor rate pages",
   "type": "kirby-plugin",
   "license": "MIT",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ratepage",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Let your visitor rate pages",
   "main": "index.js",
   "author": "Maurice Renck",

diff --git a/utils/stars.php b/utils/stars.php
@@ -40,13 +40,15 @@ public function writeRating($rating, $prevRating, $targetPage)
             $fieldData['star' . $prevRating]--;
         }
 
-        $fieldData = yaml::encode($fieldData);
+        $fieldDataString = yaml::encode($fieldData);
 
         $kirby = kirby();
         $kirby->impersonate('kirby');
         $targetPage->update([
-            'ratingStar' => $fieldData
+            'ratingStar' => $fieldDataString
         ]);
+
+        return $fieldData;
     }
 
     public function setRating($data)
@@ -63,13 +65,37 @@ public function setRating($data)
             return new Response(json_encode($targetPage), 'application/json', 404);
         }
 
-        $this->writeRating($rating['rating'], $prevRating, $targetPage['targetPage']);
+        $ratings = $this->writeRating($rating['rating'], $prevRating, $targetPage['targetPage']);
 
         $response = [
             'status' => 'ok',
             'message' => 'Rating saved',
+            'avgRating' => $this->getAvgRating($ratings)
         ];
 
         return new Response(json_encode($response), 'application/json', 201);
     }
+
+    public function getAvgRating($ratings)
+    {
+        $stars = [];
+
+        if (count($ratings) > 0) {
+            $stars = [
+                $ratings['star1'] * 1,
+                $ratings['star2'] * 2,
+                $ratings['star3'] * 3,
+                $ratings['star4'] * 4,
+                $ratings['star5'] * 5
+            ];
+        }
+
+        $totalClicks = array_sum($ratings);
+        $totalStars = array_sum($stars);
+
+        $avgStars = ($totalStars > 0 && $totalClicks > 0) ? $totalStars / $totalClicks : 0;
+        $avgStarsRounded = (round($avgStars * 4)) / 4;
+
+        return $avgStarsRounded;
+    }
 }