Merge branch 'emberjs' into develop

2 files changed, 57 insertions, 0 deletions

diff --git a/app/models/switchboard.rb b/app/models/switchboard.rb
index 74e2767..53f69a4 100644
--- a/app/models/switchboard.rb
+++ b/app/models/switchboard.rb
@@ -6,11 +6,33 @@ class Switchboard < ActiveRecord::Base
             :presence => true,
             :uniqueness => {:scope => :user_id}
 
+  validates :reload_interval,
+            :numericality => { :only_integer => true, 
+                               :greater_than => 249,
+                               :allow_nil => true 
+                             }
+
+  validates :entry_width,
+            :numericality => { :only_integer => true, 
+                               :greater_than => 0,
+                               :less_than => 5
+                             }
+
   belongs_to :user, :touch => true
   has_many :switchboard_entries, :dependent => :destroy
   has_many :sip_accounts, :through => :switchboard_entries
+  has_many :phone_numbers, :through => :sip_accounts
+
+  before_validation :convert_0_to_nil
 
   def to_s
     self.name.to_s
   end
+
+  private
+  def convert_0_to_nil
+    if self.reload_interval == 0
+      self.reload_interval = nil
+    end
+  end
 end
diff --git a/app/models/switchboard_entry.rb b/app/models/switchboard_entry.rb
index 76d002f..44de7fd 100644
--- a/app/models/switchboard_entry.rb
+++ b/app/models/switchboard_entry.rb
@@ -5,6 +5,8 @@ class SwitchboardEntry < ActiveRecord::Base
   belongs_to :switchboard, :touch => true
   belongs_to :sip_account, :touch => true
 
+  has_many :phone_numbers, :through => :sip_account
+
   validates :switchboard,
             :presence => true
 
@@ -28,4 +30,37 @@ class SwitchboardEntry < ActiveRecord::Base
       self.name.to_s
     end
   end
+
+  def avatar_src
+    if self.sip_account.sip_accountable.class == User
+      if self.sip_account.sip_accountable.image?
+        self.sip_account.sip_accountable.image_url(:profile)
+      else
+        if self.sip_account.sip_accountable.male?
+          '/assets/icons/user-male-16x.png'
+        else
+          '/assets/icons/user-female-16x.png'
+        end
+      end
+    else
+      nil
+    end
+  end
+
+  def callstate
+    if self.sip_account.call_legs.where(callstate: 'ACTIVE').any? || self.sip_account.b_call_legs.where(b_callstate: 'ACTIVE').any?
+      'ACTIVE'
+    else
+      if self.sip_account.call_legs.where(callstate: 'EARLY').any?
+        'EARLY'
+      else
+        if self.sip_account.call_legs.where(callstate: 'RINGING').any?
+          'RINGING'
+        else
+          nil
+        end
+      end
+    end
+  end
+  
 end