round out queue and call with individual call input and clearing

caller.qplug

@@ -22,6 +22,13 @@ end
 
 function GetControls(props)
     local controls = {
+        {
+            Name = "Clear",
+            ControlType = "Button",
+            ButtonType = "Trigger",
+            PinStyle = "Input",
+            UserPin = true
+        },
         {
 			Name = "QueueUp",
             ControlType = "Button",
@@ -48,14 +55,25 @@ end
 function Initialize()
 end
 
-function SetupControlHandlers()
+function CreateCall(name, queue)
-    Controls["QueueUp"].EventHandler = function (ctrl)
     local call = {
-            Queue = ctrl.Boolean,
+        Queue = queue,
-            Name = Controls["CallerName"].String,
+        Name = name,
         Time = os.time()
     }
-        local callString = json.encode(call)
+    return call
+end
+
+
+function SetupControlHandlers()
+    Controls["QueueUp"].EventHandler = function (ctrl)
+        local call = CreateCall(Controls["CallerName"].String, Controls["QueueUp"].Boolean)
+        Controls["CallOut"].String = json.encode(call)
+    end
+
+    Controls["Clear"].EventHandler = function (ctrl)
+        Controls["QueueUp"].Boolean = false
+        local call = CreateCall(Controls["CallerName"].String, false)
         Controls["CallOut"].String = json.encode(call)
     end
 end

callqueue.qplug

@@ -37,37 +37,55 @@ function GetControls(props)
 			UserPin = true
         },
         {
-            Name = "TopCallName",
+            Name = "CallList",
             ControlType = "Text",
 			PinStyle = "Output",
 			UserPin = true
         },
+        {
+            Name = "ClearAll",
+            ControlType = "Button",
+            ButtonType = "Trigger",
+            Pinstyle = "Input",
+            UserPin = true
+        }
     }
     for i=1,props["Call Count"].Value do
-        print(i)
         local name = "Call" .. i
         table.insert(controls, {
-            Name = name,
+            Name = name .. "In",
             ControlType = "Text",
             PinStyle = "Input",
             UserPin = true
          })
+        table.insert(controls, {
+            Name = name .. "Clear",
+            ControlType = "Button",
+            ButttonType = "Trigger",
+            PinStyle = "Output",
+            UserPin = true
+        })
     end
     return controls
 end
 
 function ClearCalls()
     CallList = {}
+    for i=1, Properties["Call Count"].Value do
+        Controls["Call"..i.."Clear"]:Trigger()
+    end
+    UpdateOutputs()
 end
 
 function UpdateOutputs()
-    local topCall = CallList[1]
+    local listString = ""
-    if topCall == nil then
+    if (#CallList > 0) then
-        Controls["TopCallName"].String = ""
+        for i, v in pairs(CallList) do
-    else 
+            listString = listString .. v.Name .. "\n"
-        Controls["TopCallName"].String = topCall.Name
         end
     end
+    Controls["CallList"].String = listString
+end
 
 function PushCall(call)
     for i, value in pairs(CallList) do
@@ -85,6 +103,7 @@ function PopCall()
     call = table.remove(CallList,1)
     if call then
         print("call for " .. call.Name .. " at position " .. call.Position .. " popped")
+        Controls["Call"..call.Position.."Clear"]:Trigger()
     end
     UpdateOutputs()
 end
@@ -94,9 +113,9 @@ function RemoveCall(call)
         if value.Position == call.Position then
             print("removing call for position " .. call.Position)
             table.remove(CallList, i)
-            return
         end
     end
+    UpdateOutputs()
 end
 
 function Initialize()
@@ -108,8 +127,12 @@ function SetupControlHandlers()
         PopCall()
     end
 
+    Controls["ClearAll"].EventHandler = function (ctrl)
+        ClearCalls()
+    end
+
     for i=1, Properties["Call Count"].Value do
-        Controls["Call"..i].EventHandler = function (ctrl)
+        Controls["Call"..i.."In"].EventHandler = function (ctrl)
             if ctrl.String ~= "" then
                 local call = json.decode(ctrl.String)
                 call.Position = i