Merge branch 'master' of github.com:khantey1998/nrml-dashboard

This commit is contained in:
2026-04-29 09:11:39 +07:00
12 changed files with 540 additions and 60 deletions

View File

@@ -47,7 +47,6 @@
<div class="card shadow-sm mb-3" style="height:60vh;">
<div class="card-body" >
<h5 class="fw-bold">Epidemic Trend</h5>
<p class="text-muted small report-period">
(based on selected epiweek range)
@@ -108,11 +107,11 @@
<p class="text-muted small report-period">
(based on selected epiweek range)
</p>
<canvas id="covidLineageFrequency" style=" flex:1; max-width: 90%; max-height:45vh; float: left;"></canvas>
<canvas id="covidLineageFrequency" style=" flex:1; max-width: 90%; max-height:40vh; float: left;"></canvas>
<div id="legendContainer" style="
width:10%;
margin-left:20px;
max-height:375px;
max-height:360px;
overflow-y:auto;
padding:8px;
@@ -134,7 +133,7 @@
<p class="text-muted small report-period">
(based on selected epiweek range)
</p>
<canvas id="influenzaSubtypeFrequency" style=" flex:1; max-width: 90%; max-height:45vh; float: left;"></canvas>
<canvas id="influenzaSubtypeFrequency" style=" flex:1; max-width: 90%; max-height:40vh; float: left;"></canvas>
<div id="legendContainerInfluenzaSubtypeFrequency" style="
width:10%;
margin-left:20px;

View File

@@ -27,32 +27,75 @@
</div>
</div>
<div class="card">
<div class="card-body" style="height:600px;">
<canvas id="sequencingChart"></canvas>
<div class="row mt-3">
<div class="col-md-5">
<div class="card">
<div class="card-body" style="height:500px;">
<h5 class="fw-bold">Total Sequenced Samples Over Time</h5>
<p class="text-muted small report-period">
(based on selected epiweek range)
</p>
<canvas id="sequencingTotalChart" style=" flex:1; max-height:40vh; float: left;"></canvas>
</div>
</div>
</div>
<div class="col-md-7">
<div class="card">
<div class="card-body" style="height:500px;">
<h5 class="fw-bold">Influenza Subtypes Relative Frequencies Over Time</h5>
<p class="text-muted small report-period">
(based on selected epiweek range)
</p>
<canvas id="influenzaSubtypeFrequency" style=" flex:1; max-width: 85%; max-height:40vh; float: left;"></canvas>
<div id="legendContainerInfluenzaSubtypeFrequency" style="
width:15%;
margin-left:20px;
max-height:375px;
overflow-y:auto;
padding:8px;
"></div>
</div>
</div>
</div>
</div>
<div class="row mt-3">
<!-- Counts -->
<div class="col-md-6">
<div class="col-md-12">
<div class="card">
<div class="card-body" style="height:600px;">
<h6 class="fw-bold">Lineage Counts Over Time</h6>
<canvas id="sequencingCountChart"></canvas>
<div class="card-body" style="height:500px;">
<h6 class="fw-bold">SARS-CoV-2 Lineage/Sublineage Relative Frequencies Over Time</h6>
<p class="text-muted small report-period">
(based on selected epiweek range)
</p>
{{-- <canvas id="sequencingCountChart"></canvas>--}}
<canvas id="covidLineageFrequency" style=" flex:1; max-width: 90%; max-height:40vh; float: left;"></canvas>
<div id="legendContainer" style="
width:10%;
margin-left:20px;
max-height:360px;
overflow-y:auto;
padding:8px;
"></div>
</div>
</div>
</div>
{{-- <div class="col-md-4">--}}
{{-- <div class="card">--}}
{{-- <div class="card-body" style="height:500px;">--}}
{{-- <canvas id="sequencingChart"></canvas>--}}
{{-- <canvas id="sequencingCountChart"></canvas>--}}
{{-- </div>--}}
{{-- </div>--}}
{{-- </div>--}}
<!-- Distribution -->
<div class="col-md-6">
<div class="card">
<div class="card-body" style="height:600px;">
<h6 class="fw-bold">Total Sequenced Samples Over Time</h6>
<canvas id="sequencingTotalChart" style="height: 550px;"></canvas>
</div>
</div>
</div>
</div>
@@ -62,8 +105,8 @@
@section('scripts')
<script>
window.SURVEILLANCE_ID = 6;
window.SURVEILLANCE_ID = 6;
</script>
<script src="/js/sequencing.js"></script>
@endsection
@endsection

View File

@@ -46,6 +46,9 @@
top: 0;
z-index: 1000;
}
.btn{
border-radius: 0 !important;
}
.btn-theme-outline {
background-color: #fff;
@@ -263,4 +266,4 @@
</script>
</body>
</html>
</html>