Skip to content

OKRS24-165 #119

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

Merged
merged 2 commits into from
May 28, 2024
Merged

OKRS24-165 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f851243
OKRS24-165 Replaced modal with popover.
dmytrotsko May 23, 2024
955591c
Merge branch 'development' into OKRS24-165
dmytrotsko May 28, 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
4 changes: 4 additions & 0 deletions src/assets/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,7 @@
.select2-container .select2-selection--single .select2-selection__rendered {
padding-left: 0px!important;
}

.popover {
max-width: 50%;
}
6 changes: 4 additions & 2 deletions src/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<link href="{% static 'vendor/remixicon/remixicon.css' %}" rel="stylesheet">
<link href="{% static 'vendor/simple-datatables/style.css' %}" rel="stylesheet">

<!-- Vendor JS Files -->
<script src="{% static 'vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>

<!-- Template Main CSS File -->
<link href="{% static 'css/style.css' %}" rel="stylesheet" />
<link href="{% static 'css/custom.css' %}" rel="stylesheet" />
Expand Down Expand Up @@ -127,7 +130,6 @@
<!-- Template Main JS File -->

<script src="{% static 'vendor/apexcharts/apexcharts.min.js' %}"></script>
<script src="{% static 'vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
<script src="{% static 'vendor/chart.js/chart.umd.js' %}"></script>
<script src="{% static 'vendor/echarts/echarts.min.js' %}"></script>
<script src="{% static 'vendor/quill/quill.min.js' %}"></script>
Expand All @@ -136,7 +138,7 @@

<script src="{% static 'js/main.js' %}"></script>


<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js"></script>
</body>
</html>
219 changes: 24 additions & 195 deletions src/templates/signals/signals.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ <h2 class="accordion-header" id="pathogen-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#pathogen-collapse" aria-expanded="true" aria-controls="pathogen-collapse">
<label for="id_pathogen" class="form-label">
Pathogen
<a href="#" data-bs-toggle="modal" data-bs-target="#pathogen_modal">
<i class="bi bi-info-circle"></i>
</a>
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Pathogen" data-bs-content="{{ filters_descriptions.SignalFilter.pathogen }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -50,9 +48,7 @@ <h2 class="accordion-header" id="active-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#active-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_active" class="form-label">
Active
<a href="#" data-bs-toggle="modal" data-bs-target="#active_modal">
<i class="bi bi-info-circle"></i>
</a>
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Active" data-bs-content="{{ filters_descriptions.SignalFilter.active }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -71,9 +67,7 @@ <h2 class="accordion-header" id="available_geography-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#available_geography-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_available_geography" class="form-label">
Available Geography
<a href="#" data-bs-toggle="modal" data-bs-target="#available_geography_modal">
<i class="bi bi-info-circle"></i>
</a>
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Available Geography" data-bs-content="{{ filters_descriptions.SignalFilter.available_geography }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -96,9 +90,7 @@ <h2 class="accordion-header" id="available_geography-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#signal_type-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_signal_type" class="form-label">
Signal Type
<a href="#" data-bs-toggle="modal" data-bs-target="#signal_type_modal">
<i class="bi bi-info-circle"></i>
</a>
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Signal Type" data-bs-content="{{ filters_descriptions.SignalFilter.signal_type }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -121,9 +113,7 @@ <h2 class="accordion-header" id="available_geography-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#category-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_category" class="form-label">
Category
<a href="#" data-bs-toggle="modal" data-bs-target="#category_modal">
<i class="bi bi-info-circle"></i>
</a>
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Category" data-bs-content="{{ filters_descriptions.SignalFilter.category }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -146,9 +136,7 @@ <h2 class="accordion-header" id="available_geography-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#format_type-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_format_type" class="form-label">
Format Type
<a href="#" data-bs-toggle="modal" data-bs-target="#format_type_modal">
<i class="bi bi-info-circle"></i>
</a>
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Format Type" data-bs-content="{{ filters_descriptions.SignalFilter.format_type }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -171,9 +159,7 @@ <h2 class="accordion-header" id="available_geography-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#source-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_source" class="form-label">
Source
<a href="#" data-bs-toggle="modal" data-bs-target="#source_modal">
<i class="bi bi-info-circle"></i>
</a>
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Source" data-bs-content="{{ filters_descriptions.SignalFilter.source }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -193,12 +179,10 @@ <h2 class="accordion-header" id="available_geography-heading">
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="available_geography-heading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#time_type-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_time_type" class="form-label">
Time Type
<a href="#" data-bs-toggle="modal" data-bs-target="#time_type_modal">
<i class="bi bi-info-circle"></i>
</a>
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#time_label-collapse" aria-expanded="false" aria-controls="active-collapse">
<label for="id_time_label" class="form-label">
Time Label
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Time Label" data-bs-content="{{ filters_descriptions.SignalFilter.time_label }}"><i class="bi bi-info-circle"></i></a>
</label>
</button>
</h2>
Expand All @@ -223,12 +207,6 @@ <h2 class="accordion-header" id="available_geography-heading">
</div>
<div class="col-9">
<div class="row margin-bottom-1rem d-flex justify-content-end">
<!-- <div class="col-4">
<div class="btn-group" role="group">
<a href="https://delphi.cmu.edu/covidcast/export/" target="_blank" class="btn btn-primary" role="button">Export</a>
<a href="https://delphi.cmu.edu/epivis/" target="_blank" class="btn btn-primary" role="button">Chart</a>
</div>
</div> -->
<div class="col-6">
<div class="input-group mb-3 d-flex justify-content-start">
<span class="pt-05">
Expand Down Expand Up @@ -301,172 +279,23 @@ <h2 class="accordion-header" id="available_geography-heading">
</div>
</div>
</div>
<div class="modal fade" id="pathogen_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Pathogen</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.pathogen }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="active_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Active</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.active }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="available_geography_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Available Geography</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.available_geography }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="signal_type_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Signal Type</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.signal_type }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="signal_type_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Signal Type</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.signal_type }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="category_modal" tabindex="-1" style="display: none;"aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Category</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.category }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="format_type_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Format Type</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.format_type }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="source_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Source</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.source }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="time_type_modal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Time Type</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
</div>
<div class="modal-body">
{{ filters_descriptions.SignalFilter.time_type }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary"
data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
</form>

<script>

const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]');
var popoverOptions = {
trigger: "hover,click,focus",
container: "body",
delay: {
"show": 500,
"hide": 100
}
};
const popoverList = [...popoverTriggerList].map(
popoverTriggerEl => new bootstrap.Popover(popoverTriggerEl, popoverOptions));

function showAllOptions(event, parentDiv) {
event.preventDefault();
var childDivs = parentDiv.querySelectorAll('.form-check');
Expand Down
Loading