From 829162629a52f56672c185872c7eaeb6ddbe82f0 Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Mon, 13 Mar 2023 17:52:27 +0100
Subject: [PATCH] add export buttons on university people / orgas + cleanup
extranet contacts exports
---
.../extranets/contacts_controller.rb | 23 ++++++++++++-------
.../university/organizations_controller.rb | 16 ++++++++++---
.../admin/university/people_controller.rb | 15 +++++++++---
.../extranet/application_controller.rb | 2 +-
.../extranet/contacts/persons_controller.rb | 4 ++--
.../extranet/contacts/search_controller.rb | 4 ++--
.../extranet/with_connections.rb | 6 ++---
app/models/user/with_registration_context.rb | 2 +-
.../extranets/posts/_form.html.erb | 4 ++--
.../university/organizations/index.html.erb | 3 +++
.../organizations/index.xlsx.axlsx} | 7 ++++--
.../admin/university/people/index.html.erb | 3 +++
.../people/index.xlsx.axlsx} | 7 ++++--
13 files changed, 67 insertions(+), 29 deletions(-)
rename app/views/admin/{communication/extranets/contacts/organizations.xlsx.axlsx => university/organizations/index.xlsx.axlsx} (90%)
rename app/views/admin/{communication/extranets/contacts/people.xlsx.axlsx => university/people/index.xlsx.axlsx} (88%)
diff --git a/app/controllers/admin/communication/extranets/contacts_controller.rb b/app/controllers/admin/communication/extranets/contacts_controller.rb
index 53b19b0f6..e23b7f2c7 100644
--- a/app/controllers/admin/communication/extranets/contacts_controller.rb
+++ b/app/controllers/admin/communication/extranets/contacts_controller.rb
@@ -1,18 +1,25 @@
class Admin::Communication::Extranets::ContactsController < Admin::Communication::Extranets::ApplicationController
def index
- @people = current_university.people.ordered
- @organizations = current_university.organizations.ordered
respond_to do |format|
format.html {
- @people = @people.page params[:persons_page]
- @organizations = @organizations.page params[:organizations_page]
+ @people = current_university.people.ordered.page params[:persons_page]
+ @organizations = current_university.organizations.ordered.page params[:organizations_page]
}
format.xlsx {
- # could be 2 differents controllers in Contacts/People & Contacts/Organizations, each with an index export
- @export = params['export']
- filename = "#{@export}-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+ # params[export] can be "people" oe "organizations"
+ export = params['export']
+ case params['export']
+ when 'people'
+ @people = @extranet.connected_people.ordered
+ when 'organizations'
+ @organizations = @extranet.connected_organizations.ordered
+ else
+ raise ActionController::RoutingError.new('Not Found')
+ end
+
+ filename = "#{export}-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
- render @export
+ render "admin/university/#{export}/index"
}
end
diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb
index ad28a13c4..8a7aa3c8e 100644
--- a/app/controllers/admin/university/organizations_controller.rb
+++ b/app/controllers/admin/university/organizations_controller.rb
@@ -8,9 +8,19 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio
has_scope :for_kind
def index
- @organizations = apply_scopes(@organizations).ordered.page(params[:page])
- @categories = current_university.organization_categories.ordered.page(params[:categories_page])
- breadcrumb
+ @organizations = apply_scopes(@organizations).ordered
+
+ respond_to do |format|
+ format.html {
+ @organizations = @organizations.page params[:page]
+ @categories = current_university.organization_categories.ordered.page(params[:categories_page])
+ breadcrumb
+ }
+ format.xlsx {
+ filename = "organizations-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+ response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
+ }
+ end
end
def show
diff --git a/app/controllers/admin/university/people_controller.rb b/app/controllers/admin/university/people_controller.rb
index 1c5d775f4..4031b759a 100644
--- a/app/controllers/admin/university/people_controller.rb
+++ b/app/controllers/admin/university/people_controller.rb
@@ -12,10 +12,19 @@ class Admin::University::PeopleController < Admin::University::ApplicationContro
@people = apply_scopes(@people)
.for_language_id(current_university.default_language_id)
.ordered
- .page(params[:page])
- @categories = current_university.person_categories.ordered.page(params[:categories_page])
- breadcrumb
+ respond_to do |format|
+ format.html {
+ @people = @people.page params[:page]
+ @categories = current_university.person_categories.ordered.page(params[:categories_page])
+ breadcrumb
+ }
+ format.xlsx {
+ filename = "people-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+ response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
+ }
+ end
+
end
def show
diff --git a/app/controllers/extranet/application_controller.rb b/app/controllers/extranet/application_controller.rb
index e0b98e084..f455db6b7 100644
--- a/app/controllers/extranet/application_controller.rb
+++ b/app/controllers/extranet/application_controller.rb
@@ -35,7 +35,7 @@ class Extranet::ApplicationController < ApplicationController
end
def user_is_contact
- current_extranet.connected_persons.find_by(id: current_user.person&.id).present?
+ current_extranet.connected_people.find_by(id: current_user.person&.id).present?
end
end
diff --git a/app/controllers/extranet/contacts/persons_controller.rb b/app/controllers/extranet/contacts/persons_controller.rb
index 5d6b40885..3e148cfe9 100644
--- a/app/controllers/extranet/contacts/persons_controller.rb
+++ b/app/controllers/extranet/contacts/persons_controller.rb
@@ -1,6 +1,6 @@
class Extranet::Contacts::PersonsController < Extranet::Contacts::ApplicationController
def index
- @people = current_extranet.connected_persons
+ @people = current_extranet.connected_people
.ordered
.page(params[:page])
.per(60)
@@ -9,7 +9,7 @@ class Extranet::Contacts::PersonsController < Extranet::Contacts::ApplicationCon
end
def show
- @person = current_extranet.connected_persons.find(params[:id])
+ @person = current_extranet.connected_people.find(params[:id])
@current_experiences = @person.experiences.includes(:organization).current.ordered
breadcrumb
end
diff --git a/app/controllers/extranet/contacts/search_controller.rb b/app/controllers/extranet/contacts/search_controller.rb
index 72543dc2d..82c0885fa 100644
--- a/app/controllers/extranet/contacts/search_controller.rb
+++ b/app/controllers/extranet/contacts/search_controller.rb
@@ -1,9 +1,9 @@
class Extranet::Contacts::SearchController < Extranet::Contacts::ApplicationController
def index
@term = params[:term]
- @people = current_extranet.connected_persons.for_search_term(@term).ordered.limit(20)
+ @people = current_extranet.connected_people.for_search_term(@term).ordered.limit(20)
@organizations = current_extranet.connected_organizations.for_search_term(@term).ordered.limit(20)
breadcrumb
add_breadcrumb 'Recherche'
end
-end
\ No newline at end of file
+end
diff --git a/app/models/communication/extranet/with_connections.rb b/app/models/communication/extranet/with_connections.rb
index 1325bfcec..956545b43 100644
--- a/app/models/communication/extranet/with_connections.rb
+++ b/app/models/communication/extranet/with_connections.rb
@@ -22,13 +22,13 @@ module Communication::Extranet::WithConnections
University::Organization.where(id: ids)
end
- def connected_persons
+ def connected_people
ids = connections.where(object_type: 'University::Person').pluck(:object_id)
University::Person.where(id: ids)
end
def experiences_through_connections
- University::Person::Experience.where(person_id: connected_persons, organization_id: connected_organizations)
+ University::Person::Experience.where(person_id: connected_people, organization_id: connected_organizations)
end
-end
\ No newline at end of file
+end
diff --git a/app/models/user/with_registration_context.rb b/app/models/user/with_registration_context.rb
index 476427a9d..2b994b4dd 100644
--- a/app/models/user/with_registration_context.rb
+++ b/app/models/user/with_registration_context.rb
@@ -27,7 +27,7 @@ module User::WithRegistrationContext
end
def user_is_contact?
- registration_context.has_feature?(:contacts) && registration_context.connected_persons.where(email: email).any?
+ registration_context.has_feature?(:contacts) && registration_context.connected_people.where(email: email).any?
end
end
diff --git a/app/views/admin/communication/extranets/posts/_form.html.erb b/app/views/admin/communication/extranets/posts/_form.html.erb
index d263109d3..b47a22d4d 100644
--- a/app/views/admin/communication/extranets/posts/_form.html.erb
+++ b/app/views/admin/communication/extranets/posts/_form.html.erb
@@ -15,10 +15,10 @@
<%= f.input :published %>
<%= f.input :published_at, html5: true, as: :date %>
<% end %>
- <%= f.association :category,
+ <%= f.association :category,
collection: @extranet.post_categories.ordered %>
<%= f.association :author,
- collection: @extranet.connected_persons.ordered,
+ collection: @extranet.connected_people.ordered,
label_method: :to_s_alphabetical %>
<%= f.input :slug,
as: :string,
diff --git a/app/views/admin/university/organizations/index.html.erb b/app/views/admin/university/organizations/index.html.erb
index 40afbe5cb..332429387 100644
--- a/app/views/admin/university/organizations/index.html.erb
+++ b/app/views/admin/university/organizations/index.html.erb
@@ -30,4 +30,7 @@ subtitle = t('admin.elements', count: @categories.total_count)
<%= link_to t('import_btn'),
new_admin_university_organizations_import_path,
class: button_classes if can? :create, University::Organization %>
+ <%= link_to t('export'),
+ request.params.merge(format: "xlsx"),
+ class: button_classes %>
<% end %>
diff --git a/app/views/admin/communication/extranets/contacts/organizations.xlsx.axlsx b/app/views/admin/university/organizations/index.xlsx.axlsx
similarity index 90%
rename from app/views/admin/communication/extranets/contacts/organizations.xlsx.axlsx
rename to app/views/admin/university/organizations/index.xlsx.axlsx
index a0e20d194..2428bbac8 100644
--- a/app/views/admin/communication/extranets/contacts/organizations.xlsx.axlsx
+++ b/app/views/admin/university/organizations/index.xlsx.axlsx
@@ -14,7 +14,8 @@ wb.add_worksheet(name: "index") do |sheet|
University::Organization.human_attribute_name('url'),
University::Organization.human_attribute_name('email'),
University::Organization.human_attribute_name('linkedin'),
- University::Organization.human_attribute_name('twitter')
+ University::Organization.human_attribute_name('twitter'),
+ University::Organization.human_attribute_name('categories')
]
types = [
@@ -32,6 +33,7 @@ wb.add_worksheet(name: "index") do |sheet|
:string,
:string,
:string,
+ :string,
:string
]
@@ -52,7 +54,8 @@ wb.add_worksheet(name: "index") do |sheet|
organization.url,
organization.email,
organization.linkedin,
- organization.twitter.present? ? "@#{organization.twitter}" : ''
+ organization.twitter.present? ? "@#{organization.twitter}" : '',
+ organization.categories.join(', ')
]
sheet.add_row infos, types: types
diff --git a/app/views/admin/university/people/index.html.erb b/app/views/admin/university/people/index.html.erb
index 2303555ed..6ef11496c 100644
--- a/app/views/admin/university/people/index.html.erb
+++ b/app/views/admin/university/people/index.html.erb
@@ -30,4 +30,7 @@ subtitle = t('admin.elements', count: @categories.total_count)
<%= link_to t('university.person.experiences.import_btn'),
new_admin_university_people_experiences_import_path,
class: button_classes if can? :create, University::Person::Experience %>
+ <%= link_to t('export'),
+ request.params.merge(format: "xlsx"),
+ class: button_classes %>
<% end %>
diff --git a/app/views/admin/communication/extranets/contacts/people.xlsx.axlsx b/app/views/admin/university/people/index.xlsx.axlsx
similarity index 88%
rename from app/views/admin/communication/extranets/contacts/people.xlsx.axlsx
rename to app/views/admin/university/people/index.xlsx.axlsx
index c140b04f0..90cf6d77b 100644
--- a/app/views/admin/communication/extranets/contacts/people.xlsx.axlsx
+++ b/app/views/admin/university/people/index.xlsx.axlsx
@@ -15,7 +15,8 @@ wb.add_worksheet(name: "index") do |sheet|
University::Person.human_attribute_name('phone_mobile'),
University::Person.human_attribute_name('url'),
University::Person.human_attribute_name('linkedin'),
- University::Person.human_attribute_name('twitter')
+ University::Person.human_attribute_name('twitter'),
+ University::Person.human_attribute_name('categories')
]
types = [
@@ -33,6 +34,7 @@ wb.add_worksheet(name: "index") do |sheet|
:string,
:string,
:string,
+ :string,
:string
]
@@ -54,7 +56,8 @@ wb.add_worksheet(name: "index") do |sheet|
person.phone_mobile,
person.url,
person.linkedin,
- person.twitter.present? ? "@#{person.twitter}" : ''
+ person.twitter.present? ? "@#{person.twitter}" : '',
+ person.categories.join(', ')
]
sheet.add_row infos, types: types
--
GitLab