diff options
Diffstat (limited to 'qc_app/samples.py')
| -rw-r--r-- | qc_app/samples.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/qc_app/samples.py b/qc_app/samples.py index 107e889..8f56ee1 100644 --- a/qc_app/samples.py +++ b/qc_app/samples.py @@ -22,11 +22,15 @@ from quality_control.parsing import take from qc_app import jobs from qc_app.files import save_file -from qc_app.dbinsert import species_by_id, groups_by_species from qc_app.db_utils import ( with_db_connection, database_connection, with_redis_connection) +from qc_app.db import ( + species_by_id, + save_population, + population_by_id, + populations_by_species) samples = Blueprint("samples", __name__) @@ -43,7 +47,8 @@ def select_species(): return render_template( "samples/select-population.html", species=species, - populations=groups_by_species(species_id)) + populations=with_db_connection( + lambda conn: populations_by_species(conn, species_id))) flash("Invalid species selected!", "alert-error") flash("You need to select a species", "alert-error") return index_page @@ -65,7 +70,7 @@ def create_population(): "alert-error error-create-population") return species_page - pop_id = save_population(conn, { + pop = save_population(conn, { "SpeciesId": species["SpeciesId"], "Name": pop_name, "InbredSetName": pop_fullname, @@ -79,7 +84,7 @@ def create_population(): "samples/upload-samples.html", species=species, population=with_db_connection( - lambda conn: population_by_id(conn, pop_id))) + lambda conn: population_by_id(conn, pop["population_id"]))) @samples.route("/upload/select-population", methods=["POST"]) def select_population(): |