added compability for wine in overview (#1112)

* added compability for wine in overview

* fixed calc for nrbottles

Author: efollin

src/database/prisma/migrations/20260225121120_stocklist_move_nr_bottles/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `nrBottles` on the `drinkitembatch` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "drinkitem" ADD COLUMN     "nr_bottles" INTEGER DEFAULT 0;
+
+-- AlterTable
+ALTER TABLE "drinkitembatch" DROP COLUMN "nrBottles";

src/database/prisma/schema.prisma

@@ -470,6 +470,7 @@ model DrinkItem {
   bottleEmptyWeight Int?              @map("bottle_empty_weight")
   bottleFullWeight  Int?              @map("bottle_full_weight")
   quantityAvailable Int?              @default(0) @map("quantity_available")
+  nrBottles         Int?              @default(0) @map("nr_bottles")
   stockLists        DrinkItemBatch[]
 
   @@map("drinkitem")
@@ -482,7 +483,6 @@ model DrinkItemBatch {
   quantityDelta Int       @map("quantity_delta")
   user          String
   date          DateTime
-  nrBottles     Int?
 
   @@map("drinkitembatch")
 }

src/database/schema.zmodel

@@ -553,6 +553,7 @@ model DrinkItem {
   bottleEmptyWeight Int?              @map("bottle_empty_weight")
   bottleFullWeight  Int?              @map("bottle_full_weight")
   quantityAvailable Int?              @map("quantity_available") @default(0)
+  nrBottles         Int?              @map("nr_bottles") @default(0)
 
   stockLists        DrinkItemBatch[]
 
@@ -570,7 +571,7 @@ model DrinkItemBatch {
   quantityDelta Int       @map("quantity_delta")
   user          String
   date          DateTime
-  nrBottles     Int?
+
 
   @@allow("read", true)
   @@allow("create", has(auth().policies, "drinkitembatch:create"))

src/database/seed/.snaplet/dataModel.json

@@ -4054,6 +4054,20 @@
           "isId": false,
           "maxLength": null
         },
+        {
+          "id": "public.drinkitem.nr_bottles",
+          "name": "nr_bottles",
+          "columnName": "nr_bottles",
+          "type": "int4",
+          "isRequired": false,
+          "kind": "scalar",
+          "isList": false,
+          "isGenerated": false,
+          "sequence": false,
+          "hasDefaultValue": true,
+          "isId": false,
+          "maxLength": null
+        },
         {
           "name": "drinkitembatch",
           "type": "drinkitembatch",
@@ -4140,20 +4154,6 @@
           "isId": false,
           "maxLength": null
         },
-        {
-          "id": "public.drinkitembatch.nrBottles",
-          "name": "nrBottles",
-          "columnName": "nrBottles",
-          "type": "int4",
-          "isRequired": false,
-          "kind": "scalar",
-          "isList": false,
-          "isGenerated": false,
-          "sequence": false,
-          "hasDefaultValue": false,
-          "isId": false,
-          "maxLength": null
-        },
         {
           "id": "public.drinkitembatch.quantity_delta",
           "name": "quantity_delta",

src/lib/utils/stocklistUtils.ts

@@ -23,6 +23,11 @@ export async function inventoryValue(prisma: ExtendedPrisma) {
   for (const item of items) {
     if (item.quantityType === "COUNTS") {
       value += (item.price / 100) * item.quantityAvailable!;
+    } else if (
+      (item.quantityType === "WEIGHT" && item.bottleEmptyWeight == 0) ||
+      item.bottleFullWeight == 0
+    ) {
+      continue;
     } else {
       const bottleWeight = item.bottleEmptyWeight!;
       const liquidWeight = item.quantityAvailable! - bottleWeight;

src/routes/(app)/admin/stocklist/+page.svelte

@@ -3,7 +3,22 @@
   import SetPageTitle from "$lib/components/nav/SetPageTitle.svelte";
   import SEO from "$lib/seo/SEO.svelte";
   export let data: PageData;
+  import type { DrinkItem } from "@prisma/client";
   import Navbuttons from "./navbuttons.svelte";
+
+  function calcBottles(item: DrinkItem) {
+    if (item.bottleEmptyWeight != 0 && item.bottleFullWeight != 0) {
+      return (
+        (
+          (item.quantityAvailable! -
+            item.nrBottles! * item.bottleEmptyWeight!) /
+          (item.bottleFullWeight! - item.bottleEmptyWeight!)
+        ).toFixed(2) + " flaskor"
+      );
+    } else {
+      return item.quantityAvailable + " g (flaskvikt saknas)";
+    }
+  }
 </script>
 
 <SetPageTitle title="Stocklist" />
@@ -16,19 +31,23 @@
   }}
 />
 <div
-  style="display: flex; justify-content: space-between; align-items: center;"
+  style="display: flex; justify-content: space-between; align-items: center; "
 >
   <div
-    style="display: flex; justify-content: space-between; align-items: center;"
+    style="display: flex; justify-content: space-between; align-items: center; size: "
   >
     <Navbuttons currentPage="overview"></Navbuttons>
     <form method="POST" enctype="multipart/form-data" action="?/readFile">
-      <input type="file" name="upload" class="file-input file-input-primary" />
-      <button type="submit" class="btn btn-primary">Upload</button>
+      <input
+        type="file"
+        name="upload"
+        class="file-input file-input-primary h-8 w-32"
+      />
+      <button type="submit" class="btn btn-primary btn-sm">Upload</button>
     </form>
   </div>
   <h1 style="font-size: large;">
-    Totalt lagervärde: {data.currentInventoryValue.toFixed(0)} kr
+    Totalt estimerat lagervärde: {data.currentInventoryValue.toFixed(0)} kr
   </h1>
 </div>
 <div class="overflow-x-auto">
@@ -49,7 +68,7 @@
           <tr>
             <th>{item.systembolagetID}</th>
             <td>{item.name}</td>
-            <td>Öl/Cider</td>
+            <td>{item.group === "S3" ? "Vin" : "Öl/Cider"}</td>
             <td>{item.price / 100} kr</td>
             <td>{item.quantityAvailable} st</td>
             <td>{item.group}</td>
@@ -60,12 +79,7 @@
             <td>{item.name}</td>
             <td>Sprit</td>
             <td>{item.price / 100} kr</td>
-            <td
-              >{(
-                (item.quantityAvailable! - item.bottleEmptyWeight!) /
-                (item.bottleFullWeight! - item.bottleEmptyWeight!)
-              ).toFixed(2)} flaskor</td
-            >
+            <td> {calcBottles(item)}</td>
             <td>{item.group}</td>
           </tr>
         {/if}

src/routes/(app)/admin/stocklist/addproduct/+page.svelte

@@ -22,7 +22,7 @@
     name="selectType"
     role="tab"
     class="tab text-base"
-    aria-label="Öl/Cider"
+    aria-label="Öl/Cider/Vin"
     checked
     on:click={() => {
       reset();

src/routes/(app)/admin/stocklist/navbuttons.svelte

@@ -4,31 +4,31 @@
 
 <div>
   <ul style="list-style: none;">
-    <a href="/admin/stocklist" style="margin-right:15px">
+    <a href="/admin/stocklist" style="margin-right:5px">
       <button
         class="btn btn-primary"
         class:btn-outline={currentPage !== "overview"}
       >
         Överblick
       </button>
     </a>
-    <a href="/admin/stocklist/showproducts" style="margin-right:15px">
+    <a href="/admin/stocklist/showproducts" style="margin-right:5px">
       <button
         class="btn btn-primary"
         class:btn-outline={currentPage !== "showproducts"}
       >
         Produkter
       </button>
     </a>
-    <a href="/admin/stocklist/stockchange" style="margin-right:15px">
+    <a href="/admin/stocklist/stockchange" style="margin-right:5px">
       <button
         class="btn btn-primary"
         class:btn-outline={currentPage !== "stockchange"}
       >
         Skriv in/ut
       </button>
     </a>
-    <a href="/admin/stocklist/treasury" style="margin-right:15px">
+    <a href="/admin/stocklist/treasury" style="margin-right:10px">
       <button
         class="btn btn-primary"
         class:btn-outline={currentPage !== "treasury"}

src/routes/(app)/admin/stocklist/stockchange/+page.server.ts

@@ -25,7 +25,7 @@ const createOutBatchSchema = z.object({
     .string()
     .date()
     .default(() => new Date().toLocaleDateString("se-SE")),
-  nrBottles: z.number().nonnegative(),
+  nrBottles: z.number().nonnegative().default(0),
 });
 
 const createInBatchSchema = z.object({
@@ -35,7 +35,7 @@ const createInBatchSchema = z.object({
     .string()
     .date()
     .default(() => new Date().toLocaleDateString("se-SE")),
-  nrBottles: z.number().nonnegative(),
+  nrBottles: z.number().nonnegative().default(0),
 });
 
 export const actions: Actions = {
@@ -53,7 +53,6 @@ export const actions: Actions = {
       data: {
         drinkItemId: form.data.drinkItemId,
         quantityDelta: form.data.quantityDelta,
-        nrBottles: form.data.nrBottles,
         date: dayjs(form.data.date).toDate(),
         user: user.studentId!,
       },
@@ -65,6 +64,9 @@ export const actions: Actions = {
         quantityAvailable: {
           increment: form.data.quantityDelta,
         },
+        nrBottles: {
+          increment: form.data.nrBottles,
+        },
       },
     });
     return message(form, { message: "Antal inskrivet" });
@@ -89,6 +91,9 @@ export const actions: Actions = {
         quantityAvailable: {
           decrement: form.data.quantityDelta,
         },
+        nrBottles: {
+          decrement: form.data.nrBottles,
+        },
       },
     });
 
@@ -100,7 +105,6 @@ export const actions: Actions = {
       data: {
         drinkItemId: form.data.drinkItemId,
         quantityDelta: -form.data.quantityDelta,
-        nrBottles: form.data.nrBottles,
         date: dayjs(form.data.date).toDate(),
         user: user.studentId!,
       },