Add some missing relations to list and home button to header
This commit is contained in:
parent
7e63863d53
commit
6d27564706
6 changed files with 16 additions and 1 deletions
Binary file not shown.
Binary file not shown.
|
@ -5,9 +5,12 @@
|
|||
--%>
|
||||
|
||||
<header>
|
||||
<nav style="display: flex; flex-direction: row; justify-content: space-between">
|
||||
<nav style="display: flex; flex-direction: row; justify-content: space-between; align-content: center">
|
||||
<div style="display: flex; flex-direction: row">
|
||||
<p>Welcome ${user.login}</p>
|
||||
<form name="form" method="POST">
|
||||
<input type="submit" formaction="menu.htm" value="Home" />
|
||||
</form>
|
||||
</div>
|
||||
<div style="display: flex; flex-direction: row; justify-content: flex-end">
|
||||
<form name="form" method="POST">
|
||||
|
|
|
@ -8,6 +8,9 @@
|
|||
<nav style="display: flex; flex-direction: row; justify-content: space-between">
|
||||
<div style="display: flex; flex-direction: row">
|
||||
<p>Welcome ${user.login}</p>
|
||||
<form name="form" method="POST">
|
||||
<input type="submit" formaction="menu.htm" value="Home" />
|
||||
</form>
|
||||
</div>
|
||||
<div style="display: flex; flex-direction: row; justify-content: flex-end">
|
||||
<form name="form" method="POST">
|
||||
|
|
|
@ -75,6 +75,9 @@ public class BddController extends MultiActionController {
|
|||
case "product":
|
||||
mv.addObject("results", new MagasinHelper().getProductsColums());
|
||||
mv.addObject("colonnes", Arrays.asList("productId", "manufacturerId", "productCode", "purchaseCost", "quantityOnHand", "markup", "available", "description"));
|
||||
mv.addObject("relation", new HashMap<String, String>() {{
|
||||
put("productCode", "prodCode");
|
||||
}});
|
||||
break;
|
||||
case "purchase":
|
||||
mv.addObject("results", new MagasinHelper().getPurchaseColums());
|
||||
|
@ -91,6 +94,9 @@ public class BddController extends MultiActionController {
|
|||
case "prodCode":
|
||||
mv.addObject("results", new MagasinHelper().getProductCodesColums());
|
||||
mv.addObject("colonnes", Arrays.asList("prodCode", "discountCode", "description"));
|
||||
mv.addObject("relation", new HashMap<String, String>() {{
|
||||
put("discountCode", "discount");
|
||||
}});
|
||||
break;
|
||||
default:
|
||||
mv.addObject("error", "Type not found");
|
||||
|
|
|
@ -8,6 +8,9 @@
|
|||
<nav style="display: flex; flex-direction: row; justify-content: space-between">
|
||||
<div style="display: flex; flex-direction: row">
|
||||
<p>Welcome ${user.login}</p>
|
||||
<form name="form" method="POST">
|
||||
<input type="submit" formaction="menu.htm" value="Home" />
|
||||
</form>
|
||||
</div>
|
||||
<div style="display: flex; flex-direction: row; justify-content: flex-end">
|
||||
<form name="form" method="POST">
|
||||
|
|
Reference in a new issue