upgrade_surveyor_gui 0.1.2

data/app/views/surveyor_gui/surveyforms/_question_group.html.erb

@@ -0,0 +1,116 @@
+<% @question_no = @question_no + 1 if f.object.id && f.object.question_type != 'Label'-%>
+<%= div_for(f.object) do %>
+  <fieldset class="
+    fields
+    questions
+    <%= f.object.is_mandatory ? 'mandatory_questions' : 'optional_questions' %>
+    <%= !@survey_locked && (f.object.modifiable) ? '' : 'not_modifiable' %>"
+  >
+    <div class="inner_question">
+      <!-- if dependencies, notify the user with a highlighted message at the top of the question -->
+      <% if f.object.question_group.dependent? -%>
+        <span class="question_logic_notifier">
+          <!-- list_dependencies tells the user which other questions determine whether this one is displayed -->
+          <%= list_dependencies(f.object.question_group) if f.object.question_group.dependent? %>.<br/>
+        </span>
+      <% end -%>
+
+      <!-- display the button bar unless a user has already submitted responses, thus locking the survey, or   -->
+      <!-- the survey is explicitly marked not modifiable (e.g., an administrator locks it).                   -->
+      <% if !@survey_locked && (f.object.modifiable?) -%>
+        <span class="fl ui-icon ui-icon-arrowthick-2-n-s"></span>
+
+        <span class="question_button_bar">
+
+          <button type="button" id="edit_question"
+             data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(
+              id:           f.object.survey_section.survey.id,
+              question_id:  f.object.id)%>"
+             data-edit_question_url="<%= (f.object.part_of_group? && f.object.question_group.display_type != 'grid') ? surveyor_gui.edit_question_group_url(f.object.question_group.id) : surveyor_gui.edit_question_url(f.object.id)%>"
+             data-question_id="<%= f.object.id.to_s %>"
+          >Edit Question</button>
+
+          <button type="button" id="cut_question"
+             data-cut_question_surveyform_url="<%=surveyor_gui.cut_question_surveyform_url(
+              id:           f.object.survey_section.survey.id,
+              question_id:  f.object.id)%>"
+             data-question_already_cut="<%= session[:cut_question] %>"
+          >Cut Question</button>
+
+          <button type="button" id="delete_question"
+             data-question_url="<%=surveyor_gui.question_url(f.object.id)%>"
+             data-replace_form_surveyform_url="<%= surveyor_gui.replace_form_surveyform_url(
+              id:                 f.object.survey_section.survey.id,
+              survey_section_id:  f.object.survey_section_id) %>"
+          >Delete Question</button>
+
+          <span style="float:right;">
+
+            <% if f.object.question_group.dependent? -%>
+
+              <button type="button" id="delete_logic"
+                 data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(:question_id => f.object.id)%>"
+                 data-dependency_url="<%= surveyor_gui.dependency_url(f.object.id) %>"
+                 data-question_id="<%= f.object.id.to_s %>"
+              >Delete Logic</button>
+
+
+              <button type="button" id="edit_logic"
+                data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(:question_id => f.object.id)%>"
+                data-edit_dependency_url="<%= surveyor_gui.edit_dependency_url(f.object.id) %>"
+                data-question_id="<%= f.object.id.to_s %>"
+              >Edit Logic</button>
+
+            <% else -%>
+                <button type="button" id="add_logic"
+                  data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(
+                    id:           f.object.survey_section.survey.id,
+                    question_id:  f.object.id)%>"
+                  data-new_dependency_url="<%= surveyor_gui.new_dependency_url(:id=>f.object.id) %>"
+                  data-question_id="<%= f.object.id.to_s %>"
+                >Add Logic</button>
+            <% end %>
+
+          </span>
+        </span>
+
+      <% end %>
+      <br />
+      <br />
+      <%= render "question_name_and_number", question_type: f.object.question_type, text: f.object.question_group.text %>
+      <br />
+      <div class="question_group <%= question_group_class(f.object) %> <%= f.object.repeater? ? "repeater" : nil %>">
+        <div class="question_group_header">
+          <span class="question_group_heading">&nbsp;</span>
+          <%= question_group_heading(f) %>
+        </div>
+        <%= render_one_group ss -%>
+      </div>
+
+    </div>
+  </fieldset>
+
+  <% if !@survey_locked && (f.object.modifiable?) -%>
+
+    <div class="question_buttons_bottom">
+
+      <button type="button" id="add_question" class="cut"
+        data-insert_new_question_url="<%=surveyor_gui.insert_new_question_surveyform_url(id: f.object.survey_section.survey.id, ) %>"
+        data-new_question_url="<%=surveyor_gui.new_question_url%>"
+        data-prev_question_id="<%= f.object.id.to_s %>"
+      >Add Question</button>
+
+      <% if session[:cut_question] -%>
+
+        <button type="button" id="paste_question"
+          data-paste_question_surveyform_url="<%= surveyor_gui.paste_question_surveyform_url(
+              id:           f.object.survey_section.survey.id,
+              question_id:  f.object.id) %>"
+        >Paste Question</button>
+
+      <% end %>
+
+    </div>
+
+  <% end %>
+<% end %>

