feature/user #38

Merged
Seil0 merged 31 commits from feature/user into master 2020-06-03 18:36:08 +02:00
3 changed files with 6 additions and 3 deletions
Showing only changes of commit 846e448f01 - Show all commits

View File

@ -40,8 +40,6 @@ public class UserController {
User user = userRepository.findById(userId).get();
model.addAttribute("user", user);
//TODO: klären wegen Geschäftskundenunterscheidung
return "user/settings";
}

View File

@ -56,4 +56,9 @@ public class CustomerOrder {
public String formatDeliveredAt(){
return new SimpleDateFormat("dd.MM.yyyy HH:mm").format(deliveredAt);
}
public String getEstimatedArrival() {
//TODO: get estimated arrival from api
return "TODO TODO TODO";
}
}

View File

@ -27,7 +27,7 @@
<table class="key-value">
<tr>
<th>Lieferstatus</th>
<td th:if="${order.deliveredAt == null}"><b>Unterwegs</b> <br/> Vorraussichtliche Ankunft: TODO TODO TODO TODO</td>
<td th:if="${order.deliveredAt == null}"><b>Unterwegs</b> <br/> Vorraussichtliche Ankunft: <span th:text="${order.getEstimatedArrival()}" /></td>
<td th:if="${order.deliveredAt != null}"><b>Angekommen</b> <br/> Ankunft: <span th:text="${order.formatDeliveredAt()}" /></td>
</tr>
<tr>