@@ -302,6 +302,8 @@ module Net else res.error! end + rescue Exception => e + warn e.message end def sensor(str) lib/stoker.rb @@ -2,13 +2,13 @@ module CooksHelper def cook_status(cook) case cook.status when "Not Started" - '<span style="color:yellow">Not Started</span>' + '<span class="message">Not Started</span>' when "Running" - '<span style="color:green">Running</span>' + '<span class="notice">Running</span>' when "Finished" '<strong><em>Finished</em></strong>' else - '<span style="color:red">Unknown</span>' + '<span class="warning">Unknown</span>' end end end web/app/helpers/cooks_helper.rb @@ -65,6 +65,8 @@ class Stoker < ActiveRecord::Base def sync! Stoker.transaction do + Blower.update_all("sensor_id = null", "sensor_id IN (#{self.sensors.collect{|s| s.id}.join(",")}) OR stoker_id = #{self.id}") + self.blowers.clear self.sensors.clear @@ -75,8 +77,8 @@ class Stoker < ActiveRecord::Base net_stoker.blowers.each do |nb| if blower = Blower.find_or_create_by_serial_number(nb.serial_number) blower.update_attributes!( - :name => nb.name, - :stoker => self + :name => nb.name, + :stoker => self ) else raise "Failed to find or create blower #{nb.serial_number}" @@ -86,12 +88,12 @@ class Stoker < ActiveRecord::Base net_stoker.sensors.each do |ns| if sensor = Sensor.find_or_create_by_serial_number(ns.serial_number) sensor.update_attributes!( - :name => ns.name, - :target => ns.target, - :alarm => ns.alarm, - :low => ns.low, - :high => ns.high, - :stoker => self + :name => ns.name, + :target => ns.target, + :alarm => ns.alarm, + :low => ns.low, + :high => ns.high, + :stoker => self ) if ns.blower_serial_number.to_s != "" web/app/models/stoker.rb @@ -10,12 +10,16 @@ <%= f.text_field :name %> </p> -<p> - <b>Sensor</b><br /> - <%= f.collection_select :sensor_id, Sensor.find(:all), :id, :name, {:include_blank => true} %> -</p> +<% if @blower.stoker -%> + <p> + <b>Sensor</b><br /> + <%= f.collection_select :sensor_id, @blower.stoker.sensors.find(:all), :id, :name, {:include_blank => true} %> + </p> +<% else -%> + <p class="warning">Cannot set sensor, this blower is not connected to a stoker.</p> +<% end -%> <p> <b>Stoker</b><br /> - <%= f.collection_select :stoker_id, Stoker.find(:all), :id, :name %> + <%= f.collection_select :stoker_id, Stoker.find(:all), :id, :name, {:include_blank => true} %> </p> web/app/views/blowers/_form.html.erb @@ -31,10 +31,18 @@ <%= f.text_field :high %> </p> -<p> - <b>Blower</b><br /> - <%= f.collection_select :blower_id, Blower.find(:all), :id, :name, {:include_blank => true} %> -</p> +<% if @sensor.stoker -%> + <% if @sensor.stoker.blowers.size > 0 -%> + <p> + <b>Blower</b><br /> + <%= f.collection_select :blower_id, @sensor.stoker.blowers.find(:all), :id, :name, {:include_blank => true} %> + </p> + <% else -%> + <p class="warning">There are no blowers connected to this stoker.</p> + <% end -%> +<% else -%> + <p class="warning">Cannot set blower, this sensor is not connected to a stoker.</p> +<% end -%> <p> <b>Stoker</b><br /> web/app/views/sensors/_form.html.erb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20080627181229) do +ActiveRecord::Schema.define(:version => 20080629045648) do create_table "adjustments", :force => true do |t| t.integer "cook_id" web/db/schema.rb @@ -15,6 +15,18 @@ body { */ } +.warning { + color: red; +} + +.notice { + color: green; +} + +.message { + color: darkgoldenrod; +} + #notice { border-top: 1px solid green; border-bottom: 1px solid green; web/public/stylesheets/application.css @@ -13,7 +13,7 @@ pre { } a { color: #000; } -a:visited { color: #666; } +/*a:visited { color: #666; }*/ a:hover { color: #fff; background-color:#000; } .fieldWithErrors { web/public/stylesheets/scaffold.css 13e662b3eeb6f449c6be6cef2dd823c0ba93f6f1 Tony Buser tbuser@gmail.com http://github.com/tbuser/stoker/commit/28f56f3f19d37d37a3dd6496589b7774294361b2 28f56f3f19d37d37a3dd6496589b7774294361b2 2008-06-28T22:34:14-07:00 2008-06-28T22:34:14-07:00 added code to more gracefully handle physical removal of sensors/blowers to prevent you from selecting something that isn't connected anymore added code to ignore http response when changing sensor settings since the built in http server sometimes responds with invalid http headers (the internal telnet output sometimes bleeds through to the webpage) ffcd515f8da0c93457f1cbdd495c24bd83027ebd Tony Buser tbuser@gmail.com