fe 0.0.4 → 2.0.0

data/app/views/fe/answer_sheets/_element.html.erb

@@ -1,39 +1,56 @@
-<% if element.kind == "Fe::QuestionGrid" -%>
+<% if element.kind == "Fe::QuestionGrid" || element.kind == "Fe::QuestionGridWithTotal"-%>
   <li>
-  	<label class="desc"><%= raw element.label %></label>
-  	<table class="grid">
-  	<%- if element.cols -%>
-  	<tr>
-  	<%- element.cols.split(';').each do |header| -%>
-  		<th><%= raw header || '&nbsp;' %></th>
-  	<%- end -%>
-  	</tr>
-  	<%- end -%>
-  	<tr>
-  		<%- col_count = 0
-  			element.elements.each do |grid_element| -%>
-  		<td id="element_<%= element.id %>">
-  			<% if %w(Fe::Paragraph).include?(grid_element.kind) -%>
-    			<%= simple_format grid_element.content %>
-  			<% else -%>
-    			<%# el = elements.detect {|el| el.id == grid_element.id } -%>
-                        <% if grid_element.question? -%>
-                          <label class="desc"><%= raw grid_element.label %></label>
-                        <% end %>
-                        <span class="answer"><%= simple_format grid_element.display_response(@answer_sheet) %></span>
-  			<% end -%>
-  		</td>
-  		<%- 	col_count += 1
-  				if col_count % element.num_cols == 0 then col_count = 0 -%></tr><tr><%- end -%>
-  		<%-	end -%>
-  		<%- while col_count < element.num_cols do 
-  				col_count += 1-%>
-  				<td>&nbsp;</td>
-  		<%- end unless col_count == 0-%>
-  	</tr>
-  	</table>
+    <% unless element.hide_label? %>
+      <label class="desc"><%= raw element.label %></label>
+    <% end %>
+    <table class="grid">
+    <%- if element.cols -%>
+    <tr>
+    <%- element.cols.split(";").each do |header| -%>
+      <th><%= raw header || "&nbsp;" %></th>
+    <%- end -%>
+    </tr>
+    <%- end -%>
+    <tr>
+      <%- col_count = 0
+        element.elements.each do |grid_element| -%>
+      <td id="element_<%= element.id %>">
+      <% if %w(Fe::Paragraph).include?(grid_element.kind) -%>
+        <%= simple_format grid_element.content %>
+      <% else -%>
+        <%# el = elements.detect {|el| el.id == grid_element.id } -%>
+        <% if grid_element.question? -%>
+          <label class="desc"><%= raw grid_element.label %></label>
+          <%- if @collating -%>
+            <%- for answer_sheet in @collated_answer_sheets[@answer_sheet] -%>
+              <div class="answer collate">
+              <span class="reviewer_name"><%= answer_sheet.collat_title %>:</span>
+              <span class="reviewer_answer"><%= simple_format grid_element.display_response(answer_sheet) %></span>
+              </div>
+            <%- end -%>
+          <%- else -%>
+            <span class="answer"><%= simple_format grid_element.display_response(@answer_sheet) %></span>
+          <%- end -%>
+        <% elsif grid_element.is_a?(Fe::QuestionGrid) || grid_element.is_a?(Fe::QuestionGridWithTotal) %>
+          <ul>
+            <%= render partial: "fe/answer_sheets/element", object: grid_element %>
+          </ul>
+        <% else %>
+          <%= render partial: "fe/questions/" + element.ptemplate, object: element %>
+        <% end %>
+      <% end -%>
+      </td>
+      <%-   col_count += 1
+          if col_count % element.num_cols == 0 then col_count = 0 -%></tr><tr><%- end -%>
+      <%- end -%>
+      <%- while col_count < element.num_cols do 
+          col_count += 1-%>
+          <td>&nbsp;</td>
+      <%- end unless col_count == 0-%>
+    </tr>
+    </table>
   </li>
-<% elsif element.question_grid_id.nil? && element.conditional_id.nil? -%>
+<% else %>
   <li>
     <% if element.question? -%>
       <label class="desc"><%= raw element.label %></label>
@@ -48,7 +65,10 @@
         <span class="answer"><%= simple_format element.display_response(@answer_sheet) %></span>
       <%- end -%>
     <% else -%>
