tweaks and fixes

benthemonkey · Oct 21, 2015 · b48ecaf · b48ecaf
1 parent 16d2f95
commit b48ecaf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/ajax/PointsCenter.php b/ajax/PointsCenter.php
@@ -238,11 +238,18 @@ public function getSlivkans()
 
     public function getFellows()
     {
-        return self::fetchAllQuery(
+        $fellows = self::fetchAllQuery(
             "SELECT full_name,position,about,photo
             FROM fellows
             WHERE qtr_final IS NULL"
         );
+
+        # add tokens for typeahead.js
+        $n = count($fellows);
+        for ($i=0; $i<$n; $i++) {
+            $fellows[$i]["tokens"] = explode(" ", $fellows[$i]["full_name"]);
+        }
+        return $fellows;
     }
 
     public function updateFellowPhoto($fellow, $photo)

diff --git a/css/points-table.css b/css/points-table.css
@@ -225,17 +225,13 @@ tr.odd  td.yellow.sorting_1 { background-color: #FFD500; }
     margin-left: 170px;
   }
 
-  .points-table th.name {
+  .points-table th.name,
+  .points-table td.name {
     position: absolute;
-    margin-left: -170px;
+    margin-left: -171px;
   }
 
   .points-table th.name > div {
       display: block;
   }
-
-  .points-table td.name {
-    position: absolute;
-    margin-left: -170px;
-  }
 }
diff --git a/js/points-center/breakdown.js b/js/points-center/breakdown.js
@@ -73,7 +73,7 @@ var getSlivkanPoints = function() {
     // fix height of breakdown so there is no flash of background
     $breakdown.parent().css('min-height', $breakdown.parent().height());
 
-    if (nuEmail.length > 0) {
+    if (nuEmail && nuEmail.length > 0) {
         localStorage.spc_brk_slivkan = nuEmail;
 
         $.when(

diff --git a/js/points-center/submission.js b/js/points-center/submission.js
@@ -122,7 +122,7 @@ var validateFellowName = function(entry) {
     entry.removeClass('has-warning');
 
     if (name.length > 0) {
-        valid = _.findIndex({ full_name: name }) !== -1;
+        valid = _.findIndex(fellows, { full_name: name }) !== -1;
         utils.updateValidity(entry, valid);
     } else {
         entry.removeClass('has-success has-error');

diff --git a/js/points-center/table.js b/js/points-center/table.js
@@ -52,7 +52,7 @@ module.exports = {
             };
         })();
         var adjustWidth = function() {
-            var width = (tableWrapper.width() - nameColWidth - 6 * totalsColWidth - 2) + 'px';
+            var width = (tableWrapper.width() - nameColWidth - 6 * totalsColWidth) + 'px';
 
             $('th.end').css({
                 'width': width,