beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed hide logicJump in admin panel

Browse source
This commit is contained in:
David Baldwynn 2016-11-14 11:10:51 -08:00
parent 7ad79c4882
commit 3b0af059d2
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/logic_jump.server.model.js
View file

@ -32,7 +32,7 @@ var LogicJumpSchema = new Schema({
'field begins static', 'field begins static',
'field !begins static', 'field !begins static',
'field ends static', 'field ends static',
'field !ends static', 'field !ends static'
] ]
}, },
fieldA: { fieldA: {

21
public/dist/application.js vendored
View file

@ -334,7 +334,7 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
SUBMIT: 'Submit', SUBMIT: 'Submit',
UPLOAD_FILE: 'Upload your File' UPLOAD_FILE: 'Upload your File'
}); });
}]); }]);
'use strict'; 'use strict';
@ -1276,7 +1276,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
angular.module('users').controller('PasswordController', ['$scope', '$stateParams', '$state', 'User', angular.module('users').controller('PasswordController', ['$scope', '$stateParams', '$state', 'User',
function($scope, $stateParams, $state, User) { function($scope, $stateParams, $state, User) {
$scope.error = ''; $scope.error = '';
// Submit forgotten password account id // Submit forgotten password account id
@ -1764,7 +1764,7 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
$scope.setForm = function(form){ $scope.setForm = function(form){
$scope.myform = form; $scope.myform = form;
}; };
$rootScope.resetForm = function(){ $rootScope.resetForm = function(){
$scope.myform = Forms.get({ $scope.myform = Forms.get({
formId: $stateParams.formId formId: $stateParams.formId
@ -2249,8 +2249,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
// LOGIC JUMP METHODS // LOGIC JUMP METHODS
$scope.removeLogicJump = function (field_index) { $scope.removeLogicJump = function (field_index) {
var currField = $scope.myform.form_fields[field_index]; $scope.myform.form_fields[field_index] = {};
currField.logicJump = {};
}; };
$scope.addNewLogicJump = function (field_index) { $scope.addNewLogicJump = function (field_index) {
@ -2480,7 +2479,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
/* /*
** Analytics Functions ** Analytics Functions
*/ */
$scope.AverageTimeElapsed = (function(){ $scope.AverageTimeElapsed = (function(){
var totalTime = 0; var totalTime = 0;
var numSubmissions = $scope.table.rows.length; var numSubmissions = $scope.table.rows.length;
@ -2681,15 +2680,15 @@ angular.module('forms').service('FormFields', [
// }, // },
// { // {
// name : 'stripe', // name : 'stripe',
// value : 'Payment' // value : 'Payment'
// }, // },
{ {
name : 'statement', name : 'statement',
value : 'Statement' value : 'Statement'
} }
]; ];
} }
]); ]);
'use strict'; 'use strict';
@ -2702,7 +2701,7 @@ angular.module('forms').factory('Submissions', ['$resource',
formId: '@_id' formId: '@_id'
}, { }, {
'query' : { 'query' : {
method: 'GET', method: 'GET',
isArray: true, isArray: true,
}, },
'update': { 'update': {
@ -2987,7 +2986,7 @@ angular.module('forms').directive('onFinishRender', ["$rootScope", "$timeout", f
return { return {
restrict: 'A', restrict: 'A',
link: function (scope, element, attrs) { link: function (scope, element, attrs) {
//Don't do anything if we don't have a ng-repeat on the current element //Don't do anything if we don't have a ng-repeat on the current element
if(!element.attr('ng-repeat') && !element.attr('data-ng-repeat')){ if(!element.attr('ng-repeat') && !element.attr('data-ng-repeat')){
return; return;

4
public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html
View file

@ -315,13 +315,13 @@
<div class="col-md-4 col-xs-12 field-input">{{ 'ADD_LOGIC_JUMP' | translate }}</div> <div class="col-md-4 col-xs-12 field-input">{{ 'ADD_LOGIC_JUMP' | translate }}</div>
<div class="col-md-8 col-xs-12 field-input"> <div class="col-md-8 col-xs-12 field-input">
<label class="btn col-xs-5"> <label class="btn col-xs-5">
<input type="radio" ng-checked="!!myform.form_fields[$index].logicJump.fieldA" <input type="radio" ng-checked="!!myform.form_fields[$index].logicJump.valueB"
name="logicJumpYes{{field._id}}" ng-click="addNewLogicJump($index)"/> name="logicJumpYes{{field._id}}" ng-click="addNewLogicJump($index)"/>
<span> &nbsp; {{ 'YES' | translate }}</span> <span> &nbsp; {{ 'YES' | translate }}</span>
</label> </label>
<label class="btn col-xs-5 col-xs-offset-1"> <label class="btn col-xs-5 col-xs-offset-1">
<input type="radio" ng-checked="!myform.form_fields[$index].logicJump.fieldA" <input type="radio" ng-checked="!myform.form_fields[$index].logicJump.valueB"
name="logicJumpNo{{field._id}}" ng-click="removeLogicJump($index)"/> name="logicJumpNo{{field._id}}" ng-click="removeLogicJump($index)"/>
<span> &nbsp; {{ 'NO' | translate }}</span> <span> &nbsp; {{ 'NO' | translate }}</span>
</label> </label>