-      <%= render :partial => 'fe/questions/' + element.ptemplate, :object => element %>
+      <%= render partial: "fe/questions/" + element.ptemplate, object: element %>
     <% end -%>
   </li>
+  <% element.choice_field_children.each do |choice_field_child| %>
+    <%= render "fe/answer_sheets/element", element: choice_field_child %>
+  <% end %>
 <% end -%>

data/app/views/fe/answer_sheets/_incomplete.html.erb

@@ -1,5 +1,5 @@
 <div class="submission_errors">
-  <p>You still need to answer questions on the following pages:</p>
+  <p><%= _("You still need to answer questions on the following pages:") %></p>
   <ul>
     <% @answer_sheet.pages.each do |page| %>
         <% unless page.complete?(@answer_sheet) %>

data/app/views/fe/answer_sheets/_page_link.html.erb

@@ -1,7 +1,9 @@
-<% css_class = '' %>
-<% if session[:attempted_submit] && page_link.page.has_questions? %>
-	<% css_class = page_link.page.complete?(@answer_sheet) ? 'complete' : 'incomplete' %>
-<% end %>
-<%= li_page_active_if(@presenter.active_page && page_link.page == @presenter.active_page, :id => page_link.dom_id + '-li', :class => css_class, :style => ('display:none' if @answer_sheet.question_sheet.hidden_pages(@answer_sheet).include?(page_link.page))) do %>
-  <%= link_to_function(page_link.label, load_page_js(page_link), :id => page_link.dom_id + '-link', 'data-page-id' => page_link.dom_id, :class => 'page_link', :href => page_link.load_path) %>
-<% end -%>
+<div class="application_section">
+  <% css_class = "" %>
+  <% if session[:attempted_submit] && page_link.page.has_questions? %>
+    <% css_class = page_link.page.complete?(@answer_sheet) ? "complete" : "incomplete" %>
+  <% end %>
+  <%= li_page_active_if(@presenter.active_page && page_link.page == @presenter.active_page, id: page_link.dom_id + "-li", class: css_class, style: ("display:none" if page_link.page.hidden?(@answer_sheet))) do %>
+    <%= link_to_function(page_link.label(session[:locale]), load_page_js(page_link), id: page_link.dom_id + "-link", "data-page-id" => page_link.dom_id, class: "page_link", href: page_link.load_path) %>
+  <% end -%>
+</div>

data/app/views/fe/answer_sheets/_pages_list.html.erb

@@ -1,11 +1,11 @@
 <div id="panel-pages">
-  <h4>Application Sections</h4>
+  <h4><%= _("Application Sections") %></h4>
   <div id="page_ajax_spinner" style="display:none;">
     <div>
-      <%= image_tag 'qe/ajax-loader.gif' %> Loading...
+      <%= image_tag "fe/ajax-loader.gif" %> <%= _("Loading...") %>
     </div>
   </div>
   <ul id="list-pages" class="navigation-list">
-    <%= render :partial => 'fe/answer_sheets/page_link', :collection => @presenter.page_links %>
+    <%= render partial: "fe/answer_sheets/page_link", collection: @presenter.page_links %>
   </ul>
-</div>
+</div>

data/app/views/fe/answer_sheets/_submit_to.html.erb

@@ -0,0 +1 @@
+<%= hidden_field_tag "submit_to", submit_fe_answer_sheet_path(@answer_sheet), id: "submit_to" %>

data/app/views/fe/answer_sheets/_title.html.erb

@@ -1 +1 @@
-<h3 id='sheet-name'><%= @presenter.sheet_title %></h3>
+<h3 id="sheet-name"><%= @presenter.sheet_title %></h3>

data/app/views/fe/answer_sheets/edit.html.erb

@@ -5,62 +5,62 @@
 <% else %>
   <div id="controls">
     <div id="panel">
-      <%= render :partial => 'fe/answer_sheets/pages_list' %>
+      <%= render partial: "fe/answer_sheets/pages_list" %>
     </div>
     <div id="legend">
-      <%= image_tag('fe/icons/question-balloon.png') %> Rolling over this symbol gives you help<br/>
-      <%= image_tag('fe/icons/star-small.png') %> Marks a required field
+      <%= image_tag("fe/icons/question-balloon.png") %> <%= _("Rolling over this symbol gives you help") %><br/>
+      <%= image_tag("fe/icons/star-small.png") %> <%= _("Marks a required field") %>
     </div>
   </div>
 
   <div id="preview">
