fe 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6fb928bc8a7a5dc262c00b6cd4a6e0f03fb48ad
-  data.tar.gz: 19fe655b392bc19829ec71a9f9e9ffe77f7e2396
+  metadata.gz: ab8bef6577ff95fc7c33695a64217ca1436844ae
+  data.tar.gz: bf3d6f5eac700ce6c9d2185aa0a655f3825f100a
 SHA512:
-  metadata.gz: 0d8bdb48f8d3bb12d862924535ae1d710b9fe2df2b5c9529825f379f274f72662c99107bc5cd847471ba165d5f1497b744d5c40b48e1e5693d1a110300cdbcab
-  data.tar.gz: 631b59ab65ee309d80a7e7419fddee57d5922d62006345a4db35f5200c7d938662410141d35f5f34991a224d3299eed433d0dcd4d467624b590e8501e7b50f53
+  metadata.gz: cd8180a211513f1651368c173d330fd22a8a25b5837a6ccf56e302db02c48416adb962eed75af11c9b728cd4f26259352fc32d124581cf7f0e519e74fe884d6c
+  data.tar.gz: 113bd04128aa3e34002305267127fab5e43b3741a4686c49228d560f73535cf9117390faaaa90ed9b1756ea494eee3357900730fa2980058bffe18bdf0a0ae53

data/README.md

@@ -7,6 +7,7 @@ This project rocks and uses MIT-LICENSE.
 ### Development
 
 ### Testing
+
 Setup a testing environment that mimics the Travis CI setup:
 
     rake setup_dummy_app 
@@ -15,6 +16,40 @@ Run specs:
     
     rake spec
     
-    
+Run a specific spec:
+
+    ruby -I$GEM_HOME/gems/rspec-core-3.0.2/lib:$GEM_HOME/gems/rspec-support-3.0.2/lib -S -I fe/spec rspec spec/models/fe/element_spec.rb
+
+### Example enclosing app
+
+    rails new 
+
+## install devise
+
+# add to gemfile
+
+    gem 'devise'
+
+# run
+
+    bundle install
+    rails generate devise:install
+    rails generate devise User
+
+# add to gemfile
+
+    github: 'CruGlobal/qe', branch: 'fe'
+
+# run
+
+    bundle exec rake fe_engine:install:migrations
+
+# add example user
+
+    bundle exec rails console
+
+    User.new({ :email => 'user@example.com', :password => 'password', :password_confirmation => 'password'}).save
 
+# start server
 
+    bundle exec rails server

data/Rakefile

@@ -1,27 +1,32 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+require 'bundler/setup'
+require 'thor'
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake' if File.exists? 'spec/dummy/Rakefile'
 
+
 Bundler::GemHelper.install_tasks
 
+ENV['ENGINE'] = 'fe_engine'
+
 require "rspec/core/rake_task" 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+  unless File.directory?("spec/dummy")
+    Rake::Task['dummy:app'].invoke unless ENV['SKIP_DUMMY_APP']
+  end
+  spec.rspec_opts = "-I #{File.expand_path('../spec/', __FILE__)}"
+  spec.pattern = FileList[File.expand_path('../spec/**/*_spec.rb', __FILE__)]
 end
 task default: :spec
 
-ENV['DUMMY_PATH'] = 'spec/dummy'
+
+require 'rails/dummy/tasks'
+
 # ENV['ENGINE']
 # ENV['TEMPLATE']
 
 task :setup_dummy_app do 
   # Nuke any previous testing envs (for local development purposes).
-  Rake::Task["app:db:drop"].invoke if Dir.exists? "spec/dummy"
   FileUtils.remove_dir("spec/dummy", force=true) if Dir.exists? "spec/dummy"
   
   # Use system here (rather than Rake::Task['task'].invoke) so a new rails env
@@ -30,19 +35,23 @@ task :setup_dummy_app do
   # because the "deleted" spec/dummy would still have it's "Dummy" rails app 
   # name in the Ruby VM environment.
   #
-  system({"DISABLE_MIGRATE" => "true", "DISABLE_CREATE" => "true"}, "rake dummy:app")
+  system({"DISABLE_MIGRATE" => "true", 
+          "DISABLE_CREATE" => "true"}, "rake dummy:app")
   
   # Bring in the customized mysql/postgres testing database.yml.