data/app/views/surveyor_gui/surveyforms/_question_group_fields.html.erb

@@ -0,0 +1,3 @@
+<div class="question_group_element">
+  <%= render "question_field", f: f %>
+</div>

data/app/views/surveyor_gui/surveyforms/_question_name_and_number.html.erb

@@ -0,0 +1,6 @@
+<!-- Tack a number onto questions, e.g. "3) What is your name?" but don't do it for labels -->
+<% if question_type.id != :label -%>
+  <span class="questions">
+    <%= (@question_no.to_s+ ') ' + text.to_s)%>
+  </span>
+<% end %>

data/app/views/surveyor_gui/surveyforms/_question_section.html.erb

@@ -0,0 +1,15 @@
+<!-- this code makes it possible to call this part of the view from either an ajax call
+or a reference from the survey_sections.html.erb -->
+<% if local_assigns[:f] -%>
+  <%= render_questions_and_groups_helper q, s -%>
+<% else -%>
+  <%= simple_fields_for 'surveyform', @question.survey_section.survey do |sf| %>
+    <%= sf.simple_fields_for :survey_sections do |ss| %>
+    <% end %>
+    <%= sf.simple_fields_for :survey_sections, @question.survey_section do |ss| %>
+      <%= ss.simple_fields_for :questions, @question do |q| %>
+        <%= render_questions_and_groups_helper q, ss -%>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end -%>

data/app/views/surveyor_gui/surveyforms/_question_wrapper.html.erb

@@ -0,0 +1,108 @@
+<% @question_no = @question_no + 1 if f.object.id && f.object.question_type_id != :label -%>
+<%= div_for(f.object) do %>
+  <fieldset class="
+    fields
+    questions
+    <%= f.object.is_mandatory ? 'mandatory_questions' : 'optional_questions' %>
+    <%= !@survey_locked && (f.object.modifiable) ? '' : 'not_modifiable' %>"
+  >
+    <div class="inner_question">
+      <!-- if dependencies, notify the user with a highlighted message at the top of the question -->
+      <% if f.object.dependent? -%>
+        <span class="question_logic_notifier">
+          <!-- list_dependencies tells the user which other questions determine whether this one is displayed -->
+          <%= list_dependencies(f.object) if f.object.dependency %>.<br/>
+        </span>
+      <% end -%>
+
+      <!-- display the button bar unless a user has already submitted responses, thus locking the survey, or   -->
+      <!-- the survey is explicitly marked not modifiable (e.g., an administrator locks it).                   -->
+      <% if !@survey_locked && (f.object.modifiable?) -%>
+        <span class="fl ui-icon ui-icon-arrowthick-2-n-s"></span>
+
+        <span class="question_button_bar">
+
+          <button type="button" id="edit_question"
+             data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(id: f.object.survey_section.survey.id, 
+              question_id:  f.object.id)%>"
+             data-edit_question_url="<%=surveyor_gui.edit_question_url(f.object.id)%>"
+             data-question_id="<%= f.object.id.to_s %>"
+          >Edit Question</button>
+
+          <button type="button" id="cut_question"
+             data-cut_question_surveyform_url="<%=surveyor_gui.cut_question_surveyform_url(
+              id:           f.object.survey_section.survey.id, 
+              question_id:  f.object.id)%>"
+             data-question_already_cut="<%= session[:cut_question] %>"
+          >Cut Question</button>
+
+          <button type="button" id="delete_question"
+             data-question_url="<%=surveyor_gui.question_url(f.object.id)%>"
+             data-replace_form_surveyform_url="<%= surveyor_gui.replace_form_surveyform_url(
+              id:                 f.object.survey_section.survey.id, 
+              survey_section_id:  f.object.survey_section_id) %>"
+          >Delete Question</button>
+
+          <span style="float:right;">
+
+            <% if f.object.dependent? -%>
+
+              <button type="button" id="delete_logic"
+                 data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(:question_id => f.object.id)%>"
+                 data-dependency_url="<%= surveyor_gui.dependency_url(f.object.id) %>"
+                 data-question_id="<%= f.object.id.to_s %>"
+              >Delete Logic</button>
+
+
+              <button type="button" id="edit_logic"
+                data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(:question_id => f.object.id)%>"
+                data-edit_dependency_url="<%= surveyor_gui.edit_dependency_url(f.object.id) %>"
+                data-question_id="<%= f.object.id.to_s %>"
+              >Edit Logic</button>
+
+            <% else -%>
+                <button type="button" id="add_logic"
+                  data-replace_question_url="<%=surveyor_gui.replace_question_surveyform_path(
+                    id:           f.object.survey_section.survey.id, 
+                    question_id:  f.object.id)%>"
+                  data-new_dependency_url="<%= surveyor_gui.new_dependency_url(:id=>f.object.id) %>"
+                  data-question_id="<%= f.object.id.to_s %>"
+                >Add Logic</button>
+            <% end %>
+
+          </span>
+        </span>
+
+      <% end %>
+      <br />
+      <br />
+      <%= render "question_name_and_number", question_type: f.object.question_type, text: f.object.text %>
+      <br />
+      <%= render "question_field", f: f %>
+    </div>
+  </fieldset>
+
+  <% if !@survey_locked && (f.object.modifiable?) -%>
+
+    <div class="question_buttons_bottom">
+
+      <button type="button" id="add_question" class="cut"
+        data-insert_new_question_url="<%=surveyor_gui.insert_new_question_surveyform_url(id: f.object.survey_section.survey.id, ) %>"
+        data-new_question_url="<%=surveyor_gui.new_question_url%>"
+        data-prev_question_id="<%= f.object.id.to_s %>"
+      >Add Question</button>
+
+      <% if session[:cut_question] -%>
+
+        <button type="button" id="paste_question"
+          data-paste_question_surveyform_url="<%= surveyor_gui.paste_question_surveyform_url(
+              id:           f.object.survey_section.survey.id,
+              question_id:  f.object.id) %>"
+        >Paste Question</button>
+
+      <% end %>
+
+    </div>
+
+  <% end %>
+<% end %>

