Merge pull request #257 from Hyleus/poll

Improve the Poll System
HDInnovations · Apr 10, 2018 · 01ae9aa · 01ae9aa
2 parents cca8a2c + 0fb3a56
commit 01ae9aa
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/app/Http/Controllers/PollController.php b/app/Http/Controllers/PollController.php
@@ -19,6 +19,7 @@
 use App\Http\Requests;
 use App\Http\Requests\StorePoll;
 use App\Http\Requests\VoteOnPoll;
+use App\Shoutbox;
 
 use \Toastr;
 
@@ -45,6 +46,12 @@ public function index()
     public function show($slug)
     {
         $poll = Poll::whereSlug($slug)->firstOrFail();
+        $user = auth()->user();
+        $user_has_voted = $poll->voters->where('user_id', $user->id)->isNotEmpty();
+
+        if ($user_has_voted) {
+            return $this->result($slug);
+        }
 
         return view('poll.show', compact('poll'));
     }
@@ -72,6 +79,11 @@ public function vote(VoteOnPoll $request)
             ]);
         }
 
+        $slug = $poll->slug;
+        $url = config('app.url');
+        $title = $poll->title;
+        Shoutbox::create(["user" => 1, "mentions" => 1, "message" => "An user has voted on poll [url=${url}/poll/$slug]${title}[/url]"]);
+        cache()->forget("shoutbox_messages");
         Toastr::success('Your vote has been counted.', 'Yay!', ['options']);
 
         return redirect('poll/' . $poll->slug . '/result');
@@ -80,7 +92,11 @@ public function vote(VoteOnPoll $request)
     public function result($slug)
     {
         $poll = Poll::whereSlug($slug)->firstOrFail();
+        $map = [
+            'poll' => $poll,
+            'total_votes' => $poll->totalVotes()
+        ];
 
-        return view('poll.result', compact('poll'));
+        return view('poll.result', $map);
     }
 }
diff --git a/app/Poll.php b/app/Poll.php
@@ -76,4 +76,13 @@ public function makeSlugFromTitle($title)
         $count = $this->where('slug', 'LIKE', "%$slug%")->count();
         return $count ? "{$slug}-{$count}" : $slug;
     }
+
+    public function totalVotes()
+    {
+        $result = 0;
+        foreach ($this->options as $option) {
+            $result += $option->votes;
+        }
+        return $result;
+    }
 }
diff --git a/resources/views/poll/result.blade.php b/resources/views/poll/result.blade.php
@@ -34,10 +34,14 @@
         </div>
         <div class="panel-body">
           @foreach ($poll->options as $option)
+          @php
+            $vote_value = $total_votes !== 0 ? ($option->votes / $total_votes) * 100 : 0;
+            $vote_value = round($vote_value, 2);
+          @endphp
           <strong>{{ $option->name }}</strong><span class="pull-right">{{ $option->votes }} {{ trans('poll.votes') }}</span>
           <div class="progress">
-            <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="{{ $option->votes }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ $option->votes }}%;">
-              {{ $option->votes }}
+            <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="{{ $vote_value }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ $vote_value }}%;">
+              {{ $vote_value }}%
             </div>
           </div>
           @endforeach