scheduled_resource 0.0.1 → 0.0.2

data/app/assets/javascripts/controllers.js

@@ -0,0 +1,157 @@
+'use strict';
+
+// ============================================================================
+// Hi-lock: ((" ?[T]o ?Do:.*"                                  (0 'accent10 t)))
+// Hi-lock: (("\\(^\\|\\W\\)\\*\\(\\w.*\\w\\)\\*\\(\\W\\|$\\)" (2 'accent3 t)))
+// Hi-lock: end
+// ============================================================================
+
+/* Controllers */
+
+function ResourceListCtrl($scope, $http) {
+  $.extend( $scope,
+    {
+      init_display_parms: function () {
+        TimePix.set_display_parms()
+      },
+
+      init_resources: function () {
+        $scope.init_display_parms()
+
+        $scope.rsrcs    = UseBlock.rsrcs = TimePix.meta.rsrcs
+        $scope.res_tags = [];   // ^^ Defines the order of rows
+        $scope.rsrcs.forEach( function(rsrc) {
+          $scope.res_tags.push( rsrc.tag )
+        })
+        $scope.use_block_list_Ctls = {} // To access lower-level scopes later on
+
+        setTimeout( TimePix.scroll_to_tlo, 100 )
+        setTimeout( TimePix.set_time_cursor, 1000 )
+        setTimeout( TimePix.scroll_monitor, 100 )
+      },
+
+      get_data: function (t1, t2, inc) {
+        return $http.get( $scope.make_url(t1, t2, inc) ).
+
+          success( function(data) {
+            TimePix.merge_metadata(data)
+            delete data.meta
+            $scope.json_data = data   // Park this here until we consume it.
+
+            if (! inc) { $scope.init_resources($scope) }
+            $scope.busy = false;
+          }). // success
+
+          error( function(data, status, headers, config) {
+            console.log( '\nstatus: ' + status +
+                         '\nheaders(): ' + headers() +
+                         '\nconfig: ' + config
+                        )
+            console.debug( data.meta )
+            $scope.busy = false;
+          }) // error
+      },
+
+      make_url: function (t1, t2, inc) {
+        var url = '/schedule.json'
+        if (t1 || t2 || inc)
+          url += '?t1=' + t1 + '&t2=' + t2 + '&inc=' + inc
+        return url
+      },
+
+      rq_data: function(t1, t2, inc) {
+        if (! $scope.busy ) {
+          $scope.busy = true;
+          $scope.get_data( t1, t2, inc ).
+            success( function(data) {
+              Object.keys($scope.json_data).forEach( function(key) {
+                var controller = $scope.use_block_list_Ctls[key] // To Do: Better mis-configuration response
+                if( ! controller ) {
+                  console.log( "No key " + key + " in " +
+                               $scope.use_block_list_Ctls );
+                  return
+                }
+                var blocks     = $scope.json_data[key]
+                controller.add_blocks( controller, blocks ) // To Do: Better mis-configuration response
+              })
+
+            }); // errors handled above in get_data
+        }
+      },
+      
+      more_data: function() {
+          $scope.rq_data( TimePix.thi, TimePix.next_hi(), 'hi' )
+      },
+
+      less_data: function() {
+          $scope.rq_data( TimePix.next_lo(), TimePix.tlo, 'lo' )
+      }
+    });
+  window.RsrcListCtrlScope = $scope;
+  $scope.get_data();
+} // end ResourceListCtrl
+ResourceListCtrl.$inject = ['$scope', '$http'];
+
+
+function ab (o) { return angular.bind( o, o.process ) }
+
+var process_fns = {
+  Station:            ab(StationUseBlock),
+  ZTimeHeaderDay:     ab(ZTimeHeaderDayUseBlock),
+  ZTimeHeaderHour:    ab(ZTimeHeaderHourUseBlock)
+}
+
+
+function UseBlockListCtrl($scope) {
+
+  $.extend( $scope, {
+
+    add_blocks: function ( $scope, blocks ) {
+      var how = 'push'
+      if (TimePix.inc == 'lo') {
+        how = 'unshift'
+        blocks.reverse()
+      }
+      if( ! blocks ) { return }         // Why bother with this?
+      blocks.forEach( function(block) {
+        $scope.insert_block( $scope.process_fn(block.blk), how )
+      })
+    },
+
+    insert_block: function ( block, how ) {
+      $scope.use_blocks[how]( block )
+    }
+  });
+
+
+  $scope.use_blocks = [];
+
+  var resourceTag = $scope.res_tag,
+      blocks      = $scope.json_data[ resourceTag ],
+      rsrc_kind   = resourceTag.split('_')[0];
+
+  $scope.process_fn = process_fns[rsrc_kind];
+  if (! $scope.process_fn) {
+    console.log( 'Skipping use blocks with tag ' + resourceTag + ', Kind ' + rsrc_kind )
+    return null
+  }
+
+  $scope.use_block_list_Ctls[resourceTag] = $scope
+
+  $scope.add_blocks( $scope, blocks )
+}
+UseBlockListCtrl.$inject = ['$scope'];
+
+
+function UseBlockCtrl($scope) {
+  var block = $scope.block // Just for debugger
+}
+UseBlockCtrl.$inject = ['$scope'];
+
+
+function LabelListCtrl($scope) {
+  var tag = $scope.res_tag
+  UseBlock.rsrcs[tag] // (?)
+}
+LabelListCtrl.$inject = ['$scope'];
+

