Skip to content

Commit

Permalink
solved issue #282 Rename some names in tabs and plots
Browse files Browse the repository at this point in the history
  • Loading branch information
@luissian
luissian committed Aug 25, 2024
1 parent 1db4a19 commit 73e4a28
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
28 changes: 14 additions & 14 deletions drylab/templates/drylab/stats_services_time.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,31 @@ <h5>{{ error_message }}</h5>
type="button"
role="tab"
aria-controls="nav-req-services"
aria-selected="true">Requested services</button>
aria-selected="true">Services requests</button>
<button class="nav-link"
id="nav-req-from-tab"
data-bs-toggle="tab"
data-bs-target="#nav-req-from"
type="button"
role="tab"
aria-controls="nav-req-from"
aria-selected="false">Requested from</button>
aria-selected="false">Requested by</button>
<button class="nav-link"
id="nav-samples-tab"
data-bs-toggle="tab"
data-bs-target="#nav-samples"
type="button"
role="tab"
aria-controls="nav-samples"
aria-selected="false">Analyzed Samples</button>
aria-selected="false">Sample analysis</button>
<button class="nav-link"
id="nav-samples-table-tab"
data-bs-toggle="tab"
data-bs-target="#nav-samples-table"
type="button"
role="tab"
aria-controls="nav-samples-table"
aria-selected="false">Analyzed Samples table</button>
aria-selected="false">Sample analysis table</button>
</div>
</nav>
<div class="tab-content bg-white border-tab p-2" id="nav-tabContent">
Expand All @@ -82,7 +82,7 @@ <h4>{{ services_stats_info.period_time }}.</h4>
<div class="col-md-5 ">
<div class="card ">
<div class="card-header">
<h4>Services status</h4>
<h4>Service status</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_status_requested_services %}
Expand Down Expand Up @@ -118,7 +118,7 @@ <h4>{{ services_stats_info.period_time }}.</h4>
<div class="col-md-auto">
<div class="card ">
<div class="card-header">
<h4>Requested Services per user</h4>
<h4>Service Requests by User</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_requested_services_per_user %}
Expand All @@ -133,7 +133,7 @@ <h4>Requested Services per user</h4>
<div class="col-md-6 ">
<div class="card ">
<div class="card-header">
<h4>Requested Services per center</h4>
<h4>Service Requests by center</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_center_services %}
Expand All @@ -147,7 +147,7 @@ <h4>Requested Services per center</h4>
<div class="col-md-6 ">
<div class="card ">
<div class="card-header">
<h4>Services per classification area</h4>
<h4>Service Requests by Classification Area</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_area_services %}
Expand All @@ -162,7 +162,7 @@ <h4>Services per classification area</h4>
<div class="col-md-6 ">
<div class="card ">
<div class="card-header">
<h4>Service statistics per center</h4>
<h4>Service Request Statistics by Center</h4>
</div>
<div class="card-body">
<h4>{{ services_stats_info.period_time }}.</h4>
Expand All @@ -176,7 +176,7 @@ <h4>{{ services_stats_info.period_time }}.</h4>
<div class="col-sm-6 ">
<div class="card ">
<div class="card-header">
<h4>Services Statistics per classification area</h4>
<h4>Service Request Statistics by Classification Area</h4>
</div>
<div class="card-body">
<h4>{{ services_stats_info.period_time }}.</h4>
Expand All @@ -198,7 +198,7 @@ <h4>{{ services_stats_info.period_time }}.</h4>
<div class="col-md-6">
<div class="card ">
<div class="card-header">
<h4>Analyzed Samples per user</h4>
<h4>Analyzed Samples by User</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_samples_per_user %}
Expand All @@ -211,7 +211,7 @@ <h4>Analyzed Samples per user</h4>
<div class="col-md-6">
<div class="card ">
<div class="card-header">
<h4>Analyzed Samples</h4>
<h4>Sample Analysis</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_analyzed_samples %}
Expand All @@ -226,7 +226,7 @@ <h4>Analyzed Samples</h4>
<div class="col-md-6">
<div class="card ">
<div class="card-header">
<h4>Analyzed Samples from sequenced in runs</h4>
<h4>Analyzed Samples from Sequencing Runs</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_samples_per_run %}
Expand All @@ -239,7 +239,7 @@ <h4>Analyzed Samples from sequenced in runs</h4>
<div class="col-md-6">
<div class="card ">
<div class="card-header">
<h4>Analyzed Samples grouped in projects</h4>
<h4>Analyzed Samples by Project</h4>
</div>
<div class="card-body">
{% if services_stats_info.graphic_samples_per_project %}
Expand Down
20 changes: 10 additions & 10 deletions drylab/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ def stats_by_services_request(request):
period_of_time_selected = str(" From " + start_date + " to " + end_date)
# creating the graphic for requested services
data_source = drylab.utils.graphics.column_graphic_dict(
"Requested Services from users",
"Service request by user",
period_of_time_selected,
"User names",
"Number of Services",
Expand All @@ -1199,7 +1199,7 @@ def stats_by_services_request(request):

# creating the graphic for status services
data_source = drylab.utils.graphics.graphic_3D_pie(
"Status of Requested Services",
"Service request status",
period_of_time_selected,
"",
"",
Expand Down Expand Up @@ -1235,7 +1235,7 @@ def stats_by_services_request(request):

# creating the graphic for areas
data_source = drylab.utils.graphics.column_graphic_dict(
"Services requested per Area",
"Service requests by area",
period_of_time_selected,
"Area ",
"Number of Services",
Expand Down Expand Up @@ -1267,7 +1267,7 @@ def stats_by_services_request(request):
user_center_dict[user_center] = 1
# creating the graphic for areas
data_source = drylab.utils.graphics.column_graphic_dict(
"Services requested per Center",
"Services requests by center",
period_of_time_selected,
"Center ",
"Number of Services",
Expand Down Expand Up @@ -1324,7 +1324,7 @@ def stats_by_services_request(request):
if d_period not in user_services_period[center]:
user_services_period[center][d_period] = 0
data_source = drylab.utils.graphics.column_graphic_per_time(
"Services requested by center and period of time",
"Service requests by center and period of time",
period_of_time_selected,
"date",
"number of services",
Expand Down Expand Up @@ -1374,7 +1374,7 @@ def stats_by_services_request(request):
user_area_services_period[area][d_period] = 0

data_source = drylab.utils.graphics.column_graphic_per_time(
"Services requested by Area ",
"Service requests by Area ",
period_of_time_selected,
"date",
"number of services",
Expand Down Expand Up @@ -1451,7 +1451,7 @@ def stats_by_services_request(request):
.annotate(sample_count=Count("sample_name"))
)
g_data = core.utils.graphics.preparation_graphic_data(
"Analyzed Samples from Runs",
"Analyzed Samples from sequencing runs",
"",
"",
"",
Expand All @@ -1472,7 +1472,7 @@ def stats_by_services_request(request):
.annotate(sample_count=Count("sample_name"))
)
g_data = core.utils.graphics.preparation_graphic_data(
"Analyzed Samples per projects",
"Analyzed samples by project",
"",
"",
"",
Expand All @@ -1491,7 +1491,7 @@ def stats_by_services_request(request):
"samples_in_service__service_user_id__username"
).annotate(sample_count=Count("sample_name"))
g_data = core.utils.graphics.preparation_graphic_data(
"Analyzed Samples per user",
"Analyzed samples bu user",
"",
"",
"",
Expand All @@ -1515,7 +1515,7 @@ def stats_by_services_request(request):
only_recorded_sample=False
).count()
data_source = drylab.utils.graphics.graphic_3D_pie(
"Analyzed Samples",
"Sample Analysis",
period_of_time_selected,
"",
"",
Expand Down

0 comments on commit 73e4a28

Please sign in to comment.