help_desk_dashboard 0.0.5 → 0.0.6

data/lib/help_desk_dashboard/dashboard_generator.rb

@@ -11,7 +11,7 @@ class DashboardGenerator
   def generate
     output_dir = @config[:output_dir]
     FileUtils.mkdir_p output_dir
-    data_file_generator = DataFileGenerator.new @config, File.join(output_dir, 'data')
+    data_file_generator = DataFileGenerator.new @config
     data_file_generator.generate
     source_dir = File.join File.dirname(__FILE__), 'lib', 'web'
     FileUtils.cp_r "#{source_dir}/.", output_dir

data/lib/help_desk_dashboard/lib/app_config.rb

@@ -16,12 +16,6 @@ class AppConfig
     @config[:users].select { |u| u[:password] }
   end
 
-  def self.from_file(path)
-    json = File.read path
-    config = JSON.parse json
-    AppConfig.new config
-  end
-
   private
 
   def set_defaults(config)

data/lib/help_desk_dashboard/lib/data_file_generator.rb

@@ -1,46 +1,69 @@
 require 'fileutils'
-require_relative 'app_config'
 require_relative 'provider_factory'
 
 class DataFileGenerator
 
-  def initialize(config, output_dir)
+  def initialize(config)
     @config = config
-    @output_dir = output_dir
+    @provider_factory = ProviderFactory.new
   end
 
   def generate
-    provider_factory = ProviderFactory.new
-    provider = provider_factory.create @config[:provider]
+    provider = @provider_factory.create @config[:provider]
     requests = provider.get_requests @config.users_with_password, threads: @config[:threads]
-    requests_by_submitter = requests.group_by { |r| r[:submitted_by] }
     teams = @config[:teams].map do |team|
       {
-          team_name: team[:name],
-          title: "#{team[:name]} Help Desk Requests",
-          requests: team[:members].map { |username| requests_by_submitter[username] }.flatten.compact
+          title: title(team),
+          requests: team_requests(team, requests)
       }
     end
+    requests.each { |r| replace_username_with_name r, :submitted_by, :assigned_to }
+    FileUtils.mkdir_p output_dir
+    teams.each { |t| create_data_file t }
+  end
 
-    requests.each do |r|
-      user = config[:users].find { |u| u[:username] == r[:assigned_to] }
-      r[:assigned_to] = user[:name] if user
-      user = config[:users].find { |u| u[:username] == r[:submitted_by] }
-      r[:submitted_by] = user[:name] if user
+  private
+
+  def title(team)
+    team[:title] || "#{team[:name]} Help Desk Dashboard"
+  end
+
+  def team_requests(team, requests)
+    members = team[:members].map { |m| username m }
+    requests.select { |r| members.include? username(r[:submitted_by]) }
+  end
+
+  def replace_username_with_name(request, *keys)
+    keys.each do |key|
+      username = username(request[key])
+      user = get_user username
+      request[key] = user[:name] if user
     end
+  end
 
-    FileUtils.rm_rf @output_dir
-    FileUtils.mkdir_p @output_dir
-    teams.each { |t| create_data_file t }
+  def get_user(username)
+    users_by_username[username][0]
+  end
 
+  def users_by_username
+    @users_by_username ||= @config[:users].group_by { |u| username u[:username] }
   end
 
-  private
+  def username(username)
+    username.downcase
+  end
 
   def create_data_file(team)
+    File.write data_file_path(team), team.to_json
+  end
+
+  def data_file_path(team)
     file_name = "#{team[:team_name]}.json".downcase.gsub(' ', '-')
-    path = File.join @output_dir, file_name
-    File.write path, team.to_json
+    File.join output_dir, file_name
+  end
+
+  def output_dir
+    File.join @config[:output_dir], 'data'
   end
 
 end

data/lib/help_desk_dashboard/lib/web/assets/js/app.js

@@ -13,7 +13,7 @@ function create_requests_table(requests) {
             resolved_requests.push(request);
     });
 
-    function sort_asc(r1, r2) {
+    function sort_deadline_asc(r1, r2) {
         var date1 = Date.parse(r1.deadline);
         var date2 = Date.parse(r2.deadline);
         if (date1 > date2) return 1;
@@ -21,17 +21,17 @@ function create_requests_table(requests) {
         return 0;
     }
 
-    function sort_desc(r1, r2) {
-        var date1 = Date.parse(r1.deadline);
-        var date2 = Date.parse(r2.deadline);
+    function sort_resolved_on_desc(r1, r2) {
+        var date1 = Date.parse(r1.resolved_on);
+        var date2 = Date.parse(r2.resolved_on);
         if (date1 > date2) return -1;
         if (date1 < date2) return 1;
         return 0;
     }
 
-    overdue_requests.sort(sort_asc);
-    pending_requests.sort(sort_asc);
-    resolved_requests.sort(sort_desc);
+    overdue_requests.sort(sort_deadline_asc);
+    pending_requests.sort(sort_deadline_asc);
+    resolved_requests.sort(sort_resolved_on_desc);
     requests = overdue_requests.concat(pending_requests, resolved_requests);
 
     var table = $('<table class="requests"></table>');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: help_desk_dashboard
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70198175013500 !ruby/object:Gem::Requirement
+  requirement: &70255893994400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70198175013500
+  version_requirements: *70255893994400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70198175013020 !ruby/object:Gem::Requirement
+  requirement: &70255893993920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70198175013020
+  version_requirements: *70255893993920
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70198175012560 !ruby/object:Gem::Requirement
+  requirement: &70255893993460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70198175012560
+  version_requirements: *70255893993460
 - !ruby/object:Gem::Dependency
   name: trackit_scraper
-  requirement: &70198175012100 !ruby/object:Gem::Requirement
+  requirement: &70255893993000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198175012100
+  version_requirements: *70255893993000
 description: 
 email: matthew-github@matthewriley.name
 executables: []
@@ -105,5 +105,5 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Generates a traffic light dashboard to help keep track of help desk requests.
+summary: Generates a traffic light dashboard of help desk requests.
 test_files: []