data/app/views/surveyor_gui/surveyforms/_survey_section_fields.html.erb

@@ -0,0 +1,137 @@
+<%= simple_fields_for 'surveyform', @surveyform || @survey_section.survey do |f| %>
+  <%= f.simple_fields_for :survey_sections, @survey_section do |s| %>
+
+    <% if s.object.id -%>
+      <%= div_for(s.object) do %>
+
+        <h2 style='position:relative;'>
+
+          <span class="fl ui-icon ui-icon-arrowthick-2-n-s"></span>&nbsp;
+
+          <%= s.object.title %>
+
+          <div class="section_top_button_bar">
+
+            <% if !@survey_locked && (s.object.modifiable?) %>
+
+              <button type="button" id="edit_section_title"
+                      data-replace_survey_section_url="<%=surveyor_gui.replace_survey_section_surveyform_path(
+                        survey_section_id: s.object.id,
+                        id: f.object.id)%>"
+                      data-edit_survey_section_url="<%=surveyor_gui.edit_survey_section_url(s.object.id)%>"
+                      data-survey_section_id="<%=s.object.id%>"
+              >Edit Section Title</button>
+
+              <% if session[:cut_section] -%>
+
+                <button type="button" id="paste_section"
+                  data-paste_section_surveyform_url="<%= surveyor_gui.paste_section_surveyform_url(survey_section_id: s.object.id, position: 'over') %>"
+                >Paste Section</button>
+
+              <% else -%>
+
+                <button type="button" id="cut_section"
+                        data-cut_section_surveyform_url="<%=surveyor_gui.cut_section_surveyform_url(
+                          id: f.object.id, 
+                          survey_section_id: s.object.id)%>"
+                        data-survey_section_id="<%=s.object.id%>"
+                        data-section_already_cut="<%= session[:cut_section] %>"
+                >Cut Section</button>
+
+              <% end -%>
+
+              <button type="button" id="delete_section"
+                      data-survey_section_id="<%=s.object.id%>"
+                      data-survey_section_url="<%= surveyor_gui.survey_section_url(s.object.id)%>"
+              >Delete Section</button>
+
+            <% end -%>
+
+          </div>
+
+        </h2>
+
+        <fieldset style="background:white">
+          <div class="fields surveysection">
+            <%= s.hidden_field :id %>
+            <%= s.hidden_field :modifiable %>
+
+            <% if !@survey_locked && (s.object.modifiable?)  -%>
+
+              <div class="question_buttons_top">
+
+                  <button type="button" id="add_question" class="cut"
+                    data-insert_new_question_url="<%=surveyor_gui.insert_new_question_surveyform_url(f.object.id)%>"
+                    data-new_question_url="<%=surveyor_gui.new_question_url%>"
+                  >Add Question</button>
+
+                  <% if session[:cut_question] -%>
+
+                    <button type="button" id="paste_question"
+                      data-paste_question_surveyform_url="<%= surveyor_gui.paste_question_surveyform_url(
+                        id:                 f.object.id,
+                        survey_section_id:  s.object.id) %>"
+                    >Paste Question</button>
+
+                  <% end %>
+
+              </div>
+
+            <% end %>
+
+            <div class="sortable_questions" id="sortable_question<%= s.object.id.to_s %>">
+              <%= s.simple_fields_for :questions do |q| %>
+                <%= render_questions_and_groups_helper q, s %>
+              <% end %>
+            </div>
+
+            <% if !@survey_locked && s.object.modifiable %>
+
+              <div class="button_bar_outer">
+                <div class="section_button_bar_bottom_inner">
+
+                  <button type="button" id="add_section"
+                    data-new_survey_section_url="<%=surveyor_gui.new_survey_section_url%>"
+                    data-insert_survey_section_url="<%= surveyor_gui.insert_survey_section_surveyform_path(:action => 'insert_survey_section',:id => f.object.id) %>"
+                    data-survey_section_id="<%= s.object.id.to_s %>"
+                    data-survey_id="<%= s.object.survey.id.to_s %>"
+                  >Add Section</button>
+
+                  <% if session[:cut_section] -%>
+
+                    <button type="button" id="paste_section"
+                      data-paste_section_surveyform_url="<%= surveyor_gui.paste_section_surveyform_url(:survey_section_id => s.object.id) %>"
+                    >Paste Section</button>
+
+                  <% end -%>
+
+                </div>
+              </div>
+
+            <% end -%>
+
+          </div>
+        </fieldset>
+      <% end %>
+    <% else -%>
+      <%= s.hidden_field :id %>
+      <%= s.hidden_field :title %>
+      <%= s.hidden_field :display_order %>
+      <%= s.hidden_field :modifiable %>
+      <%= s.simple_fields_for :questions do |q| %>
+        <%= q.hidden_field :id %>
+        <%= q.hidden_field :text %>
+        <%= q.hidden_field :display_order %>
+        <%= q.hidden_field :pick %>
+        <%= q.hidden_field :display_type %>
+        <%= q.hidden_field :question_group_id %>
+        <%= q.hidden_field :modifiable %>
+        <%= q.simple_fields_for :answers do |a| %>
+          <%= a.hidden_field :text %>
+          <%= a.hidden_field :response_class %>
+          <%= a.hidden_field :display_order %>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end -%>

