Revert "Revert "UImodel for offeredArticle page, html cleanup""
This reverts commit 0840eda369
.
This commit is contained in:
parent
0840eda369
commit
14bef592c4
|
@ -1,5 +1,8 @@
|
|||
package org.hso.ecommerce.controller.intern.suppliers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
@ -12,14 +15,118 @@ public class SupplierOfferController {
|
|||
@GetMapping("supplierOffers")
|
||||
public String internListedArticles(Model model) {
|
||||
|
||||
List<UImodelOfferedArticle> totals = new ArrayList<UImodelOfferedArticle>();
|
||||
|
||||
/*
|
||||
* for (Article article : articleRepository.findAll()) { UImodelArticles tmp =
|
||||
* new UImodelArticles(); tmp.addListedArticle(article,
|
||||
* warehouseEntryRepository.getArticleStock(article.id).orElse(0));
|
||||
* totals.add(tmp); }
|
||||
*/
|
||||
|
||||
UImodelOfferedArticle tmp01 = new UImodelOfferedArticle();
|
||||
UImodelOfferedArticle tmp02 = new UImodelOfferedArticle();
|
||||
UImodelOfferedArticle tmp03 = new UImodelOfferedArticle();
|
||||
|
||||
tmp01.addData("Title01", "manufacturer01", "articlenumber01", "supplierName01", 4884, "42,42 €", "ads01", 5);
|
||||
tmp02.addData("Title02", "manufacturer02", "articlenumber02", "supplierName02", 4884, "42,42 €", "ads02", 6);
|
||||
tmp03.addData("Title03", "manufacturer03", "articlenumber03", "supplierName03", 4884, "42,42 €", "ads03", 7);
|
||||
|
||||
totals.add(tmp01);
|
||||
totals.add(tmp02);
|
||||
totals.add(tmp03);
|
||||
|
||||
|
||||
|
||||
model.addAttribute("OfferedArticles", totals);
|
||||
return "intern/offeredArticles/index";
|
||||
}
|
||||
|
||||
public class UImodelOfferedArticle {
|
||||
|
||||
String title;
|
||||
String manufacturer;
|
||||
String articlenumber;
|
||||
String supplierName;
|
||||
int supplierId;
|
||||
String price;
|
||||
String ads;
|
||||
int listedArticleId;
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getManufacturer() {
|
||||
return manufacturer;
|
||||
}
|
||||
|
||||
public void setManufacturer(String manufacturer) {
|
||||
this.manufacturer = manufacturer;
|
||||
}
|
||||
|
||||
public String getArticlenumber() {
|
||||
return articlenumber;
|
||||
}
|
||||
|
||||
public void setArticlenumber(String articlenumber) {
|
||||
this.articlenumber = articlenumber;
|
||||
}
|
||||
|
||||
public String getSupplierName() {
|
||||
return supplierName;
|
||||
}
|
||||
|
||||
public void setSupplierName(String supplierName) {
|
||||
this.supplierName = supplierName;
|
||||
}
|
||||
|
||||
public int getSupplierId() {
|
||||
return supplierId;
|
||||
}
|
||||
|
||||
public void setSupplierId(int supplierId) {
|
||||
this.supplierId = supplierId;
|
||||
}
|
||||
|
||||
public String getPrice() {
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setPrice(String price) {
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public String getAds() {
|
||||
return ads;
|
||||
}
|
||||
|
||||
public void setAds(String ads) {
|
||||
this.ads = ads;
|
||||
}
|
||||
|
||||
public int getListedArticleId() {
|
||||
return listedArticleId;
|
||||
}
|
||||
|
||||
public void setListedArticleId(int listedArticleId) {
|
||||
this.listedArticleId = listedArticleId;
|
||||
}
|
||||
|
||||
public void addData(String title, String manufacturer, String articlenumber, String supplierName,
|
||||
int supplierId, String price, String ads, int listedArticleId) {
|
||||
|
||||
this.title = title;
|
||||
this.manufacturer = manufacturer;
|
||||
this.articlenumber = articlenumber;
|
||||
this.supplierName = supplierName;
|
||||
this.supplierId = supplierId;
|
||||
this.price = price;
|
||||
this.ads = ads;
|
||||
this.listedArticleId = listedArticleId;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,22 +1,18 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="de" dir="ltr" xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=0.75, user-scalable=no">
|
||||
|
||||
<title>Bearbeiten: Artikel</title>
|
||||
<script th:src="@{/js/filterTable.js}"></script>
|
||||
<link rel="stylesheet" th:href="@{/css/ecom.css}"/>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<nav th:replace="fragments/header :: header">Header</nav>
|
||||
<div class="sidebar-layout content-width">
|
||||
<nav></nav>
|
||||
<div>
|
||||
<h1>Artikel bearbeiten</h1>
|
||||
|
||||
<script th:src="@{/js/back.js}"></script>
|
||||
<div class="back" data-group="intern" data-insert="true"></div>
|
||||
</div>
|
||||
|
@ -25,10 +21,7 @@
|
|||
<nav th:replace="fragments/intern :: sidebar"></nav>
|
||||
<div class="content-width">
|
||||
<h2>Gelisteter Artikel ID <span th:text="${ArticleID.id}"></span></h2>
|
||||
|
||||
|
||||
<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" name="title" th:value="${ArticleID.title}"/>
|
||||
|
@ -69,7 +62,6 @@
|
|||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="m">
|
||||
<label for="tags">Kategorien</label>
|
||||
<p>
|
||||
|
@ -79,7 +71,6 @@
|
|||
|
||||
</textarea>
|
||||
</div>
|
||||
|
||||
<div class="s">
|
||||
<p>
|
||||
<label for="price">Einheiten pro Lagerplatz</label>
|
||||
|
@ -95,10 +86,8 @@
|
|||
</p>
|
||||
<p>
|
||||
<a href="/todo" class="button smaller">Lagerbuchung</a>
|
||||
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<p class="l">
|
||||
<label for="description">Beschreibung</label>
|
||||
<textarea name="description" class="full-width" rows="15" th:inline="text">[[${ArticleID.description}]]
|
||||
|
@ -114,5 +103,4 @@
|
|||
</main>
|
||||
<footer th:replace="fragments/footer :: footer"></footer>
|
||||
</body>
|
||||
|
||||
</html>
|
|
@ -1,22 +1,18 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="de" dir="ltr" xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=0.75, user-scalable=no">
|
||||
|
||||
<title>Gelistete Artikel</title>
|
||||
<script th:src="@{/js/filterTable.js}"></script>
|
||||
<link rel="stylesheet" th:href="@{/css/ecom.css}"/>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<nav th:replace="fragments/header :: header">Header</nav>
|
||||
<div class="sidebar-layout content-width">
|
||||
<nav></nav>
|
||||
<div>
|
||||
<h1>Gelistete Artikel</h1>
|
||||
|
||||
<script th:src="@{/js/back.js}"></script>
|
||||
<div class="back" data-group="intern" data-name="Zurück zu den gelisteten Artikeln." data-insert="false"></div>
|
||||
</div>
|
||||
|
@ -28,7 +24,6 @@
|
|||
Weitere Artikel können über Artikelübersicht der Lieferanten hinzugefügt werden.
|
||||
<a class="button smaller" th:href="@{/intern/supplierOffers}"> Jetzt Hinzufügen </a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<table id="main-table">
|
||||
<tr>
|
||||
|
@ -54,13 +49,15 @@
|
|||
<tr th:each="article : ${ListedArticles}">
|
||||
<td><img th:src="@{/shop/articles/{id}/image.jpg(id=${article.id})}" class="s"/></td>
|
||||
<td><span th:text="${article.title}"></span></td>
|
||||
<td><span th:text="${article.price}"></span></td>
|
||||
<td><span th:text="${article.price_netto}"></span></td>
|
||||
<td><span th:text="${article.price}"></span> €</td>
|
||||
<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/suppliers/articles/{id}(id = ${article.offer_id})}" th:text="${article.offer_id}"></a></td>
|
||||
<td><a th:href="@{/intern/supplierOffered/{id}(id = ${article.offer_id})}" 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></td>
|
||||
<td>
|
||||
<form th:action="@{/intern/articles/{id}(id = ${article.id})}"><input type="submit" value="Bearbeiten" /></form>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -69,5 +66,4 @@
|
|||
</main>
|
||||
<footer th:replace="fragments/footer :: footer"></footer>
|
||||
</body>
|
||||
|
||||
</html>
|
|
@ -1,22 +1,18 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="de" dir="ltr" xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=0.75, user-scalable=no">
|
||||
|
||||
<title>Händlerangebote</title>
|
||||
<script th:src="@{/js/filterTable.js}"></script>
|
||||
<link rel="stylesheet" th:href="@{/css/ecom.css}"/>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<nav th:replace="fragments/header :: header">Header</nav>
|
||||
<div class="sidebar-layout content-width">
|
||||
<nav></nav>
|
||||
<div>
|
||||
<h1>Übersicht der Angebote von Lieferanten</h1>
|
||||
|
||||
<script th:src="@{/js/back.js}"></script>
|
||||
<div class="back" data-group="intern" data-name="Zurück zur Übersicht der von Lieferanten angebotenen Artikel."
|
||||
data-insert="false"></div>
|
||||
|
@ -29,10 +25,10 @@
|
|||
<table id="main-table">
|
||||
<tr>
|
||||
<th colspan="7">
|
||||
<input type="text" placeholder="Filtern" class="smaller jsFilterTable full-width"
|
||||
data-target-id="main-table"></input>
|
||||
<input type="text" placeholder="Filtern" class="smaller jsFilterTable full-width" data-target-id="main-table"></input>
|
||||
</th>
|
||||
</tr>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Hersteller</th>
|
||||
|
@ -42,99 +38,22 @@
|
|||
<th>Werbungs-<br/>anfrage</th>
|
||||
<th>Status</th>
|
||||
</tr>
|
||||
<!--**********************************************************-->
|
||||
<tr data-group="5420">
|
||||
<td>Kamera</td>
|
||||
<td>Sonjizu</td>
|
||||
<td>K48431587EX</td>
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/listedArticles/48670}">Gelistet 44048</a></td>
|
||||
</tr>
|
||||
<tr data-group="5420">
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/suppliers/48670}">Hans Guck GmbH</a></td>
|
||||
<td>584,50 EUR</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr data-group="5420">
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/suppliers/48670}">Cheap AG</a></td>
|
||||
<td>84,54 EUR</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr data-group="5420">
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/suppliers/48670}">Not Cheap AG</a></td>
|
||||
<td>184,54 EUR</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
|
||||
</tr>
|
||||
|
||||
<!--**********************************************************-->
|
||||
<tr data-group="1233">
|
||||
<td>Earbuds</td>
|
||||
<td>Sonjizu</td>
|
||||
<td>G447#$X</td>
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/listedArticles/48670}">Gelistet 448</a></td>
|
||||
</tr>
|
||||
<tr data-group="1233">
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/suppliers/48670}">Cheap AG</a></td>
|
||||
<td>50,54 EUR</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
|
||||
<!--**********************************************************-->
|
||||
<tr data-group="42415">
|
||||
<td>Mundschutz</td>
|
||||
<td>Farma Corp</td>
|
||||
<td>Mu-15415</td>
|
||||
<td colspan="3"></td>
|
||||
<td><a class="button smaller" th:href="@{/intern/listedArticles/48670}">Hinzufügen</a></td>
|
||||
</tr>
|
||||
<tr data-group="42415">
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/suppliers/48670}">Cheap AG</a></td>
|
||||
<td>150,54 EUR</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
|
||||
</tr>
|
||||
<tr data-group="42415">
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/suppliers/48670}">Not Cheap AG</a></td>
|
||||
<td>250,54 EUR</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
|
||||
<!--**********************************************************-->
|
||||
<tr data-group="4580">
|
||||
<td>Goldbaren</td>
|
||||
<td>Bundesbank</td>
|
||||
<td>G1KG</td>
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/listedArticles/48670}">Inaktiv 4888</a></td>
|
||||
</tr>
|
||||
<tr data-group="4580">
|
||||
<td colspan="3"></td>
|
||||
<td><a th:href="@{/intern/suppliers/48670}">Cheap AG</a></td>
|
||||
<td>10000,54 EUR</td>
|
||||
<td>X</td>
|
||||
<td></td>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:each="article : ${OfferedArticles}">
|
||||
<td><span th:text="${article.title}"></span></td>
|
||||
<td><span th:text="${article.manufacturer}"></span></td>
|
||||
<td><span th:text="${article.articlenumber}"></span></td>
|
||||
<td><a th:href="@{/intern/suppliers/{id}(id = ${article.supplierId})}" th:text="${article.supplierName}"></a></td>
|
||||
<td><span th:text="${article.price}"></span></td>
|
||||
<td><span th:text="${article.ads}"></span></td>
|
||||
<td><a th:href="@{/intern/articles/{id}(id = ${article.listedArticleId})}" th:text="${article.listedArticleId}"></a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</p>
|
||||
</div>
|
||||
</main>
|
||||
<footer th:replace="fragments/footer :: footer"></footer>
|
||||
</body>
|
||||
|
||||
</html>
|
Reference in New Issue