-  File.delete("spec/dummy/config/database.yml")
-  FileUtils.cp("spec/support/database.txt",  "spec/dummy/config/database.yml")
+  database_path = "spec/dummy/config/database.yml"
+  File.delete(database_path) if File.exists?(database_path)
+  FileUtils.cp("spec/support/database.txt", database_path)
   
   Rake::Task["install_engine"].invoke
 end
 
 task :install_engine do 
   # Use system so that we load the dummy app's Rake commands.
-  system("rake app:db:create")
+
+  # Drop any existing db so that it is recreated; Hide output so there's no stack trace if the db doesn't exist
+  system('cd spec/dummy && rake db:drop >/dev/null 2>&1')
   
   # Use system so that we funcitonally test the install generator.
-  system("cd spec/dummy && rails g fe:install && rake db:migrate && rake db:test:prepare")
+  system("cd spec/dummy && rake db:create && rake db:migrate && rake db:test:prepare")
 end

data/app/assets/javascripts/application.js.erb

@@ -0,0 +1 @@
+//= require fe.public.js

data/app/assets/javascripts/fe/admin.js

@@ -1,7 +1,4 @@
-//= require jquery
-//= require jquery_ujs
-//= require jquery.ui.all
 //= require fe/fe.common.js
 //= require fe/fe.admin.js
 //= require fe/jquery.scrollTo-min.js
-//= require rails.extra.js
+//= require fe/rails.extra.js

data/app/assets/javascripts/fe/{qe.admin.js → fe.admin.js}

@@ -31,6 +31,21 @@ $(function() {
 		return false;
 	});
 
+	$(document).on('click', 'input[name=future_affect][type=radio]', function() {
+    if ($(this).val() == "yes") {
+      $(".future_answer, .future_target").show();
+    } else if ($(this).val() == "no") {
+      $(".future_answer, .future_target").hide();
+    }
+  });
+
+  $(document).on('click', "input[name='element[conditional_type]'][type=radio]", function() {
+    if ($(this).val() == "Fe::Page") {
+      $(".future_page").show();
+    } else if ($(this).val() == "Fe::Element") {
+      $(".future_page").hide();
+    }
+  });
 });
 // used by form designer
 

data/app/assets/javascripts/fe/{qe.public.js → fe.public.js}

@@ -1,13 +1,26 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require fe/fe.common.js
+//= require fe/jquery.scrollTo-min.js
+//= require fe/rails.extra.js
+//= require fe/jquery.validate.pack.js
+
 // used by answer sheets
