From a38b817f20b9c84b74a0e1fa80447d29796a74ff Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Wed, 27 May 2020 21:07:31 +0200
Subject: [PATCH 1/5] fixed empty input fields fixes #32

---
 .../resources/templates/intern/listedArticles/id.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/prototype/src/main/resources/templates/intern/listedArticles/id.html b/prototype/src/main/resources/templates/intern/listedArticles/id.html
index 1fad38c..dceafe0 100644
--- a/prototype/src/main/resources/templates/intern/listedArticles/id.html
+++ b/prototype/src/main/resources/templates/intern/listedArticles/id.html
@@ -24,7 +24,7 @@
             <form class="detailgrid" action="#" th:action="@{/intern/articles/{id}/saveChanges(id = ${ArticleID.id})}" th:object="${ArticleID}" method="POST" enctype="multipart/form-data">
                <p class="m">
                   <label for="title">Titel</label>
-                  <input class=" full-width" type="text" id="title" name="title" required="required" pattern="[A-Za-z0-9]{1,20}" th:value="${ArticleID.title}"/>
+                  <input class=" full-width" type="text" id="title" name="title" required="required" pattern=".+" th:value="${ArticleID.title}"/>
                </p>
                <p class="s">
                   <label for="ref-article">Refernzierter Artikel</label>
@@ -47,14 +47,14 @@
                <div class="s">
                   <p>
                      <label for="price">Preis (Netto)</label>
-                     <input class="" type="number" step="0.01" name="price_netto" th:value="${ArticleID.price_netto}"/>&nbsp;EUR <br/>
+                     <input class="" type="number" step="0.01" name="price_netto" required th:value="${ArticleID.price_netto}"/>&nbsp;EUR <br/>
                      (19% Mwst.)
                      <!-- Info von article ref--> <br/>
                      = <span th:text="${ArticleID.price}"></span>&nbsp;EUR Brutto
                   </p>
                   <p>
                      <label for="max-price-buy">Maximaler Einkaufspreis (Netto)</label>
-                     <input class="" type="number" id="reorderMaxPrice" step="0.01" name="reorderMaxPrice" th:value="${ArticleID.reorderMaxPrice}"/>&nbsp;EUR
+                     <input class="" type="number" id="reorderMaxPrice" step="0.01" required name="reorderMaxPrice" th:value="${ArticleID.reorderMaxPrice}"/>&nbsp;EUR
                   </p>
                   <div>
                      <fieldset>
@@ -77,7 +77,7 @@
                <div class="s">
                   <p>
                      <label for="price">Einheiten pro Lagerplatz</label>
-                     <input class="" type="number" id="units-per-slot" name="units-per-slot" th:value="${ArticleID.warehouseUnitsPerSlot}"/>                    
+                     <input class="" type="number" id="units-per-slot" required name="units-per-slot" th:value="${ArticleID.warehouseUnitsPerSlot}"/>                    
                   </p>
                   <p>
                      <b>Lagerbestand: <span th:text="${ArticleID.stock}"></span></b>

From 08dc4bcb477adeca476598e8469c7513b76f6903 Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Wed, 27 May 2020 21:43:26 +0200
Subject: [PATCH 2/5] fixed spaces in textarea

---
 .../controller/intern/InternArticleController.java          | 4 ++--
 .../main/resources/templates/intern/listedArticles/id.html  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
