From 2847c193832faf0e85a117ca3ac35e4afbcf8d12 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Fri, 13 Sep 2024 10:34:24 -0500 Subject: Samples: provide more informative page content. --- uploader/templates/samples/index.html | 6 +- uploader/templates/samples/list-samples.html | 89 +++++++++++++---------- uploader/templates/samples/select-population.html | 17 +++-- uploader/templates/samples/upload-samples.html | 7 +- 4 files changed, 71 insertions(+), 48 deletions(-) (limited to 'uploader/templates') diff --git a/uploader/templates/samples/index.html b/uploader/templates/samples/index.html index 7c88c01..ee4a63e 100644 --- a/uploader/templates/samples/index.html +++ b/uploader/templates/samples/index.html @@ -11,10 +11,8 @@ {{flash_all_messages()}}
-

Here, you can upload the samples/individuals that were used in your - experiments.

-

Since the samples are linked to specific species and populations, we will - need to first select them in the next few steps.

+

GeneNetwork has a selection of different species of organisms to choose from. Within those species, there are the populations of interest for a variety of experiments, from which you, the researcher, picked your samples (or individuals or cases) from. Here you can provide some basic details about your samples.

+

To start off, we will need to know what species and population your samples belong to. Please provide that information in the next sections.

{{select_species_form(url_for("species.populations.samples.index"), species)}}
diff --git a/uploader/templates/samples/list-samples.html b/uploader/templates/samples/list-samples.html index 8f1bf16..f82d72e 100644 --- a/uploader/templates/samples/list-samples.html +++ b/uploader/templates/samples/list-samples.html @@ -24,42 +24,52 @@

- Samples for population "{{population.FullName}}" from the + You selected the population "{{population.FullName}}" from the "{{species.FullName}}" species.

+
+ +{%if samples | length > 0%} +
+

+ This population already has {{total_samples}} + samples/individuals entered. You can explore the list of samples in this + population in the table below. +

+
+ +
+
+ {%if offset > 0:%} + + + Previous + + {%endif%} +
- {%if samples | length > 0%} -
-
- {%if offset > 0:%} - - - Previous - - {%endif%} -
- -
- Samples {{offset}} — {{offset+(count if offset + count < total_samples else total_samples - offset)}} / {{total_samples}} -
- -
- {%if offset + count < total_samples:%} - - Next - - - {%endif%} -
+
+ Samples {{offset}} — {{offset+(count if offset + count < total_samples else total_samples - offset)}} / {{total_samples}} +
+ +
+ {%if offset + count < total_samples:%} + + Next + + + {%endif%}
+
+
@@ -90,10 +100,14 @@ delete all samples

- {%else%} -

- - There are no samples for this population at this time. + + +{%else%} + +

+

+ There are no samples entered for this population. Do please go ahead and add + the samples for this population by clicking on the button below.

@@ -106,8 +120,9 @@ add samples

- {%endif%}
+{%endif%} + {%endblock%} {%block sidebarcontents%} diff --git a/uploader/templates/samples/select-population.html b/uploader/templates/samples/select-population.html index 8e22ac1..f437780 100644 --- a/uploader/templates/samples/select-population.html +++ b/uploader/templates/samples/select-population.html @@ -12,20 +12,25 @@ {{flash_all_messages()}}
-

Select the population to use with your samples:

+

You have selected "{{species.FullName}}" as the species that your data relates to.

+

Next, we need information regarding the population your data relates to. Do please select the population from the existing ones below

+
+ +
{{select_population_form( url_for("species.populations.samples.select_population", species_id=species.SpeciesId), populations)}}
-
-

Cannot find your population in the list?

-

If you cannot find the population you want in the drop-down above, you can - instead, +

+

+ If you cannot find the population your data relates to in the drop-down + above, you might want to - create a new population. + add a new population to GeneNetwork + instead.

{%endblock%} diff --git a/uploader/templates/samples/upload-samples.html b/uploader/templates/samples/upload-samples.html index b101b2e..25d3290 100644 --- a/uploader/templates/samples/upload-samples.html +++ b/uploader/templates/samples/upload-samples.html @@ -23,7 +23,12 @@ {{flash_all_messages()}}
-

You can now upload a character-separated value (CSV) file that contains +

+ You can now upload the samples for the "{{population.FullName}}" population + from the "{{species.FullName}}" species here. +

+

+ Upload a character-separated value (CSV) file that contains details about your samples. The CSV file should have the following fields:

Name
-- cgit v1.2.3