-      <%= render :partial => 'fe/answer_sheets/title' %>
-      <%= render :partial => 'fe/answer_pages/answer_page', :locals => { :show_first => true } %>
+      <%= render partial: "fe/answer_sheets/title" %>
+      <%= render partial: "fe/answer_pages/answer_page", locals: { show_first: true } %>
   </div>
 
   <script type="text/javascript">
     $(function() {
-      page_handler = $.fe.pageHandler;
-      page_handler.initialize('<%= @presenter.active_page_link.try(:dom_id) %>');
-      // Event.observe(window, 'unload', page_handler.savePage);
-          
-      // Validation.add('validate-phone', 'Please enter a valid phone number +1-800-555-1234 x102', {
+      page_handler = fe.pageHandler;
+      page_handler.initialize("<%= @presenter.active_page_link.try(:dom_id) %>");
+      // Event.observe(window, "unload", page_handler.savePage);
+
+      // Validation.add("validate-phone", "Please enter a valid phone number +1-800-555-1234 x102", {
       //   pattern: /((\(\d{3}\)?)|(\d{3}))((\s|-|\.|\/)?)(\d{3})((\s|-|\.|\/)?)(\d{4})\s*([xX]|[eE][xX][tT])?\.?\s*\d*$/
       // });
-      // Validation.add('validate-rating', 'Please select one of the above options.', function(v,elm) {
+      // Validation.add("validate-rating", "Please select one of the above options.", function(v,elm) {
       //  var p = elm.parentNode.parentNode;
-      //  var options = p.getElementsByTagName('INPUT');
+      //  var options = p.getElementsByTagName("INPUT");
       //  return $A(options).any(function(elm) {
       //    return $F(elm);
       //  });
       // })
-      
+
       // global responders for all Ajax requests
       $(function() {
-        $('#page_ajax_spinner').ajaxStart(function() {
-          $(this).show();
+        $(document).ajaxStart(function() {
+          $("#page_ajax_spinner").show();
+          $("#page_ajax_spinner").css({top: $(window).scrollTop() + 200});
         }).ajaxComplete(function() {
-          $(this).hide();
+          $("#page_ajax_spinner").hide();
         })
       });
     });
     function updateTotals() {
       // Set up js for all question grids with totals
       <% if @page %>
-        <% @page.question_sheet.pages.collect(&:question_grid_with_totals).flatten.each do |question_grid_with_total| 
-            question_grid_with_total.total_cols.split(',').collect(&:to_i).each do |col| -%>
+        <% @page.question_sheet.pages.collect(&:question_grid_with_totals).flatten.each do |question_grid_with_total|
+            question_grid_with_total.total_cols.split(",").collect(&:to_i).each do |col| -%>
               try {
-                updateTotal('<%= "#{question_grid_with_total.id}_#{col - 1}" %>')
-                $$(".col_<%= "#{question_grid_with_total.id}_#{col - 1}" %>").each(function(e) {
-                  Event.observe(e, 'blur', function(event) {
-                    updateTotal('<%= "#{question_grid_with_total.id}_#{col - 1}" %>')
-                  });
+                updateTotal("<%= "#{question_grid_with_total.id}_#{col - 1}" %>");
+                $(".col_<%= "#{question_grid_with_total.id}_#{col - 1}" %>").change(function(e) {
+                  updateTotal("<%= "#{question_grid_with_total.id}_#{col - 1}" %>");
                 });
               } catch(e) {}
         <%  end
           end %>
       <% end %>
     }
+    $(function() { $(document).trigger("fePageLoaded"); });
   </script>
-  <%= hidden_field_tag 'submit_to', submit_fe_answer_sheet_path(@answer_sheet), :id => 'submit_to' %>
+  <%= render "fe/answer_sheets/submit_to" %>
 <% end %>

data/app/views/fe/answer_sheets/incomplete.js.erb

@@ -1,5 +1,11 @@
-$('#submit_message').html('<%= escape_javascript(render('incomplete')) %>')
+if ($('#submit_message, .submit_message').length == 0) {
+  $("ul#questions_list").filter(":visible").append("<li><div id=\"submit_message\"></div></li>");
+}
+$('#submit_message, .submit_message').html('<%= escape_javascript(render("incomplete")) %>')
 <% @answer_sheet.pages.each do |page| %>
-  $('#<%= dom_id(@answer_sheet) %>-<%= dom_id(page) %>-li').replaceWith('<%= escape_javascript(render('fe/answer_sheets/page_link', :page_link => @presenter.new_page_link(@answer_sheet, page))) %>')
+  $page = $('<%= escape_javascript(render("fe/answer_sheets/page_link", page_link: @presenter.new_page_link(@answer_sheet, page))) %>');
+  <% id = "##{dom_id(@answer_sheet)}-#{dom_id(page)}-li" %> 
+  $('<%= id %>').replaceWith($page.find('<%= id %>'));
 <% end %>
-$('#submit_message').show();
+$('#submit_message, .submit_message').show();
+$('#'+fe.pageHandler.current_page+'-li').addClass('active');

data/app/views/fe/answer_sheets/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Questionnaires</h1>
 
-<% form_tag answer_sheets_path() do %>
+<% form_tag fe_answer_sheets_path do %>
   <%= select_tag("question_sheet_id", options_for_select(@question_sheets)) %>
   <%= submit_tag("Capture") %>
 <% end -%>
@@ -8,8 +8,8 @@
 <table cellspacing="0" class="list"> 
 <% for answer_sheet in @answer_sheets %>
   <tr>
-    <td><%= link_to answer_sheet.question_sheet.label, edit_answer_sheet_path(answer_sheet) %></td>
-    <td><%= link_to 'Review', answer_sheet_path(answer_sheet), :method => :get %></td>
+    <td><%= link_to answer_sheet.question_sheet.label, edit_fe_answer_sheet_path(answer_sheet) %></td>
+    <td><%= link_to "Review", fe_answer_sheet_path(answer_sheet), method: :get %></td>
   </tr>
 <% end %>
 </table>

data/app/views/fe/answer_sheets/show.html.erb

@@ -8,6 +8,6 @@
 
 <div id="preview" class="answer-page">
     
-<%= render :partial => 'answer_sheets/answer_sheet', :locals => {:answer_sheet => @answer_sheet, :elements => @elements } %>
+<%= render partial: "fe/answer_sheets/answer_sheet", locals: {answer_sheet: @answer_sheet, elements: @elements } %>
 
 </div>

data/app/views/fe/applications/_logout.html.erb

@@ -0,0 +1 @@
+<% if user_signed_in? %><%= link_to(_("Log Out"), destroy_user_session_path, { method: :delete, style: "color: #fff;", id: "link-log-out" }) %><% end %>

data/app/views/fe/applications/show.html.erb

@@ -0,0 +1 @@
+Implement the applications show view in your app

data/app/views/fe/questions/fe/_acceptance.html.erb

@@ -1,13 +1,14 @@
-<% css_class = 'checkbox ' + acceptance.validation_class(@answer_sheet)
-   checked = acceptance.has_answer?('1', @answer_sheet)
--%>
-<%= check_box_tag "answers[#{acceptance.id}]", '1',
+<% css_class = "checkbox " + acceptance.validation_class(@answer_sheet, @page)
+   checked = acceptance.has_answer?("1", @answer_sheet)
+   locked = acceptance.locked?(params, @answer_sheet, @presenter, current_person)
+%>
+<%= check_box_tag "answers[#{acceptance.id}]", "1",
        checked,
-      :id => dom_id(acceptance),
-      :class => css_class,
-      :disabled => @answer_sheet.frozen?&&!@answer_sheet.reference?,
-      :readonly => @answer_sheet.frozen?&&!@answer_sheet.reference? %>
+      id: dom_id(acceptance),
+      class: css_class,
+      disabled: locked,
+      readonly: locked %>
 <label class="choice" for="<%= dom_id(acceptance) %>">
-  <%= raw acceptance.label %>
+  <%= raw acceptance.label(session[:locale]) %>
 </label>
-<%= hidden_field_tag "answers[#{acceptance.id}]", '', :id => '' %>
+<%= hidden_field_tag "answers[#{acceptance.id}]", "", id: "" %>

data/app/views/fe/questions/fe/_attachment_field.html.erb

@@ -1,14 +1,26 @@
+<% element_id = attachment_field.id; base_element = "#element_#{element_id}" %>
+
 <% if @presenter %>
-  <% if @answer_sheet.frozen? && !@answer_sheet.reference? %>
-    Current File: <%= link_to(answer.attachment_file_name, answer.attachment.url) %>
+  <% answer = attachment_field.responses(@answer_sheet).first %>
+  <% if @answer_sheet&.frozen? && !@answer_sheet&.reference? %>
+    <% if answer %>
+      Current File: <%= link_to(answer.attachment.filename, url_for(answer.attachment)) %>
+      <%= link_to(image_tag("fe/icons/minus-button.png"),
+                  delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name),
+                  method: :delete, remote: true) %>
+    <% end %>
   <% else %>
+    <div class="legacy_uploader" style="display: none">
       <div class="uploader">
-        <input id="<%= dom_id(attachment_field) %>_file_uploader" name="image_uploader" type="file" />
-        <!-- width: 350px -->
+        <input <% if Fe.bootstrap %>class="form-control"<% end %> id="<%= dom_id(attachment_field) %>_file_uploader" name="image_uploader" type="file" />
+
         <span id="<%= dom_id(attachment_field) %>_filename">
-        <% answer = attachment_field.responses(@answer_sheet).first
-          if answer.present? %>
-            Current File: <%= link_to(answer.attachment_file_name, answer.attachment.url) %>
+          <% answer = attachment_field.sheet_answers.where(answer_sheet: @answer_sheet).first # using responses method doesn't work because it filters out value nil, but on attachments value will be nil
+             if answer&.attachment&.attached? %>
+            Current File: <%= link_to(answer.attachment.filename, url_for(answer.attachment)) %>
+            <%= link_to(image_tag('fe/icons/minus-button.png'),
+                        delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name),
+                        method: :delete, remote: true) %>
           <% end %>
         </span>
       </div>
@@ -17,9 +29,9 @@
         <% session_key_name = Rails.application.config.session_options[:key] %>
         $('#<%= dom_id(attachment_field) %>_file_uploader').uploadify({
             uploader        : '<%= asset_path "fe/uploadify/uploadify.swf" %>',
-            script          : '<%= save_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, :question_id => attachment_field.id) %>',
+            script          : '<%= save_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name) %>',
             fileDesc        : 'Pick a file',
-            fileExt         : '*.*',
+            fileExt         : '<%= attachment_field.content || "*.*" %>',
             auto            : true,
             sizeLimit       : <%= 100.megabytes %>,
             width           : 350,
@@ -34,9 +46,120 @@
               '_http_accept': 'application/javascript',
               '_method': 'post',
               '<%= session_key_name %>' : encodeURIComponent('<%= u cookies[session_key_name] %>'),
-              'authenticity_token': encodeURIComponent('<%= u form_authenticity_token %>')
+              'authenticity_token': encodeURIComponent('<%= u form_authenticity_token %>'),
+              'answer_sheet_type': answer_sheet_type
             }
         });
       </script>
+    </div>
+
+    <div class="new_uploader">
+
+      <% if answer&.attachment&.attached? %>
+        Current File: <%= link_to(answer.attachment.filename, url_for(answer.attachment)) %>
+        <%= link_to(image_tag("fe/icons/minus-button.png"),
+                    delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name),
+                    method: :delete, remote: true, class: 'remove_current') %>
+        <script>
+          $('<%= base_element %> .remove_current').click(function() {
+            $.ajax({
+              type: 'DELETE',
+              url: '<%= delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name) %>',
+              success: function(result) {
+                $.get("/fe/answer_sheets/<%= @answer_sheet.id %>/page/<%= @page.id %>/edit?answer_sheet_type=<%= @answer_sheet.class.name %>", function(data) {
+                  $('<%= base_element %>').replaceWith($(data).find('<%= base_element %>'))
+                });
+              }
+            });
+            return false;
+          });
+        </script>
+      <% else %>
+
+      <style>
+          .drop_area.file_hover {
+              background:red;
+          }
+
+      </style>
+
+      <input type="file" class="upload_field" <% if attachment_field.content %>accept="<%= attachment_field.content %>"<% end %>/>
+      <div class="drop_area" style="margin:20px 0; width:300px; padding:20px; border:1px dashed black;">or drop a file here</div>
+      <div class="progress_report">
+          <div class="progress_report_name"></div>
+          <div class="progress_report_status" style="font-style: italic;"></div>
+          <div class="progress_report_bar_container" style="width: 90%; height: 5px;">
+            <div class="progress_report_bar" style="background-color: blue; width: 0; height: 100%;"></div>
+          </div>
+          <br/>
+      </div>
+      <script type="text/javascript">
+          $(function() {
+
+              var $input = $("<%= base_element %> .upload_field").html5_upload({
+                  url: function(number) {
+                    return "<%= save_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name) %>";
+                  },
+                  sendBoundary: window.FormData || $.browser.mozilla,
+                  onStart: function(event, total) {
+                    return true;
+                    return confirm("You are trying to upload " + total + " files. Are you sure?");
+                  },
+                  onProgress: function(event, progress, name, number, total) {
+                      console.log(progress, number);
+                  },
+                  setName: function(text) {
+                    $("#element_<%= attachment_field.id %> .progress_report_name").text(text);
+                  },
+                  setStatus: function(text) {
+                    if (!$("<%= base_element %> .upload_field").data('error', true)) {
+                      $("<%= base_element %> .progress_report_status").text(text);
+                    }
+                  },
+                  setProgress: function(val) {
+                    $("<%= base_element %> .progress_report_bar").css('width', Math.ceil(val*100)+"%");
+                  },
+                  onFinishOne: function(event, response, name, number, total) {
+                    // Re-render the attachment file to show the current file; use the page view, which is not the
+                    // most efficient way, but lets us avoid making an action just for this.  And the amount of data
+                    // on a page is not that much
+                    $.get("/fe/answer_sheets/<%= @answer_sheet.id %>/page/<%= @page.id %>/edit?answer_sheet_type=<%= @answer_sheet.class.name %>", function(data) {
+                      $('<%= base_element %>').replaceWith($(data).find('<%= base_element %>'))
+                    });
+                  },
+                  onError: function(event, name, error) {
+                    $("<%= base_element %> .upload_field").data('error', true)
+                    $('<%= base_element %> .progress_report_status').text('Error while uploading file ' + name)
+                  }, onBrowserIncompatible: function() {
+                    $("<%= base_element %> .legacy_uploader").show();
+                    $("<%= base_element %> .new_uploader").hide();
+                  },
+              });
+
+              // this is absolutely necessary -- see http://weblog.bocoup.com/using-datatransfer-with-jquery-events/
+              if ($.fn.jquery.substring(0, 2) == "3.") {
+                $.event.addProp('dataTransfer');
+              } else {
+                $.event.props.push('dataTransfer');
+              }
+
+              var $drop = $('<%= base_element %> .drop_area');
+              $drop.on('dragover dragenter', function(e) {
+                  $drop.addClass('file_hover');
+                  return false;
+              }).on('dragleave dragexit', function(e) {
+                  $drop.removeClass('file_hover');
+                  return false;
+              }).on( 'drop', function(e) {
+                  if(e.originalEvent.dataTransfer && e.originalEvent.dataTransfer.files.length) {
+                      $input.trigger('html5_upload.startFromDrop', e );
+                  }
+                  return false;
+              })
+
+          });
+        </script>
+      </div>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/fe/questions/fe/_checkbox_field.html.erb

