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

fixed gruntfile bug

Browse source
This commit is contained in:
David Baldwynn 2017-10-29 11:43:20 -04:00
parent d304b80913
commit 65a8b2d7cc
2 changed files with 25 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gruntfile.js
View file

@ -27,7 +27,7 @@ module.exports = function(grunt) {
serverJS: ['gruntfile.js', 'server.js', 'config/**/*.js', 'app/**/*.js', '!app/tests/'], serverJS: ['gruntfile.js', 'server.js', 'config/**/*.js', 'app/**/*.js', '!app/tests/'],
clientViews: ['public/modules/**/*.html', 'public/form_modules/forms/base/**/*.html', '!public/modules/forms/base/**/*.html',], clientViews: ['public/modules/**/*.html', 'public/form_modules/forms/base/**/*.html', '!public/modules/forms/base/**/*.html',],
clientJS: ['public/js/*.js', 'public/form_modules/**/*.js', 'public/modules/**/*.js'], clientJS: ['public/form_modules/**/*.js', 'public/modules/**/*.js'],
clientCSS: ['public/modules/**/*.css'], clientCSS: ['public/modules/**/*.css'],
serverTests: ['app/tests/**/*.js'], serverTests: ['app/tests/**/*.js'],
@ -145,10 +145,14 @@ module.exports = function(grunt) {
} }
}, },
ngAnnotate: { ngAnnotate: {
options:{
add: true,
remove: true
},
production: { production: {
files: { files: {
'public/dist/application.js': '<%= applicationJavaScriptFiles %>', 'public/dist/application.js': ['public/application.js', 'public/config.js', 'public/form_modules/**/*.js'],
'public/dist/form-application.js': '<%= formApplicationJavaScriptFiles %>' 'public/dist/form_application.js': ['public/form-application.js', 'public/form-config.js', 'public/form_modules/**/*.js']
} }
} }
}, },

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

@ -16,7 +16,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
rows: [] rows: []
}; };
var initController = function(){ var getSubmissions = function(){
$http({ $http({
method: 'GET', method: 'GET',
url: '/forms/'+$scope.myform._id+'/submissions' url: '/forms/'+$scope.myform._id+'/submissions'
@ -31,9 +31,6 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
if(submissions[i].form_fields[x].fieldType === 'dropdown'){ if(submissions[i].form_fields[x].fieldType === 'dropdown'){
submissions[i].form_fields[x].fieldValue = submissions[i].form_fields[x].fieldValue.option_value; submissions[i].form_fields[x].fieldValue = submissions[i].form_fields[x].fieldValue.option_value;
} }
//var oldValue = submissions[i].form_fields[x].fieldValue || '';
//submissions[i].form_fields[x] = _.merge(defaultFormFields, submissions[i].form_fields);
//submissions[i].form_fields[x].fieldValue = oldValue;
} }
submissions[i].selected = false; submissions[i].selected = false;
} }
@ -42,8 +39,21 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
}); });
}; };
initController(); var getVisitors = function(){
$http({
method: 'GET',
url: '/forms/'+$scope.myform._id+'/visitors'
}).then(function successCallback(response) {
var defaultFormFields = _.cloneDeep($scope.myform.form_fields);
var visitors = response.data || [];
$scope.visitors = visitors;
});
};
getSubmissions();
getVisitors();
/* /*
** Analytics Functions ** Analytics Functions
@ -62,50 +72,8 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
return (totalTime/numSubmissions).toFixed(0); return (totalTime/numSubmissions).toFixed(0);
})(); })();
$scope.DeviceStatistics = (function(){ var updateFields = $interval(getSubmissions, 100000);
var newStatItem = function(){ var updateFields = $interval(getVisitors, 1000000);
return {
visits: 0,
responses: 0,
completion: 0,
average_time: 0,
total_time: 0
};
};
var stats = {
desktop: newStatItem(),
tablet: newStatItem(),
phone: newStatItem(),
other: newStatItem()
};
if($scope.myform.analytics && $scope.myform.analytics.visitors) {
var visitors = $scope.myform.analytics.visitors;
for (var i = 0; i < visitors.length; i++) {
var visitor = visitors[i];
var deviceType = visitor.deviceType;
stats[deviceType].visits++;
if (visitor.isSubmitted) {
stats[deviceType].total_time = stats[deviceType].total_time + visitor.timeElapsed;
stats[deviceType].responses++;
}
if(stats[deviceType].visits) {
stats[deviceType].completion = 100*(stats[deviceType].responses / stats[deviceType].visits).toFixed(2);
}
if(stats[deviceType].responses){
stats[deviceType].average_time = (stats[deviceType].total_time / stats[deviceType].responses).toFixed(0);
}
}
}
return stats;
})();
var updateFields = $interval(initController, 1000000);
$scope.$on('$destroy', function() { $scope.$on('$destroy', function() {
if (updateFields) { if (updateFields) {
@ -173,3 +141,4 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
}; };
} }
]); ]);