index 1d54302..35d76f8 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
@@ -83,7 +83,7 @@ public class InternArticleController {
 			@RequestParam(value = "price_netto", required = true) String pricenetto,
 			@RequestParam(value = "reorderMaxPrice", required = true) String reorderMaxPrice,
 			@RequestParam(value = "autobuy", required = true) Boolean shouldReorder,
-			@RequestParam(value = "categories", required = true) String categories,
+			@RequestParam(value = "categorie", required = true) String categories,
 			@RequestParam(value = "img", required = true) MultipartFile imgFile) {
 
 		Article tmpArticle = articleRepository.findArticleById(id); // get the old article
@@ -93,7 +93,7 @@ public class InternArticleController {
 		tmpArticle.categories.clear();
 
 		// loop through all categories strings and create a new category if a new one;
-		// also adds the categorys to the article
+		// also adds the categories to the article
 		for (String category : separatedCategories) {
 			tmpArticle.categories.add(categoryRepository.findCategoryByName(category.trim())
 					.orElseGet(() -> new Category(category.trim())));
diff --git a/prototype/src/main/resources/templates/intern/listedArticles/id.html b/prototype/src/main/resources/templates/intern/listedArticles/id.html
index dceafe0..874cfa8 100644
--- a/prototype/src/main/resources/templates/intern/listedArticles/id.html
+++ b/prototype/src/main/resources/templates/intern/listedArticles/id.html
@@ -70,9 +70,9 @@
                   <p>
                      Bitte jede Kategorien in eine eigene Zeile
                   </p>
-                  <textarea name="categories" id="categories" class="full-width" rows="6"th:inline="text">[[${ArticleID.categorie}]]
+                  <textarea name="categorie" id="categorie" class="full-width" required rows="6"th:inline="text" th:field="${ArticleID.categorie}">
 
-               </textarea>
+   </textarea>
                </div>
                <div class="s">
                   <p>
@@ -93,7 +93,7 @@
                </div>
                <p class="l">
                   <label for="description">Beschreibung</label>
-                  <textarea name="description" id="description" class="full-width" rows="15" th:inline="text">[[${ArticleID.description}]]
+ 				<textarea name="description" id="description" class="full-width" required th:field="${ArticleID.description}" rows="15" th:inline="text">
                   </textarea>
                </p>
                <div class="l">

From 35861d36648802be421a5edf094bfb05f0408ac9 Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Wed, 27 May 2020 21:53:58 +0200
Subject: [PATCH 3/5] fixed styling for edit/add btn

---
 .../main/resources/templates/intern/listedArticles/index.html   | 2 +-
 .../main/resources/templates/intern/offeredArticles/index.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/prototype/src/main/resources/templates/intern/listedArticles/index.html b/prototype/src/main/resources/templates/intern/listedArticles/index.html
index ad33f89..ff25abb 100644
--- a/prototype/src/main/resources/templates/intern/listedArticles/index.html
+++ b/prototype/src/main/resources/templates/intern/listedArticles/index.html
@@ -56,7 +56,7 @@
                      <td><a th:href="${'/intern/supplierOffers/#q=' + {article.title}}" th:text="${article.offer_id}"></a></td>
                      <td><a th:href="@{/intern/articles/{id}(id = ${article.id})}" th:text="${article.id}"></a></td>
                      <td>
-                        <form th:action="@{/intern/articles/{id}(id = ${article.id})}"><input type="submit" value="Bearbeiten" /></form>
+                        <form th:action="@{/intern/articles/{id}(id = ${article.id})}"><input class="button smaller" type="submit" value="Bearbeiten" /></form>
                      </td>
                   </tr>
                </tbody>
diff --git a/prototype/src/main/resources/templates/intern/offeredArticles/index.html b/prototype/src/main/resources/templates/intern/offeredArticles/index.html
index 7a18ccc..79d926a 100644
--- a/prototype/src/main/resources/templates/intern/offeredArticles/index.html
+++ b/prototype/src/main/resources/templates/intern/offeredArticles/index.html
@@ -54,7 +54,7 @@
                         <!-- ELSE -->
                         <div th:unless="${article.offerIsListed}">
                            <form class="detailgrid" action="#" th:action="@{/intern/articles/addArticle/{id}(id = ${article.offer_id})}" method="POST">
-                              <input type="submit" value="Hinzufügen" />
+                              <input class="button smaller" type="submit" value="Hinzufügen" />
                            </form>
                         </div>
                      </td>

From 2bf383b113888ceecc78fb90e2e9eaa8d967cba8 Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Thu, 28 May 2020 13:20:42 +0200
Subject: [PATCH 4/5] fix html warnings

---
 .../templates/intern/listedArticles/id.html    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/prototype/src/main/resources/templates/intern/listedArticles/id.html b/prototype/src/main/resources/templates/intern/listedArticles/id.html
index 874cfa8..135147b 100644
--- a/prototype/src/main/resources/templates/intern/listedArticles/id.html
+++ b/prototype/src/main/resources/templates/intern/listedArticles/id.html
@@ -27,18 +27,18 @@
                   <input class=" full-width" type="text" id="title" name="title" required="required" pattern=".+" th:value="${ArticleID.title}"/>
                </p>
                <p class="s">
-                  <label for="ref-article">Refernzierter Artikel</label>
+                  <label for="ref_disabled">Refernzierter Artikel</label>
                   <input class="" type="text" id="ref_disabled" th:value="${ArticleID.offer_id}" disabled/>
                   
                   <input type="hidden" id="ref_hidden" th:value="${ArticleID.offer_id}" name="ref-article" />
                   
-               <td><a th:href="${'/intern/supplierOffers/#q=' + {ArticleID.id}}">Details</a></td>
+               <a th:href="${'/intern/supplierOffers/#q=' + ArticleID.id}">Details</a>
                </p>
                <div class="spacer"></div>
                <div class="m">
                   <p>
                      <label for="img">Bild Hochladen</label>
-                     <input class="full-width" type="file" id="image" name="img"/>
+                     <input class="full-width" type="file" id="img" name="img"/>
                   </p>
                   <p>
                      <img th:src="@{/shop/articles/{id}/image.jpg(id=${ArticleID.id})}" class="m"/>
@@ -47,13 +47,13 @@
                <div class="s">
                   <p>
                      <label for="price">Preis (Netto)</label>
-                     <input class="" type="number" step="0.01" name="price_netto" required th:value="${ArticleID.price_netto}"/>&nbsp;EUR <br/>
+                     <input class="" type="number" id="price" step="0.01" name="price_netto" required th:value="${ArticleID.price_netto}"/>&nbsp;EUR <br/>
                      (19% Mwst.)
                      <!-- Info von article ref--> <br/>
                      = <span th:text="${ArticleID.price}"></span>&nbsp;EUR Brutto
                   </p>
                   <p>
-                     <label for="max-price-buy">Maximaler Einkaufspreis (Netto)</label>
+                     <label for="reorderMaxPrice">Maximaler Einkaufspreis (Netto)</label>
                      <input class="" type="number" id="reorderMaxPrice" step="0.01" required name="reorderMaxPrice" th:value="${ArticleID.reorderMaxPrice}"/>&nbsp;EUR
                   </p>
                   <div>
@@ -66,17 +66,17 @@
                   </div>
                </div>
                <div class="m">
-                  <label for="tags">Kategorien</label>
+                  <label for="categorie">Kategorien</label>
                   <p>
                      Bitte jede Kategorien in eine eigene Zeile
                   </p>
-                  <textarea name="categorie" id="categorie" class="full-width" required rows="6"th:inline="text" th:field="${ArticleID.categorie}">
+                  <textarea name="categorie" id="categorie" class="full-width" required rows="6" th:inline="text" th:field="${ArticleID.categorie}">
 
    </textarea>
                </div>
                <div class="s">
                   <p>
-                     <label for="price">Einheiten pro Lagerplatz</label>
+                     <label for="units-per-slot">Einheiten pro Lagerplatz</label>
                      <input class="" type="number" id="units-per-slot" required name="units-per-slot" th:value="${ArticleID.warehouseUnitsPerSlot}"/>                    
                   </p>
                   <p>
@@ -88,7 +88,7 @@
                      <!-- TODO: set link g-->
                   </p>
                   <p>
-                     <a href="/todo" class="button smaller">Lagerbuchung</a>
+                     <a href="/intern/warehouse/" class="button smaller">Lagerbuchung</a>
                   </p>
                </div>
                <p class="l">

From f4b0d6a576fe674a52bfd8a498060e3252489bae Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Thu, 28 May 2020 13:22:28 +0200
Subject: [PATCH 5/5] fix html warnings [2]

---
 .../main/resources/templates/intern/listedArticles/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prototype/src/main/resources/templates/intern/listedArticles/index.html b/prototype/src/main/resources/templates/intern/listedArticles/index.html
index ff25abb..6986f0b 100644
--- a/prototype/src/main/resources/templates/intern/listedArticles/index.html
+++ b/prototype/src/main/resources/templates/intern/listedArticles/index.html
@@ -29,7 +29,7 @@
                <tr>
                   <th colspan="9">
                      <input type="text" placeholder="Filtern" class="smaller jsFilterTable full-width"
-                        data-target-id="main-table"></input>
+                            data-target-id="main-table"/>
                   </th>
                </tr>
                <thead>
@@ -53,7 +53,7 @@
                      <td><span th:text="${article.price_netto}"></span> €</td>
                      <td><span th:text="${article.categorie}"></span></td>
                      <td><span th:text="${article.stock}"></span></td>
-                     <td><a th:href="${'/intern/supplierOffers/#q=' + {article.title}}" th:text="${article.offer_id}"></a></td>
+                     <td><a th:href="${'/intern/supplierOffers/#q=' + article.title}" th:text="${article.offer_id}"></a></td>
                      <td><a th:href="@{/intern/articles/{id}(id = ${article.id})}" th:text="${article.id}"></a></td>
                      <td>
                         <form th:action="@{/intern/articles/{id}(id = ${article.id})}"><input class="button smaller" type="submit" value="Bearbeiten" /></form>