@@ -1,48 +1,52 @@
-<% if checkbox_field.hide_option_labels? && !['question_pages', 'question_sheets', 'elements'].include?(controller.controller_name) %>
+<% if checkbox_field.hide_option_labels? && !["question_pages", "question_sheets", "elements"].include?(controller.controller_name) %>
   <tr id="<%= dom_id(checkbox_field) %>">
     <td>
       <label for="<%= dom_id(checkbox_field) %>" class="desc">
-        <%= raw checkbox_field.label %>
-        <% if checkbox_field.required?(@answer_sheet) -%><span class="required">required</span><% end -%>
+        <%= raw checkbox_field.label(session[:locale]) %>
+        <% if checkbox_field.required?(@answer_sheet, @page) -%><span class="required">required</span><% end -%>
         <%= tip(checkbox_field.tooltip) if checkbox_field.tooltip.present? %>
       </label>
     </td>
-  <% checkbox_field.choices.each_with_index do |choice, num| -%>
+  <% choices = checkbox_field.choices(session[:locale]) %>
+  <% choices.each_with_index do |choice, num| -%>
     <td>
-      <% css_class = 'checkbox ' -%>
-      <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1]) 
-         last_choice = (num == checkbox_field.choices.length - 1)
-         css_class += checkbox_field.validation_class(@answer_sheet) if last_choice
-      -%>
-      <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", '', :id => '' %>
+      <% css_class = checkbox_field.css_class.to_s + " checkbox " -%>
+      <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1])
+         last_choice = (num == choices.length - 1)
+         css_class += checkbox_field.validation_class(@answer_sheet, @page) if last_choice
+         locked = checkbox_field.locked?(params, @answer_sheet, @presenter, current_person)
+      %>
+      <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", "", id: "" %>
       <div class="field field_check">
         <%= check_box_tag "answers[#{checkbox_field.id}][#{num}]", choice[1],
