Rewrite some of the grossUnitPrice stuff

Refactor fronted somewhat
First draft of elm frontend
2023-08-20 16:11:44 +02:00 · 2023-08-20 16:11:44 +02:00 · 2023-08-20 16:11:44 +02:00 · 2023-08-20 16:11:44 +02:00
26 changed files with 12224 additions and 753 deletions
@@ -5,4 +5,3 @@ jon/config.json
 elm-stuff/
 venv/
 .venv/
-jon/static/*.js
@@ -1,25 +0,0 @@
-FROM debian:latest as builder
-
-RUN apt-get update 
-RUN apt-get upgrade -y
-RUN apt-get install -y elm-compiler make ca-certificates
-
-COPY . /app
-WORKDIR /app
-RUN rm -rf .venv venv
-
-RUN make frontend
-
-
-FROM python:3.11-alpine as runner
-COPY --from=builder /app /app
-
-WORKDIR /app
-RUN pip install -r requirements.txt
-RUN pip install gunicorn
-
-EXPOSE 5000
-ENV JON_DB_CONNECTION_STRING="host=fsmi-db.fsmi.org dbname=garfield"
-ENV JON_SECRET_KEY="changeme"
-
-CMD ["sh", "-c", "gunicorn -b '0.0.0.0:5000' --chdir /app 'jon:create_app()'"]
@@ -1,6 +0,0 @@
-.PHONY: frontend
-
-frontend: jon/static/entry.js
-
-jon/static/entry.js: $(shell find frontend -name '*.elm')
-	elm make --optimize frontend/Entry.elm --output $@
@@ -4,11 +4,6 @@

 ## Setup

-`jon` is a Python WSGI application written using Flask.
-This means you'll have to install a bunch of Python packages to get up and running.
-
-### Dependencies
-
 ```
 pip install -r requirements.txt
 ```
@@ -16,27 +11,6 @@ pip install -r requirements.txt
 You should probably use a virtualenv for that.
 I develop `jon` using Python 3.10 but it should work with older versions as well.

-#### Arch Linux
-
-If you're on Arch, these packages are required for running the server:
-
-```
-python python-flask python-flask-login python-psycopg2
-```
-
-### Building Frontend JS
-
-Most of jon works without JS but there are some features that require it.
-The frontend code lives in `./frontend` and is written using Elm, a functional language that compiles to JS.
-To compile the Elm code to `.js` files, first make sure that the Elm compiler is installed:
-
-```
-elm --version
-# 0.19.1
-```
-
-Then run `make frontend`.
-
 ## Running

 ```
@@ -45,20 +19,6 @@ flask --app jon run --debug

 `--debug` restarts the server when a source file changes.

-## Running with docker
-When you prefer running the application using docker you can just use
-```
-docker compose up
-```
-
-In case your local username does not line up with your FSMI-username, you need to specify your FSMI-username
-using `USER=<username>`, e.g.:
-```
-USER=shirkanesi docker compose up
-```
-
-This can also be persisted by following the instructions in the docker-compose.yml
-
 ## fsmi-db forward

 ```
@@ -67,19 +27,12 @@ ssh -nNTvL 5432:fsmi-db.fsmi.org:5432 fsmi-login.fsmi.uni-karlsruhe.de

 ## TODO

+- [ ] Implement item and snack entry as Elm application
+  - [ ] Needs good documentation for maintainability
 - [ ] Implement and document report generation
  - [ ] How many days will the item last?
  - [ ] How many do we need to last X months?
  - [ ] etc.
  - [ ] Make it print nicely
 - [ ] Make it possible to edit entries
- [ ] Fix unsafe client-side sessions, either:
-  - [ ] Use `flask-session` for file-backed sessions
-  - [ ] Use `flask-login` with a single user stored in memory
 - [ ] Improve project structure
- [ ] Use `flask.flash` for error messages
- [x] Implement item and snack entry as Elm application
-  - [x] Figure out/Add documentation about building `entry.js`
-  - [ ] Clean up the code a little and add some comments
-  - [ ] Needs good documentation for maintainability
- [ ] Use cool new function for deactivating items
@@ -1,19 +0,0 @@
---
-version: '3.7'
-
-services:
-  jon:
-    container_name: jon
-    build: .
-    ports:
-      - "5000:5000"
-    volumes:
-      - ~/.pgpass:/root/.pgpass:ro
-    dns:
-      - 1.1.1.1
-      - 8.8.8.8
-    network_mode: bridge
-    environment:
-      # If your local user is different from your fsmi user, change $USER here!
-      - JON_DB_CONNECTION_STRING="host=fsmi-db.fsmi.org dbname=garfield user=$USER"
-      - JON_SECRET_KEY="changemetosomethingsuperrandomandsecure"
@@ -1,128 +0,0 @@
-module Calculator exposing (..)
-
-import Html exposing (..)
-import Html.Attributes exposing (..)
-import Html.Events exposing (..)
-
-import NumberInput
-import Select
-
-type Tax = Net | Gross
-
-- Duplicated from Entry.elm but too lazy to sandwich this out
-type alias TaxGroup =
-  { id : Int
-  , description : String
-  , percentage : Float
-  }
-
-showTax : Tax -> String
-showTax tax = case tax of
-  Gross -> "Brutto"
-  Net -> "Netto"
-
-type alias Model =
-  { tax : Select.Model Tax
-  , bundlePrice : NumberInput.Model Float
-  , bundleSize : NumberInput.Model Int
-  }
-
-init : Float -> Model
-init bundlePrice = Model
-  (Select.init showTax showTax Net [Net, Gross])
-  (NumberInput.fromFloat bundlePrice)
-  (NumberInput.fromInt 1)
-
-getResult : Model -> TaxGroup -> Maybe Float
-getResult model taxGroup =
-  case (NumberInput.get model.bundlePrice, NumberInput.get model.bundleSize) of
-    (Just bundlePrice, Just bundleSize) ->
-      Just <| roundTo 2 <|
-        if Select.get model.tax == Gross then
-          (bundlePrice / toFloat bundleSize) / (1 + taxGroup.percentage)
-        else
-          bundlePrice / toFloat bundleSize
-    _ ->
-      Nothing
-
-
-type Msg
-  = SetTax String
-  | SetBundlePrice String
-  | SetBundleSize String
-
-update : Msg -> Model -> Model
-update msg model = case msg of
-  SetTax key ->
-    { model | tax = Select.update key model.tax }
-  SetBundlePrice str ->
-    { model | bundlePrice = NumberInput.update str model.bundlePrice }
-  SetBundleSize str ->
-    { model | bundleSize = NumberInput.update str model.bundleSize }
-
-view : Model -> TaxGroup -> Html Msg
-view model taxGroup =
-  let
-    mainPart =
-      [ text "("
-      , div [ class "form-input --inline" ]
-        [ label [ for "bundle-price" ] [ text "Gebindepreis" ]
-        , input
-          [ placeholder "Gebindepreis"
-          , value <| NumberInput.show model.bundlePrice
-          , onInput SetBundlePrice
-          , id "bundle-price"
-          , type_ "number"
-          , step "0.01"
-          ]
-          []
-        ]
-      , text " ÷ "
-      , div [ class "form-input --inline" ]
-        [ label [ for "bundle-size" ] [ text "Gebindegröße" ]
-        , input
-          [ placeholder "Gebindegröße"
-          , value <| NumberInput.show model.bundleSize
-          , onInput SetBundleSize
-          , id "bundle-size"
-          , type_ "number"
-          , step "1"
-          ]
-          []
-        ]
-      , text ") "
-      ]
-    taxPart =
-      [ text " ÷ "
-      , div [ class "form-input --inline" ]
-        [ label [ for "tax" ] [ text "Steuer" ]
-        , input
-          [ value <| String.fromFloat <| 1 + taxGroup.percentage
-          , id "tax"
-          , type_ "number"
-          , step "0.01"
-          , disabled True
-          ]
-          []
-        ]
-      ]
-    resultPart =
-      [ text " = "
-      , text <| Maybe.withDefault "?" <| Maybe.map String.fromFloat <| getResult model taxGroup
-      ]
-  in
-    fieldset []
-      [ legend [] [ text "Preisrechner" ]
-      , div [] <| List.concat <| List.filterMap identity
-        [ Just mainPart
-        , if Select.get model.tax == Gross then Just taxPart else Nothing
-        , Just resultPart
-        ]
-      , div [ class "form-input" ]
-        [ label [ for "calculator-tax" ] [ text "Gebindepreis ist" ]
-        , Select.view [] SetTax model.tax
-        ]
-      ]
-
-roundTo : Int -> Float -> Float
-roundTo places x = toFloat (round <| x * 10 ^ toFloat places) / 10 ^ toFloat places
@@ -10,54 +10,9 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (..)

-import Calculator
 import NumberInput
 import Select

-{-
-Elm forces us to use the Elm architecture:
-
-              ┌──────┐
- ┌─────Model──► view ├──Html───────┐
- │            └──────┘             │
- │                                 │
-┌┴─────────────────────────────────▼┐
-│            Elm runtime            │
-└▲─────────────────────────────────┬┘
- │                                 │
- │            ┌──────┐             │
- └─Model+Cmd──┤update◄──Msg+Model──┘
-              └──────┘
-
-This architecture is similar to what React does but its implementation
-in Elm is a bit special since it's purely functional and side effects
-are isolated into the runtime system.
-
-An Elm component is usually centered around two types, Model and Msg.
-Model contains all data the application is concerned with, including the state
-of UI elements. Msg encodes all updates to Model that the application supports.
-
-In addition to Msg and Model, we have to provide two functions, view and update.
-
-view : Model -> Html Msg
-update : Msg -> Model -> (Model, Cmd Msg)
-
-view maps a Model to a DOM tree. Events in this DOM tree create Msg values.
-update maps a Msg and a Model to a new Model. In addition, update can create
-a command. Commands are used to make the runtime do side effects, which in
-turn create new Msg values.
-
-For example, we have a SetSearchTerm message which simply updates the searchTerm
-property in the model. This message is triggered every time the search box input
-is changed. Submitting the search box form triggers a SubmitSearch event.
-This event leaves the model unchanged but issues a command that sends the search
-term to a JSON endpoint. When the request successfully resolves, the runtime
-triggers a ReceiveSearchResults messages which updates the list of search results
-in the model.
-
-See Calculator.elm for a simpler example of this architecture.
-}
-
 main = Browser.element
  { init = \globals ->
    ( Context globals <| ItemSearch { searchTerm = "", searchResults = [] }
@@ -82,7 +37,6 @@ type alias SearchResult =
  , groupName : String
  , groupId : Int
  , taxGroupId : Int
-  , unitsLeft : Int
  }

 searchResultDecoder =
@@ -98,7 +52,6 @@ searchResultDecoder =
    |> P.required "group_name" D.string
    |> P.required "group_id" D.int
    |> P.required "tax_group_id" D.int
-    |> P.required "units_left" D.int

 type alias Location =
  { id : Int
@@ -116,16 +69,6 @@ type alias TaxGroup =
  , percentage : Float
  }

-type alias NewItem =
-  { barcode : String
-  , name : String
-  , salesUnits : Int
-  , group : Group
-  , location : Location
-  , netUnitPrice : Float
-  , taxGroup : TaxGroup
-  }
-
 type alias Context =
  { globals : Globals
  , state : State
@@ -146,7 +89,6 @@ type State
    { barcode : String
    , name : String
    , salesUnits : NumberInput.Model Int
-    , calculator : Calculator.Model
    , netUnitPrice : NumberInput.Model Float
    , grossUnitPrice : NumberInput.Model Float
    , group : Select.Model Group
@@ -162,7 +104,6 @@ type Msg
  | SetBarcode String
  | SetName String
  | SetSalesUnits String
-  | CalculatorMsg Calculator.Msg
  | SetNetUnitPrice String
  | SetGrossUnitPrice String
  | SetGroup String
@@ -194,13 +135,11 @@ updateState msg globals state = case state of
      case find (\tg -> tg.id == searchResult.taxGroupId) globals.taxGroups of
        Nothing -> (state, Cmd.none)
        Just taxGroup ->
-          ( ItemEditor
+          ( ItemEditor <| updateGrossUnitPrice
            { barcode = searchResult.barcode
            , name = searchResult.name
-            , calculator = Calculator.init searchResult.netUnitPrice
            , netUnitPrice = NumberInput.fromFloat searchResult.netUnitPrice
-            , grossUnitPrice = NumberInput.fromFloat
-              (suggestedGrossPrice searchResult.netUnitPrice taxGroup.percentage)
+            , grossUnitPrice = NumberInput.fromFloat 0
            , salesUnits = NumberInput.fromInt searchResult.salesUnits
            , group = Select.init (.id >> String.fromInt) (.name) { id = searchResult.groupId, name = searchResult.groupName } globals.groups
            , location = Select.init (.id >> String.fromInt) (.name) { id = searchResult.locationId, name = searchResult.locationName } globals.locations
@@ -217,36 +156,34 @@ updateState msg globals state = case state of
      (ItemEditor { model | name = name }, Cmd.none)
    SetSalesUnits str ->
      (ItemEditor { model | salesUnits = NumberInput.update str model.salesUnits }, Cmd.none)
-    CalculatorMsg msg_ ->
-      (ItemEditor { model | calculator = Calculator.update msg_ model.calculator }, Cmd.none)
    SetNetUnitPrice str ->
-      ( ItemEditor { model | netUnitPrice = NumberInput.update str model.netUnitPrice }
+      ( ItemEditor <| updateGrossUnitPrice { model | netUnitPrice = NumberInput.update str model.netUnitPrice }
      , Cmd.none
      )
    SetGrossUnitPrice str ->
-      ( ItemEditor { model | grossUnitPrice = NumberInput.update str model.grossUnitPrice }
-      , Cmd.none
-      )
+      (ItemEditor { model | grossUnitPrice = NumberInput.update str model.grossUnitPrice }, Cmd.none)
    SetGroup key ->
      (ItemEditor { model | group = Select.update key model.group }, Cmd.none)
    SetLocation key ->
      (ItemEditor { model | location = Select.update key model.location }, Cmd.none)
    SetTaxGroup key ->
-      ( ItemEditor { model | taxGroup = Select.update key model.taxGroup }
+      ( ItemEditor <| updateGrossUnitPrice { model | taxGroup = Select.update key model.taxGroup }
      , Cmd.none
      )
    _ ->
      (state, Cmd.none)

-suggestedGrossPrice netPrice percentage =
-  roundTo 2 <| netPrice * (1 + percentage) + 0.01
+updateGrossUnitPrice model =
+  { model
+  | grossUnitPrice = Maybe.withDefault model.grossUnitPrice <| Maybe.map NumberInput.fromFloat <| calculateGarfieldPrice model
+  }

 -- View stuff

 view { globals, state } = case state of
  ItemSearch model ->
    fieldset []
-      [ legend [] [ text "Vorlage für Auftrag wählen" ]
+      [ legend [] [ text "Vorlage für neuen Inventareintrag" ]
      , Html.form [ onSubmit SubmitSearch ]
        [ div [ class "form-input" ]
          [ label [ for "search-term", title "Barcode oder Name" ] [ text "Suchbegriff" ]
@@ -256,109 +193,66 @@ view { globals, state } = case state of
        ]
      ]
  ItemEditor model ->
-    Html.form [ method "POST" ]
+    Html.form []
      [ fieldset []
        [ legend [] [ text "Neuer Inventareintrag" ]
        , div [ class "form-input" ]
          [ label [ for "barcode" ] [ text "Barcode" ]
-          , input [ onInput SetBarcode, value model.barcode, name "barcode", id "barcode" ] []
+          , input [ onInput SetBarcode, value model.barcode, disabled True, id "barcode" ] []
          ]
        , div [ class "form-input" ]
          [ label [ for "name" ] [ text "Name" ]
-          , input [ onInput SetName, value model.name, name "name", id "name" ] []
+          , input [ onInput SetName, value model.name, id "name" ] []
          ]
        , div [ class "form-input" ]
-          [ label [ for "sales-units" ] [ text "Eingekauft" ]
-          , input [ onInput SetSalesUnits, value <| NumberInput.show model.salesUnits, name "sales-units", id "sales-units", type_ "number" ] []
+          [ label [ for "sales-units" ] [ text "Stückzahl" ]
+          , input [ onInput SetSalesUnits, value <| NumberInput.show model.salesUnits, id "sales-units", type_ "number" ] []
          ]
        , div [ class "form-input" ]
          [ label [ for "group" ] [ text "Gruppe" ]
-          , Select.view [ name "group-id", id "group" ] SetGroup model.group
-          , input
-            [ type_ "hidden"
-            , name "group-name"
-            , value <| (Select.get model.group).name
-            ]
-            []
+          , Select.view SetGroup model.group
          ]
        , div [ class "form-input" ]
          [ label [ for "location" ] [ text "Raum" ]
-          , Select.view [ name "location-id", id "location" ] SetLocation model.location
+          , Select.view SetLocation model.location
+          ]
+        , div [ class "form-input" ]
+          [ label [ for "net-unit-price" ] [ text "Stückpreis (Netto)" ]
          , input
-            [ type_ "hidden"
-            , name "location-name"
-            , value <| (Select.get model.location).name
+            [ value <| NumberInput.show model.netUnitPrice
+            , onInput SetNetUnitPrice
+            , type_ "number"
+            , id "net-unit-price"
+            , step "0.01"
            ]
            []
          ]
        , div [ class "form-input" ]
          [ label [ for "tax-group" ] [ text "Steuergruppe" ]
-          , Select.view [ name "tax-group-id", id "tax-group" ] SetTaxGroup model.taxGroup
-          , input
-            [ type_ "hidden"
-            , name "tax-group-description"
-            , value <| (Select.get model.taxGroup).description
+          , Select.view SetTaxGroup model.taxGroup
          ]
-            []
        ]
-        , Html.map CalculatorMsg <| Calculator.view model.calculator (Select.get model.taxGroup)
+      , fieldset []
+        [ legend [] [ text "Neuer Snackeintrag" ]
        , div [ class "form-input" ]
-          [ label [ for "net-unit-price" ] [ text "Einkaufspreis (Netto)" ]
-          , input
-            [ value <| NumberInput.show model.netUnitPrice
-            , onInput SetNetUnitPrice
-            , type_ "number"
-            , name "net-unit-price"
-            , id "net-unit-price"
-            , step "0.01"
+          [ label [ for "snack-name" ] [ text "Name" ]
+          , input [ value model.name, disabled True, id "snack-name" ] []
          ]
-            []
-          , viewSetCalculatedPriceButton model
-          ]
-        , div [ class "form-input" ]
-          [ label [ for "gross-unit-price" ] [ text "Verkaufspreis (Brutto)" ]
-          , input
-            [ value <| NumberInput.show model.grossUnitPrice
-            , onInput SetGrossUnitPrice
-            , type_ "number"
-            , name "gross-unit-price"
-            , id "gross-unit-price"
-            , step "0.01"
-            ]
-            []
-          , viewSetSuggestedPriceButton model
-          ]
-        , button [] [ text "Auftrag anlegen" ]
+        , viewGrossUnitPriceInput model
        ]
      ]

-viewSetCalculatedPriceButton model =
-  case Calculator.getResult model.calculator (Select.get model.taxGroup) of
-    Nothing ->
-      button [ disabled True ] [ text "Auf ? setzen" ]
-    Just calculatedPrice ->
-      button
-        [ onClick <| SetNetUnitPrice <| String.fromFloat calculatedPrice
-        -- Prevent submitting the form
-        , type_ "button"
-        ]
-        [ text <| "Auf " ++ String.fromFloat calculatedPrice ++ " setzen"
-        ]
-
-viewSetSuggestedPriceButton model =
-  case NumberInput.get model.netUnitPrice of
-    Nothing ->
-      button [ disabled True ] [ text "Auf ? setzen" ]
-    Just netUnitPrice ->
+viewGrossUnitPriceInput model =
  let
-        grossUnitPrice = suggestedGrossPrice netUnitPrice (Select.get model.taxGroup).percentage
+    suggestedPriceStr = case calculateGarfieldPrice model of
+      Nothing -> "?"
+      Just suggestedPrice -> String.fromFloat suggestedPrice
  in
-        button
-          [ onClick <| SetGrossUnitPrice <| String.fromFloat grossUnitPrice
-          -- Prevent submitting the form
-          , type_ "button"
+    div [ class "form-input" ]
+      [ label [ for "gross-unit-price" ]
+        [ text <| "Stückpreis (Brutto), Vorschlag: " ++ suggestedPriceStr
        ]
-          [ text <| "Auf " ++ String.fromFloat grossUnitPrice ++ " setzen"
+      , input [ onInput SetGrossUnitPrice, value <| NumberInput.show model.grossUnitPrice, id "gross-unit-price", type_ "number", step "0.01" ] []
      ]

 searchResultHeaders =
@@ -385,9 +279,7 @@ viewSearchResult model =
    , td [] [ text model.locationName ]
    , td [] [ text <| showBool model.available ]
    , td []
-      [ Html.form [ onSubmit <| GotoItemEditor model ]
-        [ button [] [ text "Als Vorlage verwenden" ]
-        ]
+      [ button [ onClick <| GotoItemEditor model ] [ text "Als Vorlage verwenden" ]
      ]
    ]

@@ -1,6 +1,6 @@
 module Select exposing (..)

-import Html exposing (Attribute, Html, option, select, text)
+import Html exposing (Html, option, select, text)
 import Html.Attributes exposing (selected, value)
 import Html.Events exposing (onInput)

@@ -20,15 +20,15 @@ update key model =
    Nothing -> model
    Just x -> { model | selected = x }

-view : List (Attribute m) -> (String -> m) -> Model a -> Html m
-view attributes msg model =
+view : (String -> m) -> Model a -> Html m
+view msg model =
  let
    viewOption x =
      option
        [ selected <| model.identify model.selected == model.identify x, value <| model.identify x ]
        [ text <| model.show x ]
  in
-    select ([ onInput msg ] ++ attributes) <| List.map viewOption model.options
+    select [ onInput msg ] <| List.map viewOption model.options

 get : Model a -> a
 get = .selected
@@ -20,10 +20,14 @@ def create_app():
    # You don't need a config.json. If you don't provide one, default-config.json
    # is used.
    app.config.from_file("config.json", load=json.load, silent=True)
-    app.config.from_prefixed_env(prefix="JON")

    db.init_app(app)
-    auth.init_app(app)
+
+    # This function denies every request until `auth.ACCESS_TOKEN`
+    # is passed using `?token=` to authenticate the session.
+    @app.before_request
+    def before_req_fun():
+        return auth.before_request()

    @app.context_processor
    def utility_processor():
@@ -39,7 +43,5 @@ def create_app():
        return render_template("index.html")

    print(f"Jon started. Token: {auth.ACCESS_TOKEN}", file=sys.stderr)
-    # TODO: Get host and port from config
-    print(f"http://localhost:5000/?token={auth.ACCESS_TOKEN}", file=sys.stderr)

    return app
@@ -1,15 +1,12 @@
-import secrets
+import random
 import string

-from flask import Blueprint, request, redirect, render_template
-from flask_login import current_user, login_user, logout_user, LoginManager
-from typing import Any, Dict, List, Optional
-
+from flask import Blueprint, request, redirect, render_template, session

 bp = Blueprint("auth", __name__, url_prefix="/auth")


-ACCESS_TOKEN = "".join(secrets.choice(string.ascii_lowercase) for i in range(64))
+ACCESS_TOKEN = "".join(random.choice(string.ascii_lowercase) for i in range(64))


 ALLOWED_PATHS = [
@@ -18,67 +15,27 @@ ALLOWED_PATHS = [
 ]


-# A poor man's replacement for memory-backed session solution.
-# We keep exactly one User (and the corresponding UserData) in
-# memory and use that to store session data.
-class UserData:
-    location: Optional[Dict[str, Any]]
-    orders: List[Dict[str, Any]]
-
-    def __init__(self):
-        self.location = None
-        self.orders = []
-
-
-class User:
-    is_authenticated: bool
-    is_active: bool
-    is_anonymous: bool
-
-    data: UserData
-
-    def __init__(self):
-        self.is_authenticated = True
-        self.is_active = True
-        self.is_anonymous = False
-
-        self.data = UserData()
-
-    def get_id(self) -> str:
-        return ""
-
-
-def init_app(app):
-    login_manager = LoginManager(app)
-    the_one_and_only_user = User()
-
-    @login_manager.user_loader
-    def load_user(user_id: str) -> User:
-        assert user_id == ""
-        return the_one_and_only_user
-
-    # This function denies every request until `auth.ACCESS_TOKEN`
-    # is passed using `?token=` to authenticate the user.
-    # We use this instead of @login_required because otherwise we'd have
-    # to add that annotation to all routes.
-    # See also: https://flask-login.readthedocs.io/en/latest/#flask_login.login_required
-    @app.before_request
-    def before_request():
+def before_request():
+    """
+    If the correct token query parameter is passed along with any request,
+    we mark this session authenticated by setting `session["authenticated"]`.
+    Unless the session is authenticated, all requests result in a 403 FORBIDDEN.
+    """
    if "token" in request.args:
        if request.args["token"] == ACCESS_TOKEN:
-                login_user(the_one_and_only_user)
+            session["authenticated"] = ()
        # Reload the page without query parameters
        return redirect(request.path)

-        # Never deny any paths in `ALLOWED_PATHS`
+    # Don't deny any paths in `ALLOWED_PATHS`
    if request.path in ALLOWED_PATHS:
        return

-        if not current_user.is_authenticated:
+    if not "authenticated" in session:
        return render_template("auth/denied.html"), 403


@bp.get("/logout")
 def logout():
-    logout_user()
+    session.pop("authenticated", None)
    return redirect("/")
@@ -7,6 +7,8 @@ from psycopg2.extras import RealDictCursor

 def get_db():
    if "db" not in g:
+        # TODO: Make this configurable and use a default that works
+        # on the pool computers.
        g.db = psycopg2.connect(current_app.config["DB_CONNECTION_STRING"])
        run_query_on(g.db, "add_views.sql", None)

@@ -11,7 +11,6 @@ SELECT
  inventory_items.available,
  inventory_items.item_group,
  inventory_items.location,
-  inventory_items.tax_group,
  inventory_item_groups.group_name,
  COALESCE(b.sales::numeric, 0::numeric) - COALESCE(cancel.count::numeric, 0::numeric) AS sales,
  inventory_items.sales_units::numeric - COALESCE(b.sales, 0::bigint)::numeric + COALESCE(c.delta, 0::numeric) + COALESCE(cancel.count::numeric, 0::numeric) AS units_left,
@@ -58,56 +57,3 @@ FROM garfield.inventory_items
  ) m USING (item_id)
 ORDER BY inventory_items.name;

-- How many *other* active inventory lines exist with the same barcode in the same location that are newer?
-CREATE TEMPORARY VIEW more_recent_inventory_lines_with_same_barcode AS
-SELECT
-  a.item_id,
-  -- It's important not to count(*) here because item_id is NULL
-  -- when no other inventory lines exist.
-  count(b.item_id) AS other_lines_count
-FROM garfield.inventory_items AS a
-LEFT JOIN garfield.inventory_items AS b
-       ON a.item_barcode = b.item_barcode
-      AND a.item_id != b.item_id
-      AND a.location = b.location
-      AND b.available
-      AND b.bought > a.bought
-GROUP BY a.item_id;
-
-- We need to create this table so that we can put an index on it
-- Otherwise the join in the consumption graph query becomes much slower
-- Perhaps it would be nicer to use a materialized view instead
-DROP TABLE IF EXISTS last_n_days;
-CREATE TEMPORARY TABLE last_n_days AS (
-  SELECT
-    generate_series(now() - interval '14 days', now(), interval '1 day')::date AS sale_date
-);
-CREATE UNIQUE INDEX last_n_days_sale_date ON last_n_days (sale_date);
-
-- Get an array of how often items were sold over the last 14 days
-CREATE TEMPORARY VIEW inventory_last_n_days_sales AS
-WITH
-sales_by_date AS (
-  SELECT
-    inventory_line AS item_id,
-    date_trunc('day', snack_sales_log_timestamp AT TIME ZONE 'UTC+1') AS sale_date,
-    count(*)::int AS sales
-  FROM garfield.snack_sales_log
-  GROUP BY item_id, sale_date
-),
-beeg AS (
-  SELECT item_id, sale_date, count(snack_sales_log_timestamp)::int AS sales
-  FROM garfield.inventory_items
-  CROSS JOIN last_n_days
-  LEFT JOIN garfield.snack_sales_log
-         ON inventory_line = item_id
-- snack_sales_log has an index on snack_sales_log_timestamp to speed up this query
-- If that index doesn't exist the query takes much longer.
-        AND sale_date = date_trunc('day', snack_sales_log_timestamp AT TIME ZONE 'UTC+1')
-  WHERE available
-  GROUP BY item_id, sale_date
-  ORDER BY item_id, sale_date
-)
-SELECT item_id, array_agg(sales) AS last_n_days_sales
-FROM beeg
-GROUP BY item_id
@@ -1,26 +0,0 @@
-DO $$
-DECLARE new_item_id integer;
-DECLARE new_snack_id integer;
-BEGIN
-
-- Create a new inventory line
-INSERT INTO garfield.inventory_items
-(item_barcode, name, item_group, location, tax_group, sales_units, unit_price)
-VALUES
-(%(barcode)s, %(name)s, %(group_id)s, %(location_id)s, %(tax_group_id)s, %(sales_units)s, %(net_unit_price)s)
-RETURNING item_id INTO new_item_id;
-
-- Delete (i.e. mark as inactive) any old snacks with the same barcode in the given location
-PERFORM garfield.snack_delete(snack_id)
-FROM garfield.snacks
-WHERE snack_barcode = %(barcode)s
-  AND location_id = %(location_id)s;
-
-- Create a new snack entry...
-SELECT garfield.snack_create(%(name)s, %(barcode)s, %(gross_unit_price)s, %(tax_group_id)s, %(location_id)s)
-INTO new_snack_id;
-
-- ... and map it to the new inventory line
-PERFORM garfield.inventory_map_snack(new_snack_id, new_item_id);
-
-END$$
@@ -1,8 +1,6 @@
 SELECT
  *
 FROM all_inventory_item_overview
-LEFT JOIN more_recent_inventory_lines_with_same_barcode USING (item_id)
-LEFT JOIN inventory_last_n_days_sales USING (item_id)
 WHERE (%(location_id)s IS NULL OR location = %(location_id)s)
  AND available
 ORDER BY
@@ -6,12 +6,13 @@ SELECT
  sales_units,
  available,
  location_name,
-  location as location_id,
+  location_id,
  group_name,
  item_group AS group_id,
-  tax_group AS tax_group_id,
-  units_left :: integer
-FROM all_inventory_item_overview
+  tax_group AS tax_group_id
+FROM garfield.inventory_items
+LEFT JOIN garfield.locations ON location = location_id
+LEFT JOIN garfield.inventory_item_groups ON item_group = group_id
 WHERE (%(location_id)s IS NULL OR location = %(location_id)s)
  AND (name ILIKE CONCAT('%%', %(search_term)s, '%%') OR item_barcode = %(search_term)s)
 ORDER BY bought DESC
@@ -1,5 +1,5 @@
-from flask import Blueprint, flash, redirect, render_template, request
-from flask_login import current_user
+from flask import Blueprint, redirect, render_template, request, session
+

 from . import db

@@ -7,84 +7,8 @@ from . import db
 bp = Blueprint("entry", __name__, url_prefix="/entry")


-@bp.route("/", methods=["GET", "POST"])
+@bp.get("/")
 def index():
-    return render_template(
-        "entry/index.html"
-    )
-
-
-@bp.post("/add-new-items")
-def add_new_entries():
-    i_know_what_im_doing = "i-know-what-im-doing" in request.form
-    if not i_know_what_im_doing:
-        return "Du weißt nicht was du tust", 400
-
-    orders = current_user.data.orders
-    if not orders:
-        return "Keine Aufträge", 404
-    
-    # I'm aware of execute_many and extras.execute_values but we don't need to
-    # optimize here (yet?). This way it's a bit easier to use anyways.
-    for order in orders:
-        with db.run_query("entry/add_item_and_snack_entry.sql", order) as cursor:
-            pass
-    db.get_db().commit()
-
-    # Reset the cart
-    current_user.data.orders = []
-
-    return redirect(request.referrer)
-
-
-@bp.post("/delete-order")
-def delete_order():
-    try:
-        order_index = int(request.form["order-index"])
-    except:
-        return "Incomplete or mistyped form", 400
-
-    del current_user.data.orders[order_index]
-
-    return redirect(request.referrer)
-
-
-@bp.route("/new-order", methods=["GET", "POST"])
-def new_order():
-    if request.method == "POST":
-        try:
-            barcode = request.form["barcode"]
-            name = request.form["name"]
-            sales_units = int(request.form["sales-units"])
-            group_id = int(request.form["group-id"])
-            # group_name, location_name and tax_group_description are not
-            # necessarily needed here but storing them makes it easier to
-            # render the list of orders.
-            group_name = request.form["group-name"]
-            location_id = int(request.form["location-id"])
-            location_name = request.form["location-name"]
-            tax_group_id = int(request.form["tax-group-id"])
-            tax_group_description = request.form["tax-group-description"]
-            net_unit_price = float(request.form["net-unit-price"])
-            gross_unit_price = float(request.form["gross-unit-price"])
-        except:
-            return f"Incomplete or mistyped form", 400
-        
-        current_user.data.orders.append({
-            "barcode": barcode,
-            "name": name,
-            "sales_units": sales_units,
-            "group_id": group_id,
-            "group_name": group_name,
-            "location_id": location_id,
-            "location_name": location_name,
-            "tax_group_id": tax_group_id,
-            "tax_group_description": tax_group_description,
-            "net_unit_price": net_unit_price,
-            "gross_unit_price": gross_unit_price
-        })
-        return redirect("/entry")
-
    with db.run_query("entry/get_groups.sql") as cursor:
        groups = cursor.fetchall()

@@ -94,17 +18,11 @@ def new_order():
    with db.run_query("entry/get_tax_groups.sql") as cursor:
        tax_groups = cursor.fetchall()

-    return render_template(
-        "entry/new-order.html",
-        groups=groups,
-        locations=locations,
-        tax_groups=tax_groups
-    )
-
-
-
-# API routes for interactive JS stuff
-
+    return render_template("entry/index.html", **{
+        "locations": locations,
+        "groups": groups,
+        "tax_groups": tax_groups
+    })

@bp.get("/api/search-items")
 def api_search_items():
@@ -113,9 +31,10 @@ def api_search_items():
    except:
        return {"error": "Missing query parameter `search-term`"}, 400

-    location = current_user.data.location
+    location = session.get("location", None)
+
    with db.run_query("search_items.sql", {
-        "location_id": location["location_id"] if location else None,
+        "location_id": None if location is None else location["location_id"],
        "search_term": search_term
    }) as cursor:
        items = cursor.fetchall()
@@ -1,5 +1,4 @@
-from flask import Blueprint, redirect, render_template, request
-from flask_login import current_user
+from flask import Blueprint, redirect, render_template, request, session

 from . import db

@@ -9,7 +8,7 @@ bp = Blueprint("inventory", __name__, url_prefix="/inventory")

@bp.get("/")
 def index():
-    location = current_user.data.location
+    location = session.get("location", None)
    items = db.run_query("get_inventory_overview.sql", {
        "location_id": None if location is None else location["location_id"]
    }).fetchall()
@@ -21,7 +20,7 @@ def index():

@bp.get("/report")
 def read_report():
-    location = current_user.data.location
+    location = session.get("location", None)
    items = db.run_query("get_inventory_report.sql", {
        "location_id": None if location is None else location["location_id"]
    }).fetchall()
@@ -1,5 +1,4 @@
-from flask import Blueprint, render_template, request
-from flask_login import current_user
+from flask import Blueprint, render_template, request, session

 from . import db

@@ -12,12 +11,13 @@ def index():
    if request.method == "POST":
        location_id = request.form.get("location_id", "")
        if location_id == "":
-            current_user.data.location = None
+            session.pop("location", None)
        else:
            location = db.run_query("get_location_by_id.sql", {
-                "location_id": location_id
-            }).fetchone()
-            current_user.data.location = location
+                "location_id": location_id}
+            ).fetchone()
+            session["location"] = location
+        

    locations = db.run_query("get_locations.sql").fetchall()

@@ -63,18 +63,3 @@ th {
 .form-input > select {
  display: block;
 }
-.form-input.--inline {
-  display: inline-block;
-}
-.form-input.--inline > input:not([type=radio]),
-.form-input.--inline > select {
-  display: block;
-  width: 8em;
-}
-details {
-  font-size: 0.8em;
-}
-.consumption-graph {
-  display: block;
-  height: 1em;
-}
@@ -15,10 +15,10 @@
          <li{{ " class=current-page" if request.path.startswith("/entry") else "" }}><a href="/entry">Eintragen</a></li>
          <li{{ " class=current-page" if request.path.startswith("/location") else "" }}>
            <a href="/location">
-            {% if not current_user.data.location %}
+            {% if "location" not in session %}
              Raum wählen
            {% else %}
-              Raum: {{ current_user.data.location.location_name }}
+              Raum: {{ session.location.location_name }}
            {% endif %}
            </a>
          </li>
@@ -30,16 +30,6 @@
      <details>
        <summary><code>config</code></summary>
        <pre>{% for key, value in config.items() %}{{ key }} = {{ value }}
-{% endfor %}</pre>
-      </details>
-      <details>
-        <summary><code>session</code></summary>
-        <pre>{% for key, value in session.items() %}{{ key }} = {{ value }}
-{% endfor %}</pre>
-      </details>
-      <details>
-        <summary><code>current_user.data</code></summary>
-        <pre>{% for key, value in current_user.data.__dict__.items() %}{{ key }} = {{ value }}
 {% endfor %}</pre>
      </details>
      {% endif %}
@@ -1,42 +1,16 @@
 {% extends "base.html" %}

 {% block content %}
-<a href="/entry/new-order">Neuer Auftrag</a>
-<h2>Aufträge</h2>
-<table>
-  <tr>
-    <th>Barcode</th>
-    <th>Name</th>
-    <th>Eingekauft</th>
-    <th>Gruppe</th>
-    <th>Raum</th>
-    <th>Steuergruppe</th>
-    <th>EK-Preis (Netto)</th>
-    <th>VK-Preis (Brutto)</th>
-    <th>Aktionen</th>
-  </tr>
-  {% for cart_item in current_user.data.orders %}
-  <tr>
-    <td><code>{{ cart_item.barcode }}</code></td>
-    <td>{{ cart_item.name }}</td>
-    <td class="--align-right">{{ cart_item.sales_units }}</td>
-    <td class="--align-right">{{ cart_item.group_name }} ({{ cart_item.group_id }})</td>
-    <td class="--align-right">{{ cart_item.location_name }} ({{ cart_item.location_id }})</td>
-    <td class="--align-right">{{ cart_item.tax_group_description }} ({{ cart_item.tax_group_id }})</td>
-    <td class="--align-right">{{ format_currency(cart_item.net_unit_price) }}</td>
-    <td class="--align-right">{{ format_currency(cart_item.gross_unit_price) }}</td>
-    <td>
-      <form method="POST" action="/entry/delete-order">
-        <input type="hidden" name="order-index" value="{{ loop.index0 }}">
-        <button>Löschen</button>
-      </form>
-    </td>
-  </tr>
-  {% endfor %}
-</table>
-<form method="POST" action="/entry/add-new-items">
-  <input type="checkbox" name="i-know-what-im-doing" id="i-know-what-im-doing">
-  <label for="i-know-what-im-doing">I weiß, was ich tue</label>
-  <button>Neue Einträge anlegen</button>
-</form>
+<div class="entry-app"></div>
+<script src="{{ url_for('static', filename='entry.js') }}"></script>
+<script>
+Elm.Entry.init({
+  node: document.querySelector('.entry-app'),
+  flags: {
+    locations: {{ to_json(locations) | safe }},
+    groups: {{ to_json(groups) | safe }},
+    taxGroups: {{ to_json(tax_groups) | safe }}
+  }
+});
+</script>
 {% endblock %}
@@ -1,16 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="entry-app"></div>
-<script src="{{ url_for('static', filename='entry.js') }}"></script>
-<script>
-Elm.Entry.init({
-  node: document.querySelector('.entry-app'),
-  flags: {
-    locations: {{ to_json(locations) | safe }},
-    groups: {{ to_json(groups) | safe }},
-    taxGroups: {{ to_json(tax_groups) | safe }}
-  }
-});
-</script>
-{% endblock %}
@@ -1,34 +1,9 @@
-{% macro consumption_graph_svg(values) -%}
-{% set stroke_width = 8 %}
-{% set width = 300 %}
-{% set height = 100 %}
-{% set padding = 4 %}
-{% set dx = (width - 2 * padding) / ((values | length) + 1) %}
-{% set dy = (height - 2 * padding) / ((values + [1]) | max) %}
-<svg viewBox="0 0 {{ width }} {{ height }}" role="img" class="consumption-graph">
-  <polyline
-    points="
-    {% for value in values %}
-      {{ padding + loop.index * dx }}, {{ height - padding - value * dy }}
-    {% endfor %}
-    "
-    stroke="green"
-    stroke-width="{{ stroke_width }}"
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    fill="none"
-  >
-</svg>
-{% endmacro -%}
-
 {% extends "base.html" %}

 {% block content %}
 <table>
  <tr>
-    <th>Stat</th>
    <th>ID</th>
-    <th>Graph</th>
    <th>Barcode</th>
    <th>Name</th>
    <th>Preis (Netto)</th>
@@ -42,12 +17,7 @@
  </tr>
 {% for item in items %}
  <tr>
-    <td>
-      {% if item.units_left == 0 %}<span title="Leerer aktiver Inventareintrag">🅾️</span>{% endif %}
-      {% if item.other_lines_count != 0 %}<span title="{% if item.other_lines_count == 1 %}Neuerer Eintrag mit demselben Barcode ist aktiv{% else %}{{ item.other_lines_count }} Einträge mit demselben Barcode sind aktiv{% endif %}">🔄</span>{% endif %}
-    </td>
    <td><a href="/inventory/item/{{ item.item_id }}">{{ item.item_id }}</a></td>
-    <td>{{ consumption_graph_svg(item.last_n_days_sales) }}</td>
    <td><code>{{ item.item_barcode }}</code></td>
    <td>{{ item.name }}</td>
    <td class="--align-right">{{ format_currency(item.unit_price) }}</td>
@@ -3,9 +3,9 @@
 {% block content %}
 <form method="POST">
  <select name="location_id">
-    <option value="" {{ "selected" if not current_user.data.location else ""}}>-</option>
+    <option value="" {{ "selected" if "location" not in session else ""}}>-</option>
  {% for location in locations %}
-    <option value="{{ location.location_id }}" {{ "selected" if current_user.data.location.location_id == location.location_id else "" }}>{{ location.location_name }}</option>
+    <option value="{{ location.location_id }}" {{ "selected" if "location" in session and session.location.location_id == location.location_id else "" }}>{{ location.location_name }}</option>
  {% endfor %}
  </select>

@@ -1,7 +1,6 @@
 blinker==1.6.2
 click==8.1.3
 Flask==2.3.2
-Flask-Login==0.6.2
 itsdangerous==2.1.2
 Jinja2==3.1.2
 MarkupSafe==2.1.2
Author	SHA1	Message	Date
paul	6c7bb1042c	Rewrite some of the grossUnitPrice stuff	2023-08-20 16:11:44 +02:00
paul	c30ae58829	Refactor fronted somewhat	2023-08-20 16:11:44 +02:00
paul	b30ee53e9d	First draft of elm frontend This will probably be scrapped or rewritten	2023-08-20 16:11:44 +02:00
paul	2d1c086e12	Remove old entry stuff	2023-08-20 16:11:44 +02:00