Issue202: Add contributor to the DMP downloaded files

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### Added
+
+- Added contributors to plan's cover page (if there is any) [#202](https://github.com/portagenetwork/roadmap/issues/202)
+- Added plan title to csv exported file
+
 ## [3.0.4+portage-3.0.12] - 2022-05-12
 
 ### Added

app/controllers/plan_exports_controller.rb

@@ -46,6 +46,16 @@ def show
       @selected_phase = @plan.phases.order("phases.updated_at DESC")
                              .detect { |p| p.visibility_allowed?(@plan) }
     end
+
+    # Added contributors to coverage of plans. 
+    # Users will see both roles and contributor names if the role is filled
+    @hash.merge(
+      {:data_curation: Contributor.where(:plan_id => @plan.id).data_curation},
+      {:investigation: = Contributor.where(:plan_id => @plan.id).investigation},
+      {:pa: Contributor.where(:plan_id => @plan.id).project_administration},
+      {:other: Contributor.where(:plan_id => @plan.id).other}
+    )
+
     respond_to do |format|
       format.html { show_html }
       format.csv  { show_csv }

app/models/concerns/exportable_plan.rb

@@ -101,6 +101,15 @@ def prepare_coversheet
       attribution << role.user.name(false)
     end
     hash[:attribution] = attribution
+
+    # Added contributors to coverage of plans. 
+    # Users will see both roles and contributor names if the role is filled
+    @hash.merge(
+      {:data_curation: Contributor.where(:plan_id => @plan.id).data_curation},
+      {:investigation: = Contributor.where(:plan_id => @plan.id).investigation},
+      {:pa: Contributor.where(:plan_id => @plan.id).project_administration},
+      {:other: Contributor.where(:plan_id => @plan.id).other}
+    )
 
     # Org name of plan owner's org
     hash[:affiliation] = owner.present? ? owner.org.name : ""
@@ -127,12 +136,25 @@ def prepare_coversheet
 
   # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def prepare_coversheet_for_csv(csv, _headings, hash)
+    csv << [_("Title: "), _("%{title}") % { title: title }]
     csv << [if hash[:attribution].many?
               _("Creators: ")
             else
               _("Creator:")
             end, _("%{authors}") % { authors: hash[:attribution].join(", ") }]
-    csv << ["Affiliation: ", _("%{affiliation}") % { affiliation: hash[:affiliation] }]
+    if hash[:investigation].present? 
+      csv <<  [_("Principal Investigator: "), _("%{investigation}") % { investigation: hash[:investigation].map(&:name).join(', ') }] 
+    end
+    if hash[:data_curation].present? 
+      csv << [_("Date Manager: "), _("%{data_curation}") % { data_curation: hash[:data_curation].map(&:name).join(', ') }] 
+    end
+    if hash[:pa].present? 
+      csv << [_("Project Administrator: "), _("%{pa}") % { pa: hash[:pa].map(&:name).join(', ') }] 
+    end
+    if hash[:other].present? 
+      csv << [_("Contributor: "), _("%{other}") % { other: hash[:other].map(&:name).join(', ') }] 
+    end
+    csv << [_("Affiliation: "), _("%{affiliation}") % { affiliation: hash[:affiliation] }]
     csv << if hash[:funder].present?
              [_("Template: "), _("%{funder}") % { funder: hash[:funder] }]
            else

app/views/shared/export/_plan_coversheet.erb

@@ -7,6 +7,22 @@
   <%# Allow raw html (==) for plan_attribution as it has <b> tags %>
   <p><%== plan_attribution(@hash[:attribution]) %></p><br>
 
+  <%# Added contributors to coverage of plans. 
+    # Users will see both roles and contributor names if the role is filled %>
+  <%# Roles are ranked by PI -> DM -> PA -> Other (if any) %>
+  <% if @hash[:investigation].present? %>
+  <p><b><%= _("Principal Investigator: ") %></b><%= @hash[:investigation].map(&:name).join(', ') %></p><br>
+  <% end %>
+  <% if @hash[:data_curation].present? %>
+  <p><b><%= _("Data Manager: ") %></b><%= @hash[:data_curation].map(&:name).join(', ') %></p><br>
+  <% end %>
+  <% if @hash[:pa].present? %>
+  <p><b><%= _("Project Administrator: ") %></b><%= @hash[:pa].map(&:name).join(', ') %></p><br>
+  <% end %>
+  <% if @hash[:other].present? %>
+  <p><b><%= _("Contributor: ") %></b><%= @hash[:other].map(&:name).join(', ') %></p><br>
+  <% end %>
+
   <p><b><%= _("Affiliation: ") %></b><%= @hash[:affiliation] %></p><br>
 
   <% if @hash[:funder].present? %>

app/views/shared/export/_plan_txt.erb

@@ -1,7 +1,23 @@
 <%= "#{@plan.title}" %>
 <%= "----------------------------------------------------------\n" %>
 <% if @show_coversheet %>
+
 <%= @hash[:attribution].many? ? _("Creators: ") : _('Creator:') %> <%= @hash[:attribution].join(', ') %>
+<%# Added contributors to coverage of plans. 
+    # Users will see both roles and contributor names if the role is filled %>
+<%# Roles are ranked by PI -> DM -> PA -> Other (if any) %>
+  <% if @hash[:investigation].present? %>
+<%= _("Principal Investigator: ") + @hash[:investigation].map(&:name).join(', ') %>
+  <% end %>
+  <% if @hash[:data_curation].present? %>
+<%= _("Data Manager: ") +  @hash[:data_curation].map(&:name).join(', ') %>
+  <% end %>
+  <% if @hash[:pa].present? %>
+<%= _("Project Administrator: ") + @hash[:pa].map(&:name).join(', ') %>
+  <% end %>
+  <% if @hash[:other].present? %>
+<%= _("Contributor: ") + @hash[:other].map(&:name).join(', ') %>
+  <% end %>
 <%= _("Affiliation: ") + @hash[:affiliation] %>
   <% if @hash[:funder].present? %>
 <%= _("Template: ") + @hash[:funder] %>