-              checkbox_field.has_answer?(choice[1], @answer_sheet), 
-              :id => dom_id, 
-              :class => css_class,
-              :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
-              :readonly => @answer_sheet.frozen?&&!@presenter.reference? %>
+              checkbox_field.has_answer?(choice[1], @answer_sheet),
+              id: dom_id,
+              class: css_class,
+              disabled: locked,
+              readonly: locked %>
       </div>
      </td>
   <% end -%>
   </tr>
 <% else %>
   <div id="<%= dom_id(checkbox_field) %>">
-  <% css_class = 'checkbox ' -%>
-  <% checkbox_field.choices.each_with_index do |choice, num| -%>
-    <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1]) 
-       last_choice = (num == checkbox_field.choices.length - 1)
-       css_class += checkbox_field.validation_class(@answer_sheet) if last_choice
-    -%>
-    <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", '', :id => '' %>
-    <div class="field field_check">
-    <%= check_box_tag "answers[#{checkbox_field.id}][#{num}]", choice[1],
-          checkbox_field.has_answer?(choice[1], @answer_sheet), 
-          :id => dom_id, 
-          :class => css_class,
-          :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
-          :readonly => @answer_sheet.frozen?&&!@presenter.reference? %>
-    <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
+    <% css_class = checkbox_field.css_class.to_s + " checkbox " -%>
+    <% choices = checkbox_field.choices(session[:locale]) %>
+    <% choices.each_with_index do |choice, num| -%>
+      <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1])
+         last_choice = (num == choices.length - 1)
+         css_class += checkbox_field.validation_class(@answer_sheet, @page) if last_choice
+         locked = checkbox_field.locked?(params, @answer_sheet, @presenter, current_person)
+      %>
+      <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", "", id: "" %>
+      <div class="field field_check">
+      <%= check_box_tag "answers[#{checkbox_field.id}][#{num}]", choice[1],
+          checkbox_field.has_answer?(choice[1], @answer_sheet),
+          id: dom_id,
+          class: css_class,
+          disabled: locked,
+          readonly: locked %>
+      <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
     </div>
   <% end -%>
   </div>

