Rework report

jon/db/get_inventory_report.sql

@@ -1,49 +1,43 @@
+-- parameters:
+--
+-- location_id: Location to generate the report for
+
 WITH
-most_recent_sales AS (
+sales_by_item_id AS (
-  SELECT DISTINCT ON (inventory_line)
+  SELECT
-    inventory_line, snack_sales_log_id, snack_sales_log_timestamp AS most_recent_sale
+    inventory_line AS item_id,
+    max(snack_sales_log_timestamp) AS last_sold,
+    count(*)::int AS units_sold
   FROM garfield.snack_sales_log
-  ORDER BY inventory_line ASC, snack_sales_log_timestamp DESC
+  WHERE type_id = 'SNACK_BUY'
+    AND inventory_line IS NOT NULL
+    AND snack_sales_log_timestamp > NOW() - INTERVAL '120 days'
+    AND location_id = %(location_id)s
+  GROUP BY item_id
 ),
-enhanced_overview1 AS (
+sales_by_barcode AS (
   SELECT
-    inventory_items.item_id,
+    item_barcode,
-    inventory_items.item_barcode,
+    max(name) AS name,
-    inventory_items.name,
+    sum(units_sold) AS units_sold,
-    units_left,
+    round(avg((units_sold / extract(epoch FROM (CASE WHEN available THEN now() ELSE last_sold END) - bought)) * 86400)::numeric, 2) AS sold_per_day
-    inventory_items.sales_units,
+  FROM sales_by_item_id
-    correction_delta,
-    location_name,
-    location,
-      CASE
-        WHEN snack_sales_log_id IS NULL THEN 0
-        ELSE sales / (EXTRACT(EPOCH FROM (
-          CASE
-            WHEN units_left <= 0 THEN most_recent_sale
-            ELSE NOW()
-          END
-        )) - EXTRACT(EPOCH FROM bought)) * 24 * 3600
-    END AS per_day
-  FROM garfield.inventory_item_overview
   LEFT JOIN garfield.inventory_items USING (item_id)
-  LEFT JOIN most_recent_sales ON item_id = inventory_line
+  GROUP BY item_barcode
 ),
-enhanced_overview2 AS (
+current_inventory AS (
   SELECT
-    *,
+    item_barcode,
-    CASE
+    sum(units_left)::int AS units_left
-      WHEN per_day = 0 THEN NULL
+  FROM all_inventory_item_overview
-      ELSE GREATEST(0, units_left / per_day)
+  WHERE available
-    END AS days_left
+    AND location = %(location_id)s
-  FROM enhanced_overview1
+  GROUP BY item_barcode
 )
 
 SELECT
-  *,
+  sales_by_barcode.*,
-  CASE
+  COALESCE(current_inventory.units_left, 0)::int AS units_left
-    WHEN days_left IS NULL THEN NULL
+FROM sales_by_barcode
-    ELSE GREATEST(0, (60 - days_left) * per_day)
+LEFT JOIN current_inventory USING (item_barcode)
-  END AS for_two_months
+ORDER BY units_sold DESC
-FROM enhanced_overview2
-WHERE (%(location_id)s IS NULL OR location = %(location_id)s)
-ORDER BY days_left ASC, per_day DESC

jon/inventory.py

@@ -22,11 +22,17 @@ def index():
 @bp.get("/report")
 def read_report():
     location = current_user.data.location
+
+    if location is None:
+        # TODO: Error handling
+        return "please select a location in order to generate a report", 400
+
     items = db.run_query("get_inventory_report.sql", {
-        "location_id": None if location is None else location["location_id"]
+        "location_id": location["location_id"]
     }).fetchall()
 
     return render_template("inventory/read_report.html", **{
+        "location": location,
         "items": items
     })
 

jon/static/jon.css

@@ -40,6 +40,9 @@ nav > ul > li + li:before {
 .--centered {
   text-align: center;
 }
+.--not-important {
+  color: #aaa;
+}
 @keyframes wiggle {
   0%, 100% { margin-top: 0; }
   50% { margin-top: -0.5em; }
@@ -55,6 +58,10 @@ th {
   body {
     font-size: 8px;
   }
+  /* hide the menu when printing */
+  header {
+    display: none;
+  }
 }
 .form-input > label {
   font-size: .8em;

jon/templates/base.html

@@ -12,6 +12,7 @@
         <ul>
           <li{{ " class=current-page" if request.path == "/" else "" }}><a href="/">Home</a></li>
           <li{{ " class=current-page" if request.path.startswith("/inventory") else "" }}><a href="/inventory">Inventar</a></li>
+          <li><a href="/inventory/report">Einkäuferbericht</a></li>
           <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">

jon/templates/inventory/read_report.html

@@ -1,29 +1,29 @@
 {% extends "base.html" %}
 
 {% block content %}
+<h2>Einkäuferbericht für {{ location.location_name }}</h2>
+
 <table>
   <tr>
-    <th>ID</th>
     <th>Barcode</th>
     <th>Name</th>
     <th>Inventar</th>
-    <th>Gesamt</th>
+    <th title="In den letzten 4 Monaten verkauft">Verkauft</th>
-    <th>Raum</th>
     <th>Verbrauch [1/d]</th>
+    <th>Verbrauch [1/60d]</th>
+    <!--
     <th title="Estimated Time Until Empty">ETUE [d]</th>
     <th>Für 2m</th>
+    -->
   </tr>
 {% for item in items %}
-  <tr>
+<tr{% if item.units_left >= item.units_sold %} class="--not-important"{% endif %}>
-    <td><a href="/inventory/item/{{ item.item_id }}">{{ item.item_id }}</a></td>
     <td><code>{{ item.item_barcode }}</code></td>
     <td>{{ item.name }}</td>
     <td class="--align-right">{{ item.units_left }}</td>
-    <td class="--align-right">{{ item.sales_units + item.correction_delta }}</td>
+    <td class="--align-right">{{ item.units_sold }}</td>
-    <td>{{ item.location_name }}</td>
+    <td class="--align-right">{{ item.sold_per_day }}</td>
-    <td class="--align-right">{{ item.per_day|round(2) }}</td>
+    <td class="--align-right">{{ item.sold_per_day * 60 }}</td>
-    <td class="--align-right">{% if item.days_left != None %}{{ item.days_left|round(1) }}{% endif %}</td>
-    <td class="--align-right">{% if item.for_two_months %}{{ item.for_two_months|round(1) }}{% endif %}</td>
   </tr>
 {% endfor %}
 </table>