[VID-12] Delivery of remaining features for v1.1

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / directives / parameterBlockDirective.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js
index 811a51e..b6a360f 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js
@@ -49,7 +49,7 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) {
     var checkboxInputStyle = "height: 18px; width: 18px; padding: 2px 5px;";\r
     var selectStyle = "height: 25px; padding: 2px; text-align: center;";\r
     var requiredLabelStyle = "width: 25px; padding: 5px 10px 10px 5px;";\r
-    var textInputPrompt = "Enter data";\r
+    \r
 \r
     var getParameterHtml = function(parameter, editable) {\r
        var style = valueStyle;\r
@@ -60,7 +60,11 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) {
        if (UtilityService.hasContents(parameter.description)) {\r
            attributeString += " title=' " + parameter.description + " '";\r
        }\r
-       var html = "<tr><td style='" + nameStyle + "'" + attributeString + ">"\r
+       var rowstyle='';\r
+       if(parameter.type == 'file' && !parameter.isVisiblity){\r
+               rowstyle = ' style="display:none;"';\r
+       }\r
+       var html = "<tr"+rowstyle+"><td style='" + nameStyle + "'" + attributeString + ">"\r
                + getNameHtml(parameter) + "</td><td style='" + style + "'>";\r
        if (editable === undefined) {\r
            if (UtilityService.hasContents(parameter.value)) {\r
@@ -102,6 +106,8 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) {
     };\r
 \r
     var getValueHtml = function(parameter) {\r
+       \r
+    var textInputPrompt = "Enter data";\r
        var attributeString = " parameter-id='" + parameter.id + "'";\r
        var additionalStyle = "";\r
        if (parameter.isEnabled === false) {\r
@@ -136,6 +142,14 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) {
            name = parameter.id;\r
        }\r
        attributeString += " parameter-name='" + name + "'";\r
+       \r
+       if ( parameter.type === PARAMETER.MAP ) {\r
+               textInputPrompt = "{<key1>: <value1>,\.\.\.,<keyN>: <valueN>}";\r
+       }\r
+       \r
+       if ( parameter.type === PARAMETER.LIST ) {\r
+               textInputPrompt = "[<value1>,\.\.\.,<valueN>]";\r
+       }\r
 \r
        switch (parameter.type) {\r
        case PARAMETER.BOOLEAN:\r
@@ -151,6 +165,18 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) {
                        + "</select>";\r
                }\r
            break;\r
+       case PARAMETER.CHECKBOX:\r
+               if (parameter.value) {\r
+                       return "<input type='checkbox' "+attributeString+ " checked='checked' style='"+checkboxInputStyle+"'" \r
+                       + " value='true'/>";\r
+               }else{\r
+                       return "<input type='checkbox' "+attributeString+ "' style='"+checkboxInputStyle+"'" \r
+                       + " value='false'/>";\r
+               }\r
+           break;\r
+       case PARAMETER.FILE:\r
+                       return "<input type='file' "+attributeString+ " id='"+parameter.id+"' value='"+parameter.value+"'/>";\r
+           break;\r
        case PARAMETER.NUMBER:\r
                var value=parameter.value;\r
                var parameterSpec = "<input type='number'" + attributeString + " style='" + textInputStyle + additionalStyle + "'";\r
@@ -258,6 +284,9 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) {
        };\r
        if ($(element).prop("type") === "checkbox") {\r
            parameter.value = $(element).prop("checked");\r
+       }else if ($(element).prop("type") === "file") {\r
+           parameter.value = $('#'+id).attr("value");\r
+\r
        } else {\r
            if ($(element).prop("type") === "text") {\r
                $(element).val($(element).val().trim());\r