localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

WIP feature/listedArticles #15

Merged
Seil0 merged 33 commits from feature/listedArticles into master 2020-05-15 19:48:22 +02:00
Conversation 0 Commits 33 Files Changed 10 +28 -11
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09c85fe8cb - Show all commits

3
prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
View File

@ -170,7 +170,7 @@ public class RequestController {
}
*/
/*
@GetMapping("/intern/articles/")
public String internArticles() {
return "intern/articles/index";
@ -180,6 +180,7 @@ public class RequestController {
public String internArticlesId() {
return "intern/articles/id";
}
*/
@GetMapping("/intern/customers/")
public String internCustomers() {

22
prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
View File

@ -12,7 +12,7 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
@Controller
@RequestMapping("intern/listedArticles")
@RequestMapping("intern/articles")
public class InternArticleController {
@Autowired
private final ArticleRepository articleRepository = null;
@ -49,6 +49,26 @@ public class InternArticleController {
return "intern/listedArticles/id";
}
@PostMapping("/{id}")
public String newEmployee( Model model, @PathVariable String id) {
System.out.println("\n------ POST -----\n");
int articleid = Integer.parseInt(id);
ListedArticlesListIdTotal total = new ListedArticlesListIdTotal();
total.addArticle(articleRepository.findArticleById(articleid),
warehouseEntryRepository.getArticleStock(articleid).orElse(0));
model.addAttribute("ArticleID", total);
return "intern/listedArticles/id";
}
public static class ListedArticlesListTotals {
Seil0 commented 2020-05-15 19:35:58 +02:00
Outdated
Review
Copy Link

String[] separatedCategories

String[] separatedCategories
localhorst commented 2020-05-15 19:46:08 +02:00
Review
Copy Link

fixed with a98782bc01

fixed with https://git.mosad.xyz/localhorst/e-commerce/commit/a98782bc01fcdd03b746a9030539fc2bdf9301c4

8
prototype/src/main/resources/templates/fragments/intern.html
View File

@ -13,11 +13,7 @@
<ul>
<li><a th:href="@{/intern/}">Dashboard</a>
</li>
<li><a th:href="@{/intern/listedArticles/}">Gelistete Artikel</a>
<ul>
<li><a th:href="@{/intern/articles/}">Händlerangebote</a>
</li>
</ul>
<li><a th:href="@{/intern/articles/}">Gelistete Artikel</a>
</li>
<li><a th:href="@{/intern/accounting/}">Alle Buchungen</a>
<ul>
@ -38,7 +34,7 @@
<li><a th:href="@{/intern/suppliers/}">Lieferanten</a>
<ul>
<li><a th:href="@{/intern/supplierOrders/}">Bestellungen</a></li>
<li><a th:href="@{/intern/articles/}">&gt; Händlerangebote</a></li>
<li><a th:href="@{/intern/suppliers/articles/}">&gt; Händlerangebote</a></li>
</ul>
</li>

6
prototype/src/main/resources/templates/intern/listedArticles/index.html
View File

@ -52,14 +52,14 @@
</thead>
<tbody>
<tr th:each="article : ${ListedArticles}">
<td><img th:src="${article.imgPath}" class="s"/></td>
<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.categorie}"></span></td>
<td><span th:text="${article.stock}"></span></td>
<td><a th:href="@{/intern/articles/{id}(id = ${article.offer_id})}" th:text="${article.offer_id}"></a></td>
<td><a th:href="@{/intern/listedArticles/{id}(id = ${article.id})}" th:text="${article.id}"></a></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/articles/{id}(id = ${article.id})}" th:text="${article.id}"></a></td>
</tr>
</tbody>
</table>