From 8b2737c391834e8245c42e13b84c67ed2a0d942b Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Mon, 29 Dec 2025 11:02:16 -0600 Subject: Sequencing Platforms: Move feature to new UI templates. --- uploader/platforms/views.py | 6 +- uploader/templates/platforms/base.html | 22 ++-- uploader/templates/platforms/create-platform.html | 20 ++-- uploader/templates/platforms/list-platforms.html | 5 - uploader/templates/platforms/sui-base.html | 17 --- .../templates/platforms/sui-create-platform.html | 116 --------------------- .../templates/platforms/sui-list-platforms.html | 88 ---------------- 7 files changed, 21 insertions(+), 253 deletions(-) delete mode 100644 uploader/templates/platforms/sui-base.html delete mode 100644 uploader/templates/platforms/sui-create-platform.html delete mode 100644 uploader/templates/platforms/sui-list-platforms.html diff --git a/uploader/platforms/views.py b/uploader/platforms/views.py index 0092760..ba0f0ef 100644 --- a/uploader/platforms/views.py +++ b/uploader/platforms/views.py @@ -8,8 +8,6 @@ from flask import ( Blueprint, current_app as app) -from uploader.sui import sui_template - from uploader.flask_extensions import url_for from uploader.ui import make_template_renderer from uploader.authorisation import require_login @@ -62,7 +60,7 @@ def list_platforms(species_id: int): start_from = max(safe_int(request.args.get("start_from") or 0), 0) count = safe_int(request.args.get("count") or 20) return render_template( - sui_template("platforms/list-platforms.html"), + "platforms/list-platforms.html", species=species, platforms=enumerate_sequence( platforms_by_species(conn, @@ -89,7 +87,7 @@ def create_platform(species_id: int): if request.method == "GET": return render_template( - sui_template("platforms/create-platform.html"), + "platforms/create-platform.html", species=species, activelink="create-platform") diff --git a/uploader/templates/platforms/base.html b/uploader/templates/platforms/base.html index dac965f..d4f3686 100644 --- a/uploader/templates/platforms/base.html +++ b/uploader/templates/platforms/base.html @@ -1,13 +1,17 @@ {%extends "species/base.html"%} +{%from "species/macro-display-species-card.html" import display_sui_species_card%} -{%block lvl3_breadcrumbs%} -
  • - - Sequencing Platforms +{%block breadcrumbs%} +{{super()}} +
  • + + Platforms +
    • -{%block lvl4_breadcrumbs%}{%endblock%} +{%endblock%} + + +{%block sidebarcontents%} +{{display_sui_species_card(species)}} {%endblock%} diff --git a/uploader/templates/platforms/create-platform.html b/uploader/templates/platforms/create-platform.html index 0866d5e..3a62472 100644 --- a/uploader/templates/platforms/create-platform.html +++ b/uploader/templates/platforms/create-platform.html @@ -1,19 +1,15 @@ {%extends "platforms/base.html"%} {%from "flash_messages.html" import flash_all_messages%} -{%from "species/macro-display-species-card.html" import display_species_card%} {%block title%}Platforms — Create Platforms{%endblock%} -{%block pagetitle%}Platforms — Create Platforms{%endblock%} - -{%block lvl3_breadcrumbs%} -
  • +{%block breadcrumbs%} +{{super()}} +
  • create platform + species_id=species['SpeciesId'])}}"> + Create +
    • {%endblock%} @@ -118,7 +114,3 @@ {%endblock%} - -{%block sidebarcontents%} -{{display_species_card(species)}} -{%endblock%} diff --git a/uploader/templates/platforms/list-platforms.html b/uploader/templates/platforms/list-platforms.html index a6bcfdc..db14745 100644 --- a/uploader/templates/platforms/list-platforms.html +++ b/uploader/templates/platforms/list-platforms.html @@ -1,6 +1,5 @@ {%extends "platforms/base.html"%} {%from "flash_messages.html" import flash_all_messages%} -{%from "species/macro-display-species-card.html" import display_species_card%} {%block title%}Platforms — List Platforms{%endblock%} @@ -87,7 +86,3 @@ {%endif%} {%endblock%} - -{%block sidebarcontents%} -{{display_species_card(species)}} -{%endblock%} diff --git a/uploader/templates/platforms/sui-base.html b/uploader/templates/platforms/sui-base.html deleted file mode 100644 index 136b956..0000000 --- a/uploader/templates/platforms/sui-base.html +++ /dev/null @@ -1,17 +0,0 @@ -{%extends "species/sui-base.html"%} -{%from "species/macro-display-species-card.html" import display_sui_species_card%} - -{%block breadcrumbs%} -{{super()}} -
  • - - Platforms - -
    • -{%endblock%} - - -{%block sidebarcontents%} -{{display_sui_species_card(species)}} -{%endblock%} diff --git a/uploader/templates/platforms/sui-create-platform.html b/uploader/templates/platforms/sui-create-platform.html deleted file mode 100644 index 25977a7..0000000 --- a/uploader/templates/platforms/sui-create-platform.html +++ /dev/null @@ -1,116 +0,0 @@ -{%extends "platforms/sui-base.html"%} -{%from "flash_messages.html" import flash_all_messages%} - -{%block title%}Platforms — Create Platforms{%endblock%} - -{%block breadcrumbs%} -{{super()}} -
  • - - Create - -
    • -{%endblock%} - -{%block contents%} -{{flash_all_messages()}} - -
    -

    Create New Platform

    - -

    You can create a new genetic sequencing platform below.

    -
    - -
    -
    - -
    - - - -

    This is the platform's - - accession value on NCBI. If you do not know the value, click the - link and search on NCBI for species '{{species.FullName}}'.

     -
    - -
    - - - -

    This is name of the genetic sequencing platform.

     -
    - -
    - - - -

    Use the following conventions for this field: -

      -
    1. Start with a 4-letter vendor code, e.g. "Affy" for "Affymetrix", "Illu" for "Illumina", etc.
      2. -
    2. Append an underscore to the 4-letter vendor code
      3. -
    3. Use the name of the array given by the vendor, e.g. U74AV2, MOE430A, etc.
      4. -
    -

    -     -
    - -
    - - - -

    The full platform title. Sometimes, this is the same as the Platform - Name above.

     -
    - -
    - - - -

    This is a Chip identification value useful for analysis with the - - GeneWeaver - and - - WebGestalt - tools.
    - This can be left blank for custom platforms.

     -
    - -
    - -
    -
    -
    -{%endblock%} diff --git a/uploader/templates/platforms/sui-list-platforms.html b/uploader/templates/platforms/sui-list-platforms.html deleted file mode 100644 index f4c17e8..0000000 --- a/uploader/templates/platforms/sui-list-platforms.html +++ /dev/null @@ -1,88 +0,0 @@ -{%extends "platforms/sui-base.html"%} -{%from "flash_messages.html" import flash_all_messages%} - -{%block title%}Platforms — List Platforms{%endblock%} - -{%block pagetitle%}Platforms — List Platforms{%endblock%} - - -{%block contents%} -{{flash_all_messages()}} - -
    -

    View the list of the genetic sequencing platforms that are currently - supported by GeneNetwork.

    -

    If you cannot find the platform you wish to use, you can add it by clicking - the "New Platform" button below.

    -

    Create Platform

    -
    - -
    -

    Supported Platforms

    - {%if platforms is defined and platforms | length > 0%} -

    There are {{total_platforms}} platforms supported by GeneNetwork

    - -
    -
    - {%if start_from > 0%} - - - Previous - - {%endif%} -
    -
    - Displaying platforms {{start_from+1}} to {{start_from+count if start_from+count < total_platforms else total_platforms}} of - {{total_platforms}} -
    -
    - {%if start_from + count < total_platforms%} - - Next - - - {%endif%} -
    -
    - - - - - - - - - - - - - {%for platform in platforms%} - - - - - - - {%endfor%} - -
    Platform NameGEO PlatformTitle
    {{platform.sequence_number}}{{platform.GeneChipName}}{{platform.GeoPlatform}}{{platform.Title}}
    - {%else%} -

    - - There are no platforms supported at this time!

    - {%endif%} -
    -{%endblock%} -- cgit 1.4.1