Merge pull request #168 from alexmattoni/master

Lock game attendance
rpiambulance · Feb 7, 2024 · af6cf3e · af6cf3e
2 parents ba858d8 + 81c5294
commit af6cf3e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/.add_game.php b/.add_game.php
@@ -26,6 +26,7 @@
 $date = $input['datestamp'];
 $type = $input['type'];
 $ees = 0;
+$locked = $input['locked'];
 $mode = $input['mode'];
 
 if($mode == 'edit') {
@@ -55,7 +56,7 @@
 
     $logid = $statement->fetchAll(PDO::FETCH_ASSOC)[0]['max'] + 1;
 
-    $statement = $connection->prepare("INSERT INTO games(id, `date`, start, `end`, description, location, ees, hide) VALUES (:logid, :date, :start_time, :end_time, :event_name, :event_location, :ees, 0)");
+    $statement = $connection->prepare("INSERT INTO games(id, `date`, start, `end`, description, location, locked, ees, hide) VALUES (:logid, :date, :start_time, :end_time, :event_name, :event_location, 0, :ees, 0)");
 
     $statement->bindParam(":logid", $logid);
     $statement->bindParam(":date", $date);
@@ -73,6 +74,7 @@
       `end`=:end_time,
       `description`=:event_name,
       `location`=:event_location,
+      `locked`=:locked,
       `hide`=0
     WHERE id=:id");
 
@@ -82,6 +84,7 @@
     $statement->bindParam(":end_time", $end_time);
     $statement->bindParam(":event_name", $event_name);
     $statement->bindParam(":event_location", $event_location);
+    $statement->bindParam(":locked", $locked);
 
     $result = $statement->execute();
   }

diff --git a/.docker/mysql/schema.sql b/.docker/mysql/schema.sql
@@ -124,6 +124,7 @@ CREATE TABLE `games` (
   `end` time NOT NULL DEFAULT '00:00:00',
   `description` text NOT NULL,
   `location` text NOT NULL,
+  `locked` tinyint(1) NOT NULL DEFAULT '0',
   `ees` tinyint(1) NOT NULL DEFAULT '0',
   `hide` tinyint(1) NOT NULL,
   `gcalEventId` VARCHAR(255) DEFAULT NULL

diff --git a/js/controllers/AddEventCtrl.js b/js/controllers/AddEventCtrl.js
@@ -42,7 +42,8 @@ angular.module(ctrl_name, []).controller(ctrl_name, ['$scope', '$http', '$locati
       end_time: "",
       date: "",
       type: "",
-      limit: ""
+      limit: "",
+      locked: ""
   };
 
   function parseDateString(string) {
@@ -81,6 +82,7 @@ angular.module(ctrl_name, []).controller(ctrl_name, ['$scope', '$http', '$locati
                   $scope.formData.date = parseDateString(response.data.event.date);
                   $scope.formData.type = "1";
                   $scope.formData.limit = parseInt(response.data.event.limit);
+                  $scope.formData.locked = "-1";
               }
           });
 
@@ -106,6 +108,7 @@ angular.module(ctrl_name, []).controller(ctrl_name, ['$scope', '$http', '$locati
                   } else {
                     $scope.formData.type = "2";
                   }
+                  $scope.formData.locked = response.data.game.locked;
               }
           });
     }

diff --git a/js/controllers/GameCtrl.js b/js/controllers/GameCtrl.js
@@ -25,6 +25,7 @@ angular.module(ctrl_name, []).controller(ctrl_name, ['$scope', '$http', '$httpPa
                 console.log(response.data);
                 $scope.attendees = response.data.attendees;
                 $scope.game = response.data.game;
+                $scope.locked = response.data.game.locked;
                 $scope.alreadySignedUp = response.data.alreadySignedUp;
                 $scope.eligiblePositions = response.data.eligiblePositions;
                 $scope.currentPosition = response.data.currentPosition;
@@ -73,7 +74,7 @@ angular.module(ctrl_name, []).controller(ctrl_name, ['$scope', '$http', '$httpPa
     $scope.load();
 
     $scope.signup = function (position) {
-        if ($scope.alreadySignedUp && $scope.currentPosition === position) {
+        if (($scope.alreadySignedUp && $scope.currentPosition === position) || $scope.locked === '1') {
             return;
         }
 

diff --git a/views/add-event.html b/views/add-event.html
@@ -63,14 +63,19 @@ <h2 ng-if-start="!editMode">Add Event</h2>
                                 <option value="3">Game (NO EES)</option>
                             </select>
                         </div>
-                        <div class="form-group col-xs-6 fixed-height-form-element" ng-if="editMode && formData.type != 1"></div>
+
+                        <div class="form-group col-xs-6 fixed-height-form-element" ng-if="editMode && formData.type != 1">
+                            <label for="locked">Lock Game</label>
+                            <input type="checkbox" name="locked" id="locked" class="form-control" ng-model="formData.locked" ng-true-value="'1'" ng-false-value="'0'" ng-checed="formData.locked" style="margin: 0px; height: 32px"/>
+                        </div>
 
                         <div class="form-group col-xs-6 fixed-height-form-element" ng-if="!formData.type || formData.type == 1">
                             <label for="lim">Attendance Limit</label>
                             <input type="number" name="lim" id="lim" class="form-control" ng-model="formData.limit" min="-1"
                                    placeholder="0 for no limit, -1 for no signups" required/>
                            <p class="help-block text-small">Note: Games do not have a specifiable limit.</p>
                         </div>
+
                         <div class="form-group col-xs-6 fixed-height-form-element" ng-if="!editMode && (!formData.type || formData.type == 1)"></div>
 
                         <div class="form-actions" ng-if="!editMode">

diff --git a/views/game.html b/views/game.html
@@ -53,7 +53,7 @@ <h3 class="btn-toolbar">
                     <button class="btn btn-primary btn-lg" ng-if="alreadySignedUp" ng-click="drop()">
                         <span class="fa fa-minus"></span> Drop Game
                     </button>
-                    <button class="btn btn-primary btn-lg" ng-repeat="p in positions" ng-if="p.value !== currentPosition && eligiblePositions.indexOf(p.value) !== -1" ng-click="signup(p.value)">
+                    <button class="btn btn-primary btn-lg" ng-repeat="p in positions" ng-if="p.value !== currentPosition && eligiblePositions.indexOf(p.value) !== -1 && locked == '0'" ng-click="signup(p.value)">
                         <span class="fa fa-plus"></span>
                         <span ng-if="!alreadySignedUp">Sign up as</span>
                         <span ng-if="alreadySignedUp">Switch to</span>