Compare commits
4 Commits
16ba5b4aea
...
fc2df2c8dd
Author | SHA1 | Date | |
---|---|---|---|
fc2df2c8dd | |||
ddbffd1a55 | |||
eed81d7fcc | |||
3c30ffe11c |
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
__pycache__
|
||||
*.swp
|
||||
jon/config.json
|
||||
elm-stuff/
|
||||
|
@ -35,3 +35,4 @@ ssh -nNTvL 5432:fsmi-db.fsmi.org:5432 fsmi-login.fsmi.uni-karlsruhe.de
|
||||
- [ ] etc.
|
||||
- [ ] Make it print nicely
|
||||
- [ ] Make it possible to edit entries
|
||||
- [ ] Improve project structure
|
||||
|
28
elm.json
Normal file
28
elm.json
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
"type": "application",
|
||||
"source-directories": [
|
||||
"frontend"
|
||||
],
|
||||
"elm-version": "0.19.1",
|
||||
"dependencies": {
|
||||
"direct": {
|
||||
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
|
||||
"elm/browser": "1.0.2",
|
||||
"elm/core": "1.0.5",
|
||||
"elm/html": "1.0.0",
|
||||
"elm/http": "2.0.0",
|
||||
"elm/json": "1.1.3"
|
||||
},
|
||||
"indirect": {
|
||||
"elm/bytes": "1.0.8",
|
||||
"elm/file": "1.0.5",
|
||||
"elm/time": "1.0.0",
|
||||
"elm/url": "1.0.0",
|
||||
"elm/virtual-dom": "1.0.3"
|
||||
}
|
||||
},
|
||||
"test-dependencies": {
|
||||
"direct": {},
|
||||
"indirect": {}
|
||||
}
|
||||
}
|
297
frontend/Entry.elm
Normal file
297
frontend/Entry.elm
Normal file
@ -0,0 +1,297 @@
|
||||
module Entry exposing (main)
|
||||
|
||||
import Browser
|
||||
import Http
|
||||
|
||||
import Json.Decode as D
|
||||
import Json.Decode.Pipeline as P
|
||||
|
||||
import Html exposing (..)
|
||||
import Html.Attributes exposing (..)
|
||||
import Html.Events exposing (..)
|
||||
|
||||
import NumberInput
|
||||
import Select
|
||||
|
||||
main = Browser.element
|
||||
{ init = \globals ->
|
||||
( Context globals <| ItemSearch { searchTerm = "", searchResults = [] }
|
||||
, Cmd.none
|
||||
)
|
||||
, subscriptions = \_ -> Sub.none
|
||||
, update = update
|
||||
, view = view
|
||||
}
|
||||
|
||||
-- Data types
|
||||
|
||||
type alias SearchResult =
|
||||
{ barcode : String
|
||||
, name : String
|
||||
, netUnitPrice : Float
|
||||
, bought : String
|
||||
, salesUnits : Int
|
||||
, available : Bool
|
||||
, locationName : String
|
||||
, locationId : Int
|
||||
, groupName : String
|
||||
, groupId : Int
|
||||
, taxGroupId : Int
|
||||
}
|
||||
|
||||
searchResultDecoder =
|
||||
D.succeed SearchResult
|
||||
|> P.required "item_barcode" D.string
|
||||
|> P.required "name" D.string
|
||||
|> P.required "unit_price" D.float
|
||||
|> P.required "bought" D.string
|
||||
|> P.required "sales_units" D.int
|
||||
|> P.required "available" D.bool
|
||||
|> P.required "location_name" D.string
|
||||
|> P.required "location_id" D.int
|
||||
|> P.required "group_name" D.string
|
||||
|> P.required "group_id" D.int
|
||||
|> P.required "tax_group_id" D.int
|
||||
|
||||
type alias Location =
|
||||
{ id : Int
|
||||
, name : String
|
||||
}
|
||||
|
||||
type alias Group =
|
||||
{ id : Int
|
||||
, name : String
|
||||
}
|
||||
|
||||
type alias TaxGroup =
|
||||
{ id : Int
|
||||
, description : String
|
||||
, percentage : Float
|
||||
}
|
||||
|
||||
type alias Context =
|
||||
{ globals : Globals
|
||||
, state : State
|
||||
}
|
||||
|
||||
type alias Globals =
|
||||
{ locations : List Location
|
||||
, groups : List Group
|
||||
, taxGroups : List TaxGroup
|
||||
}
|
||||
|
||||
type State
|
||||
= ItemSearch
|
||||
{ searchTerm : String
|
||||
, searchResults : List SearchResult
|
||||
}
|
||||
| ItemEditor
|
||||
{ barcode : String
|
||||
, name : String
|
||||
, salesUnits : NumberInput.Model Int
|
||||
, netUnitPrice : NumberInput.Model Float
|
||||
, grossUnitPrice : NumberInput.Model Float
|
||||
, group : Select.Model Group
|
||||
, location : Select.Model Location
|
||||
, taxGroup : Select.Model TaxGroup
|
||||
}
|
||||
|
||||
type Msg
|
||||
= SetSearchTerm String
|
||||
| SubmitSearch
|
||||
| ReceiveSearchResults (Result Http.Error (List SearchResult))
|
||||
| GotoItemEditor SearchResult
|
||||
| SetBarcode String
|
||||
| SetName String
|
||||
| SetSalesUnits String
|
||||
| SetNetUnitPrice String
|
||||
| SetGrossUnitPrice String
|
||||
| SetGroup String
|
||||
| SetLocation String
|
||||
| SetTaxGroup String
|
||||
|
||||
-- Update logic: State machine etc.
|
||||
|
||||
update msg { globals, state } =
|
||||
let
|
||||
(state_, cmd) = updateState msg globals state
|
||||
in
|
||||
({ globals = globals, state = state_ }, cmd)
|
||||
|
||||
updateState msg globals state = case state of
|
||||
ItemSearch model -> case msg of
|
||||
SetSearchTerm searchTerm ->
|
||||
(ItemSearch { model | searchTerm = searchTerm }, Cmd.none)
|
||||
SubmitSearch ->
|
||||
( state
|
||||
, Http.get
|
||||
{ url = "/entry/api/search-items?search-term=" ++ model.searchTerm
|
||||
, expect = Http.expectJson ReceiveSearchResults <| D.list searchResultDecoder
|
||||
}
|
||||
)
|
||||
ReceiveSearchResults (Ok searchResults) ->
|
||||
(ItemSearch { model | searchResults = searchResults }, Cmd.none)
|
||||
GotoItemEditor searchResult ->
|
||||
case find (\tg -> tg.id == searchResult.taxGroupId) globals.taxGroups of
|
||||
Nothing -> (state, Cmd.none)
|
||||
Just taxGroup ->
|
||||
( ItemEditor <| updateGrossUnitPrice
|
||||
{ barcode = searchResult.barcode
|
||||
, name = searchResult.name
|
||||
, netUnitPrice = NumberInput.fromFloat searchResult.netUnitPrice
|
||||
, 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
|
||||
, taxGroup = Select.init (.id >> String.fromInt) (.description) taxGroup globals.taxGroups
|
||||
}
|
||||
, Cmd.none
|
||||
)
|
||||
_ ->
|
||||
(state, Cmd.none)
|
||||
ItemEditor model -> case msg of
|
||||
SetBarcode barcode ->
|
||||
(ItemEditor { model | barcode = barcode }, Cmd.none)
|
||||
SetName name ->
|
||||
(ItemEditor { model | name = name }, Cmd.none)
|
||||
SetSalesUnits str ->
|
||||
(ItemEditor { model | salesUnits = NumberInput.update str model.salesUnits }, Cmd.none)
|
||||
SetNetUnitPrice str ->
|
||||
( ItemEditor <| updateGrossUnitPrice { model | netUnitPrice = NumberInput.update str model.netUnitPrice }
|
||||
, Cmd.none
|
||||
)
|
||||
SetGrossUnitPrice str ->
|
||||
(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 <| updateGrossUnitPrice { model | taxGroup = Select.update key model.taxGroup }
|
||||
, Cmd.none
|
||||
)
|
||||
_ ->
|
||||
(state, Cmd.none)
|
||||
|
||||
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 neuen Inventareintrag" ]
|
||||
, Html.form [ onSubmit SubmitSearch ]
|
||||
[ div [ class "form-input" ]
|
||||
[ label [ for "search-term", title "Barcode oder Name" ] [ text "Suchbegriff" ]
|
||||
, input [ onInput SetSearchTerm, value model.searchTerm, id "search-term" ] []
|
||||
]
|
||||
, table [] <| searchResultHeaders :: List.map viewSearchResult model.searchResults
|
||||
]
|
||||
]
|
||||
ItemEditor model ->
|
||||
Html.form []
|
||||
[ fieldset []
|
||||
[ legend [] [ text "Neuer Inventareintrag" ]
|
||||
, div [ class "form-input" ]
|
||||
[ label [ for "barcode" ] [ text "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, id "name" ] []
|
||||
]
|
||||
, div [ class "form-input" ]
|
||||
[ 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 SetGroup model.group
|
||||
]
|
||||
, div [ class "form-input" ]
|
||||
[ label [ for "location" ] [ text "Raum" ]
|
||||
, Select.view SetLocation model.location
|
||||
]
|
||||
, div [ class "form-input" ]
|
||||
[ label [ for "net-unit-price" ] [ text "Stückpreis (Netto)" ]
|
||||
, input
|
||||
[ 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 SetTaxGroup model.taxGroup
|
||||
]
|
||||
]
|
||||
, fieldset []
|
||||
[ legend [] [ text "Neuer Snackeintrag" ]
|
||||
, div [ class "form-input" ]
|
||||
[ label [ for "snack-name" ] [ text "Name" ]
|
||||
, input [ value model.name, disabled True, id "snack-name" ] []
|
||||
]
|
||||
, viewGrossUnitPriceInput model
|
||||
]
|
||||
]
|
||||
|
||||
viewGrossUnitPriceInput model =
|
||||
let
|
||||
suggestedPriceStr = case calculateGarfieldPrice model of
|
||||
Nothing -> "?"
|
||||
Just suggestedPrice -> String.fromFloat suggestedPrice
|
||||
in
|
||||
div [ class "form-input" ]
|
||||
[ label [ for "gross-unit-price" ]
|
||||
[ text <| "Stückpreis (Brutto), Vorschlag: " ++ suggestedPriceStr
|
||||
]
|
||||
, input [ onInput SetGrossUnitPrice, value <| NumberInput.show model.grossUnitPrice, id "gross-unit-price", type_ "number", step "0.01" ] []
|
||||
]
|
||||
|
||||
searchResultHeaders =
|
||||
tr []
|
||||
[ th [] [ text "Barcode" ]
|
||||
, th [] [ text "Name" ]
|
||||
, th [] [ text "Gruppe" ]
|
||||
, th [] [ text "Stückpreis (Netto)" ]
|
||||
, th [] [ text "Eingekauft" ]
|
||||
, th [] [ text "Kaufdatum" ]
|
||||
, th [] [ text "Raum" ]
|
||||
, th [] [ text "Aktiv?" ]
|
||||
, th [] []
|
||||
]
|
||||
|
||||
viewSearchResult model =
|
||||
tr []
|
||||
[ td [] [ code [] [ text model.barcode ] ]
|
||||
, td [] [ text model.name ]
|
||||
, td [] [ text model.groupName ]
|
||||
, td [] [ text <| String.fromFloat model.netUnitPrice ]
|
||||
, td [] [ text <| String.fromInt model.salesUnits ]
|
||||
, td [] [ text model.bought ]
|
||||
, td [] [ text model.locationName ]
|
||||
, td [] [ text <| showBool model.available ]
|
||||
, td []
|
||||
[ button [ onClick <| GotoItemEditor model ] [ text "Als Vorlage verwenden" ]
|
||||
]
|
||||
]
|
||||
|
||||
calculateGarfieldPrice model =
|
||||
NumberInput.get model.netUnitPrice |> Maybe.map (\netUnitPrice ->
|
||||
roundTo 2 <| netUnitPrice * (1 + (Select.get model.taxGroup).percentage) + 0.01
|
||||
)
|
||||
|
||||
roundTo places x = toFloat (round <| x * 10 ^ places) / 10 ^ places
|
||||
|
||||
showBool b = case b of
|
||||
True -> "✅"
|
||||
False -> "❌"
|
||||
|
||||
find pred xs = List.head <| List.filter pred xs
|
29
frontend/NumberInput.elm
Normal file
29
frontend/NumberInput.elm
Normal file
@ -0,0 +1,29 @@
|
||||
module NumberInput exposing (..)
|
||||
|
||||
type alias Model a =
|
||||
{ value : Maybe a
|
||||
, original : String
|
||||
, convert : String -> Maybe a
|
||||
}
|
||||
|
||||
fromFloat : Float -> Model Float
|
||||
fromFloat x = Model (Just x) (String.fromFloat x) String.toFloat
|
||||
|
||||
fromInt : Int -> Model Int
|
||||
fromInt x = Model (Just x) (String.fromInt x) String.toInt
|
||||
|
||||
get : Model a -> Maybe a
|
||||
get = .value
|
||||
|
||||
withDefault : a -> Model a -> a
|
||||
withDefault d = Maybe.withDefault d << get
|
||||
|
||||
isValid : Model a -> Bool
|
||||
isValid model = model.value /= Nothing
|
||||
|
||||
update : String -> Model a -> Model a
|
||||
update str model =
|
||||
{ model | value = model.convert str, original = str }
|
||||
|
||||
show : Model a -> String
|
||||
show = .original
|
36
frontend/Select.elm
Normal file
36
frontend/Select.elm
Normal file
@ -0,0 +1,36 @@
|
||||
module Select exposing (..)
|
||||
|
||||
import Html exposing (Html, option, select, text)
|
||||
import Html.Attributes exposing (selected, value)
|
||||
import Html.Events exposing (onInput)
|
||||
|
||||
type alias Model a =
|
||||
{ identify : a -> String
|
||||
, show : a -> String
|
||||
, selected : a
|
||||
, options : List a
|
||||
}
|
||||
|
||||
init : (a -> String) -> (a -> String) -> a -> List a -> Model a
|
||||
init = Model
|
||||
|
||||
update : String -> Model a -> Model a
|
||||
update key model =
|
||||
case find (\x -> key == model.identify x) model.options of
|
||||
Nothing -> model
|
||||
Just x -> { model | selected = x }
|
||||
|
||||
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 ] <| List.map viewOption model.options
|
||||
|
||||
get : Model a -> a
|
||||
get = .selected
|
||||
|
||||
find pred xs = List.head <| List.filter pred xs
|
@ -1,6 +1,6 @@
|
||||
SELECT
|
||||
group_id,
|
||||
group_name
|
||||
group_id AS id,
|
||||
group_name AS name
|
||||
FROM garfield.inventory_item_groups
|
||||
ORDER BY
|
||||
group_name ASC
|
4
jon/db/entry/get_locations.sql
Normal file
4
jon/db/entry/get_locations.sql
Normal file
@ -0,0 +1,4 @@
|
||||
SELECT
|
||||
location_id AS id,
|
||||
location_name AS name
|
||||
FROM garfield.locations
|
9
jon/db/entry/get_tax_groups.sql
Normal file
9
jon/db/entry/get_tax_groups.sql
Normal file
@ -0,0 +1,9 @@
|
||||
SELECT
|
||||
tax_group_id AS id,
|
||||
description,
|
||||
tax_percentage :: float AS percentage,
|
||||
tax_description AS description
|
||||
FROM garfield.tax_groups,
|
||||
LATERAL garfield.tax_find(tax_group_id, NOW() :: date) AS tax_id
|
||||
LEFT JOIN garfield.taxes USING (tax_id)
|
||||
WHERE active
|
18
jon/db/search_items.sql
Normal file
18
jon/db/search_items.sql
Normal file
@ -0,0 +1,18 @@
|
||||
SELECT
|
||||
item_barcode,
|
||||
name,
|
||||
unit_price :: float,
|
||||
TO_CHAR(bought, 'YYYY-MM-DD') AS bought,
|
||||
sales_units,
|
||||
available,
|
||||
location_name,
|
||||
location_id,
|
||||
group_name,
|
||||
item_group AS group_id,
|
||||
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
|
63
jon/entry.py
63
jon/entry.py
@ -1,9 +1,6 @@
|
||||
import datetime
|
||||
import zoneinfo
|
||||
|
||||
|
||||
from flask import Blueprint, redirect, render_template, request, session
|
||||
|
||||
|
||||
from . import db
|
||||
|
||||
|
||||
@ -12,48 +9,34 @@ bp = Blueprint("entry", __name__, url_prefix="/entry")
|
||||
|
||||
@bp.get("/")
|
||||
def index():
|
||||
return render_template("entry/index.html")
|
||||
with db.run_query("entry/get_groups.sql") as cursor:
|
||||
groups = cursor.fetchall()
|
||||
|
||||
with db.run_query("entry/get_locations.sql") as cursor:
|
||||
locations = cursor.fetchall()
|
||||
|
||||
@bp.route("/edit-item-data", methods=["GET", "POST"])
|
||||
def edit_item_data():
|
||||
if "entry" not in session:
|
||||
session["entry"] = dict()
|
||||
with db.run_query("entry/get_tax_groups.sql") as cursor:
|
||||
tax_groups = cursor.fetchall()
|
||||
|
||||
if request.method == "POST":
|
||||
session["entry"] = {
|
||||
"item_bought": datetime.datetime.strptime(request.form.get("item_bought"), "%Y-%m-%d"),
|
||||
"item_barcode": request.form.get("item_barcode"),
|
||||
"item_name": request.form.get("item_name"),
|
||||
"item_group_id": int(request.form.get("item_group")),
|
||||
"item_net_unit_price": float(request.form.get("item_net_unit_price")),
|
||||
"item_tax_group_id": int(request.form.get("item_tax_group")),
|
||||
"item_amount": int(request.form.get("item_amount")),
|
||||
"item_location_id": int(request.form.get("item_location"))
|
||||
}
|
||||
|
||||
return redirect("/entry/select-snack-entry")
|
||||
|
||||
groups = db.run_query("get_groups.sql").fetchall()
|
||||
locations = db.run_query("get_locations.sql").fetchall()
|
||||
|
||||
return render_template("entry/edit-item-data.html", **{
|
||||
"groups": groups,
|
||||
return render_template("entry/index.html", **{
|
||||
"locations": locations,
|
||||
"entry": session["entry"]
|
||||
"groups": groups,
|
||||
"tax_groups": tax_groups
|
||||
})
|
||||
|
||||
@bp.get("/api/search-items")
|
||||
def api_search_items():
|
||||
try:
|
||||
search_term = request.args["search-term"]
|
||||
except:
|
||||
return {"error": "Missing query parameter `search-term`"}, 400
|
||||
|
||||
@bp.route("/select-snack-entry", methods=["GET", "POST"])
|
||||
def edit_snack_data():
|
||||
if "entry" not in session:
|
||||
return redirect("/entry/edit-item-data")
|
||||
location = session.get("location", None)
|
||||
|
||||
snacks = db.run_query("get_snacks_by_barcode.sql", {
|
||||
"snack_barcode": session["entry"]["item_barcode"]
|
||||
}).fetchall()
|
||||
with db.run_query("search_items.sql", {
|
||||
"location_id": None if location is None else location["location_id"],
|
||||
"search_term": search_term
|
||||
}) as cursor:
|
||||
items = cursor.fetchall()
|
||||
|
||||
return render_template("entry/select-snack-entry.html", **{
|
||||
"entry": session["entry"],
|
||||
"snacks": snacks
|
||||
})
|
||||
return items
|
||||
|
12105
jon/static/entry.js
Normal file
12105
jon/static/entry.js
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
import datetime
|
||||
import json
|
||||
|
||||
|
||||
def format_currency(x):
|
||||
@ -15,16 +15,5 @@ def format_bool(x):
|
||||
return "✅" if x else "❌"
|
||||
|
||||
|
||||
def now():
|
||||
return datetime.datetime.now()
|
||||
|
||||
|
||||
def get_garfield_price(net_unit_price, tax_group_id):
|
||||
if tax_group_id == 1:
|
||||
tax_factor = 1.19
|
||||
elif tax_group_id == 2:
|
||||
tax_factor = 1.07
|
||||
else:
|
||||
raise Error("Unknown tax group ID")
|
||||
|
||||
return net_unit_price * tax_factor + 0.01
|
||||
def to_json(x):
|
||||
return json.dumps(x)
|
||||
|
@ -1,56 +0,0 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
<pre>{{ entry }}</pre>
|
||||
|
||||
<fieldset>
|
||||
<legend>Neuer Inventareintrag</legend>
|
||||
|
||||
<form method="POST" action="/entry/edit-item-data">
|
||||
<div class="form-input">
|
||||
<label for="item_bought">Kaufdatum</label>
|
||||
<input name="item_bought" id="item_bought" type="date" value="{{ (entry.item_bought or now()).strftime('%Y-%m-%d') }}">
|
||||
</div>
|
||||
<div class="form-input">
|
||||
<label for="item_barcode">Barcode</label>
|
||||
<input name="item_barcode" id="item_barcode" type="text" value="{{ entry.item_barcode }}" placeholder="Barcode">
|
||||
</div>
|
||||
<div class="form-input">
|
||||
<label for="item_name">Artikel</label>
|
||||
<input name="item_name" id="item_name" type="text" value="{{ entry.item_name }}" placeholder="Artikel">
|
||||
</div>
|
||||
<div class="form-input">
|
||||
<label for="item_group">Gruppe</label>
|
||||
<select name="item_group" id="item_group">
|
||||
{% for group in groups %}
|
||||
<option value="{{ group.group_id }}"{% if entry.item_group_id == group.group_id %} selected{% endif %}>{{ group.group_name }} ({{ group.group_id }})</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-input">
|
||||
<label for="item_net_unit_price">Stückpreis (Netto) in €</label>
|
||||
<input name="item_net_unit_price" id="item_net_unit_price" type="number" step="0.01" value="{{ entry.item_net_unit_price }}" placeholder="Stückpreis (Netto) in €">
|
||||
</div>
|
||||
<div class="form-input">
|
||||
<input name="item_tax_group" id="item_tax_group_1" type="radio" value="1"{% if entry.item_tax_group_id == 1 %} selected{% endif %}>
|
||||
<label for="item_tax_group_1">Volle Umsatzsteuer (19%)</label>
|
||||
|
||||
<input name="item_tax_group" id="item_tax_group_2" type="radio" value="2"{% if entry.item_tax_group_id == 2 %} selected{% endif %}>
|
||||
<label for="item_tax_group_2">Ermäßigte Umsatzsteuer (7%)</label>
|
||||
</div>
|
||||
<div class="form-input">
|
||||
<label for="item_amount">Anzahl</label>
|
||||
<input name="item_amount" id="item_amount" type="number" value="{{ entry.item_amount }}" placeholder="Anzahl">
|
||||
</div>
|
||||
<div class="form-input">
|
||||
<label for="item_group">Raum</label>
|
||||
<select name="item_location" id="item_location">
|
||||
{% for location in locations %}
|
||||
<option value="{{ location.location_id }}"{% if entry.item_location_id == location.location_id or ("item_location" not in entry and (session.location.location_id == location.location_id)) %} selected{% endif %}>{{ location.location_name }} ({{ location.location_id }})</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<button>Weiter zu den Snackeinträgen</button>
|
||||
</form>
|
||||
</fieldset>
|
||||
{% endblock %}
|
@ -1,5 +1,16 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
<a href="/entry/edit-item-data">Neuer Eintrag</a>
|
||||
<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,83 +0,0 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
<pre>{{ entry }}</pre>
|
||||
|
||||
<fieldset>
|
||||
<legend>Neuer Inventareintrag</legend>
|
||||
<table>
|
||||
<tr>
|
||||
<th class="--align-left">ID</th>
|
||||
<td>{{ entry.item_id }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Barcode</th>
|
||||
<td><code>{{ entry.item_barcode }}</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Name</th>
|
||||
<td>{{ entry.item_name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Einkaufspreis (Netto)</th>
|
||||
<td>{{ format_currency(entry.item_net_unit_price) }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Empfohlener Garfield-Verkaufspreis</th>
|
||||
<td>{{ format_currency(get_garfield_price(entry.item_net_unit_price, entry.item_tax_group_id)) }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Kaufdatum</th>
|
||||
<td>{{ format_date(entry.item_bought) }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Gruppe</th>
|
||||
<td>{{ entry.item_group_name }} ({{ entry.item_group_id }})</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Anzahl</th>
|
||||
<td>{{ entry.item_amount }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="--align-left">Raum</th>
|
||||
<td>{{ entry.item_location_name }} ({{ entry.item_location_id }})</td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
|
||||
<fieldset>
|
||||
<legend>Snackeinträge mit Barcode <code>{{ entry.item_barcode }}</code></legend>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Barcode</th>
|
||||
<th>Name</th>
|
||||
<th>Verkaufspreis (Brutto)</th>
|
||||
<th>Eintragedatum</th>
|
||||
<th>Steuersatz</th>
|
||||
<th>Raum</th>
|
||||
<th>Aktiv?</th>
|
||||
<th>Aktionen</th>
|
||||
</tr>
|
||||
{% for snack in snacks %}
|
||||
<tr>
|
||||
<td>{{ snack.snack_id }}</td>
|
||||
<td><code>{{ snack.snack_barcode }}</code></td>
|
||||
<td>{{ snack.snack_name }}</td>
|
||||
<td class="--align-right">{{ format_currency(snack.snack_price) }}</td>
|
||||
<td>{{ format_date(snack.snack_timestamp) }}</td>
|
||||
<td>{{ snack.description }} ({{ snack.tax_group_id }})</td>
|
||||
<td>{{ snack.location_name }} ({{ snack.location_id }})</td>
|
||||
<td>{{ format_bool(snack.snack_available) }}</td>
|
||||
<td>
|
||||
<form method="POST" action="/entry/select-snack-entry">
|
||||
<input type="hidden" name="snack_id" value="{{ snack.snack_id }}">
|
||||
<button>Snackeintrag übernehmen</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</fieldset>
|
||||
{% endblock %}
|
Loading…
x
Reference in New Issue
Block a user