Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions jsapp/js/components/modalForms/submission.es6
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,13 @@ class Submission extends React.Component {
case 'video':
return this.renderAttachment(submissionValue, q.type);
break;
case 'begin_repeat':
const list = submissionValue.map((r) => {
const stringified = JSON.stringify(r);
return <li key={stringified}>{stringified}</li>
});
return <ul>{list}</ul>
break;
default:
return submissionValue;
break;
Expand Down
3 changes: 2 additions & 1 deletion jsapp/xlform/src/view.row.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ $viewParams = require './view.params'
$viewRowDetail = require './view.rowDetail'
renderKobomatrix = require('js/formbuild/renderInBackbone').renderKobomatrix
_t = require('utils').t
alertify = require 'alertifyjs'

module.exports = do ->
class BaseRowView extends Backbone.View
Expand Down Expand Up @@ -179,7 +180,7 @@ module.exports = do ->
$appearanceField.find('input:checkbox').prop('checked', false)
appearanceModel = @model.get('appearance')
if appearanceModel.getValue()
@surveyView.ngScope.miscUtils.alert(_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) =>
Expand Down
11 changes: 2 additions & 9 deletions jsapp/xlform/src/view.surveyApp.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $rowView = require './view.row'
$baseView = require './view.pluggedIn.backboneView'
$viewUtils = require './view.utils'
_t = require('utils').t
alertify = require 'alertifyjs'

module.exports = do ->
surveyApp = {}
Expand Down Expand Up @@ -681,16 +682,8 @@ module.exports = do ->
enketoServer: window.koboConfigs?.enketoServer or false
enketoPreviewUri: window.koboConfigs?.enketoPreviewUri or false
onSuccess: => @onEscapeKeydown = $viewUtils.enketoIframe.close
onError: (message, opts)=> @alert message, opts
onError: (message)=> alertify.error(message)
return

alert: (message, opts={}) ->
title = opts.title or 'Error'
$('.alert-modal').html(message).dialog('option', {
title: title,
width: 500,
dialogClass: 'surveyapp__alert'
}).dialog 'open'
downloadButtonClick: (evt)->
# Download = save a CSV file to the disk
surveyCsv = @survey.toCSV()
Expand Down