Merge pull request #443 from DigitalCurationCentre/issue_431

Issue 431

Author: vyruss

app/views/phases/_add_note.html.erb app/views/notes/_add.html.erbapp/views/phases/_add_note.html.erb renamed to app/views/notes/_add.html.erb

@@ -1,4 +1,3 @@
-
 <%= form_for(note,
              url: archive_note_path(note),
              remote: true,
@@ -8,7 +7,7 @@
     <%= f.hidden_field :id, :value => note.id %>
     <%= f.hidden_field :archived_by, :value => current_user.id %>
 
-    <%= render :partial => "/phases/view_note", locals: {note: note} %>
+    <%= render :partial => "/notes/view", locals: {note: note} %>
 
     <p><%= _('Are you sure you want to remove this note?')%></p>
 

app/views/phases/_archive_note.html.erb app/views/notes/_archive.html.erbapp/views/phases/_archive_note.html.erb renamed to app/views/notes/_archive.html.erb

@@ -58,27 +58,27 @@
 <% latest_note = notes_not_archived.sort { |x,y| y.updated_at <=> x.updated_at }.first %>
 <% if !latest_note.nil? then%>
   <div id = "latest_comment_div_<%= question_id %>" class ="view_comment_class">
-    <%= render :partial => "/phases/view_note", locals: {note: latest_note} %>
+    <%= render :partial => "/notes/view", locals: {note: latest_note} %>
     <div class="two-column-clear question-divider"></div>
   </div>
 <%end%>
 <!-- load notes to view and edit -->
 <%notes.each do |note|%>
   <!-- view note -->
   <div id = "view_comment_div_<%= note.id %>" class ="view_comment_class" style="display: none">
-    <%= render :partial => "/phases/view_note", locals: {note: note} %>
+    <%= render :partial => "/notes/view", locals: {note: note} %>
     <div class="two-column-clear question-divider"></div>
   </div>
 
   <!-- edit note block -->
   <div id = "edit_comment_div_<%= note.id %>"  class ="edit_comment_class" style="display: none">
-    <%= render :partial => "/phases/edit_note", locals: {note: note} %>
+    <%= render :partial => "/notes/edit", locals: {note: note} %>
     <div class="two-column-clear question-divider"></div>
   </div>
 
   <!-- archive note block -->
   <div id = "archive_comment_div_<%= note.id %>"  class ="archive_comment_class" style="display: none">
-    <%= render :partial => "/phases/archive_note", locals: {note: note, question_id: question_id} %>
+    <%= render :partial => "/notes/archive", locals: {note: note, question_id: question_id} %>
     <div class="two-column-clear question-divider"></div>
   </div>
 

app/views/phases/_edit_note.html.erb app/views/notes/_edit.html.erbapp/views/phases/_edit_note.html.erb renamed to app/views/notes/_edit.html.erb

@@ -34,42 +34,30 @@
     <div id="right-area-tabs-<%= question.id %>" class="question_right_column_nav">
       <% comments = answer.notes.all %> 
       <%= hidden_field_tag :question_id, question.id, class: "question_id" %>
+      <% active_tab = nil %>
       <ul class="question_right_column_ul">
-      <% annotations = question.annotations.where(type: Annotation.types[:guidance]) %>
-      <% if annotations.present? || question_guidances.present? %>
-        <!-- add css to comment div-->
-        <% css_style_comment_div = "display: none;"%>
-        <% css_style_guidance_div = ""%>
-        <li class="active guidance_tab_class">
-          <%= link_to _('Guidance'), "#", class: "guidance_accordion_button" %>
-        </li>
-        <li class="comment_tab_class">
-          <% if comments.count > 0%>
-            <% comments_label_with_count = "#{_('Notes')} (#{comments.count})"%>
-            <%= link_to comments_label_with_count , "#", id: "notes_number_#{question.id}", class: "comments_accordion_button" %>
+        <% annotations = question.annotations.where(type: Annotation.types[:guidance]) %>
+        <% if annotations.present? || question_guidances.present? %>
+          <% active_tab = 'guidance_tab' %>
+          <li class="guidance_tab active">
+            <%= link_to _('Guidance'), "#", class: "right_column_tab_link" %>
+          </li>
+        <% else %>
+        <% active_tab = 'note_tab' %>
+        <% end %>
+        <li class="note_tab <%= "active" if active_tab == 'note_tab' %>">
+          <% if comments.count > 0 %>
+            <%= link_to "#{_('Notes')} (#{comments.count})" , "#", id: "notes_number_#{question.id}", class: "right_column_tab_link" %>
           <% else %>
-            <%= link_to _('Share note'), "#", id: "notes_number_#{question.id}", class: "comments_accordion_button" %>
+            <%= link_to _('Share note'), "#", id: "notes_number_#{question.id}", class: "right_column_tab_link" %>
           <% end %>
         </li>
-        <% else %>
-          <!-- remove the css from comment div-->
-          <% css_style_comment_div = ""%>
-          <% css_style_guidance_div = "display: none;"%>
-          <li>
-            <% if comments.count > 0 %>
-              <% comments_label_with_count = "#{_('Notes')} (#{comments.count})"%>
-              <p id="notes_number_<%=question.id%>" class= "accordion_label"><%= comments_label_with_count %></p>
-            <% else %>
-              <p id="notes_number_<%=question.id%>" class= "accordion_label"><%= _('Share note') %></p>
-            <% end %>
-          </li>
-        <% end %>
       </ul>
     </div>
 
 
-    <!--guidance area -->
-    <div class="question-guidance" id="guidance-question-area-<%= question.id %>" style="<%= css_style_guidance_div%>" >
+    <!--guidance content -->
+    <div class="question-guidance guidance_tab" id="guidance-question-area-<%= question.id %>" style="<%= active_tab == 'guidance_tab' ? '' : 'display:none;' %>">
      <div class="accordion" id="<%= question.id %>-guidance">
 
         <!--question guidance-->
@@ -120,9 +108,9 @@
        <% end %>   <!-- question_guidances.each_pair -->
 
      </div>   <!-- accordion-questionid -->
-    </div>   <!-- question-guidance -->
-  <!--comment area -->
-  <div class="comment-area" id="comment-question-area-<%= question.id %>"  style="<%= css_style_comment_div%>">
+  </div>   <!-- question-guidance -->
+  <!--note content -->
+  <div class="comment-area note_tab" id="comment-question-area-<%= question.id %>"  style="<%= active_tab == 'note_tab' ? '' : 'display:none;' %>">
       <%= render partial: "note", locals: {question: question, answer: answer, plan: plan, suffix: "" }%>
   </div>
 </div> <!-- question area right column -->

app/views/phases/_list_notes.html.erb app/views/notes/_list.html.erbapp/views/phases/_list_notes.html.erb renamed to app/views/notes/_list.html.erb

@@ -1,6 +1,3 @@
-<!-- if there are notes then list of notes and view last note
-  else display display add note form -->
-
   <% if answer.present? && answer.notes.any? %>
     <% notes = answer.notes.all.to_a.sort! {|x,y| y.updated_at <=> x.updated_at } %>
     <% questionid = question.id %>
@@ -18,15 +15,15 @@
     <div class="div_clear"></div>
 
     <!-- list of notes, view and edit a note -->
-    <%= render :partial => "/phases/list_notes", locals: {question_id: question.id, notes: notes, plan: plan} %>
+    <%= render :partial => "/notes/list", locals: {question_id: question.id, notes: notes, plan: plan} %>
 
 
     <div class="div_clear"></div>
 
     <!-- add a note block -->
     <div id="add_comment_block_div_<%= questionid %>" style="display: none">
-      <%= render :partial => "/phases/add_note", locals: {answer: answer, question: question, plan_id: plan.id }%>
+      <%= render :partial => "/notes/add", locals: {answer: answer, question: question, plan_id: plan.id }%>
     </div>
   <% else%>
-    <%= render :partial => "/phases/add_note", locals: {answer: answer, question: question, plan_id: plan.id }%>
+    <%= render :partial => "/notes/add", locals: {answer: answer, question: question, plan_id: plan.id }%>
   <% end%>

app/views/phases/_view_note.html.erb app/views/notes/_view.html.erbapp/views/phases/_view_note.html.erb renamed to app/views/notes/_view.html.erb

@@ -1,6 +1,7 @@
 <%- model_class = Plan -%>
 <% javascript "plans.js" %>
 <% javascript "answers/status.js" %>
+<% javascript "notes/index.js" %>
 <!--
   editing plan details is handled through plan#show
   so if we come this way then we are editing a phase
@@ -25,14 +26,6 @@
 
       <% sectionid = section.id %>
 
-      <!-- verify if the session[:question_id_comments] has been created. -->
-      <% if session[:question_id_comments].to_i != 0 then %>
-        <% question_from_comment = Question.find(session[:question_id_comments])%>
-        <% if sectionid == question_from_comment.section_id then %>
-          <%= hidden_field_tag :comment_section_id, question_from_comment.section_id, :class => "comment_section_id" %>
-        <%end%>
-      <% end%>
-
       <div class="accordion-group">
         <!-- section heading -->
         <div class="accordion-heading">
@@ -123,6 +116,3 @@
 </div>
 
 <%= render :partial => "plans/export", locals: {plan: @plan, plan_data: @plan_data, phase: @phase } %>
-
-<!-- this session is created when a comment is created, edited or deleted. After the view is loaded this session variable can be deleted-->
-<% session.delete(:question_id_comments)%>

app/views/phases/_answer_form.html.erb

@@ -83,6 +83,7 @@ class Application < Rails::Application
     config.assets.precompile += %w(contacts/new_contact.js)
     config.assets.precompile += %w(shared/register_form.js)
     config.assets.precompile += %w(answers/status.js)
+    config.assets.precompile += %w(notes/index.js)
 
     config.autoload_paths += %W(#{config.root}/lib)
     config.action_controller.include_all_helpers = true