fixed view problems

Author: bougyman

app.rb

@@ -4,7 +4,7 @@
 Ramaze.setup do |g|
   gem 'bacon', '1.1.0'
   gem 'eventmachine', '0.12.10'
-  gem 'freeswitcher', '0.6.0', lib: 'fsr'
+  gem 'freeswitcher', '0.6.12', lib: 'fsr'
   gem 'log4r', '1.1.9'
   gem 'name_parse', '0.0.5'
   gem 'pg', '0.10.1'

bin/dialer

@@ -11,6 +11,7 @@ require "fsr/command_socket"
 FSR.load_all_commands
 require "tiny_dialer/tcc_helper"
 TinyDialer::Log.level = Log4r.const_get(TinyDialer.options.dialer.log_level)
+
 module TinyDialer
   class DialManager
     attr_reader :hopper, :host, :pass, :max_dials
@@ -43,7 +44,7 @@ module TinyDialer
 
     def ready_agents
       agents = if TinyDialer.options.direct_listener.tcc_root
-        TCC_Helper.ready_agents.size
+        TCC_Helper.ready_agents(TinyDialer.options.dialer.transfer_queue).size
       else
         if row = TinyDialer.db[:dialer_pool].first
           row[:dialer_max]

controller/admin.rb

@@ -49,6 +49,7 @@ def stats
       return {
         ratio: ratio,
         aim: aim,
+        queue: queue,
         current_dials: current_dials,
         dialer_status: dialer_status,
         ivr_status: ivr_status,
@@ -59,11 +60,12 @@ def stats
     private
 
     def dialer_status
-      dialer_status = `sv stat #{ENV['HOME']}/service/#{ENV['APP_DB']} 2>/dev/null`.split(':')[0]
+      Ramaze::Log.info cmd = "sv stat #{ENV['HOME']}/service/#{ENV['APP_DB']} 2>/dev/null"
+      dialer_status = `#{cmd}`.split(':')[0]
     end
 
     def ivr_status
-      ivr_status = `sv stat #{ENV['HOME']}/service/ivr 2>/dev/null`.split(':')[0]
+      ivr_status = `sv stat #{ENV['HOME']}/service/td_direct_listener 2>/dev/null`.split(':')[0]
     end
   end
 end

lib/tiny_dialer/tcc_helper.rb

@@ -2,14 +2,17 @@ module TinyDialer
   module TCC_Helper
     def self.ready_agents(queue = nil)
       reg_servers = {}
-      all_agents = agents
+
       if queue
         members = Hash[tier_members(queue).map { |t| [t.agent, t.state] }]
-        our_agents = all_agents.select { |a| members.key?(a.name) }
+        our_agents = agents.select { |a| members.key?(a.name) }
       else
-        our_agents = all_agents
+        our_agents = agents
+        members = Hash[our_agents.map { |t| [t.agent, t.state] }]
       end
 
+      # TinyDialer::Log.info "Our agents: #{our_agents.inspect}"
+
       our_agents.each { |n|
         n.ext = TinyCallCenter::Account.extension(n.name)
         n.reg_server = TinyCallCenter::Account.registration_server(n.ext)
@@ -20,10 +23,10 @@ def self.ready_agents(queue = nil)
         next unless agent.status =~ /Available/ # only select Available
         next unless members[agent.name] =~ /Ready/
         channels = reg_servers[agent.reg_server]
-        channels.select{|channel|
+        channels.any?{|channel|
           next if channel.dest == '19999' # ignore calls with dest
           channel.dest == agent.ext || channel.name =~ /(?:^|\/)(?:sip:)?#{agent.ext}[@-]/
-        }.empty?
+        }
       }
     end
 

options.rb

@@ -34,7 +34,7 @@ module TinyDialer
       o "Freeswitch Server Password",
         :fs_auth, ENV['TD_FS_SERVER_AUTH'] || 'ClueCon'
       o "Log Level (DEBUG, INFO, WARN, ERROR, CRIT)",
-        :log_level, ENV['TD_LOG_LEVEL'] || 'INFO'
+        :log_level, ENV['TD_LOG_LEVEL'] || 'DEBUG'
     end
   end
 end

view/index.xhtml

@@ -7,13 +7,15 @@
     <th>Aim</th>
     <th>Dialer Status</th>
     <th>IVR Listener</th>
+    <th>Transfer Queue</th>
   </tr>
   <tr>
     <td id="show_current_dials"></td>
     <td id="show_ready_agents"></td>
     <td id="show_aim"></td>
     <td id="show_dialer_status"></td>
     <td id="show_ivr_status"></td>
+    <td id="show_queue"></td>
   </tr>
 </table>