concerto_hardware 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7755452c779d4727103fc30b2a4240fab346bcf0
-  data.tar.gz: b4ac85892d72694abe88eb8203230083e479a631
+  metadata.gz: 60218790f815f50493889a41f7159684350b2832
+  data.tar.gz: 59f19eff655c4ab07161be98783b3aec94ce2fb0
 SHA512:
-  metadata.gz: 527f89252a3e7aaf88468aa0e606d2cacc40c0690300625277d38b675630f12776d3bdf83941d9df5689976643477e2114d0f2738830a96a717c6b9e2d0bf80f
-  data.tar.gz: c91e1657fb61bcafd689e9eeee934454dce3b028b557672b1517b871711c2208085e187358ece759c0a543bc3d7dff55ac670169dcf007e7fdc3c0201691eb3c
+  metadata.gz: 363b0240ff7675c4ca9a5652fc0e46b4fa4dc1b512cd783cca2a320e519b2d6249a487111edabe9038d9fabc242c1f3fb5fb49caadb056f31362d757cbd74df6
+  data.tar.gz: a053a3a1ad62e64d49df6f002f5e561db33f926b3ab489d12870d885c363ccbed37aa468a073080aba71dd43ff1c711519c01df2f0f181a6e772b07e93c98474

data/app/assets/javascripts/concerto_hardware/players.js

@@ -12,12 +12,20 @@ var ConcertoHardware = {
       $('#wknd_off_time_div').show();
     }
   },
+  updateAlwaysOn: function() {
+    show = !$('#player_always_on').is(':checked');
+    $('#on_off_details_div').toggle(show);
+  },
 
   initPlayers: function() {
     ConcertoHardware.updateWkndOnOff();
     $('#player_wknd_disable').change(function() {
       ConcertoHardware.updateWkndOnOff();
     });
+    ConcertoHardware.updateAlwaysOn();
+    $('#player_always_on').change(function() {
+      ConcertoHardware.updateAlwaysOn();
+    });
   }
 };
 

data/app/controllers/concerto_hardware/players_controller.rb

@@ -88,7 +88,7 @@ class PlayersController < ConcertoHardware::ApplicationController
   # Deal with strong parameter restrictions.
   def player_params
     params.require(:player).permit(:wkday_on_time, :wkday_off_time,
-      :wknd_on_time, :wknd_off_time, :wknd_disable, :force_off)
+      :wknd_on_time, :wknd_off_time, :wknd_disable, :force_off, :always_on)
   end
 end
 

data/app/models/concerto_hardware/player.rb

@@ -9,6 +9,7 @@ module ConcertoHardware
     # as parts of serialized JSON fields such as screen_on_off)
     time_accessor :wkday_on_time, :wkday_off_time
     time_accessor :wknd_on_time, :wknd_off_time
+    attr_accessor :always_on
     attr_accessor :wknd_disable
     attr_accessor :force_off
 
@@ -100,6 +101,12 @@ module ConcertoHardware
           :date => Time.now.strftime("%Y-%m-%d")
         }
       end
+      if self.always_on == "1"
+        # Note: supersedes everything else.
+        ruleset << {
+          :action => "force_on"
+        }
+      end
       if ruleset.empty? && self.screen_on_off.blank?
         ruleset << {
           :action => "on"
@@ -115,6 +122,7 @@ module ConcertoHardware
     # supports 3 simple rules.
     def retrieve_screen_on_off
       return nil if screen_on_off.blank?
+      self.always_on = false # default unless rule exists
 
       ruleset = ActiveSupport::JSON.decode(self.screen_on_off)
       ruleset.each do |rule|
@@ -138,6 +146,9 @@ module ConcertoHardware
               self.force_off = (rule['action'] != 'on')
             end
           end # force off rules
+          if rule['action'] == 'force_on'
+            self.always_on = true
+          end # always on
         end # has an action
       end # each rule
     end # retrive_screen_on_off
@@ -156,6 +167,9 @@ module ConcertoHardware
       rules = []
       if self.screen_on_off.blank?
         rules << "On/off times not configured. The screen will always be on."
+      elsif self.always_on
+        rules << "Screen is always on. Click 'Edit Player' to configure "+
+                 "power-saving screen controls."
       elsif !screen_on_off_valid
         rules << "On/off rules are invalid. Edit and save the Player to fix."
       else

data/app/views/concerto_hardware/players/_form.html.erb

@@ -21,7 +21,16 @@
       </div>
     </div>
 
+    <div class="clearfix">
+      <div class="input checkbox">
+        <ul class="inputs-list">
+          <li><%= f.check_box :always_on%> <%= f.label :always_on%> (<%= t('.always_on_msg') %>)</li>
+        </ul>
+      </div>
+    </div>
+
     <!-- Screen on/off times. Good luck, UI designer. -->
+    <div id = "on_off_details_div">
     <div class="clearfix">
       <%= f.label :wkday_on_time %>
       <div class="input-prepend">
@@ -66,6 +75,7 @@
         </ul>
       </div>
     </div>
+    </div>
   </fieldset>
 
   <div class="submit_bar actions">

data/config/locales/en.yml

@@ -12,6 +12,7 @@ en:
         wknd_on_time: 'Weekend turn on time'
         wknd_off_time: 'Weekend turn off time'
         screen_on_off_times: "Screen On/Off Times"
+        always_on: "Player Always On"
     errors:
       models:
         concerto_hardware/player:
@@ -27,6 +28,7 @@ en:
       form:
         provide_details: "Provide Details"
         force_off_msg: "temporarily turns off the screen until midnight tonight"
+        always_on_msg: "prevents Concerto from turning off the screen, but may waste energy"
       show_body:
         no_screen_found: "No Screen Found"
       is_activated: "Activated"

data/lib/concerto_hardware/version.rb

@@ -1,3 +1,3 @@
 module ConcertoHardware
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_hardware
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails