From d820e81674d3745ffc938fe64f2e850d2f93b3e9 Mon Sep 17 00:00:00 2001
From: Haoyu Sun <SunH26@cardiff.ac.uk>
Date: Mon, 28 Oct 2024 20:10:00 +0000
Subject: [PATCH] check itemDetails and exchangeItem, button exchange and
cancel function
---
.../takeaway/index/ExchangeController.java | 3 -
.../demo/takeaway/index/ExchangeItem.java | 4 +-
.../resources/templates/page/itemDetail.html | 59 ++++++++++++++++---
.../resources/templates/page/itemList.html | 2 +-
4 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java
index 05f3995..c0ed941 100644
--- a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java
+++ b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java
@@ -26,8 +26,5 @@ public class ExchangeController {
ExchangeItem exchangeItem = exchangeService.getExchangeItem(id);
modelAndView.addObject("exchangeItem", exchangeItem);
return modelAndView;
-
-
-
}
}
diff --git a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeItem.java b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeItem.java
index a43adec..a9a5e6e 100644
--- a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeItem.java
+++ b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeItem.java
@@ -9,6 +9,6 @@ public class ExchangeItem {
private Long id;
private String name;
private String description;
- private boolean ExchangeOrNot;
- private boolean MoneyOrNot;
+ private boolean exchangeOrNot;
+ private boolean moneyOrNot;
}
diff --git a/src/main/resources/templates/page/itemDetail.html b/src/main/resources/templates/page/itemDetail.html
index 9cb5311..d36d7d1 100644
--- a/src/main/resources/templates/page/itemDetail.html
+++ b/src/main/resources/templates/page/itemDetail.html
@@ -1,10 +1,55 @@
<!DOCTYPE html>
<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Title</title>
-</head>
-<body>
- <div>itemDetail</div>
-</body>
+
+ <head>
+ <meta charset="UTF-8">
+ <title>Title</title>
+ <script>
+ function sendRequest() {
+ alert("exchange message send successful");
+ }
+ </script>
+ </head>
+ <body>
+<!-- <div>itemDetail</div>-->
+ <table>
+ <!-- thead-->
+ <thead>
+ <tr>
+ <th>itemDetail</th>
+ </tr>
+ </thead>
+ <!--tbody-->
+ <tbody>
+ <tr>
+ <td>Id</td>
+ <td th:text="${exchangeItem.id}"></td>
+ </tr>
+ <tr>
+ <td>ItemName</td>
+ <td th:text="${exchangeItem.name}"></td>
+ </tr>
+ <tr>
+ <td>Description</td>
+ <td th:text="${exchangeItem.description}"></td>
+ </tr>
+ <tr>
+ <td>exchangeOrNot</td>
+ <td th:text="${exchangeItem.exchangeOrNot}"></td>
+ </tr>
+ <tr>
+ <td>exchangeOrNot</td>
+ <td th:text="${exchangeItem.moneyOrNot}"></td>
+ </tr>
+
+ </tbody>
+
+ </table>
+ <a th:href="@{/exchange}" style="text-decoration: none">
+ <button onclick="sendRequest()">EXCHANGE</button>
+ </a>
+ <a th:href="@{/exchange}" style="text-decoration: none">
+ <button>Cancel</button>
+ </a>
+ </body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/page/itemList.html b/src/main/resources/templates/page/itemList.html
index 8a78b94..26c9829 100644
--- a/src/main/resources/templates/page/itemList.html
+++ b/src/main/resources/templates/page/itemList.html
@@ -22,7 +22,7 @@
<td th:text="${exchangeItem.name}"></td>
<td th:text="${exchangeItem.description}"></td>
<td>
- <button><a th:href="@{/exchange/{link} (link=${exchangeItem.id})}">
+ <button><a th:href="@{/exchange/{link} (link=${exchangeItem.id})}" style="text-decoration: none">
seeDetails
</a></button>
</td>
--
GitLab