From 92cd7e5677496c5d9769911670f765dbf2cb5d2b Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Sun, 3 Dec 2023 13:49:30 -0500 Subject: [PATCH] .9: Auto stash before merge of "dev0.9" and "origin/dev0.9" --- rcdb_web/select_values/veiws.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/rcdb_web/select_values/veiws.py b/rcdb_web/select_values/veiws.py index dcd53b2..f7c4cee 100644 --- a/rcdb_web/select_values/veiws.py +++ b/rcdb_web/select_values/veiws.py @@ -1,22 +1,14 @@ -import json -import re -import sys - -from flask import Blueprint, request, render_template, flash, g, session, redirect, url_for -# from werkzeug import check_password_hash, generate_password_hash -import rcdb -from collections import defaultdict -from rcdb.model import Run, Condition, ConditionType, RunPeriod -from sqlalchemy.orm import subqueryload - -from rcdb.provider import RCDBProvider +from flask import Blueprint, request, render_template, flash, g, redirect, url_for +from rcdb.model import ConditionType from runs.views import _parse_run_range mod = Blueprint('select_values', __name__, url_prefix='/select_values') +# rcdb/select_value @mod.route('/') def index(): + # noinspection PyUnresolvedReferences all_conditions = g.tdb.session.query(ConditionType).order_by(ConditionType.name.asc()).all() run_periods = g.tdb.session.query(RunPeriod).all() run_from_str = request.args.get('runFrom', '') @@ -35,8 +27,10 @@ def index(): req_conditions_str=req_conditions_str) +# rcdb/select_value?rr=...&q=...&cnd=... @mod.route('/search', methods=['GET']) def search(): + # noinspection PyUnresolvedReferences all_conditions = g.tdb.session.query(ConditionType).order_by(ConditionType.name.asc()).all() run_periods = g.tdb.session.query(RunPeriod).all() run_range = request.args.get('rr', '')