Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: display the list of concepts in a collection at one sight #295

Merged
merged 10 commits into from
Jul 31, 2023
Merged

Fix: display the list of concepts in a collection at one sight #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
44d029f
Add a dynamic Submenu activation
SirineMhedhbi Jul 19, 2023
20d69e4
Display members count with link to concepts list
SirineMhedhbi Jul 19, 2023
0359dd6
Display the list of concepts
SirineMhedhbi Jul 20, 2023
5f1bdb9
Remove the js code of submenu
SirineMhedhbi Jul 20, 2023
64e5246
add concept sub_menu helpers
SirineMhedhbi Jul 28, 2023
04e20d4
use sub_menu helpers in the concept browser
SirineMhedhbi Jul 28, 2023
b61e600
update collection member count redirection sub_menu to use list
SirineMhedhbi Jul 28, 2023
d24ced3
Merge branch 'development' into Fix-display-the-list-of-concepts-in-a…
syphax-bouazzouni Jul 31, 2023
2ab2606
make concept list frame not load if concept_collections param is empty
syphax-bouazzouni Jul 31, 2023
1b94b4c
add 'data-turbo-frame':'_top' to member count link to show top loader
syphax-bouazzouni Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/ontologies_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class OntologiesController < ApplicationController
include InstancesHelper
include ActionView::Helpers::NumberHelper
include OntologiesHelper
include SchemesHelper
include SchemesHelper, ConceptsHelper
include CollectionsHelper
include MappingStatistics

Expand Down
16 changes: 16 additions & 0 deletions app/helpers/concepts_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@ def get_concept_id(params, concept, root)
end
end

def sub_menu_active?(section)
params["sub_menu"]&.eql? section
end

def sub_menu_active_class(section)
"active show" if sub_menu_active?(section)
end

def default_sub_menu?
!sub_menu_active?('list') && !sub_menu_active?('date')
end

def default_sub_menu_class
"active show" if default_sub_menu?
end

def concept_label(ont_id, cls_id)
@ontology = LinkedData::Client::Models::Ontology.find(ont_id)
@ontology ||= LinkedData::Client::Models::Ontology.find_by_acronym(ont_id).first
Expand Down
7 changes: 5 additions & 2 deletions app/views/collections/_collection.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
- c.header(stripped: true) do |t|
- t.add_row({th: 'ID'}, {td: collection["@id"]})
- t.add_row({th: 'Preferred Name'}, {td: get_collection_label(collection)})
- t.add_row({th: 'Members count'}, {td: collection["memberCount"]})
- t.add_row({th: 'Type'}, {td: collection["@type"]})
- t.add_row({th: 'Members count'}) do |r|
- r.td do
= link_to collection["memberCount"], "/ontologies/" + @ontology.acronym + "/?p=classes&sub_menu=list&concept_collections=" + collection["@id"], 'data-turbo-frame':'_top'
- t.add_row({th: 'Type'}, {td: collection["@type"]})

12 changes: 6 additions & 6 deletions app/views/ontologies/concepts_browsers/_concepts_browser.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
%nav
.nav.nav-tabs.text-center{:role => "tablist", style:"background-color: rgba(0, 0, 0, 0.03);"}

%a#concepts-tree-tab.nav-item.nav-link.active.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-tree-container", title: 'Hierarchy view', 'data-controller': "tooltip"}
%a#concepts-tree-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-tree-container", title: 'Hierarchy view', 'data-controller': "tooltip", class: default_sub_menu_class}
%img{src: asset_path('list-tree.svg') , style:'width: 25px; height: 25px'}
- if skos?
%a#concepts-list-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-list-container", title: 'Collection view', 'data-controller': "tooltip"}
%a#concepts-list-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-list-container", title: 'Collection view', 'data-controller': "tooltip", class: sub_menu_active_class('list')}
%i.fas.fa-list.text-dark{style:'font-size: 25px'}
%a#concepts-date-sort-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-date-sort-container", title: 'Date view', 'data-controller': "tooltip"}
%a#concepts-date-sort-tab.nav-item.nav-link.flex-grow-1.border-radius-0{"data-toggle" => "tab", :href => "#concepts-date-sort-container", title: 'Date view', 'data-controller': "tooltip", class: sub_menu_active_class('date')}
%i.far.fa-calendar-alt.text-dark{style:'font-size: 25px'}
.tab-content.px-1.py-2
#concepts-tree-container.tab-pane.fade.show.active
#concepts-tree-container.tab-pane.fade{class: default_sub_menu_class}
= render partial: 'ontologies/concepts_browsers/concepts_tree'
- if skos?
#concepts-list-container.tab-pane.fade
#concepts-list-container.tab-pane.fade{class: sub_menu_active_class('list')}
= render partial: 'ontologies/concepts_browsers/concepts_list'
#concepts-date-sort-container.tab-pane.fade
#concepts-date-sort-container.tab-pane.fade{class: sub_menu_active_class('date')}
= render partial: 'ontologies/concepts_browsers/concepts_date_sort'
2 changes: 1 addition & 1 deletion app/views/ontologies/concepts_browsers/_concepts_list.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
data: {action: 'changed->turbo-frame#updateFrame'}}

%div#sd_content.card.p-1{style: 'overflow-y: scroll; height: 60vh;'}
= render TurboFrameComponent.new(id: 'concepts_list_view-page-1', data: {'turbo-frame-target': 'frame'}) do
= render TurboFrameComponent.new(id: 'concepts_list_view-page-1', data: {'turbo-frame-target': 'frame'}, src:params[:concept_collections] ? "/ajax/classes/list?ontology_id=#{@ontology.acronym}&collection_id=#{params[:concept_collections]}" : '') do
Please select a collection to display