data/app/assets/javascripts/script.js

@@ -0,0 +1,11 @@
+// declare a module
+var srAppModule = angular.module('srApp', []);
+ 
+// Configure the module.  Create some filters.
+srAppModule.filter('style_geo', function() {
+  return angular.bind(TimePix, TimePix.style_geo);
+});
+
+srAppModule.filter('rowKind', function() {
+  return angular.bind(TimePix, TimePix.row_kind);
+});

data/app/views/layouts/application.html.erb

@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html  lang='en' ng-app='srApp'>
+<head>
+  <title>Scheduled Resource Example <%= controller.action_name %></title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+  <div class="container">
+
+    <%= yield %>
+
+    <!--Body content-->
+    <div class="row"> <!-- -fluid -->
+      <div id="schedule-container"
+           ng-controller="ResourceListCtrl"> 
+
+        <div id="labels-container">
+          <div id="resource-labels">
+            <div ng-controller="LabelListCtrl"
+                 ng-repeat="rsrc in rsrcs"
+                 class="rsrcRow {{ rsrc.tag | rowKind }}row">
+
+              <div class="rsrclabel">
+                <img ng-src="/assets/{{ rsrc.label }}.jpg" title="{{ rsrc.title }}" />
+                <div class="filter"> </div>
+                <div class="label-text">{{rsrc.label}}</div>
+              </div>
+
+            </div>
+          </div>
+        </div>
+
+        <div id="timespans-container">
+          <div id="scrolling-container">
+            <div id="positioned-container">
+              <div id="current-time-cursor"> </div>
+
+              <div ng-repeat="res_tag in res_tags"
+                   ng-controller="UseBlockListCtrl"
+                   class="rsrcRow {{ res_tag | rowKind }}row">
+                
+                <div class="timespan">
+                  <div ng-repeat="block in use_blocks" 
+                       ng-controller="UseBlockCtrl"
+                       class="{{ block.css_classes }} blockdiv"
+                       style="{{ block | style_geo }} ">
+
+                    <div class="text_locator">
+                      <a href="" ng-bind-html-unsafe="block.label"></a>
+                    </div>
+
+                    <!-- app/views/schedule/_block_internal.html.erb -->
+                  </div>
+                </div>
+              </div>
+
+            </div>
+          </div>
+        </div>
+              
+        
+
+      </div> <!-- end ResourceListCtrl -->
+    </div>
+
+  </div>
+</body>
+</html>

data/app/views/schedule/index.html.erb

@@ -0,0 +1,3 @@
+<center><h2> 
+  Angularjs-Rails Scheduled Resource Example <%= controller.controller_name %> <%= controller.action_name %>
+</h2></center>

data/lib/assets/javascripts/justify_tweaks.js

