Skip to content

Commit

Permalink
Merge branch 'chart.js' of https://github.com/Mattk70/Chirpity-Electron
Browse files Browse the repository at this point in the history
… into chart.js
  • Loading branch information
Mattk70 committed Dec 15, 2023
2 parents 696c9d9 + 266df1d commit b95e128
Show file tree
Hide file tree
Showing 18 changed files with 153 additions and 130 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

54 changes: 3 additions & 51 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,6 @@ ul {
}


/* .bird-list-wrapper {
margin-top: -3px;
overflow: hidden;
max-height: 250px;
position: absolute;
z-index: 12;
box-shadow: -2px 6px 6px rgba(0, 0, 0, 0.4);
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
min-width: 320px;
} */

.bird-list {
overflow: auto;
margin-right: 0;
Expand Down Expand Up @@ -272,41 +260,6 @@ region.wavesurfer-region[data-region-highlight] {
margin: 30px 1em 1em;
}

.highcharts-data-table table {
margin: 0 1em 1em;
display: block;
max-width: 280px;
overflow: auto;
}


.highcharts-data-table caption {
display: none;
}

.highcharts-data-table th {
font-weight: 600;
padding: 0.5em;
}

.highcharts-data-table td,
.highcharts-data-table th,
.highcharts-data-table caption {
padding: 0.5em;
}

.highcharts-data-table thead tr,
.highcharts-data-table tr:nth-child(even) {
background: #f8f8f8;
}

.highcharts-data-table tr:hover {
background: #f1f7ff;
}

.highcharts-background {
opacity: 0.75;
}


/* Scrollbar */
Expand Down Expand Up @@ -345,7 +298,8 @@ footer {
#fullscreen {
margin: 5px;
position: absolute;
z-index: 4;
z-index: 1;
top: 1em;
right: 0em;
max-width: 70px;
}
Expand Down Expand Up @@ -609,6 +563,7 @@ input[type="range"].vertical {
max-width: 400px;
}


/* Tour highlighting */

.highlighted {
Expand Down Expand Up @@ -647,6 +602,3 @@ input[type="range"].vertical {
background-color: #4CAF50; /* Set the color for WebKit browsers */
}

.form-select {
font-size: 0.74rem;
}
51 changes: 48 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ <h5 class="modal-title" id="locationModalLabel">Set Location</h5>
</div>
</div>
<!-- Explore Div -->
<div id="exploreWrapper" class="p-1 row g-1 d-none justify-content-evenly">
<div id="exploreWrapper" class="p-1 m-1 row g-1 d-none justify-content-evenly">
<div class="col align-middle">
<div class="btn btn-light me-2 pt-3" id="exploreRange">
<span class="material-symbols-outlined align-bottom">date_range</span>&nbsp;
Expand Down Expand Up @@ -919,10 +919,11 @@ <h5 class="modal-title" id="locationModalLabel">Set Location</h5>
<!-- Spectrogram view -->
<div class="w-100 d-none" id="spectrogramWrapper">
<div>
<span title="Toggle Fullscreen mode (Ctrl+F)" id="fullscreen"
class="material-symbols-outlined btn btn-outline-secondary p-1 pointer d-none">fullscreen</span>
<div class="bg-dark border border-secondary w-100" id="timeline"></div>
<div class="w-100" id="spectrogram">
<span title="Toggle Fullscreen mode (Ctrl+F)" id="fullscreen"
class="material-symbols-outlined btn btn-outline-secondary p-1 pointer d-none">fullscreen</span>

</div>
<div class="w-100" id="waveform"></div>
</div>
Expand Down Expand Up @@ -1033,6 +1034,50 @@ <h5 class="modal-title" id="locationModalLabel">Set Location</h5>
<label for="explore-locations">Location</label>
</div>
</div>
<div class="col">
<fieldset class="border border rounded bg-light p-2">
<legend class="h6">Sum Detections by:</legend>

<div class="form-row">
<div class="form-check-inline">
<input class="form-check-input" type="radio" name="showTotals" id="hourTotal" value="Hour">
<label class="form-check-label" for="hourTotal">Hour</label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="radio" name="showTotals" id="dayTotal" value="Day">
<label class="form-check-label" for="dayTotal">Day</label>
</div>
<div class="form-check-inline pb-3">
<input class="form-check-input" type="radio" name="showTotals" id="weekTotal" value="Week">
<label class="form-check-label" for="weekTotal">Week</label>
</div>
</div>


<legend class="h6">Group Detections by:</legend>

<div class="form-row">
<div class="form-check-inline">
<input class="form-check-input" type="radio" name="groupTotals" id="dayGroup" value="Day">
<label class="form-check-label" for="dayGroup">Day</label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="radio" name="groupTotals" id="weekGroup" value="Week">
<label class="form-check-label" for="weekGroup">Week</label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="radio" name="groupTotals" id="monthGroup" value="Month">
<label class="form-check-label" for="monthGroup">Month</label>
</div>
</div>
<div class="form-row pt-3">
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" name="stackYears" id="stackYears" checked>
<label class="form-check-label" for="stackYears">Stack Years</label>
</div>
</div>
</fieldset>
</div>
</div>
<div class="col-9">
<div class="chart-outer position-relative">
Expand Down
Loading

0 comments on commit b95e128

Please sign in to comment.