Merge pull request kobotoolbox#2076 from kobotoolbox/enable-file-rang…

…e-simple Enable file and range question types (simple)
qedsoftware · Dec 10, 2018 · fafea5d · fafea5d
2 parents ab6e8c4 + 77b566b
commit fafea5d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/jsapp/scss/stylesheets/partials/_icons.scss b/jsapp/scss/stylesheets/partials/_icons.scss
@@ -35,6 +35,7 @@
 .fa.fa-lato-text:before,
 .fa.fa-lato-integer:before,
 .fa.fa-lato-decimal:before,
+.fa.fa-lato-range:before,
 .fa.fa-lato-calculate:before {
   font-family: $font;
   font-weight: 600;
@@ -55,6 +56,11 @@
   font-size: 0.9em;
 }
 
+.fa.fa-lato-range:before {
+  content: "1..1";
+  font-size: 0.9em;
+}
+
 .fa.fa-lato-calculate:before {
   content: "1+1";
   font-size: 0.9em;

diff --git a/jsapp/scss/stylesheets/partials/form_builder/_card.scss b/jsapp/scss/stylesheets/partials/form_builder/_card.scss
@@ -184,8 +184,11 @@ $cardIndicatorIconWidth: 21px;
         font-size: 0.95em;
         background-color: #8595A5;
     }
-    .fa-lato-calculate, .fa-lato-decimal,
-    .fa-lato-integer, .fa-lato-text {
+    .fa-lato-range,
+    .fa-lato-calculate,
+    .fa-lato-decimal,
+    .fa-lato-integer,
+    .fa-lato-text {
         font-size: 15px;
         width: $cardIndicatorIconWidth;
     }

diff --git a/jsapp/xlform/src/model.configs.coffee b/jsapp/xlform/src/model.configs.coffee
@@ -132,6 +132,9 @@ module.exports = do ->
     audio:
       label:
         value: "Use the camera's microphone to record a sound"
+    file:
+      label:
+        value: "Upload a file"
     note:
       label:
         value: "This note can be read out loud"
@@ -150,6 +153,9 @@ module.exports = do ->
     date:
       label:
         value: "Enter a date"
+    range:
+      label:
+        value: "Enter a number within a specified range"
     calculate:
       calculation:
         value: ""
@@ -187,6 +193,7 @@ module.exports = do ->
       ["text", "Text"], # expects text
       ["integer", "Integer"], #e.g. 42
       ["decimal", "Decimal"], #e.g. 3.14
+      ["range", "Range"], #e.g. 1-5
       ["geopoint", "Geopoint (GPS)"], # Can use satelite GPS coordinates
       ["geotrace", "Geotrace (GPS)"], # Can use satelite GPS coordinates
       ["geoshape", "Geoshape (GPS)"], # Can use satelite GPS coordinates
@@ -197,6 +204,7 @@ module.exports = do ->
       ["datetime", "Date and Time"], #e.g. (2012-Jan-4 3:04PM)
       ["audio", "Audio", isMedia: true], # Can use phone microphone to record audio
       ["video", "Video", isMedia: true], # Can use phone camera to record video
+      ["file", "File"],
       ["calculate", "Calculate"],
       ["select_one", "Select", orOtherOption: true, specifyChoice: true],
       ["score", "Score"],

diff --git a/jsapp/xlform/src/view.icons.coffee b/jsapp/xlform/src/view.icons.coffee
@@ -114,10 +114,22 @@ module.exports = do ->
       grouping: "r5"
       id: "rank"
     ,
+
+    # r6
       label: _t("Calculate")
       faClass: "lato-calculate"
-      grouping: "r4"
+      grouping: "r6"
       id: "calculate"
+    ,
+      label: _t("File")
+      faClass: "file"
+      grouping: "r6"
+      id: "file"
+    ,
+      label: _t("Range")
+      faClass: "lato-range"
+      grouping: "r6"
+      id: "range"
     ,
     ]
 

diff --git a/jsapp/xlform/src/view.rowSelector.coffee b/jsapp/xlform/src/view.rowSelector.coffee
@@ -69,7 +69,10 @@ module.exports = do ->
       for mrow in $icons.grouped()
         menurow = $("<div>", class: "questiontypelist__row").appendTo $menu
         for mitem, i in mrow when mitem
-          menurow.append $viewTemplates.$$render('xlfRowSelector.cell', mitem.attributes)
+          if mitem.id is 'range'
+            console.warn("range question type is not fully supported yet")
+          else
+            menurow.append $viewTemplates.$$render('xlfRowSelector.cell', mitem.attributes)
 
       @scrollFormBuilder('+=220')
       @$('.questiontypelist__item').click _.bind(@selectMenuItem, @)