@@ -19,14 +19,14 @@
 // changes to the '.text_locator' with a little randomness thrown in.
 
 // ToDo: Convert this to an object w/ methods, for better encapsulation.
- 
-// Sole exported function: 
+
+// Sole exported function:
 function filter_justify_tweaks(sc) {
   var scrollLeft  = sc.scrollLeft()
 
   // Don't repeat the calculation unnecessarily....
   if ( filter_justify_tweaks.old_srcoll == scrollLeft ) return
-  filter_justify_tweaks.old_srcoll = scrollLeft 
+  filter_justify_tweaks.old_srcoll = scrollLeft
 
   do_justify_tweaks( sc, scrollLeft )
 }

data/lib/assets/javascripts/time_pix.js.coffee

@@ -8,7 +8,7 @@ class @TimePix            # Ultimately, an angular $service
     @scroll_container().css( 'width', @pixWindow + 'px' )
     $('#scrollbar-hider').css('width', @pixWindow + 61 + 'px' )
 
-  
+
   @baseTime: 0
   @timeWindow: (3 * 3600)
   @pixWindow: 750         # Matching width of #scrolling-container
@@ -42,7 +42,7 @@ class @TimePix            # Ultimately, an angular $service
   @style_geo: (block) ->
     [s, e] = [block.starttime, block.endtime]             # per margins V
     "left: #{@secs_to_pix_scale(s - @baseTime)}px; " +
-    "width: #{@secs_to_pix_scale(e-s)-4}px;" 
+    "width: #{@secs_to_pix_scale(e-s)-4}px;"
 
   @row_kind: (tag) ->  # may/may not belong here.
     tag.split('_')[0]
@@ -67,7 +67,7 @@ class @TimePix            # Ultimately, an angular $service
     @scroll_to_ux_time( @thi - @timeWindow )
 
   @ux_time_of_pix: (x) ->
-    @pix_to_secs(x) 
+    @pix_to_secs(x)
 
   @scroll_to_tlo: =>   # bound
     @scroll_to_ux_time @tlo

data/lib/assets/javascripts/use_block.js.coffee

@@ -12,7 +12,7 @@ class @ZTimeHeaderDayUseBlock extends UseBlock
 
   @label: (block) ->
     block.label  = block.title
-  
+
   @css_classes: (block) ->
     # Could just as well come from server.
     classes = 'ZTimeHeaderDayRow '
@@ -30,7 +30,7 @@ class @ZTimeHeaderHourUseBlock extends UseBlock
 
   @label: (block) ->
     block.label  = block.title
-  
+
   @css_classes: (block) ->
     # Could just as well come from server.
     # classes = 'ZTimeHeaderHourRow '
@@ -42,7 +42,7 @@ class @ZTimeHeaderHourUseBlock extends UseBlock
 
 
 
-# Uses these fields of block: title, subtitle, category, category_type, 
+# Uses these fields of block: title, subtitle, category, category_type,
 # Sets these fields of block: label, css_classes
 class @StationUseBlock extends UseBlock
   constructor: -> nil
@@ -79,7 +79,7 @@ class @StationUseBlock extends UseBlock
   @css_class_search: (category) ->
     for key, regex of @categories
       return ('cat_' + key) if regex.test category
-    'cat_Unknown' 
+    'cat_Unknown'
 
 
   @memo: {}

data/lib/scheduled_resource.rb

@@ -20,7 +20,7 @@ require 'z_time_label_hour'
 # Example: A Room (resource) is scheduled for a meeting (resource use block)
 # titled "Weekly Staff Meeting" tomorrow from 9am to 11am.
 #
-# Class SchedResource manages class names, id's and labels for a
+# Class ScheduledResource manages class names, id's and labels for a
 # schedule.  An instance ties together:
 #
 #  1. A resource class (eg Room),
@@ -67,19 +67,19 @@ class ScheduledResource
 
   class_attribute :config
 
-  # (SchedResource protocol) Returns a hash where each key is an
+  # (ScheduledResource protocol) Returns a hash where each key is an
   # <tt>rid</tt> and the value is an array of resource use
   # blocks in the interval <tt>t1...t2</tt>, ordered by
   # <tt>starttime</tt>.
   #
