GUI - Minor Timer and State control tweeks.

Author: VaughnRupp

UI/Web/controls/ctrlStateImage.ascx.cs

@@ -38,7 +38,7 @@ protected void Page_Load(object sender, EventArgs e)
         {
             LightLevel = Convert.ToUInt16(OSAEObjectPropertyManager.GetObjectPropertyValue(ObjectName, "Light Level").Value);
         }
-        catch (Exception ex)
+        catch
         {
             LightLevel = 100.00;
         }
@@ -62,6 +62,7 @@ protected void Page_Load(object sender, EventArgs e)
         }
     }
 
+    /*
     public void Update()
     {
         if (OSAEObjectStateManager.GetObjectStateValue(hdnObjName.Value).Value != hdnCurState.Value)
@@ -86,7 +87,6 @@ public void Update()
                 LightLevel = 100.00;
             }
 
-
             string imgName = screenObject.Property(StateMatch + " Image").Value;
             OSAEImage img = imgMgr.GetImage(imgName);
             imgStateImage.ImageUrl = "~/ImageHandler.ashx?id=" + img.ID;
@@ -101,5 +101,5 @@ public void Update()
                 imgStateImage.Attributes.Add("onclick", "runMethod('" + ObjectName + "','ON','','');");
             }
         }
-    }
+    }*/
 }

UI/Web/controls/ctrlTimerLabel.ascx.cs

@@ -17,36 +17,32 @@ public partial class controls_ctrlTimerLabel : System.Web.UI.UserControl
     private string CurrentState;
     private int TimeInState;
     TimeSpan span;
-    string time;
+    string sValue;
 
     protected void Page_Load(object sender, EventArgs e)
     {
         ObjectName = screenObject.Property("Object Name").Value;
-        OSAEObject timerObj = OSAEObjectManager.GetObjectByName(ObjectName);
-        if (timerObj.Property("OFF TIMER").Value != "")
-            OffTimer = Int32.Parse(timerObj.Property("OFF TIMER").Value);
-        else
-            OffTimer = 0;
-        CurrentState = timerObj.State.Value;
-
-        TimeSpan ts = DateTime.Now - DateTime.Parse(timerObj.LastUpd);
-        TimeInState = (int)ts.TotalSeconds;
+        OSAEObjectState os = OSAEObjectStateManager.GetObjectStateValue(ObjectName);
+        CurrentState = os.Value;
 
-        if (CurrentState == "OFF")
-            time = "OFF";
-        else
-        {
-            span = TimeSpan.FromSeconds(OffTimer - TimeInState); 
-            time = span.ToString(@"mm\:ss");
-        }
+        OffTimer = Convert.ToUInt16(OSAEObjectPropertyManager.GetObjectPropertyValue(ObjectName, "OFF TIMER").Value);
+        TimeInState = (int)os.TimeInState;
 
         string sBackColor = screenObject.Property("Back Color").Value;
         string sForeColor = screenObject.Property("Fore Color").Value;
         string sPrefix = screenObject.Property("Prefix").Value;
         string sSuffix = screenObject.Property("Suffix").Value;
         string iFontSize = screenObject.Property("Font Size").Value;
 
-        TimerLabel.Text = time;
+        if (CurrentState == "OFF")
+            sValue = os.StateLabel;
+        else
+        {
+            span = TimeSpan.FromSeconds(OffTimer - TimeInState); //Or TimeSpan.FromSeconds(seconds); (see Jakob C´s answer)
+            sValue = span.ToString(@"mm\:ss");
+        }
+
+        TimerLabel.Text = sValue;
         TimerLabel.Attributes.Add("Style", "position:absolute;top:" + (Int32.Parse(screenObject.Property("Y").Value) + 50).ToString() + "px;left:" + (Int32.Parse(screenObject.Property("X").Value) + 10).ToString() + "px;z-index:" + (Int32.Parse(screenObject.Property("ZOrder").Value) + 10).ToString() + ";");
 
         if (sBackColor != "")