data/app/views/fe/questions/fe/_country.html.erb

@@ -1,7 +1,7 @@
-<% locked = country.locked?(params, @answer_sheet, @presenter) %>
+<% locked = country.locked?(params, @answer_sheet, @presenter, current_person) %>
 <%= select_tag "answers[#{country.id}]", 
-      options_for_select([''] + Carmen.countries, country.response(@answer_sheet).to_s),
-      :class => 'select ' + country.validation_class(@answer_sheet), 
-      :id => dom_id(country),
-      :disabled => locked,
-      :readonly => locked %>
+      options_for_select([""] + Carmen.countries, country.response(@answer_sheet).to_s),
+      class: "#{"form-control" if Fe.bootstrap} select " + country.validation_class(@answer_sheet, @page), 
+      id: dom_id(country),
+      disabled: locked,
+      readonly: locked %>

data/app/views/fe/questions/fe/_date_field.html.erb

@@ -1,7 +1,7 @@
+<% locked = date_field.locked?(params, @answer_sheet, @presenter, current_person) %>
 <%= calendar_date_select_tag "answers[#{date_field.id}]", date_field.format_date_response(@answer_sheet),
-      :class => 'text ' + date_field.validation_class(@answer_sheet),
-      :id => dom_id(date_field),
-      :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
-      :readonly => true %>
-<div id="advice-validate-date-<%= dom_id(date_field) %>" class="validation-advice" style="display: none;">Please enter a valid date (MM/DD/YYYY).</div>
+      class: "#{"form-control" if Fe.bootstrap} text " + date_field.validation_class(@answer_sheet, @page),
+      id: dom_id(date_field),
+      disabled: locked,
+      readonly: true %>
 <div id="advice-required-<%= dom_id(date_field) %>" class="validation-advice" style="display: none;">This is a required field.</div>