From ed59dc5180dcd84d7d3c9e5eda890ea2545242e3 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Mon, 29 Dec 2025 11:35:17 -0600 Subject: Populations: Move feature to new UI templates. --- uploader/population/views.py | 5 +- uploader/templates/populations/base.html | 28 +-- .../templates/populations/create-population.html | 18 +- .../populations/macro-display-population-card.html | 3 +- uploader/templates/populations/sui-base.html | 12 -- .../templates/populations/sui-view-population.html | 127 ------------- .../templates/populations/view-population.html | 201 ++++++++++++--------- 7 files changed, 135 insertions(+), 259 deletions(-) delete mode 100644 uploader/templates/populations/sui-base.html delete mode 100644 uploader/templates/populations/sui-view-population.html diff --git a/uploader/population/views.py b/uploader/population/views.py index caee55b..795ce81 100644 --- a/uploader/population/views.py +++ b/uploader/population/views.py @@ -11,8 +11,6 @@ from flask import (flash, Blueprint, current_app as app) -from uploader.sui import sui_template - from uploader.samples.views import samplesbp from uploader.flask_extensions import url_for from uploader.oauth2.client import oauth2_post @@ -244,5 +242,4 @@ def view_population(species_id: int, population_id: int): dataset_phenotypes(conn, population["Id"], _dataset["Id"])) } - return render_template(sui_template("populations/view-population.html"), - **_kwargs) + return render_template("populations/view-population.html", **_kwargs) diff --git a/uploader/templates/populations/base.html b/uploader/templates/populations/base.html index 9db8083..24cacc2 100644 --- a/uploader/templates/populations/base.html +++ b/uploader/templates/populations/base.html @@ -1,18 +1,20 @@ {%extends "species/base.html"%} +{%from "populations/macro-display-population-card.html" import display_sui_population_card%} -{%block lvl2_breadcrumbs%} -
  • - {%if population is mapping%} +{%block breadcrumbs%} +{{super()}} +{%if population%} +
  • {{population.Name}} - {%else%} - Populations - {%endif%} + species_id=species['SpeciesId'], + population_id=population['Id'])}}"> + {{population["Name"]}} +
    • -{%block lvl3_breadcrumbs%}{%endblock%} +{%endif%} +{%endblock%} + + +{%block sidebarcontents%} +{{display_sui_population_card(species, population)}} {%endblock%} diff --git a/uploader/templates/populations/create-population.html b/uploader/templates/populations/create-population.html index 007b6bf..d5359f5 100644 --- a/uploader/templates/populations/create-population.html +++ b/uploader/templates/populations/create-population.html @@ -1,20 +1,16 @@ {%extends "populations/base.html"%} {%from "flash_messages.html" import flash_all_messages%} -{%from "species/macro-select-species.html" import select_species_form%} -{%from "species/macro-display-species-card.html" import display_species_card%} {%block title%}Create Population{%endblock%} {%block pagetitle%}Create Population{%endblock%} -{%block lvl3_breadcrumbs%} -
  • +{%block breadcrumbs%} +{{super()}} +
  • create population + species_id=species['SpeciesId'])}}"> + create population
    • {%endblock%} @@ -263,7 +259,3 @@ {%endblock%} - -{%block sidebarcontents%} -{{display_species_card(species)}} -{%endblock%} diff --git a/uploader/templates/populations/macro-display-population-card.html b/uploader/templates/populations/macro-display-population-card.html index 6b5f1e0..f3040ea 100644 --- a/uploader/templates/populations/macro-display-population-card.html +++ b/uploader/templates/populations/macro-display-population-card.html @@ -43,7 +43,7 @@ {%macro display_sui_population_card(species, population)%} {{display_sui_species_card(species)}} - +{%if population%}
    @@ -75,4 +75,5 @@
    Current population
    +{%endif%} {%endmacro%} diff --git a/uploader/templates/populations/sui-base.html b/uploader/templates/populations/sui-base.html deleted file mode 100644 index 0ca5c59..0000000 --- a/uploader/templates/populations/sui-base.html +++ /dev/null @@ -1,12 +0,0 @@ -{%extends "species/sui-base.html"%} - -{%block breadcrumbs%} -{{super()}} -
  • - - {{population["Name"]}} - -
    • -{%endblock%} diff --git a/uploader/templates/populations/sui-view-population.html b/uploader/templates/populations/sui-view-population.html deleted file mode 100644 index a35eac6..0000000 --- a/uploader/templates/populations/sui-view-population.html +++ /dev/null @@ -1,127 +0,0 @@ -{%extends "populations/sui-base.html"%} -{%from "macro-step-indicator.html" import step_indicator%} -{%from "populations/macro-display-population-card.html" import display_sui_population_card%} - -{%block contents%} -
    -

    {{population.FullName}} ({{population.Name}})

    -
    - -
    - -
    - -
    -
    -
    -

    Think of a "sample" as say a single case or individual - in the experiment. It could even be a single strain (where applicable). -

    -

    This is a convenience feature for when you want to upload phenotypes to - the system, but do not have the genotypes data ready yet.

    - Manage Samples -
    - -
    - -
    -

    Phenotypes in Population "{{population.FullName}} ({{population.Name}})"

    - -

    To view existing phenotype traits, or upload new ones, click the button below:

    - -
    -
    - Phenotypes -
    -
    -
    -
    - -
    -

    This allows you to upload the data that concerns your genotypes.

    -

    Any samples/individuals/cases/strains that do not already exist in the - system will be added. This does not delete any existing data.

    - upload genotypes -
    -
    -

    Upload expression data (mRNA data) for this population.

    - upload genotypes -
    -
    -
    -{%endblock%} - -{%block sidebarcontents%} -
    -

    Each tab presents a feature that's available at the population level. - Select the tab that allows you to continue with your task.

    -
    -{{display_sui_population_card(species, population)}} -{%endblock%} - - - - -{%block javascript%} -{%endblock%} diff --git a/uploader/templates/populations/view-population.html b/uploader/templates/populations/view-population.html index 3b9661b..ac89bc7 100644 --- a/uploader/templates/populations/view-population.html +++ b/uploader/templates/populations/view-population.html @@ -1,104 +1,127 @@ {%extends "populations/base.html"%} -{%from "flash_messages.html" import flash_all_messages%} -{%from "species/macro-select-species.html" import select_species_form%} -{%from "species/macro-display-species-card.html" import display_species_card%} - -{%block title%}Populations{%endblock%} - -{%block pagetitle%}Populations{%endblock%} - -{%block lvl3_breadcrumbs%} -
  • - view -
    • -{%endblock%} - +{%from "macro-step-indicator.html" import step_indicator%} +{%from "populations/macro-display-population-card.html" import display_sui_population_card%} {%block contents%}
    -

    Population Details

    - - {{flash_all_messages()}} - -
    -
    Name
    -
    {{population.Name}}
    - -
    FullName
    -
    {{population.FullName}}
    - -
    Code
    -
    {{population.InbredSetCode}}
    - -
    Genetic Type
    -
    {{population.GeneticType}}
    - -
    Family
    -
    {{population.Family}}
    - -
    Information
    -
    Population Information
    -
    +

    {{population.FullName}} ({{population.Name}})

    - … maybe provide a way to organise populations in the same family here … +
    -

    Actions

    - -

    - Click any of the following links to use this population in performing the - subsequent operations. -

    - - +
    +
    +

    Think of a "sample" as say a single case or individual + in the experiment. It could even be a single strain (where applicable). +

    +

    This is a convenience feature for when you want to upload phenotypes to + the system, but do not have the genotypes data ready yet.

    + Manage Samples +
    + +
    + +
    +

    Phenotypes in Population "{{population.FullName}} ({{population.Name}})"

    + +

    To view existing phenotype traits, or upload new ones, click the button below:

    + +
    +
    + Phenotypes +
    +
    +
    +
    + +
    +

    This allows you to upload the data that concerns your genotypes.

    +

    Any samples/individuals/cases/strains that do not already exist in the + system will be added. This does not delete any existing data.

    + upload genotypes +
    +
    +

    Upload expression data (mRNA data) for this population.

    + upload genotypes +
    +
    {%endblock%} {%block sidebarcontents%} -{{display_species_card(species)}} +
    +

    Each tab presents a feature that's available at the population level. + Select the tab that allows you to continue with your task.

    +
    +{{super()}} +{%endblock%} + + + + +{%block javascript%} {%endblock%} -- cgit 1.4.1