data/app/views/surveyor_gui/surveyforms/clone_survey.html.erb

@@ -0,0 +1,13 @@
+<div class="column3">
+  <div class="shadebox round">
+    <div id="survey">
+        <h1 class="round-top"><%= @title %></h1>
+        <%= simple_form_for @surveyform, :url => create_cloned_surveyform_path do |f| %>
+          <%= f.error_messages %>
+          <%= f.hidden_field :id %>
+          <%= f.input :title, :label => "New Title",:hint => 'Name this survey, questionnaire, or form', :input_html=>{:style=>'width:25em;'}, :label_html=>{:style=>'width:6em;'}%>
+          <%= f.button :submit, @title %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/surveyor_gui/surveyforms/edit.html.erb

@@ -0,0 +1,5 @@
+<%= render 'form' %>
+  <p class="floatdown">
+    <%= link_to "Show", surveyor_gui.surveyform_path(@surveyform) %> |
+    <%= link_to "View All", surveyor_gui.surveyforms_path %>
+  </p>

data/app/views/surveyor_gui/surveyforms/index.html.erb

@@ -0,0 +1,40 @@
+<div class="column2">
+  <div class="shadebox round">
+  <div id="survey">
+    <h1 class="round-top"><%= @title %></h1>
+      <%= form_tag surveyforms_path, :method => 'get' do %>
+        <p>
+        <%= text_field_tag :search, params[:search] %>
+        <%= submit_tag "Search", :name => nil %>
+        </p>
+    <% end %>
+  <%= will_paginate %>
+  <br />
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Version</th>
+    <th>Actions</th>
+  </tr>
+  <% for survey in @surveyforms %>
+    <tr>
+      <td><%= survey.title %></td>
+      <td><%= survey.survey_version %></td>
+      <td><%= link_to "Show", survey %>&nbsp
+      <%= link_to "Edit", edit_surveyform_path(survey) %>&nbsp
+      <%= link_to "Clone", clone_survey_surveyform_path(survey) %>&nbsp
+      <%= link_to "Destroy", survey, data: { confirm: 'Are you sure?' }, :method => :delete %>&nbsp; 
+      <%= link_to "Run Report", report_path(survey) %> &nbsp;
+      <%= link_to "View Responses" , responses_path(id: survey) %></td>
+    </tr>
+  <% end %>
+</table>
+<br />
+<%= will_paginate %>
+<p>
+  <%= link_to "New Survey", new_surveyform_path() %>&nbsp
+  <%= link_to "Take a Survey", surveyor.available_surveys_path %>&nbsp
+</p>
+</div>
+  </div>
+</div>