[smarcet] - #13137

* fixed voting app issues

Author: smarcet

summit-voting-app/code/PresentationVotingPage.php

@@ -42,9 +42,12 @@ class PresentationVotingPage_Controller extends Page_Controller
         'handleAPI',
         'handleIndex'
     );
-    /**
-     *
-     */
+
+
+    public function getCurrentSummit(){
+        return Summit::get_active();
+    }
+
     public function init()
     {
         parent::init();
@@ -188,9 +191,8 @@ public function handlePresentations(SS_HTTPRequest $r)
     {
         $presentations = [];
         $offset = $r->getVar('offset') ?: 0;
-        $m = Member::currentUser();
-        $list = $m ? $m->getRandomisedPresentations(null, $this->summit) : $this->summit->VoteablePresentations();
-$list = Presentation::get()->sort('Created DESC')->limit(100);
+        $m      = Member::currentUser();
+        $list   = $m ? $m->getRandomisedPresentations(null, $this->summit) : $this->summit->VoteablePresentations();
         if($list) {
             if ($r->getVar('category')) {
                 $list = $list->filter(['CategoryID' => $r->getVar('category')]);
@@ -227,11 +229,13 @@ public function handlePresentations(SS_HTTPRequest $r)
      */
     public function handleReadPresentation(SS_HTTPRequest $r)
     {
-        $presentation = $this->getFromFilename($r->param('ID'), 'Presentation');
-        $presentation = Presentation::get()->byID(explode('.', $r->param('ID'))[0]);
-        if (!$presentation) {
+        $id           = intval($r->param('ID'));
+        $presentation = Presentation::get()->byID($id);
+
+        if (!$presentation || !$presentation->Category()->VotingVisible) {
             return $this->httpError(404);
         }
+
         $vote = $presentation->getUserVote();
         $json = [
             'id' => $presentation->ID,
@@ -245,7 +249,7 @@ public function handleReadPresentation(SS_HTTPRequest $r)
                 'date' => $vote->obj('Created')->Format('F j, Y'),
                 'ago' => $vote->obj('Created')->Ago()
             ] : null,
-            'abstract' => $presentation->Description,
+            'abstract' => $presentation->Abstract,
             'attendees_expected_learnt' => $presentation->AttendeesExpectedLearnt
         ];
         foreach ($presentation->getSpeakersAndModerators() as $s) {
@@ -293,14 +297,18 @@ public function handleUpdatePresentation(SS_HTTPRequest $r)
         if (!Member::currentUser()) {
             return $this->httpError(403, 'You must be logged in to vote');
         }
-        $presentation = $this->getFromFilename($r->param('ID'), 'Presentation');
-        $presentation = Presentation::get()->byID(explode('.', $r->param('ID'))[0]);
-        if (!$presentation) {
+
+        $id           = intval($r->param('ID'));
+        $presentation = Presentation::get()->byID($id);
+
+        if (!$presentation || !$presentation->Category()->VotingVisible) {
             return $this->httpError(404);
         }
+
         if(!$presentation->Summit()->isVotingOpen()) {
-        //  return $this->httpError(403,'Voting is closed');
+            return $this->httpError(403,'Voting is closed');
         }
+
         $vars = Convert::json2array($r->getBody());
         if (isset($vars['vote'])) {
             $presentation->setUserVote((int)$vars['vote']);
@@ -326,11 +334,14 @@ public function handleDeleteComment(SS_HTTPRequest $r)
         if (!Member::currentUser()) {
             return $this->httpError(403, 'You must be logged in to vote');
         }
-        $presentation = $this->getFromFilename($r->param('ID'), 'Presentation');
-        $presentation = Presentation::get()->byID(explode('.', $r->param('ID'))[0]);
-        if (!$presentation) {
+
+        $id           = intval($r->param('ID'));
+        $presentation = Presentation::get()->byID($id);
+
+        if (!$presentation || !$presentation->Category()->VotingVisible) {
             return $this->httpError(404);
         }
+
         if(!$presentation->Summit()->isVotingOpen()) {
             return $this->httpError(403,'Voting is closed');
         }
@@ -364,19 +375,5 @@ public function handleCategories(SS_HTTPRequest $r)
         return (new SS_HTTPResponse(Convert::array2json($result), 200))
             ->addHeader('Content-Type', 'application/json');
     }
-    /**
-     * @param $file
-     * @param $class
-     * @return mixed
-     */
-    protected function getFromFilename($file, $class)
-    {
-        $info = pathinfo($file);
-        $id = $info['filename'];
-        $list = $class::get();
-        if ($class === 'Presentation') {
-            $list = $list->filter('Category.VotingVisible', true);
-        }
-        return $list->byID($id);
-    }
+
 }

summit-voting-app/templates/PresentationVotingPage.ss

@@ -60,7 +60,7 @@
                               <h1>
                                  Vote For Presentations
                                  <span>
-                                 Deadline: Tuesday, February 21 at 11:59pm PST / Wednesday, February 22 at 6:59am UTC
+                                 Deadline:  $Top.CurrentSummit.getNiceVotingEnd(America/Los_Angeles) / $Top.CurrentSummit.getNiceVotingEnd(UTC)
                                  </span>
                               </h1>
                            </div>

summit/code/controllers/SummitSecurity.php

@@ -165,10 +165,10 @@ public function redirect($url, $code = 302) {
     }
 
     /**
-     * Ensure all root requests go to login
-     * @return SS_HTTPResponse
+     * @param SS_HTTPRequest $request
+     * @return SS_HTTPResponse|void
      */
-    public function index() {
+    public function index(SS_HTTPRequest $request) {
         $back_url = $this->CurrentCallForSpeakersPageUrl();
         if(is_null($back_url))  return $this->httpError(404, "Call for Speakers Page not Found!");
         if(Member::currentUser())

summit/code/infrastructure/active_records/Summit.php

@@ -1642,4 +1642,16 @@ public function getExternalEventId()
     {
         return $this->getField("ExternalEventId");
     }
+
+    /**
+     * @param string $timezone_name
+     * @return string
+     */
+    public function getNiceVotingEnd($timezone_name = 'UTC'){
+        $dt = new DateTime($this->getField('VotingEndDate'), new DateTimeZone('UTC'));
+        $timezone = new DateTimeZone($timezone_name);
+        $dt->setTimezone($timezone);
+        return sprintf("%s at %s %s", $dt->format('l, F d'), $dt->format('H:i A'), $dt->format('T'));
+    }
+
 }