LP_DevOps/JEE_Project
Archived
1
0
Fork 0
Code Activity

Add some missing relations to list and home button to header

Browse source
This commit is contained in:
Ethanell 2022-06-29 23:21:15 +02:00
parent 7e63863d53
commit 6d27564706
6 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
build/web/WEB-INF/classes/controller/BddController$1.class
View file

Binary file not shown.

BIN
build/web/WEB-INF/classes/controller/BddController.class
View file

Binary file not shown.

5
build/web/WEB-INF/classes/jsp/header.jsp
View file

@ -5,9 +5,12 @@
--%> --%>
<header> <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"> <div style="display: flex; flex-direction: row">
<p>Welcome ${user.login}</p> <p>Welcome ${user.login}</p>
<form name="form" method="POST">
<input type="submit" formaction="menu.htm" value="Home" />
</form>
</div> </div>
<div style="display: flex; flex-direction: row; justify-content: flex-end"> <div style="display: flex; flex-direction: row; justify-content: flex-end">
<form name="form" method="POST"> <form name="form" method="POST">

3
build/web/WEB-INF/jsp/header.jsp
View file

@ -8,6 +8,9 @@
<nav style="display: flex; flex-direction: row; justify-content: space-between"> <nav style="display: flex; flex-direction: row; justify-content: space-between">
<div style="display: flex; flex-direction: row"> <div style="display: flex; flex-direction: row">
<p>Welcome ${user.login}</p> <p>Welcome ${user.login}</p>
<form name="form" method="POST">
<input type="submit" formaction="menu.htm" value="Home" />
</form>
</div> </div>
<div style="display: flex; flex-direction: row; justify-content: flex-end"> <div style="display: flex; flex-direction: row; justify-content: flex-end">
<form name="form" method="POST"> <form name="form" method="POST">

6
src/java/controller/BddController.java
View file

@ -75,6 +75,9 @@ public class BddController extends MultiActionController {
case "product": case "product":
mv.addObject("results", new MagasinHelper().getProductsColums()); mv.addObject("results", new MagasinHelper().getProductsColums());
mv.addObject("colonnes", Arrays.asList("productId", "manufacturerId", "productCode", "purchaseCost", "quantityOnHand", "markup", "available", "description")); mv.addObject("colonnes", Arrays.asList("productId", "manufacturerId", "productCode", "purchaseCost", "quantityOnHand", "markup", "available", "description"));
mv.addObject("relation", new HashMap<String, String>() {{
put("productCode", "prodCode");
}});
break; break;
case "purchase": case "purchase":
mv.addObject("results", new MagasinHelper().getPurchaseColums()); mv.addObject("results", new MagasinHelper().getPurchaseColums());
@ -91,6 +94,9 @@ public class BddController extends MultiActionController {
case "prodCode": case "prodCode":
mv.addObject("results", new MagasinHelper().getProductCodesColums()); mv.addObject("results", new MagasinHelper().getProductCodesColums());
mv.addObject("colonnes", Arrays.asList("prodCode", "discountCode", "description")); mv.addObject("colonnes", Arrays.asList("prodCode", "discountCode", "description"));
mv.addObject("relation", new HashMap<String, String>() {{
put("discountCode", "discount");
}});
break; break;
default: default:
mv.addObject("error", "Type not found"); mv.addObject("error", "Type not found");

3
web/WEB-INF/jsp/header.jsp
View file

@ -8,6 +8,9 @@
<nav style="display: flex; flex-direction: row; justify-content: space-between"> <nav style="display: flex; flex-direction: row; justify-content: space-between">
<div style="display: flex; flex-direction: row"> <div style="display: flex; flex-direction: row">
<p>Welcome ${user.login}</p> <p>Welcome ${user.login}</p>
<form name="form" method="POST">
<input type="submit" formaction="menu.htm" value="Home" />
</form>
</div> </div>
<div style="display: flex; flex-direction: row; justify-content: flex-end"> <div style="display: flex; flex-direction: row; justify-content: flex-end">
<form name="form" method="POST"> <form name="form" method="POST">