fe 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7be29ca99d6897702864247f44659b07068b917d
-  data.tar.gz: 3a4b5b1401e357ca9b4fdd5a9d65c49083fbda89
+SHA256:
+  metadata.gz: d532161845556e86ac4817b6e8fc7d843075fc9a3a824090890cc6461a0da92c
+  data.tar.gz: 560b04c4e19e1013caa5a92e65a674fc190eba38feb5f4c09fb87eba64df152a
 SHA512:
-  metadata.gz: f480268cc6bac72b46ff5e19debbd5114997f39cba51f48e57972b84fae257e3ad7289c6af4c890f7a159dedb97f88d1c98c6828e1286f1e23a83f7d289668ac
-  data.tar.gz: ffa4819032a0495515a75d28e83bb2bc3e6d26615046b26fd4a6fd10bc90fb3e35c9984792d912e11c7e9a3a9e3e3639a86a9fa41f2686e1ee32d6b4a7d3694e
+  metadata.gz: 6e6e3e7781acdada557c30bb4933850c41ce4f5c227fa67b0137ed3fe900c78f0eb3d5121eb0305c83966df1e3367145cc4ea19556caffd5d2f93372c5300625
+  data.tar.gz: f1f7db08b919f8ca3359a8fab29f0fef5982d0fe107e69c75fb3826dda2c094b7d79dd6f8e1043685aa77f6d705a05db4d62dc79c040e46d5664f9e72bc83d3e

data/README.md

@@ -8,17 +8,17 @@ This project rocks and uses MIT-LICENSE.
 
 ### Testing
 
-Setup a testing environment that mimics the Travis CI setup:
+Setup the testing db
 
-    rake setup_dummy_app 
+    bundle exec rake setup_db
 
 Run specs:
     
-    rake spec
+    bundle exec 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
+    bundle exec rspec spec/models/fe/element_spec.rb
 
 ### Example enclosing app
 

data/app/assets/config/fe/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../../images
+//= link_directory ../../javascripts/fe .js
+//= link_tree ../../stylesheets

data/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_tree ../javascripts
+//= link_tree ../stylesheets

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

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

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

@@ -1,3 +1,2 @@
 //= require fe/fe.common.js
 //= require fe/fe.admin.js
-//= require fe/jquery.scrollTo-min.js

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

@@ -118,18 +118,14 @@ function snapElementProperties(el) {
     $('#panel-properties-element').css({'margin-top': propsTop});
 }
 
