From 63349287794d184fd580036e411893829a77bc63 Mon Sep 17 00:00:00 2001 From: Will Bradley Date: Tue, 7 Oct 2014 19:55:34 -0700 Subject: [PATCH] Making door alert / webpage status work as expected --- app/controllers/door_logs_controller.rb | 2 +- app/models/door_log.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/door_logs_controller.rb b/app/controllers/door_logs_controller.rb index 6879142..fdf9013 100755 --- a/app/controllers/door_logs_controller.rb +++ b/app/controllers/door_logs_controller.rb @@ -5,7 +5,7 @@ class DoorLogsController < ApplicationController # GET /door_logs # GET /door_logs.json def index - @door_logs = DoorLog.find(:all, :order => "created_at DESC", :limit => 100) + @door_logs = DoorLog.find(:all, :order => "created_at DESC", :limit => 1000) begin diff --git a/app/models/door_log.rb b/app/models/door_log.rb index 324e333..ec06783 100755 --- a/app/models/door_log.rb +++ b/app/models/door_log.rb @@ -91,8 +91,8 @@ class DoorLog < ActiveRecord::Base door_1_locked = parse_locked_status(door_logs, "door_1_locked") door_2_locked = parse_locked_status(door_logs, "door_2_locked") - # Doors are unlocked if 1 AND 2 are NOT locked - status = {:unlocked => (!door_1_locked && !door_2_locked), :door_1_locked => door_1_locked, :door_2_locked => door_2_locked } + # Doors are unlocked if 1 OR 2 are NOT locked + status = {:unlocked => (!door_1_locked || !door_2_locked), :door_1_locked => door_1_locked, :door_2_locked => door_2_locked } end def self.parse_locked_status(door_logs, door_key)