')
if @model
@p.val @model.get("label") || 'Empty'
diff --git a/jsapp/xlform/src/view.choices.templates.coffee b/jsapp/xlform/src/view.choices.templates.coffee
index b94b54729d..cc96d7b623 100644
--- a/jsapp/xlform/src/view.choices.templates.coffee
+++ b/jsapp/xlform/src/view.choices.templates.coffee
@@ -1,11 +1,10 @@
module.exports = do ->
- _t = require('utils').t
addOptionButton = () ->
"""
-
-
+ #{_t("Click to add another response...")}
#{_t("AUTOMATIC")}+ #{t("Click to add another response...")}
#{_t("AUTOMATIC")}
"""
diff --git a/jsapp/xlform/src/view.icons.coffee b/jsapp/xlform/src/view.icons.coffee
index 3f8690e3d2..c68d8d9df9 100644
--- a/jsapp/xlform/src/view.icons.coffee
+++ b/jsapp/xlform/src/view.icons.coffee
@@ -42,6 +42,7 @@ module.exports = do ->
addIconToRow(constants.QUESTION_TYPES.get("rank"), "r5")
# row 6
addIconToRow(constants.QUESTION_TYPES.get("calculate"), "r6")
+ addIconToRow(constants.QUESTION_TYPES.get("hidden"), "r6")
addIconToRow(constants.QUESTION_TYPES.get("file"), "r6")
addIconToRow(constants.QUESTION_TYPES.get("range"), "r6")
diff --git a/jsapp/xlform/src/view.row.coffee b/jsapp/xlform/src/view.row.coffee
index 6deefa21ba..500d65c0b7 100644
--- a/jsapp/xlform/src/view.row.coffee
+++ b/jsapp/xlform/src/view.row.coffee
@@ -13,7 +13,6 @@ $viewMandatorySetting = require './view.mandatorySetting'
$acceptedFilesView = require './view.acceptedFiles'
$viewRowDetail = require './view.rowDetail'
renderKobomatrix = require('js/formbuild/renderInBackbone').renderKobomatrix
-_t = require('utils').t
alertify = require 'alertifyjs'
module.exports = do ->
@@ -88,7 +87,7 @@ module.exports = do ->
questionType: questionType
}).render().insertInDOMAfter(@$header)
- if questionType is 'calculate'
+ if questionType is 'calculate' or questionType is 'hidden'
@$hint.hide()
if 'getList' of @model and (cl = @model.getList())
@@ -139,7 +138,7 @@ module.exports = do ->
add_row_to_question_library: (evt) =>
evt.stopPropagation()
- @ngScope?.add_row_to_question_library @model
+ @ngScope?.add_row_to_question_library @model, @model.getSurvey()._initialParams
class GroupView extends BaseRowView
className: "survey__row survey__row--group xlf-row-view xlf-row-view--depr"
@@ -151,7 +150,7 @@ module.exports = do ->
deleteGroup: (evt)=>
skipConfirm = $(evt.currentTarget).hasClass('js-force-delete-group')
- if skipConfirm or confirm(_t("Are you sure you want to split apart this group?"))
+ if skipConfirm or confirm(t("Are you sure you want to split apart this group?"))
@_deleteGroup()
evt.preventDefault()
@@ -197,7 +196,7 @@ module.exports = do ->
$appearanceField.find('input:checkbox').prop('checked', false)
appearanceModel = @model.get('appearance')
if appearanceModel.getValue()
- alertify.warning(_t("You can't display nested groups on the same screen - the setting has been removed from the parent group"))
+ alertify.warning(t("You can't display nested groups on the same screen - the setting has been removed from the parent group"))
appearanceModel.set('value', '')
@model.on 'remove', (row) =>
@@ -218,6 +217,9 @@ module.exports = do ->
@mandatorySetting = new $viewMandatorySetting.MandatorySettingView({
model: @model.get('required')
}).render().insertInDOM(@)
+ else if key is '_isRepeat' and @model.getValue('type') is 'kobomatrix'
+ # don't display repeat checkbox for matrix groups
+ continue
else
new $viewRowDetail.DetailView(model: val, rowView: @).render().insertInDOM(@)
@@ -306,7 +308,7 @@ module.exports = do ->
if @model._scoreRows.length < 1
@model._scoreRows.add
- label: _t("Enter your question")
+ label: t("Enter your question")
name: ''
score_rows = for sr in @model._scoreRows.models
diff --git a/jsapp/xlform/src/view.row.templates.coffee b/jsapp/xlform/src/view.row.templates.coffee
index 3163204a3d..59e23ee917 100644
--- a/jsapp/xlform/src/view.row.templates.coffee
+++ b/jsapp/xlform/src/view.row.templates.coffee
@@ -1,5 +1,4 @@
module.exports = do ->
- _t = require('utils').t
replaceSupportEmail = require('utils').replaceSupportEmail
expandingSpacerHtml = """
@@ -15,9 +14,9 @@ module.exports = do ->