Add inline SVG consumption graphs

Dockerfile

@@ -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()'"]

README.md

@@ -45,20 +45,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
 
 ```
@@ -82,4 +68,3 @@ ssh -nNTvL 5432:fsmi-db.fsmi.org:5432 fsmi-login.fsmi.uni-karlsruhe.de
   - [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

docker-compose.yml

@@ -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"

jon/__init__.py

@@ -20,7 +20,6 @@ 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)

jon/db/add_views.sql

@@ -58,56 +58,29 @@ 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
+last_n_days AS (
+  SELECT generate_series(now() - interval '14 days', now(), interval '1 day')::date AS sale_date
 ),
-beeg AS (
-  SELECT item_id, sale_date, count(snack_sales_log_timestamp)::int AS sales
+last_n_days_sales AS (
+  SELECT
+    item_id,
+    sale_date,
+    count(snack_sales_log_timestamp) AS sale_date_sales
   FROM garfield.inventory_items
+  LEFT JOIN garfield.inventory_map ON item_id = inventory_id
+  -- Is there a better way of writing this?
+  -- TODO: Try to speed this query up
   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
+         ON inventory_map.snack_id = snack_sales_log.snack_id
+        AND DATE_TRUNC('day', snack_sales_log_timestamp) = sale_date
   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
+SELECT
+  item_id,
+  array_agg(sale_date_sales) AS last_n_days_sales
+FROM last_n_days_sales
 GROUP BY item_id

jon/db/get_inventory_overview.sql

@@ -1,7 +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

jon/templates/inventory/index.html

@@ -26,7 +26,6 @@
 {% block content %}
 <table>
   <tr>
-    <th>Stat</th>
     <th>ID</th>
     <th>Graph</th>
     <th>Barcode</th>
@@ -42,10 +41,6 @@
   </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>