Skip to content

Commit

Permalink
.9: Auto stash before merge of "dev0.9" and "origin/dev0.9"
Browse files Browse the repository at this point in the history
  • Loading branch information
DraTeots committed Dec 3, 2023
1 parent b952083 commit 92cd7e5
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions rcdb_web/select_values/veiws.py
Original file line number Diff line number Diff line change
@@ -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', '')
Expand All @@ -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', '')
Expand Down

0 comments on commit 92cd7e5

Please sign in to comment.