-  # What <em>in</em> means depends on <em>inc</em>.  If inc(remental) is 
+  # What <em>in</em> means depends on <em>inc</em>.  If inc(remental) is
   # false, the client is building the interval from scratch.  If "hi", it is
   # an addition to an existing interval on the high side.  Similarly
   # for "lo".  This is to avoid re-transmitting blocks that span the
   # current time boundaries on the client.
   #
   # Here the resource is a channel and the use blocks are programs.
-  # 
+  #
   # ==== Parameters
   # * <tt>rids</tt> - A list of schedules resource ids (strings).
   # * <tt>t1</tt>   - Start time.
@@ -102,19 +102,19 @@ class ScheduledResource
     blockss
   end
 
-  
+
   # ==== Parameters
   # * <tt>name</tt>  - The class name (string) of a schedule resource.
   #
   # ==== Returns
   # * <tt>Class</tt> - The class representing the <em>use</em> of that resource for an interval of time.
   def self.block_class_for_resource_name( name )
-    config[:block_class_for_resource_kind][name]
+    config[:block_class_for_resource_kind][name].constantize
   end
 
 
   # ==== Returns
-  # * <tt>Array[SchedResource]</tt> - List of all configured SchedResources .
+  # * <tt>Array[ScheduledResource]</tt> - List of configured ScheduledResources.
   def self.resource_list; config[:all_resources] end
 
   # ==== Returns
@@ -166,8 +166,8 @@ class ScheduledResource
                    }
     yml = YAML.load_file CONFIG_FILE
 
-    yml['ResourceKinds'].each do |key, val| # {"Channel" => <#Class Program>...}
-      config[:block_class_for_resource_kind][key] = eval val
+    yml['ResourceKinds'].each do |key, val| # {"Channel" => "Program"...}
+      config[:block_class_for_resource_kind][key] = val # class name (string)
     end
 
     if (rkls = yml['Resources'])        # Resource Kind Lists, eg
@@ -185,12 +185,12 @@ class ScheduledResource
     config[:time_range_min] = t0 ? (eval t0) : (Time.now - 1.week)
 
     tn = yml['timeRangeMax']
-    config[:time_range_max] = tn ? (eval tn) : (Time.now - 1.week)
+    config[:time_range_max] = tn ? (eval tn) : (Time.now + 1.week)
 
     config
   end
 
-  
+
   def self.add_resources(rsrcs)
     rs = config[:all_resources]
     rsrcs.each{ |rsrc| rs.include?( rsrc ) || rs << rsrc }
@@ -236,16 +236,16 @@ class ScheduledResource
   def kind()    @tag.sub( /_.*/, '' )          end
 
   # ==== Returns
-  # * <tt>String</tt> - The <tt>rid</tt> (abstract id) of the SchedResource.
+  # * <tt>String</tt> - The <tt>rid</tt> (abstract id) of the ScheduledResource.
   def sub_id()  @tag.sub( /.*_/, '' )          end
 
   def to_s() # :nodoc:
     @tag
-  end 
+  end
 
   def inspect() # :nodoc:
-    "<#SchedResource \"#{@tag}\">"
-  end 
+    "<#ScheduledResource \"#{@tag}\">"
+  end
 
   attr_accessor :label, :title
   def label();     @label || @tag end

data/lib/scheduled_resource/version.rb

@@ -1,3 +1,3 @@
 class ScheduledResource
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/scheduled_resource.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = ScheduledResource::VERSION
   spec.authors       = ["Mike Cannon"]
   spec.email         = ["michael.j.cannon@gmail.com"]
-  spec.summary       = %q{Help display how something is used over time.}
+  spec.summary       = %q{Display how something is used over time.}
   spec.description   = %Q{== README.md:\n#{IO.read 'README.md'}}
-  spec.homepage      = ""
+  spec.homepage      = "http://github.com/emeyekayee/scheduled_resource"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails"
-  spec.add_dependency "coffee-rails"
+  spec.add_dependency "rails", "~> 4.2"
+  spec.add_dependency "coffee-rails", "~> 4.1"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end