web/app/views/cooks/_adjustment.html.erb @@ -1,6 +1,7 @@ web/log/*.log web/db/*.db web/db/*.sqlite3 +web/db/*.sqlite3-journal tmp/**/* web/doc/api web/doc/app .gitignore @@ -12,6 +12,7 @@ class CooksController < ApplicationController end def show + @adjustments = @cook.adjustments.find(:all, :order => "created_at DESC") @refresh = true params[:range] ||= @cook.running? ? "last" : "all" web/app/controllers/cooks_controller.rb @@ -8,6 +8,24 @@ class Adjustment < ActiveRecord::Base before_create :update_sensor + def differences + differences = {} + + last_adjustment = self.sensor.adjustments.find(:first, :conditions => ["created_at < ?", self.created_at], :order => "created_at DESC") + + [:target, :alarm, :low, :high, :blower].each do |setting| + if last_adjustment + if self.send(setting) != last_adjustment.send(setting) + differences[setting] = {:old => last_adjustment.send(setting), :new => self.send(setting)} + end + else + differences[setting] = {:old => "unknown", :new => self.send(setting)} unless self.send(setting) == nil + end + end + + differences + end + private def update_sensor @@ -22,5 +40,5 @@ class Adjustment < ActiveRecord::Base errors.add_to_base "Failed to update sensor" false end - end + end end web/app/models/adjustment.rb @@ -9,6 +9,10 @@ class Blower < ActiveRecord::Base before_update :update_net_stoker + def to_s + self.name + end + def update_net_stoker if !Stoker.skip_update and (self.changed & ["name", "sensor_id"]).size > 0 # spawn do web/app/models/blower.rb @@ -46,6 +46,7 @@ class Cook < ActiveRecord::Base Stoker.no_update do Cook.transaction do begin + puts "--------------> #{self.sensors.size}" self.sensors.each do |sensor| adjustment = self.adjustments.build( :sensor_id => sensor.id, web/app/models/cook.rb @@ -22,10 +22,23 @@ </p> <% if @cook.running? -%> - <%= render :partial => "/sensors/list", :locals => {:sensors => @cook.sensors, :cook => @cook} %> - <br/> + <p><%= render :partial => "/sensors/list", :locals => {:sensors => @cook.sensors, :cook => @cook} %></p> <% end -%> +<p id="show_adjustments"> + <%= link_to_function "Show Adjustments", "$('adjustments').show();$('show_adjustments').hide();" %> +</p> + +<div id="adjustments" style="display:none"> + <p id="hide_adjustments"> + <%= link_to_function "Hide Adjustments", "$('adjustments').hide();$('show_adjustments').show();" %> + </p> + + <hr/> + + <%= render :partial => "adjustment", :collection => @adjustments %> +</div> + <% form_tag cook_path(@cook), :method => :get do %> <%= radio_button_tag :range, "last", params[:range] == "last", :onclick => "$('range_select').hide();" %> Last <%= text_field_tag :hours, params[:hours], :size => "2", :maxlength => "2" %> Hours <%= radio_button_tag :range, "all", params[:range] == "all", :onclick => "$('range_select').hide();" %> All web/app/views/cooks/show.html.erb 45cca037d20c903e09c50304381a45a3d48aa22a Tony Buser tbuser@gmail.com http://github.com/tbuser/stoker/commit/e036d5df2b3d9b88bec26e6e7eb162296c3ecbcf e036d5df2b3d9b88bec26e6e7eb162296c3ecbcf 2008-07-07T11:47:04-07:00 2008-07-07T11:47:04-07:00 more work on cook adjustments (something not working right as it doesn't create all the initial adjustments...) 7fbc4e2f63aa8266d7a03b0d7e4fde0414bcc4d8 Tony Buser tbuser@gmail.com