Skip to content

Group metadata fields in OPR #1684

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

Draft
bmlancien wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Group metadata fields in OPR #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86811c0
Merge branch 'develop' of https://github.com/OpenEnergyPlatform/oepla…
bmlancien Apr 26, 2024
6b2dbe1
Merge branch 'develop' of https://github.com/OpenEnergyPlatform/oepla…
bmlancien May 2, 2024
5f5367f
add placeholder for opr categorization of metadata items #1650
bmlancien May 13, 2024
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 base/static/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

183 changes: 182 additions & 1 deletion dataedit/templates/dataedit/opr_review.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ <h5 class="modal-title" id="exampleModalLabel">The Open Peer Review process</h5>
<div class="review__content">
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="general" role="tabpanel" aria-labelledby="general-tab">
<div class="review__items">

<!-- Commented out in order to show the placeholder below instead -->
<!-- <div class="review__items">
{% for item in meta.general %}
<div id="field_{{item.field}}" class="field review__item" data-category="general" onclick="click_field('{{item.field}}', '{{ item.value }}', 'general');">
<p class="review__item-content">
Expand All @@ -133,7 +135,186 @@ <h5 class="modal-title" id="exampleModalLabel">The Open Peer Review process</h5>
</p>
</div>
{% endfor %}
</div> -->

<!-- Start Placeholder for metadata grouping -->
<div class="review__items">
<!-- `.review__items-group` for non-categorized metadata -->
<div class="review__items-group">
<div class="field review__item">
<p class="review__item-content">
<span class="key">Id</span>
<span class="value">http://openenergyplatform.org/dataedit/view/model_draft/oep_metadata_table_example_v152</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">Name</span>
<span class="value">oep_metadata_table_example_v152</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">Title</span>
<span class="value">Example title for metadata example - Version 1.5.2</span>
</p>
</div>
</div>
<!-- `.review__items-group.accordion` for categorized metadata we want to have inside an accordion item -->
<div class="review__items-group accordion" id="accordionGeneralContext">
<div class="accordion-item">
<h2 class="accordion-header" id="headingGeneralContext">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseGeneralContext" aria-expanded="true" aria-controls="collapseGeneralContext">
Context
</button>
</h2>
<div id="collapseGeneralContext" class="accordion-collapse collapse show" aria-labelledby="headingGeneralContext" data-bs-parent="#accordionGeneralContext">
<div class="field review__item">
<p class="review__item-content">
<span class="key">Contact</span>
<span class="value">https://github.com/Ludee</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">GrantNo</span>
<span class="value">03EI1005</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">Homepage</span>
<span class="value">https://reiner-lemoine-institut.de/lod-geoss/</span>
</p>
</div>
</div>
</div>
</div>
<div class="review__items-group accordion" id="accordionGeneralSubject">
<div class="accordion-item">
<h2 class="accordion-header" id="headingGeneralSubject">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseGeneralSubject" aria-expanded="true" aria-controls="collapseGeneralSubject">
Subject
</button>
</h2>
<div id="collapseGeneralSubject" class="accordion-collapse collapse show" aria-labelledby="headingGeneralSubject" data-bs-parent="#accordionGeneralSubject">
<!-- `.review__items-group.category` for categorized metadata we DON'T want to have inside an accordion item -->
<div class="review__items-group category">
<div class="category-item">
<h3 class="category-header">0</h3>
<div class="category-items">
<div class="field review__item">
<p class="review__item-content">
<span class="key">Name</span>
<span class="value">energy</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">Path</span>
<span class="value">https://openenergy-platform.org/ontology/oeo/OEO_00000150</span>
</p>
</div>
</div>
</div>
</div>
<div class="review__items-group category">
<div class="category-item">
<h3 class="category-header">1</h3>
<div class="category-items">
<div class="field review__item">
<p class="review__item-content">
<span class="key">Name</span>
<span class="value">test data set</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">Path</span>
<span class="value">https://openenergy-platform.org/ontology/oeo/OEO_00000408</span>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="review__items-group accordion" id="accordionGeneralKeywords">
<div class="accordion-item">
<h2 class="accordion-header" id="headingGeneralKeywords">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseGeneralKeywords" aria-expanded="true" aria-controls="collapseGeneralKeywords">
Keywords
</button>
</h2>
<div id="collapseGeneralKeywords" class="accordion-collapse collapse show" aria-labelledby="headingGeneralKeywords" data-bs-parent="#accordionGeneralKeywords">
<div class="field review__item">
<p class="review__item-content">
<span class="key">1</span>
<span class="value">test</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">2</span>
<span class="value">stuff</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">3</span>
<span class="value">test1</span>
</p>
</div>
</div>
</div>
</div>
<div class="review__items-group accordion" id="accordionGeneralLanguages">
<div class="accordion-item">
<h2 class="accordion-header" id="headingGeneralLanguages">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseGeneralLanguages" aria-expanded="true" aria-controls="collapseGeneralLanguages">
Languages
</button>
</h2>
<div id="collapseGeneralLanguages" class="accordion-collapse collapse show" aria-labelledby="headingGeneralLanguages" data-bs-parent="#accordionGeneralLanguages">
<div class="field review__item">
<p class="review__item-content">
<span class="key">1</span>
<span class="value">en-US</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">2</span>
<span class="value">de-DE</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">3</span>
<span class="value">fr-FR</span>
</p>
</div>
</div>
</div>
</div>
<div class="review__items-group">
<div class="field review__item">
<p class="review__item-content">
<span class="key">Description</span>
<span class="value">This is an metadata example for example data. There is a corresponding table on the OEP for each metadata version.</span>
</p>
</div>
<div class="field review__item">
<p class="review__item-content">
<span class="key">PublicationDate</span>
<span class="value">2022-05-04</span>
</p>
</div>
</div>
</div>
<!-- End Placeholder for metadata grouping -->

</div>
<div class="tab-pane fade" id="spatiotemporal" role="tabpanel" aria-labelledby="spatiotemporal-tab">
<div class="review__items">
Expand Down
56 changes: 54 additions & 2 deletions theming/scss/layouts/_review.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,61 @@
}
}

&__items-group {
@extend .mb-3;
}

&__items-group.category {
.category-item {
@extend .border-start;
}

.category-header {
@extend .py-1;
@extend .px-3;
@extend .mb-2;
@extend .fs-7;
@extend .fw-semibold;
background-color: $gray-100 !important;
color: $body-color !important;
}

.category-items {
@extend .ps-3;
}
}

&__items-group.accordion {
.accordion-item {
@extend .border-0;
@extend .border-start;
@extend .rounded-0;
}

.accordion-button {
@extend .py-1;
@extend .px-3;
@extend .mb-2;
@extend .rounded-0;
@extend .fs-7;
@extend .fw-semibold;
background-color: $gray-200 !important;
color: $body-color !important;

&.collapsed {
background-color: $gray-200 !important;
}
}

.accordion-collapse {
@extend .ps-3;
}
}

&__item {
@extend .w-100;
@extend .border;
@extend .mb-1;
@extend .mb-2;
background-color: $white; // not as extend because of JS override
border-left-width: 4px!important;
border-color: $gray-200!important;
Expand Down Expand Up @@ -108,7 +159,8 @@
}

&-content {
@extend .p-3;
@extend .py-2;
@extend .px-3;
@extend .mb-0;
word-break: break-all;

Expand Down