+
 (function($) {
+  //debugger;
 	$(function() {
 
 		$(document).on('click', '.save_button', function() {
 			$.fe.pageHandler.savePage($(this).closest('.answer-page'), true);
 		});
 		
+    //debugger;
 		$(document).on('keydown', '#payment_staff_first, #payment_staff_last', function(e) {
+      //debugger;
 			if (e.which == 13) {
+        console.log('staff_search click');
 				$('#staff_search').trigger('click');
 				return false;
 			}
@@ -44,6 +57,33 @@
 			$(this).parent().find('.charsRemaining').html('');
 		});
 		
+    // Payment submission
+    $(document).on('click', '.submit_payment', function() {
+      var form = $(this).closest('form');
+      $this = $(this);
+      $.ajax({url: $(this).attr('data-url'), data: form.serializeArray(), type: 'POST', dataType:'script',
+             beforeSend: function (xhr) {
+               $('body').trigger('ajax:loading', xhr);
+               if ($this.data('disable-with') !== null) {
+                 $this.attr('disabled','disabled');
+                 $this.data('enabled-text', $(this).html());
+                 $this.attr('value', $this.data('disable-with'));
+               }
+             },
+             complete: function (xhr) {
+               $('body').trigger('ajax:complete', xhr);
+               $this.removeAttr('disabled');
+               $this.attr('value', $this.data('enabled-text'));
+             },
+             error: function (xhr, status, error) {
+               $('body').trigger('ajax:failure', [xhr, status, error]);
+               $this.removeAttribute('disabled');
+               $this.attr('value', $this.data('enabled-text'));
+             }
+      });
+      return false;
+    });
+
 	});
 	$.fe = {};
 	$.fe.pageHandler = {
@@ -150,25 +190,32 @@
 	  // save form if any changes were made
 	  savePage : function(page, force) {  
 			if (page == null) page = $('#' + this.current_page);
-	    form_data = this.captureForm(page);
-	    if( form_data ) {
-	      if( page.data('form_data') == null || page.data('form_data').data !== form_data.data || force === true) {  // if any changes
-	        page.data('form_data', form_data);
-					$.ajax({url: form_data.url, type: 'put', data: form_data.data,  beforeSend: function (xhr) {
-																								                            $('#spinner_' + page.attr('id')).show();
-																									                        },
-																									                        complete: function (xhr) {
-																								                            $('#spinner_' + page.attr('id')).hide();
-																									                        },
-																																					error: function() {
-																															              page.data('form_data', null);    // on error, force save for next call to save
-																														                // WARNING: race conditions with load & show?
-																														                // sort of a mess if save fails while another page is already loading!!
-																																          }});
-	    	}
-	  	}
-			// Update last saved stamp
-		},
+      // don't save more than once per second
+      timeNow = new Date();
+      if (typeof(lastSave) != "undefined" && lastSave && !force && (timeNow - lastSave < 1000)) {
+        return true;
+      }
+      lastSave = timeNow;
+      form_data = this.captureForm(page);
+      if( form_data ) {
+        if( page.data('form_data') == null || page.data('form_data').data !== form_data.data || force === true) {  // if any changes
+          page.data('form_data', form_data);
+          $.ajax({url: form_data.url, type: 'put', data: form_data.data,  
+                 beforeSend: function (xhr) {
+                   $('#spinner_' + page.attr('id')).show();
+                 },
+                 complete: function (xhr) {
+                   $('#spinner_' + page.attr('id')).hide();
+                 },
+                 error: function() {
+                   page.data('form_data', null);    // on error, force save for next call to save
+                   // WARNING: race conditions with load & show?
+                   // sort of a mess if save fails while another page is already loading!!
+                 }});
+        }
+      }
+      // Update last saved stamp
+    },
 		
 		savePages : function(force) {
 			$('.answer-page').each(function() {$.fe.pageHandler.savePage($(this), force)})
@@ -244,7 +291,7 @@
 		var all_valid = ($('#list-pages li.incomplete').length == 0);
 		
 		// Make sure any necessary payments are made
-		var payments_made = $('.payment_question.required').length == $('.payment').length
+		var payments_made = $('.payment_question.required').length <= $('.payment').length
 		
 		
 		if(  payments_made)
@@ -287,13 +334,54 @@
 		}
   },
   
-  // is page loaded? (useful for toggling enabled state of questions)
-  isPageLoaded : function(page)
-  {
-		return $('#' + page)[0] != null
-  }
-  
-};
+    // is page loaded? (useful for toggling enabled state of questions)
+    isPageLoaded : function(page)
+    {
+      return $('#' + page)[0] != null
+    },
+
+    checkConditional : function($element_li) {
+      matchable_answers = String($element_li.data('conditional_answer')).split(',').map(function(s) { return s.trim(); })
+      if ($element_li.hasClass('fe::choicefield') && $element_li.hasClass('yes-no')) {
+        if ($(matchable_answers).filter([1, '1', true, 'true', 'yes']).length > 0) {
+          matchable_answers = [1, '1', true, 'true', 'yes'];
+        }
+        vals = $([$element_li.find("input[type=radio]:checked").val()]);
+      } else if ($element_li.hasClass('fe::choicefield') && $element_li.hasClass('checkbox')) {
+        vals = $element_li.find("input[type=checkbox]:checked").map(function(i, el) { return $(el).val(); });
+      } else {
+        vals = $([$element_li.find("input:visible, select:visible").val()]);
+      }
+      match = $(matchable_answers).filter(vals).length > 0;
+
+      console.log('checkConditional match: ' + match);
+
+      switch ($element_li.data('conditional_type')) {
+        case 'Fe::Element':
+          if (match) {
+            $("#element_" + $element_li.data('conditional_id')).show(); 
+          } else {
+            $("#element_" + $element_li.data('conditional_id')).hide();
+          }
+        case 'Fe::Page':
+          li_id = "li#fe_application_" + $element_li.data('application_id') + '-fe_page_' + $element_li.data('conditional_id') + '-li';
+          if (match) {
+            $(li_id).show();
+          } else {
+            $(li_id).hide();
+          }
+      }
+    }
+
+  };
+
+  $(document).on('click', "li.conditional input, li.conditional select", function() {
+    console.log('click');
+    $.fe.pageHandler.checkConditional($(this).closest('li'));
+  });
+  $(document).on('keyup', "li.conditional input, li.conditional select", function() { $(this).click(); });
+  $(document).on('blug', "li.conditional input, li.conditional select", function() { $(this).click(); });
+  $(document).on('change', "li.conditional select", function() { $(this).click(); });
 
 })(jQuery);
 

