Updated ui for variant and label and fixed error with loading labe for variant.

common/src/models/variant.rs

@@ -19,7 +19,15 @@ pub struct Variant {
 }
 
 async fn from_postgres_row(row: PgRow, pool: &PgPool) -> Variant {
-    let label = load_label(row.get(0), pool).await;
+    let label_id_option: Option<i64> = row.get(8);
+    let label: Option<Label> = match label_id_option {
+        Some(label_id) => {
+            load_label(label_id, pool).await
+        }
+        None => {
+            None
+        }
+    };
 
     Variant {
         id: row.get(0),

frontend/app/components/article/article.vue

@@ -50,6 +50,7 @@
           <v-text-field
               v-model.trim="store.articleEdit.name"
               :readonly="!edit"
+              label="Produkt Bezeichnung"
           />
 
           <v-spacer />

frontend/app/components/variant/variantCreate.vue

@@ -3,6 +3,7 @@
   import {useLabelEditorStore} from "~/store/labelEditorStore";
   import { Variant } from "~/types/variant";
   import type {Unit} from "~/types/unit";
+  import type {Label} from "~/types/label";
 
   let store = useLabelEditorStore();
 
@@ -15,6 +16,8 @@
   let unit: Ref<Unit | null> = ref<Unit | null>(null);
   let description: Ref<string | null> = ref<string | null>(null);
   let ingredients: Ref<string | null> = ref<string | null>(null);
+  let label: Ref<Label | null> = ref<Label | null>(null);
+  let variant_description: Ref<string | null> = ref<string | null>(null);
 
   if (store.article != null) {
     unit.value = store.article.default_unit;
@@ -27,7 +30,7 @@
     ) {
       loading.value = true;
 
-      const variant: Variant = new Variant(0, weight.value, ean.value, name.value, description.value, ingredients.value, unit.value);
+      const variant: Variant = new Variant(0, weight.value, ean.value, name.value, description.value, ingredients.value, unit.value, label.value, variant_description.value);
 
       await store.addVariant(variant);
 
@@ -89,12 +92,27 @@
 
       <v-card-text>
         <v-text-field
-            v-model.trim="name"
+            v-model.trim="variant_description"
-            label="Bezeichnung"
+            label="Varianten Bezeichnung"
             autofocus
         />
 
+        <v-text-field
+            v-model.trim="name"
+            label="Produkt Bezeichnung"
+        />
+
         <v-row>
+          <v-col>
+            <v-select
+                v-model="label"
+                :items="store.labels"
+                label="Etiketten Typ"
+                :return-object="true"
+                item-title="name"
+                no-data-text="Keine Etiketten Typen angelegt"
+            />
+          </v-col>
           <v-col>
             <v-text-field
                 v-model.trim="weight"
@@ -110,7 +128,7 @@
           </v-col>
         </v-row>
 
-        <v-textarea
+        <v-text-field
             v-model.trim="ean"
             label="EAN-Code"
         />

frontend/app/components/variant/variantRow.vue

@@ -68,8 +68,9 @@
     <v-card-title>
       <v-row style="padding-top: 10px">
         <v-text-field
-            v-model.trim="name"
+            v-model.trim="variant_description"
             :readonly="!edit"
+            label="Varianten Bezeichnung"
         />
 
         <v-spacer />
@@ -138,6 +139,19 @@
           align="start"
       >
         <v-col cols="2">
+          <v-row>
+            <v-select
+                v-model="label"
+                :items="store.labels"
+                label="Etiketten Typ"
+                :readonly="!edit"
+                :return-object="true"
+                item-title="name"
+                :clearable="edit"
+                no-data-text="Keine Etiketten Typen angelegt"
+
+            />
+          </v-row>
           <v-row>
             <v-text-field
                 v-model.trim="weight"
@@ -151,18 +165,17 @@
                 :items="store.units"
                 label="Einheit"
                 :readonly="!edit"
-            ></v-select>
-          </v-row>
-          <v-row>
-            <v-text-field
-                v-model.trim="ean"
-                label="EAN"
-                :readonly="!edit"
             />
           </v-row>
         </v-col>
 
         <v-col cols="5">
+          <v-text-field
+              v-model.trim="name"
+              :readonly="!edit"
+              label="Produkt Bezeichnung"
+          />
+
           <v-textarea
               v-model.trim="description"
               :tile=true
@@ -182,6 +195,12 @@
         </v-col>
 
         <v-col cols="5">
+          <v-text-field
+              v-model.trim="ean"
+              label="EAN"
+              :readonly="!edit"
+          />
+
           <v-textarea
               v-model.trim="ingredients"
               :tile=true

frontend/app/store/labelEditorStore.ts

@@ -187,6 +187,8 @@ export const useLabelEditorStore = defineStore('label_editor_store', {
 
     // Article
     async loadArticle(articleID: number) {
+      await this.loadLabels();
+
       try {
         const article: Article = await $fetch<Article>(this.config.public.url + '/article/' + articleID, {
           method: 'GET',