Fixed #121

Author: 5hu5ky

.gitignore

@@ -4,3 +4,4 @@ __pycache__/
 *.sqlite
 *.key
 /.project
+/.pydevproject

HardwareCheckout/auth.py

@@ -71,6 +71,7 @@ async def post(self):
         try:
             name = self.get_argument("name")
             password = self.get_argument("password")
+            ctf = self.get_argument("ctf")
         except MissingArgumentError:
             return self.render("signup.html", messages="Missing username or password")
 
@@ -87,6 +88,7 @@ async def post(self):
             # Create the new user entry
             new_user = User(
                 name=name,
+                ctf=ctf,
                 password=generate_password_hash(password, method="pbkdf2:sha256:45000"),
                 roles=[roles],
             )

HardwareCheckout/main.py

@@ -62,5 +62,5 @@ async def updateQueues(cls):
         '''
         with make_session() as session:
             cls.RWTerminals = await as_future(session.query(User.name, DeviceQueue.webUrl).join(User.deviceQueueEntry).filter_by(state="in-use").all)
-            cls.ROTerminals = await as_future(session.query(User.name, DeviceQueue.roUrl).join(User.deviceQueueEntry).filter_by(state="in-use").all)
+            cls.ROTerminals = await as_future(session.query(User.name, DeviceQueue.roUrl).join(User.deviceQueueEntry).filter_by(state="in-use",ctf=1).all)
             cls.queues      = await as_future(session.query(DeviceType.id, DeviceType.name, func.count(UserQueue.userId)).select_from(DeviceType).join(UserQueue, isouter=True).group_by(DeviceType.id, DeviceType.name).all)

HardwareCheckout/models.py

@@ -22,6 +22,7 @@ class User(db.Model):
     __tablename__ = "user"
     id = Column(Integer, primary_key=True)
     password = Column(String(93), unique=True)
+    ctf = Column(Integer)
     name = Column(String(1000))
 
     # relationships

HardwareCheckout/templates/login.html

@@ -22,12 +22,6 @@
                     <input class="input is-large" type="password" name="password" placeholder="Your Password">
                 </div>
             </div>
-            <div class="field">
-                <label class="checkbox">
-                    <input type="checkbox">
-                    Remember me
-                </label>
-            </div>
             <button class="button is-block is-large is-fullwidth">Login</button>
         </form>
     </div>

HardwareCheckout/templates/signup.html

@@ -23,6 +23,12 @@
                         <input class="input is-large" type="password" name="password" placeholder="Password">
                     </div>
                 </div>
+                <div class="field">
+                	<label class="checkbox">
+                    <input type="checkbox" name="ctf">
+                    CTF User
+                </label>
+            </div>
 
                 <button class="button is-block is-large is-fullwidth">Sign Up</button>
             </form>