-function scrollToElement(id) {
-    $(id).scrollTo();
-}
-
 function addError(id) {
     $('#' + id).addClassName('fieldWithErrors');
 }
 
 // convert label to slug
 function updateSlug(source, dest) {
-  label = $F(source)
-  slug = $F(dest)
+  label = $(source).val();
+  slug = $(dest).val();
   if( label == null || slug == null) return;  // oh oh
 
   label = label.strip();

data/app/assets/javascripts/fe/{fe.common.js → fe.common.js.erb}

@@ -57,12 +57,12 @@ function setUpSortables() {
 }
 
 function setUpCalendars() {
-	now = new Date();
-	year = now.getFullYear() + 10;
-	$('[data-calendar]').datepicker({
+  now = new Date();
+  year = now.getFullYear() + 10;
+  $('[data-calendar]').datepicker({
     changeYear:true,
-		yearRange: '1950:' + year,
-    dateFormat: 'yy-mm-dd'
+    yearRange: '1950:' + year,
+    dateFormat: '<%= Fe.date_format %>'
   })
 }
 
@@ -75,8 +75,8 @@ function setUpJsHelpers() {
 		// ==================
 		// Calendar
 		setUpCalendars();
-  	// ==================
-		$(".tip[title], a[title]").tooltip()
+		// ==================
+    <% unless Fe.bootstrap %>$(".tip[title], a[title]").tooltip()<% end %>
 }
 
 function fixGridColumnWidths() {
@@ -89,3 +89,10 @@ function fixGridColumnWidths() {
 		}
 	});
 };
+
+function scrollTo(el) {
+  if ($(el).length == 0) { return; }
+  $('html, body').animate({
+    scrollTop: $(el).offset().top
+  }, 1000);
+}

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

@@ -1,6 +1,5 @@
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require jquery-ui
-//= require fe/jquery.scrollTo-min.js
 //= require fe/jquery.validate.pack.js
 //= require fe/fe.public.nojquery.js

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

@@ -3,47 +3,66 @@
 // used by answer sheets
 
 (function($) {
-  //debugger;
-  $(function() {
+  <% if Fe.bootstrap %>
+  // http://stackoverflow.com/questions/18754020/bootstrap-3-with-jquery-validation-plugin
+  $.validator.setDefaults({
+      errorElement: "span",
+      errorClass: "help-block",
+      highlight: function (element, errorClass, validClass) {
+          $(element).closest('.form-group').addClass('has-error');
+      },
+      unhighlight: function (element, errorClass, validClass) {
+          $(element).closest('.form-group').removeClass('has-error');
+      },
+      errorPlacement: function (error, element) {
+          if (element.parent('.input-group').length || element.prop('type') === 'checkbox' || element.prop('type') === 'radio') {
+              error.appendTo(element.closest('div:not(.field'));
+          } else {
+              error.insertAfter(element);
+          }
+      }
+  });
+  <% end %>
 
-    $(document).on('click', '.save_button', function() {
-      $.fe.pageHandler.savePage($(this).closest('.answer-page'), true);
-    });
+  $(document).on('click', '.save_button', function() {
+    fe.pageHandler.savePage($(this).closest('.answer-page'), true);
+  });
 
-    $(document).on('click', '.reference_send_invite', function() {
-      var el = this;
-      var data = $(el).closest('form').serializeArray();
-
-      data.push({name: 'answer_sheet_type', value: answer_sheet_type});
-      $.ajax({url: $(el).attr('href'), data: data, dataType: 'script',  type: 'POST',
-             beforeSend: function (xhr) {
-               $('body').trigger('ajax:loading', xhr);
-             },
-             complete: function (xhr) {
-               $('body').trigger('ajax:complete', xhr);
-             },
-             error: function (xhr, status, error) {
-               $('body').trigger('ajax:failure', [xhr, status, error]);
-             }
-      });
-      return false;
-    });
-    $(document).on('focus', 'textarea[maxlength]', function() {
-      var max = parseInt($(this).attr('maxlength'));
-      $(this).parent().find('.charsRemaining').html('You have ' + (max - $(this).val().length) + ' characters remaining');
-    }).on('keyup', 'textarea[maxlength]', function(){
-      var max = parseInt($(this).attr('maxlength'));
-      if($(this).val().length > max){
-        $(this).val($(this).val().substr(0, $(this).attr('maxlength')));
-      }
-      $(this).parent().find('.charsRemaining').html('You have ' + (max - $(this).val().length) + ' characters remaining');
-    }).on('blur', 'textarea[maxlength]', function() {
-      $(this).parent().find('.charsRemaining').html('');
+  $(document).on('click', '.reference_send_invite', function() {
+    var el = this;
+    var form_elements = $(el).closest('form').find('input:not(.dont_submit), textarea:not(.dont_submit), select:not(.dont_submit)');
+    var data = form_elements.serializeArray();
+
+    data.push({name: 'answer_sheet_type', value: answer_sheet_type});
+    $.ajax({url: $(el).attr('href'), data: data, dataType: 'script',  type: 'POST',
+           beforeSend: function (xhr) {
+             $('body').trigger('ajax:loading', xhr);
+           },
+           complete: function (xhr) {
+             $('body').trigger('ajax:complete', xhr);
+           },
+           error: function (xhr, status, error) {
+             $('body').trigger('ajax:failure', [xhr, status, error]);
+           }
     });
+    return false;
+  });
+  $(document).on('focus', 'textarea[maxlength]', function() {
+    var max = parseInt($(this).attr('maxlength'));
+    $(this).parent().find('.charsRemaining').html('You have ' + (max - $(this).val().length) + ' characters remaining');
+  }).on('keyup', 'textarea[maxlength]', function(){
+    var max = parseInt($(this).attr('maxlength'));
+    if($(this).val().length > max){
+      $(this).val($(this).val().substr(0, $(this).attr('maxlength')));
+    }
+    $(this).parent().find('.charsRemaining').html('You have ' + (max - $(this).val().length) + ' characters remaining');
+  }).on('blur', 'textarea[maxlength]', function() {
+    $(this).parent().find('.charsRemaining').html('');
   });
 
-  $.fe = {};
-  $.fe.pageHandler = {
+  window.fe = {};
+  fe.pageHandler = {
+
     initialize : function(page) {
       this.auto_save_frequency = 30;  // seconds
       this.timer_id = null;
@@ -69,8 +88,8 @@
 
       // HACK: Need to clear the main error message when returning to the submit page
       //       It is very confusing to users to be there when they revisit the page
-      if ((page=='submit_page') && ($('#submit_message')[0] != null)) $('#submit_message').hide(); 
-      if ((page=='submit_page') && ($('#application_errors')[0] != null)) $('#application_errors').html('');
+      $('#submit_message, .submit_message').hide(); 
+      $('#application_errors, .application_errors').html('');
 
       // show the new
       // $('#' + page + '-li').removeClass('incomplete');
@@ -86,7 +105,7 @@
     // callback onSuccess
     pageLoadedBackground : function(response, textStatus, jqXHR) {
       //this.pageLoaded(response, textStatus, jqXHR, true)
-      $.fe.pageHandler.pageLoaded(response, textStatus, jqXHR, true)
+      fe.pageHandler.pageLoaded(response, textStatus, jqXHR, true)
     },
 
     // callback onSuccess
@@ -98,17 +117,20 @@
       if( match != null )
         {
           var page = match[1];
-          if ($('#'+page).length > 0) {
+          if (response.match(/<html/)) {
+            alert("There was a problem loading that page. To work on other pages, please refresh the website.");
+            document.location = document.location;
+          } else if ($('#'+page).length > 0) {
             $('#'+page).replaceWith(response);
           } else {
             $('#preview').append(response);
           }
 
-          if (!background_load) { $.fe.pageHandler.showPage(page); } // show after load, unless loading in background
+          if (!background_load) { fe.pageHandler.showPage(page); } // show after load, unless loading in background
           setUpJsHelpers();
-          $.fe.pageHandler.enableValidation(page);
-          if (background_load) { $.fe.pageHandler.validatePage(page, true); }
-          $('#' + page).data('form_data', $.fe.pageHandler.captureForm($('#' + page)));
+          fe.pageHandler.enableValidation(page);
+          if (background_load) { fe.pageHandler.validatePage(page, true); }
+          $('#' + page).data('form_data', fe.pageHandler.captureForm($('#' + page)));
         }
         $('#page_ajax_spinner').hide();
         $('.reference_send_invite').button();
@@ -116,33 +138,51 @@
         $(document).trigger('fePageLoaded'); // allow other code to handle page load event by using $(document).on('fePageLoaded', function() { ... });
     },
 
-    loadPage : function(page, url, background_load) {
+    loadPage : function(page, url, background_load, validate_current_page) {
       background_load = typeof background_load !== 'undefined' ? background_load : false;
+      validate_current_page = typeof validate_current_page !== 'undefined' ? validate_current_page : true;
+
+      if (validate_current_page) {
+        isValid = this.validatePage(this.current_page);   // mark current page as valid (or not) as we're leaving
+      } else {
+        isValid = true
+      }
+
+      // Provide a way for enclosing apps to not go to the next page until the current page is valid
+      // They can do that with this:
+      //
+      //     $(document).on 'fePageLoaded', (evt, page) ->
+      //        $(".page > form").addClass('enforce-valid-before-next');
+      //
+      if (!isValid && $('#' + this.current_page + "-form").hasClass('enforce-valid-before-next')) {
+        // scroll up to where the error is
+        scrollTo($(".help-block:visible")[0].closest("li"));
+        return;
+      }
 
       this.unregisterAutoSave();  // don't auto-save while loading/saving
       // will register auto-save on new page once loaded/shown
 
-      this.validatePage(this.current_page);   // mark current page as valid (or not) as we're leaving
       this.savePage();
 
       if (!background_load) { 
         if ($('a[name="main"]').length == 1) {
-          $.scrollTo('a[name="main"]');
+          scrollTo('a[name="main"]');
         } else {
-          $.scrollTo('#main');
+          scrollTo('#main');
         }
       }
 
-      if ($.fe.pageHandler.isPageLoaded(page) && page.match('no_cache') == null) {
+      if (fe.pageHandler.isPageLoaded(page) && page.match('no_cache') == null) {
         // if already loaded (element exists) excluding pages that need reloading
-        if (!background_load) { $.fe.pageHandler.showPage(page); }
+        if (!background_load) { fe.pageHandler.showPage(page); }
         $('#page_ajax_spinner').hide();
       } else {
         $.ajax({
           url: url,
           type: 'GET',
           data: {'answer_sheet_type':answer_sheet_type},
-          success: background_load ? $.fe.pageHandler.pageLoadedBackground : $.fe.pageHandler.pageLoaded,
+          success: background_load ? fe.pageHandler.pageLoadedBackground : fe.pageHandler.pageLoaded,
           error: function (xhr, status, error) {
             alert("There was a problem loading that page. We've been notified and will fix it as soon as possible. To work on other pages, please refresh the website.");
             document.location = document.location;
@@ -158,8 +198,11 @@
     },
 
     // save form if any changes were made
-    savePage : function(page, force) {  
+    savePage : function(page, force, blocking) {
+
       if (page == null) page = $('#' + this.current_page);
+      if (typeof blocking == "undefined") blocking = false;
+
       // don't save more than once per second
       timeNow = new Date();
       if (typeof(lastSave) != "undefined" && lastSave && !force && (timeNow - lastSave < 1000)) {
@@ -180,6 +223,7 @@
                  success: function (xhr) {
                    page.data('save_fails', 0)
                  },
+                 async: !blocking,
                  error: function() {
                    save_fails = page.data('save_fails') == null ? 0 : page.data('save_fails');
                    save_fails += 1;
@@ -201,7 +245,7 @@
     },
 
     savePages : function(force) {
-      $('.answer-page').each(function() {$.fe.pageHandler.savePage(null, force)})
+      $('.answer-page').each(function() {fe.pageHandler.savePage(null, force)})
     },
 
     // setup a timer to auto-save (only one timer, for the page being viewed)
@@ -221,21 +265,36 @@
     captureForm : function(page) {      
       form_el = $('#' + page.attr('id') + '-form');
       if( form_el[0] == null ) return null;
-      return {url: form_el.attr('action'), data: form_el.serialize() + '&answer_sheet_type=' + answer_sheet_type};
+      form_all_el = form_el.find("input:not(.dont_submit), textarea:not(.dont_submit), select:not(.dont_submit)");
+      return {url: form_el.attr('action'), data: form_all_el.serialize() + '&answer_sheet_type=' + answer_sheet_type};
     },
 
 
     // enable form validation (when form is loaded)
     enableValidation : function(page) {
-      $('#' + page + '-form').validate({onsubmit:false, focusInvalid:true, onfocusout: function(element) { this.element(element);}});  
-      $('#' + page + '-form :input').change(function() {
-        $.fe.pageHandler.validatePage(page, true);
+      // Provide a way for enclosing apps to not have validation continually as people fill things out
+      // They can do that with this:
+      //
+      //     $(document).on 'fePageLoaded', (evt, page) ->
+      //        $(".page > form").addClass('no-ongoing-validation');
+      //
+      $('#' + page + '-form:not(.no-ongoing-validation)').validate({onsubmit:false, focusInvalid:true, onfocusout: function(element) { this.element(element);}});
+      $('#' + page + '-form:not(.no-ongoing-validation):input').change(function() {
+        fe.pageHandler.validatePage(page, true);
       });
     },
 
     validatePage : function(page, page_classes_only) {
       page_classes_only = typeof page_classes_only !== 'undefined' ? page_classes_only : false;
 
+      // Provide a way for enclosing apps to never validate a form
+      // They can do that with this:
+      //
+      //     $(document).on 'fePageLoaded', (evt, page) ->
+      //        $(".page > form").addClass('no-validation');
+      //
+      if ($('#' + this.current_page + "-form").hasClass('no-validation')) { return; }
+
       try {
         var li = $('#' + page + '-li');
         var form = $('#' + page + '-form');
@@ -273,12 +332,12 @@
     // callback when falls to 0 active Ajax requests
     completeAll : function()
     {
-      $('#submit_button').attr('disabled', true)
-      $('#submit_message').html('');
-      $('#submit_message').hide();
+      $('.page:visible #submit_button').attr('disabled', true)
+      $('#submit_message, .submit_message').html('');
+      $('#submit_message, .submit_message').hide();
       // validate all the pages
       $('.page_link').each(function(index, page) {
-        $.fe.pageHandler.validatePage($(page).attr('data-page-id'));
+        fe.pageHandler.validatePage($(page).attr('data-page-id'));
       });	
       var all_valid = ($('#list-pages li.incomplete').length == 0);
 
@@ -288,7 +347,8 @@
 
       if(  payments_made)
         {
-          this.savePage($('#' + $.fe.pageHandler.current_page));  // in case any input fields on submit_page
+          // force an async save (so it finishes before submitting) in case any input fields on submit_page
+          this.savePage(null, true, true);
 
           // submit the application
           if($('#submit_to')[0] != null)
@@ -296,7 +356,7 @@
               url = $('#submit_to').val();
               // clear out pages array to force reload.  This enables "frozen" apps
               //       immediately after submission - :onSuccess (for USCM which stays in the application vs. redirecting to the dashboard)
-              var curr = $.fe.pageHandler.current_page;
+              var curr = fe.pageHandler.current_page;
               $.ajax({url: url, dataType:'script',
                      data: {answer_sheet_type: answer_sheet_type, a: $('input[type=hidden][name=a]').val()},
                      type:'post', 
@@ -319,8 +379,8 @@
         else
           {
             // some pages aren't valid
-            $('#submit_message').html("Please make a payment"); 
-            $('#submit_message').show();
+            $('#submit_message, .submit_message').html("Please make a payment");
+            $('#submit_message, .submit_message').show();
 
             var btn = $('#submit_button'); if (btn) { btn.attr('disabled', false); }
           }
@@ -333,8 +393,8 @@
     },
 
     checkConditional : function($element) {
-      matchable_answers = String($element.data('conditional_answer')).split(',').map(function(s) { return s.trim(); })
-      if ($element.hasClass('fe_choicefield') && $element.hasClass('style_yes-no')) {
+      matchable_answers = String($element.data('conditional_answer')).split(';').map(function(s) { return s.trim(); })
+      if ($element.hasClass('fe_choicefield') && ($element.hasClass('style_yes-no') || $element.hasClass('yes-no'))) {
         if ($(matchable_answers).filter([1, '1', true, 'true', 'yes', 'Yes']).length > 0) {
           matchable_answers = [1, '1', true, 'true', 'yes', 'Yes'];
         }
@@ -344,6 +404,8 @@
         vals = $([$element.find("input[type=radio]:checked").val()]);
       } else if ($element.hasClass('fe_choicefield') && $element.hasClass('checkbox')) {
         vals = $element.find("input[type=checkbox]:checked").map(function(i, el) { return $(el).val(); });
+      } else if ($element.hasClass('fe_choicefield') && $element.hasClass('radio')) {
+        vals = $([$element.find("input[type=radio]:checked").val()]);
       } else {
         vals = $([$element.find("input:visible, select:visible").val()]);
       }
@@ -361,6 +423,7 @@
           prefix = $element.data('answer_sheet_id_prefix');
           pg = prefix + '_' + $element.data('application_id') + '-fe_page_' + $element.data('conditional_id');
           li_id = 'li#'+pg+'-li';
+          li_id += ', li#'+pg+'-no_cache-li';
 
           if (match) {
             $(li_id).show();
@@ -373,9 +436,11 @@
       }
     },
 
-    next : function() {
-      curr_page_link = $('#'+$.fe.pageHandler.current_page+"-link");
-      //$.fe.pageHandler.loadPage('application_22544-fe_page_165-no_cache','/fe/answer_sheets/22544/page/165/edit'); return false;
+    next : function(validate_current_page) {
+      validate_current_page = typeof validate_current_page !== 'undefined' ? validate_current_page : false;
+
+      curr_page_link = $('#'+fe.pageHandler.current_page+"-link");
+      //fe.pageHandler.loadPage('application_22544-fe_page_165-no_cache','/fe/answer_sheets/22544/page/165/edit'); return false;
       page_link = curr_page_link
         .parents('.application_section')
         .nextAll()
@@ -383,12 +448,12 @@
         .first()
         .find('a.page_link');
       $(".answer-page:visible div.buttons button").prop("disabled", true)
-      $.fe.pageHandler.loadPage(page_link.data('page-id'), page_link.attr('href'));
+      fe.pageHandler.loadPage(page_link.data('page-id'), page_link.attr('href'), false, validate_current_page);
     },
 
     prev : function() {
-      curr_page_link = $('#'+$.fe.pageHandler.current_page+"-link");
-      //$.fe.pageHandler.loadPage('application_22544-fe_page_165-no_cache','/fe/answer_sheets/22544/page/165/edit'); return false;
+      curr_page_link = $('#'+fe.pageHandler.current_page+"-link");
+      //fe.pageHandler.loadPage('application_22544-fe_page_165-no_cache','/fe/answer_sheets/22544/page/165/edit'); return false;
       page_link = curr_page_link
         .parents('.application_section')
         .prevAll()
@@ -396,13 +461,13 @@
         .first()
         .find('a.page_link');
       $(".answer-page:visible div.buttons button").prop("disabled", true)
-      $.fe.pageHandler.loadPage(page_link.data('page-id'), page_link.attr('href'));
+      fe.pageHandler.loadPage(page_link.data('page-id'), page_link.attr('href'));
     }
 
   };
 
   $(document).on('click', ".conditional input, .conditional select", function() {
-    $.fe.pageHandler.checkConditional($(this).closest('.conditional'));
+    fe.pageHandler.checkConditional($(this).closest('.conditional'));
   });
   $(document).on('keyup', ".conditional input, .conditional select", function() { $(this).click(); });
   $(document).on('blug', ".conditional input, .conditional select", function() { $(this).click(); });
@@ -413,6 +478,10 @@
     remaining = maxlength - $(this).val().length;
     $('#'+$(this).attr('id')+'_count').val(remaining);
   });
+
+  $(document).on('click', 'a[disabled]', function(event) {
+    event.preventDefault();
+  });
 })(jQuery);
 
 $(function() {
@@ -425,7 +494,7 @@ function updateTotal(id) {
   try {
     total = 0;
     $(".col_" + id).each(function(index, el) {
-      total += Number($(el).val());
+      total += Number($(el).val().replace(',',''));
     });
     $('#total_' + id).val(total).trigger('totalChanged');
   } catch(e) {
@@ -448,3 +517,10 @@ function submitToFrame(id, url) {
   form.submit();
   return false
 }
+
+function scrollTo(el) {
+  if ($(el).length == 0) { return; }
+  $('html, body').animate({
+    scrollTop: $(el).offset().top
+  }, 1000);
+}