data/app/assets/javascripts/fe/rails.extra.js

@@ -0,0 +1,6 @@
+(function($) {
+	// Enable sortable items
+	$(function() {
+		setUpJsHelpers();
+	});			
+})(jQuery);

data/app/assets/stylesheets/fe/{qe.screen.css.scss.erb → fe.screen.css.scss.erb}

@@ -2,6 +2,10 @@
 /* Summer Project Form Engines */
 /* *********************************************************** */
 
+/*
+ *= require jquery-ui
+ */
+
 /* RESET */
 ul, li, body, p {
     list-style: none;
@@ -90,24 +94,15 @@ ul#list-pages {
     margin: 20px 0 0 0;
 }
 
-#list-pages li a {
-    background: url("<%= asset_path('fe/icons/document--pencil.png') %>") no-repeat 4px 50%;
-    padding: 8px 0 8px 24px;
-    border-bottom: 1px dotted #999;
-    display: block;
-    margin-right: 8px;
+#list-pages li {
+    padding: 3px 0;
 }
 
-#list-pages li.active {
-    background-color: #fff;
+#list-pages li a {
+    padding: 2px 0;
 }
 
-#list-pages li.active a {
-    margin-right: 0;
-    border: 1px solid #F7931E;
-    border-right: none;
-    margin-top: -1px;
-}
+#list-pages li.active a {}
 
 #link-page-add {
     background: #f0f0f0 url("<%= asset_path('fe/icons/add.png') %>") no-repeat 4px 50%;
@@ -193,7 +188,6 @@ ul#nav-controls li a:hover {
 #preview {
     width: 689px;
     float: right;
-    border: 1px solid #F7931E;
     padding: 10px;
 }
 
@@ -546,7 +540,7 @@ td.actions a {padding: 2px 10px 2px 20px;}
     padding: 5px;
 
     ul {
-      color:red;
-      font-weight: bold;
+        color:red;
+        font-weight: bold;
     }
-}
+}

data/app/controllers/fe/admin/elements_controller.rb

@@ -1,6 +1,6 @@
 class Fe::Admin::ElementsController < ApplicationController
   before_filter :check_valid_user
-  layout 'fe.admin'
+  layout 'fe/fe.admin'
   
   before_filter :get_page
   
@@ -157,9 +157,9 @@ class Fe::Admin::ElementsController < ApplicationController
     if element.question_grid_id
       element.set_position(element.question_grid.position(@page), @page) 
       element.question_grid_id = nil
-    elsif element.conditional_id
+    elsif element.choice_field_id
       element.set_position(element.choice_field.position(@page), @page) 
-      element.conditional_id = nil
+      element.choice_field_id = nil
     end
     element.save!
     render :action => :drop
@@ -179,7 +179,7 @@ class Fe::Admin::ElementsController < ApplicationController
   end
 
   def element_params
-    params.fetch(:element, {}).permit(:style, :label, :tooltip, :position, :source, :value_xpath, :text_xpath, :question_grid_id, :cols, :total_cols, :css_id, :css_class, :related_question_sheet_id, :conditional_id, :hide_option_labels, :slug, :required, :is_confidential, :hide_label, :object_name, :attribute_name, :max_length)
+    params.fetch(:element, {}).permit(:style, :label, :tooltip, :position, :source, :value_xpath, :text_xpath, :question_grid_id, :cols, :total_cols, :css_id, :css_class, :related_question_sheet_id, :conditional_id, :hide_option_labels, :slug, :required, :is_confidential, :hide_label, :object_name, :attribute_name, :max_length, :content, :conditional_type, :conditional_id, :conditional_answer)
   end
 
 end