Merge branch 'main' of github.com:canyongbs/aidingapp into Operationa…

…l-Excellence/AIDAPP-327
canyongbs · Oct 28, 2024 · 3e3ab9f · 3e3ab9f
2 parents 47a9847 + 244b065
commit 3e3ab9f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/...Http/Controllers/KnowledgeManagementPortal/KnowledgeManagementPortalArticleController.php b/...Http/Controllers/KnowledgeManagementPortal/KnowledgeManagementPortalArticleController.php
@@ -57,6 +57,15 @@ public function show(KnowledgeBaseCategory $category, KnowledgeBaseItem $article
         $voterType = session()->has('guest_id') ? (new PortalGuest())->getMorphClass() : (new Contact())->getMorphClass();
         $voterId = session()->has('guest_id') ? session('guest_id') : auth('contact')->user()?->getKey();
 
+        $totalVotes = $article->votes->count();
+        $helpfulVotes = $article->votes->where('is_helpful', true)->count();
+
+        $helpfulVotePercentage = 0;
+
+        if (ArticleWasHelpful::active() && $totalVotes > 0) {
+            $helpfulVotePercentage = round(($helpfulVotes / $totalVotes) * 100, 0);
+        }
+
         if (! $article->public) {
             return response()->json([], 401);
         }
@@ -94,6 +103,7 @@ public function show(KnowledgeBaseCategory $category, KnowledgeBaseItem $article
                 'featured' => $article->is_featured,
             ]),
             'portal_view_count' => $article->portal_view_count,
+            'helpful_vote_percentage' => $helpfulVotePercentage,
         ]);
     }
 }
diff --git a/...rc/Http/Controllers/KnowledgeManagementPortal/StoreKnowledgeBaseArticleVoteController.php b/...rc/Http/Controllers/KnowledgeManagementPortal/StoreKnowledgeBaseArticleVoteController.php
@@ -39,6 +39,7 @@
 use Illuminate\Http\JsonResponse;
 use App\Http\Controllers\Controller;
 use AidingApp\Portal\Models\PortalGuest;
+use AidingApp\KnowledgeBase\Models\KnowledgeBaseItem;
 use AidingApp\Portal\Models\KnowledgeBaseArticleVote;
 use AidingApp\Portal\Http\Requests\StoreKnowledgeBaseArticleVoteRequest;
 
@@ -72,6 +73,20 @@ public function __invoke(StoreKnowledgeBaseArticleVoteRequest $request): JsonRes
                 $voter->knowledgeBaseArticleVotes()->where('article_id', $request->article_id)->delete();
             }
         }
+        $helpfulVoteData = KnowledgeBaseItem::withCount([
+            'votes',
+            'votes as helpful_votes_count' => function ($query) {
+                $query->where('is_helpful', true);
+            },
+        ])->find($request->article_id);
+
+        $helpfulVotePercentage = 0;
+
+        if ($helpfulVoteData->votes_count > 0) {
+            $helpfulVotePercentage = round(($helpfulVoteData->helpful_votes_count / $helpfulVoteData->votes_count) * 100, 0);
+        }
+
+        $articleVote['helpful_vote_percentage'] = $helpfulVotePercentage;
 
         return response()->json($articleVote, 200);
     }

diff --git a/portals/knowledge-management/src/Pages/ViewArticle.vue b/portals/knowledge-management/src/Pages/ViewArticle.vue
@@ -73,6 +73,7 @@
     const portalViewCount = ref(0);
     const portalViewCountFlag = ref(false);
     const feedback = ref(null);
+    const helpfulVotePercentage = ref(0);
 
     watch(
         route,
@@ -94,6 +95,7 @@
                     article.value = response.data.article;
                     portalViewCount.value = response.data.portal_view_count;
                     feedback.value = response.data.article.vote ? response.data.article.vote.is_helpful : null;
+                    helpfulVotePercentage.value = response.data.helpful_vote_percentage;
                 }
 
                 loading.value = false;
@@ -112,11 +114,15 @@
             article_id: route.params.articleId,
         })
             .then((response) => {
-                if (response.status === 200 && !response.data) {
-                    feedback.value = null;
-                } else if (response.status === 200) {
-                    feedback.value = response.data.is_helpful;
+                if (response.status === 200) {
+                    if (response.data.hasOwnProperty('is_helpful') && response.data.is_helpful !== null) {
+                        feedback.value = response.data.is_helpful;
+                    } else {
+                        feedback.value = null;
+                    }
                 }
+
+                helpfulVotePercentage.value = response.data.helpful_vote_percentage;
             })
             .catch((error) => {
                 console.error('Error submitting feedback:', error);
@@ -192,6 +198,9 @@
                                                 <span class="text-sm">No</span>
                                             </button>
                                         </div>
+                                        <p class="text-lg font-semibold ml-4" v-if="helpfulVotePercentage">
+                                            {{ helpfulVotePercentage }}% of visitors found this helpful.
+                                        </p>
                                     </div>
                                 </div>
                                 <div class="flex items-center justify-center min-h-screen bg-gray-100" v-else>