Skip to content
Snippets Groups Projects
Commit 2932cdd4 authored by Remco Tukker's avatar Remco Tukker
Browse files

use a table to determine what years are previews

parent daa4a911
No related branches found
No related tags found
1 merge request!71Create a preview mode for publishing survey data
recursive-include compendium_v2/static * recursive-include compendium_v2/static *
include compendium_v2/templates/index.html include compendium_v2/templates/index.html
include compendium_v2/templates/survey-index.html include compendium_v2/templates/survey-index.html
recursive-include compendium_v2/migrations/versions *
include compendium_v2/migrations/alembic.ini include compendium_v2/migrations/alembic.ini
recursive-include compendium_v2/migrations/versions *
recursive-include compendium_v2/migrations/surveymodels *
recursive-include compendium_v2/background_task/xlsx * recursive-include compendium_v2/background_task/xlsx *
include compendium_v2/conversion/NREN-Services-prefills_2023_Recovered.xlsx include compendium_v2/conversion/NREN-Services-prefills_2023_Recovered.xlsx
include compendium_v2/routes/survey_model.json
recursive-exclude test * recursive-exclude test *
...@@ -28,6 +28,11 @@ int_pk_fkNREN = Annotated[int, mapped_column(ForeignKey("nren.id"), primary_key= ...@@ -28,6 +28,11 @@ int_pk_fkNREN = Annotated[int, mapped_column(ForeignKey("nren.id"), primary_key=
# mypy: disable-error-code="name-defined" # mypy: disable-error-code="name-defined"
class PreviewYear(db.Model):
__tablename__ = 'preview_year'
year: Mapped[int_pk]
class NREN(db.Model): class NREN(db.Model):
__tablename__ = 'nren' __tablename__ = 'nren'
id: Mapped[int_pk] id: Mapped[int_pk]
......
"""add preview year
Revision ID: d6f581374e8f
Revises: 96f26bf37f6c
Create Date: 2023-08-27 20:45:39.740091
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = 'd6f581374e8f'
down_revision = '96f26bf37f6c'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('preview_year',
sa.Column('year', sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint('year', name=op.f('pk_preview_year'))
)
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('preview_year')
# ### end Alembic commands ###
...@@ -4,7 +4,7 @@ Utilities used by multiple route blueprints. ...@@ -4,7 +4,7 @@ Utilities used by multiple route blueprints.
import functools import functools
import logging import logging
from compendium_v2 import db from compendium_v2 import db
from compendium_v2.db.model import NREN from compendium_v2.db.model import NREN, PreviewYear
from flask import Response, request from flask import Response, request
from sqlalchemy import select from sqlalchemy import select
...@@ -65,5 +65,5 @@ def get_data(table_class): ...@@ -65,5 +65,5 @@ def get_data(table_class):
select_statement = select(table_class).join(NREN).order_by(NREN.name.asc(), table_class.year.desc()) select_statement = select(table_class).join(NREN).order_by(NREN.name.asc(), table_class.year.desc())
preview = request.args.get('preview') is not None preview = request.args.get('preview') is not None
if not preview: if not preview:
select_statement = select_statement.where(table_class.year.not_in([2022])) select_statement = select_statement.where(table_class.year.not_in(select(PreviewYear.year)))
return db.session.scalars(select_statement) return db.session.scalars(select_statement)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment