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

removed autosave for configuration settings

Browse source
This commit is contained in:
David Baldwynn 2015-07-06 19:52:55 -07:00
parent c07a9ba267
commit 23fd8e36d6
12 changed files with 81 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM dockerfile/nodejs
FROM node:0.10
MAINTAINER Matthias Luebken, matthias@catalyst-zero.com

2
app/controllers/users/users.authentication.server.controller.js
View file

@ -39,7 +39,7 @@ exports.signup = function(req, res) {
if (err) {
res.status(400).send(err);
} else {
res.json(user);
res.status(200).send('user successfully loggedin');
}
});
}

3
public/modules/forms/controllers/view-form.client.controller.js
View file

@ -4,6 +4,7 @@
angular.module('forms').controller('ViewFormController', ['$rootScope', '$scope', '$stateParams', '$state', 'Forms', 'CurrentForm','$http',
function($rootScope, $scope, $stateParams, $state, Forms, CurrentForm, $http) {
$scope.myform = CurrentForm.getForm();
$scope.submissions = undefined;
$scope.viewSubmissions = false;
@ -147,9 +148,7 @@ angular.module('forms').controller('ViewFormController', ['$rootScope', '$scope'
}else {
form._id = form_id;
}
$http.delete('/forms/'+form._id)
.success(function(data, status, headers){
console.log('form deleted successfully');

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

@ -31,11 +31,15 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
$scope.finishedRender = true;
});
$scope.$watch('form', function(newValue, oldValue) {
$scope.$watch('myform.form_fields', function(newValue, oldValue) {
// console.log('auto saving');
// console.log(oldValue);
// console.log(newValue);
if(difference(oldValue.form_fields,newValue.form_fields).length !== 0 && !$formCtrl.$dirty) {
console.log(oldValue);
console.log(newValue);
if(difference(oldValue,newValue).length === 0 || oldValue === undefined){
console.log('returning');
return;
}
if(difference(oldValue,newValue).length !== 0 && !$formCtrl.$dirty) {
$formCtrl.$setDirty();
}
// else if(difference(oldValue.form_fields,newValue.form_fields).length === 0 ){
@ -43,13 +47,13 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
// }
// console.log('\n\n-------\n$pristine: '+( $formCtrl.$pristine ) );
// console.log('$dirty: '+( $formCtrl.$dirty ) );
console.log('form_fields changed: '+difference(oldValue.form_fields,newValue.form_fields).length );
console.log('$valid: '+$formCtrl.$valid);
console.log('finishedRender: '+$scope.finishedRender);
console.log('saveInProgress: '+$scope.saveInProgress);
// console.log('form_fields changed: '+difference(oldValue.form_fields,newValue.form_fields).length );
// console.log('$valid: '+$formCtrl.$valid);
// console.log('finishedRender: '+$scope.finishedRender);
// console.log('saveInProgress: '+$scope.saveInProgress);
if($scope.finishedRender && ($formCtrl.$dirty || difference(oldValue.form_fields,newValue.form_fields).length !== 0)) {
console.log('auto saving');
if($scope.finishedRender && ($formCtrl.$dirty || difference(oldValue,newValue).length !== 0)) {
// console.log('auto saving');
if(savePromise) {
$timeout.cancel(savePromise);
@ -63,7 +67,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun
// console.log('inside');
if($scope.$eval(expression) !== false) {
console.log('Form data persisted -- setting pristine flag');
// console.log('Form data persisted -- setting pristine flag');
$formCtrl.$setPristine();
// $scope.finishedRender = false;
}

19
public/modules/forms/directives/configure-form.client.directive.js
View file

@ -6,6 +6,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http
controller: function($scope){
$scope.log = '';
$scope.pdfLoading = false;
$scope.languages = $rootScope.languages;
var _current_upload = null;
$scope.createOrUpdate = $rootScope.createOrUpdate;
$scope.resetForm = $rootScope.resetForm;
@ -25,11 +26,11 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http
};
$scope.removePDF = function(){
$scope.form.pdf = null;
$scope.form.isGenerated = false;
$scope.form.autofillPDFs = false;
$scope.myform.pdf = null;
$scope.myform.isGenerated = false;
$scope.myform.autofillPDFs = false;
console.log('form.pdf: '+$scope.form.pdf+' REMOVED');
console.log('form.pdf: '+$scope.myform.pdf+' REMOVED');
};
$scope.uploadPDF = function(files) {
@ -41,7 +42,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http
url: '/upload/pdf',
fields: {
'user': $scope.user,
'form': $scope.form
'form': $scope.myform
},
file: file
}).progress(function (evt) {
@ -51,12 +52,12 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http
$scope.pdfLoading = true;
}).success(function (data, status, headers, config) {
$scope.log = 'file ' + data.originalname + ' uploaded as '+ data.name +'. JSON: ' + JSON.stringify(data) + '\n' + $scope.log;
console.log($scope.form.pdf);
$scope.form.pdf = angular.fromJson(angular.toJson(data));
console.log($scope.myform.pdf);
$scope.myform.pdf = angular.fromJson(angular.toJson(data));
$scope.pdfLoading = false;
console.log($scope.log);
console.log('$scope.pdf: '+$scope.form.pdf.name);
console.log('$scope.pdf: '+$scope.myform.pdf.name);
if(!$scope.$$phase){
$scope.$apply();
}
@ -73,7 +74,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http
templateUrl: './modules/forms/views/directiveViews/form/configure-form.html',
restrict: 'E',
scope: {
form:'=',
myform:'=',
user:'=',
pdfFields:'@',
formFields:'@'

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

@ -9,7 +9,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht
templateUrl: './modules/forms/views/directiveViews/form/edit-form.html',
restrict: 'E',
scope: {
form:'=',
myform:'=',
user:'='
},
controller: function($scope){
@ -53,25 +53,25 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht
};
// put newField into fields array
$scope.form.form_fields.unshift(newField);
$scope.myform.form_fields.unshift(newField);
console.log($scope.myform.form_fields.length);
};
// deletes particular field on button click
$scope.deleteField = function (hashKey){
console.log($scope.form.form_fields);
for(var i = 0; i < $scope.form.form_fields.length; i++){
console.log($scope.form.form_fields[i].$$hashKey === hashKey);
if($scope.form.form_fields[i].$$hashKey === hashKey){
$scope.form.form_fields.splice(i, 1);
console.log($scope.myform.form_fields);
for(var i = 0; i < $scope.myform.form_fields.length; i++){
console.log($scope.myform.form_fields[i].$$hashKey === hashKey);
if($scope.myform.form_fields[i].$$hashKey === hashKey){
$scope.myform.form_fields.splice(i, 1);
break;
}
}
};
$scope.duplicateField = function (field, field_index){
for(var i = 0; i < $scope.form.form_fields.length; i++){
if($scope.form.form_fields[i].field_id === field.field_id){
// $scope.form.form_fields.splice(field_index+1, 0, field);
$scope.addNewField($scope.form.form_fields[i].fieldType);
for(var i = 0; i < $scope.myform.form_fields.length; i++){
if($scope.myform.form_fields[i].field_id === field.field_id){
$scope.addNewField($scope.myform.form_fields[i].fieldType);
break;
}
}

52
public/modules/forms/views/directiveViews/form/configure-form.html
View file

@ -15,12 +15,12 @@
<div class="field-input col-sm-6">
<label>
<input type="radio" data-ng-value="true" ng-model="form.hideFooter" ng-required="true" />
<input type="radio" data-ng-value="true" ng-model="myform.hideFooter" ng-required="true" />
&nbsp;<span>Yes</span>
</label>
<label>
<input type="radio" data-ng-value="false" ng-model="form.hideFooter" ng-required="true" />
<input type="radio" data-ng-value="false" ng-model="myform.hideFooter" ng-required="true" />
&nbsp;<span>No</span>
</label>
@ -29,7 +29,7 @@
</div>
<!-- autofillPDFs yes/no field -->
<div class="row field" ng-if="form.isGenerated">
<div class="row field">
<div class="field-title col-sm-6">
<h5>Save Submissions as PDFs?</h5>
</div>
@ -37,12 +37,12 @@
<div class="field-input col-sm-6">
<label>
<input type="radio" data-ng-value="true" ng-model="form.autofillPDFs" ng-required="true" />
<input type="radio" data-ng-value="true" ng-model="myform.autofillPDFs" ng-required="true" />
&nbsp;<span>Yes</span>
</label>
<label>
<input type="radio" data-ng-value="false" ng-model="form.autofillPDFs" ng-required="true" />
<input type="radio" data-ng-value="false" ng-model="myform.autofillPDFs" ng-required="true" />
&nbsp;<span>No</span>
</label>
@ -51,20 +51,20 @@
</div>
<!-- Upload PDF Field -->
<div class="row field" ng-if="form.autofillPDFs">
<div class="row field" ng-if="myform.autofillPDFs || myform.isGenerated">
<div class="col-sm-6 field-title">
<h5>Upload Your PDF Template</h5>
</div>
<div class="col-sm-6 field-input">
<div class="input-group ">
<div tabindex="-1" class="form-control file-caption">
<span class="file-caption-ellipsis" ng-if="!form.pdf">…</span>
<div class="file-caption-name" ng-if="form.pdf">
{{form.pdf.originalname}}
<span class="file-caption-ellipsis" ng-if="!myform.pdf">…</span>
<div class="file-caption-name" ng-if="myform.pdf">
{{myform.pdf.originalname}}
</div>
</div>
<div class="input-group-btn">
<button type="button" ng-if="form.pdf" ng-click="removePDF();" title="Clear selected files" class="btn btn-danger fileinput-remove fileinput-remove-button">
<button type="button" ng-if="myform.pdf" ng-click="removePDF();" title="Clear selected files" class="btn btn-danger fileinput-remove fileinput-remove-button">
<i class="glyphicon glyphicon-trash" ></i>
Delete
</button>
@ -74,7 +74,7 @@
Cancel
</button>
<div class="btn btn-success btn-file" ngf-select ngf-change="uploadPDF($files)" ng-if="!form.pdf">
<div class="btn btn-success btn-file" ngf-select ngf-change="uploadPDF($files)" ng-if="!myform.pdf">
<i class="glyphicon glyphicon-upload"></i>
Upload your PDF
</div>
@ -84,19 +84,19 @@
</div>
<!-- generate form from PDF yes/no field -->
<div class="row field" ng-if="form.pdf">
<div class="row field">
<div class="col-sm-6 field-title">
<h5>Autogenerate Form?</h5>
</div>
<div class="col-sm-6 field-input">
<label>
<input type="radio" data-ng-value="true" ng-model="form.isGenerated" ng-required="true" />
<input type="radio" data-ng-value="true" ng-model="myform.isGenerated" ng-required="true" />
&nbsp;<span>Yes</span>
</label>
<label>
<input type="radio" data-ng-value="false" ng-model="form.isGenerated" ng-required="true" />
<input type="radio" data-ng-value="false" ng-model="myform.isGenerated" ng-required="true" />
&nbsp;<span>No</span>
</label>
</div>
@ -105,7 +105,7 @@
<!-- !!!!!!DAVID: TODO: Finish this so we can upload pdfFieldMap!!!!!!!!! -->
<!-- Map form inputs to PDF inputs Field -->
<!-- <div class="textfield field row" ng-if="form.pdf">
<!-- <div class="textfield field row" ng-if="myform.pdf">
<div class="col-xs-2 field-title field-title">Map Form Fields to PDF Fields </div>
<div class="col-xs-4 field-input field-input">
<div class="row" ng-repeat="field in formFields">
@ -137,8 +137,8 @@
<div class="col-sm-6 field-input field-input">
<input type="text"
ng-model="form.title"
value="{{form.title}}">
ng-model="myform.title"
value="{{myform.title}}">
<span class="required-error" ng-show="field.required && !field.fieldValue">* required</span>
</div>
</div>
@ -151,12 +151,12 @@
<div class="field-input col-sm-6">
<label>
<input type="radio" data-ng-value="true" ng-model="form.isLive" ng-required="true" style="background-color:#33CC00;"/>
<input type="radio" data-ng-value="true" ng-model="myform.isLive" ng-required="true" style="background-color:#33CC00;"/>
&nbsp;<span>Public</span>
</label>
<label>
<input type="radio" data-ng-value="false" ng-model="form.isLive" ng-required="true" />
<input type="radio" data-ng-value="false" ng-model="myform.isLive" ng-required="true" />
&nbsp;<span>Private</span>
</label>
@ -164,13 +164,13 @@
</div>
</div>
<div class="row field">
<div class="col-xs-7 field-title">{{field.title}} </div>
<div class="col-xs-5 field-input">
<select ng-model="field.fieldValue" ng-model-options="{ debounce: 250 }" ng-required="field.required" ng-disabled="field.disabled">
<option ng-repeat="option in field.field_options"
ng-selected="option.option_value == field.fieldValue"
value="{{option.option_id}}">
{{option.option_title}}
<div class="col-xs-6 field-title">Language</div>
<div class="col-xs-4 field-input">
<select ng-model="myform.language">
<option ng-repeat="language in languages"
ng-selected="language == myform.language"
value="{{language}}">
{{language}}
</option>
</select>
<span class="required-error" ng-show="field.required && !field.fieldValue">* required</span>

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

@ -1,4 +1,4 @@
<form class="row" name="fieldForm" form-locator auto-save-form="update()" form="form" novalidation>
<form class="row" name="fieldForm" form-locator auto-save-form="update()" form="myform" novalidation>
<div class="add-field col-xs-5">
<!-- <select ng-model="addField.new" ng-options="type.name as type.value for type in addField.types"></select>
<button type="submit" class="btn" ng-click="addNewField()">
@ -28,7 +28,7 @@
<div class="row">
<div class="col-xs-10">
<accordion close-others="accordion.oneAtATime">
<accordion-group ng-repeat="field in form.form_fields" is-open="accordion[$index].isOpen" on-finish-render="setFormValid()">
<accordion-group ng-repeat="field in myform.form_fields" is-open="accordion[$index].isOpen" on-finish-render="setFormValid()">
<accordion-heading>
<span class="pull-left" ng-switch="field.fieldType">

17
public/modules/forms/views/view-form.client.view.html
View file

@ -1,17 +1,14 @@
<section data-ng-controller="ViewFormController" data-ng-init="findOne()" class="container admin-form">
<div class="page-header row" style="padding-bottom: 0px;">
<div class="col-xs-6">
<h1 data-ng-bind="form.title" style="margin-bottom: 0px;"></h1>
<h1 data-ng-bind="myform.title" style="margin-bottom: 0px;"></h1>
</div>
<div class="col-xs-3">
<div class="col-xs-2 col-xs-offset-2">
<small class=" pull-right">
<a class="btn btn-default" href="/#!/forms/{{form._id}}">
<span ng-click="remove()">Delete Form</span>
<!-- <i class="fa fa-sign-out"></i> -->
</a>
<button class="btn btn-danger" ng-click="remove()"><i class="fa fa-trash-o"></i> Delete Form</button>
</small>
</div>
<div class="col-xs-3">
<div class="col-xs-2">
<small class=" pull-right">
<a class="btn btn-default" href="/#!/forms/{{form._id}}">
<span ng-show="myform.isLive">View Live</span> <span ng-hide="myform.isLive">Preview</span> Form
@ -30,19 +27,19 @@
<tab-heading>
Edit Form Fields
</tab-heading>
<edit-form-directive form="myform" user="user"></edit-form-directive>
<edit-form-directive myform="myform" user="user"></edit-form-directive>
</tab>
<tab disabled="true">
<tab-heading >
Edit Design
</tab-heading>
<edit-form-directive form="myform" user="user"></edit-form-directive>
<edit-form-directive myform="myform" user="user"></edit-form-directive>
</tab>
<tab>
<tab-heading>
Configure
</tab-heading>
<configure-form-directive form="myform" user="user"></configure-form-directive>
<configure-form-directive myform="myform" user="user"></configure-form-directive>
</tab>
<tab data-ng-click="showSubmissions()">
<tab-heading>

10
public/modules/users/controllers/authentication.client.controller.js
View file

@ -5,6 +5,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
$scope = $rootScope;
$scope.credentials = {};
$scope.error = null;
// If user is signed in then redirect back home
if ($scope.authentication.isAuthenticated()) $state.go('home');
@ -14,9 +15,8 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
// console.log($scope.credentials);
Auth.currentUser = User.login($scope.credentials).then(
function(response) {
Auth.login();
$rootScope.user = Auth.ensureHasCurrentUser(User);
$scope = $rootScope;
Auth.login(response);
$scope.user = $rootScope.user = Auth.ensureHasCurrentUser(User);
console.log('$state.previous: \n');
console.log($state.previous);
@ -29,7 +29,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
},
function(error) {
$rootScope.user = Auth.ensureHasCurrentUser(User);
$scope = $rootScope;
$scope.user = $rootScope.user;
$scope.error = error;
console.log('loginError: '+error);
@ -38,7 +38,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
};
$scope.signup = function() {
$scope.user = User.save($scope.registration,
User.save($scope.registration,
function() {
$state.go('signup-success');
},

3
public/modules/users/services/auth.js
View file

@ -52,8 +52,9 @@ angular.module('users')
return userState;
},
login: function() {
login: function(new_user) {
userState.isLoggedIn = true;
service.currentUser = new_user;
},
logout: function() {

1
public/modules/users/services/user.js
View file

@ -22,7 +22,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', '
var deferred = $q.defer();
$http.post('/auth/signin', credentials).success(function(response) {
// console.log(response);
deferred.resolve(response);
}).error(function(error) {