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

fixed rating field

Browse source
This commit is contained in:
David Baldwynn 2017-03-09 14:59:55 -08:00
parent ff52274882
commit b6e6fb93a6
No known key found for this signature in database
GPG key ID: 15D1C13202224A9B
4 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/modules/forms/admin/directives/auto-save.client.directive.js
View file

@ -1,6 +1,5 @@
'use strict'; 'use strict';
function removeDateFieldsFunc(o) { function removeDateFieldsFunc(o) {
var clone = _.clone(o); var clone = _.clone(o);
function eachObject(v,k){ function eachObject(v,k){
@ -80,9 +79,10 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
delete oldValue.visible_form_fields; delete oldValue.visible_form_fields;
newValue.form_fields = _.removeDateFields(newValue.form_fields); newValue.form_fields = _.removeDateFields(newValue.form_fields);
oldValue.form_fields = _.removeDateFields(oldValue.form_fields); oldValue.form_fields = _.removeDateFields(oldValue.form_fields);
var changedFields = !!DeepDiff.diff(oldValue, newValue) && DeepDiff.diff(oldValue, newValue).length > 0; var changedFields = !!DeepDiff.diff(oldValue, newValue) && DeepDiff.diff(oldValue, newValue).length > 0;
console.log(DeepDiff.diff(oldValue, newValue));
//If our form is undefined, don't save form //If our form is undefined, don't save form
if(!changedFields){ if(!changedFields){
$rootScope.finishedRender = true; $rootScope.finishedRender = true;

11
public/modules/forms/admin/directives/edit-form.client.directive.js
View file

@ -91,8 +91,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
*/ */
// Add a new field // Add a new field
$scope.addNewField = function(modifyForm, fieldType){ $scope.addNewField = function(modifyForm, fieldType){
console.log('fieldType:'+fieldType);
// increment lastAddedID counter // increment lastAddedID counter
$scope.addField.lastAddedID++; $scope.addField.lastAddedID++;
var fieldTitle = fieldType; var fieldTitle = fieldType;
@ -120,9 +118,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
shape: 'Heart' shape: 'Heart'
} }
} }
console.log(newField.title);
if($scope.showAddOptions(newField)){ if($scope.showAddOptions(newField)){
newField.fieldOptions = []; newField.fieldOptions = [];
newField.fieldOptions.push({ newField.fieldOptions.push({
@ -141,7 +137,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
// Delete particular field on button click // Delete particular field on button click
$scope.deleteField = function (field_index) { $scope.deleteField = function (field_index) {
console.log($scope.myform.form_fields);
$scope.myform.form_fields.splice(field_index, 1); $scope.myform.form_fields.splice(field_index, 1);
}; };
@ -177,7 +172,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
for(var i = 0; i < $scope.myform.startPage.buttons.length; i++){ for(var i = 0; i < $scope.myform.startPage.buttons.length; i++){
currID = $scope.myform.startPage.buttons[i]._id; currID = $scope.myform.startPage.buttons[i]._id;
console.log(currID);
if(currID === button._id){ if(currID === button._id){
$scope.myform.startPage.buttons.splice(i, 1); $scope.myform.startPage.buttons.splice(i, 1);
@ -194,9 +188,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
// add new option to the field // add new option to the field
$scope.addOption = function(field_index){ $scope.addOption = function(field_index){
var currField = $scope.myform.form_fields[field_index]; var currField = $scope.myform.form_fields[field_index];
//console.log(field_index);
//console.log(currField);
if(currField.fieldType === 'checkbox' || currField.fieldType === 'dropdown' || currField.fieldType === 'radio'){ if(currField.fieldType === 'checkbox' || currField.fieldType === 'dropdown' || currField.fieldType === 'radio'){
if(!currField.fieldOptions){ if(!currField.fieldOptions){
$scope.myform.form_fields[field_index].fieldOptions = []; $scope.myform.form_fields[field_index].fieldOptions = [];

4
public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
View file

@ -39,7 +39,6 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
} }
$scope.table.rows = submissions; $scope.table.rows = submissions;
console.log(submissions);
/* /*
** Analytics Functions ** Analytics Functions
@ -94,9 +93,6 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
stats[deviceType].completion = (stats[deviceType].responses / stats[deviceType].visits).toFixed(0); stats[deviceType].completion = (stats[deviceType].responses / stats[deviceType].visits).toFixed(0);
if(!stats[deviceType].completion) stats[deviceType].completion = 0; if(!stats[deviceType].completion) stats[deviceType].completion = 0;
} }
console.log("stats");
} }
return stats; return stats;

1
public/modules/forms/base/views/directiveViews/field/rating.html
View file

@ -16,7 +16,6 @@
<div class="col-xs-12 field-input"> <div class="col-xs-12 field-input">
<input-stars max="{{field.ratingOptions.steps}}" <input-stars max="{{field.ratingOptions.steps}}"
ng-init="field.fieldValue = 1"
on-star-click="$root.nextField()" on-star-click="$root.nextField()"
icon-full="{{field.ratingOptions.shape}}" icon-full="{{field.ratingOptions.shape}}"
icon-base="fa fa-3x" icon-base="fa fa-3x"