Skip to content

Commit b4933e6

Browse files
committed
FindByShipAndRank working
1 parent e2ac55f commit b4933e6

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

src/main/webapp/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,17 @@ <h2>Congrats on your shiny, new Open Liberty sample app!</h2>
9191
<div id="findByShipSizeAndRank" class="flexBox vFlexContainer queryContainer">
9292
<strong id="createCrewMember" class="flexSelfCenter">Crew Members by Ship Size and Rank<br>CrewMembers.findByShipSizeAndRank()</strong>
9393
<div id="findByShipSizeAndRankSelectors" class="hFlexContainer">
94-
<select id="shipSizeSelector">
94+
<select id="shipSizeSelector" onchange="refreshDisplay()">
9595
<option>small</option>
9696
<option>large</option>
9797
</select>
98-
<select id="rankSelector">
98+
<select id="rankSelector" onchange="refreshDisplay()">
9999
<option>Captain</option>
100100
<option>Officer</option>
101101
<option>Engineer</option>
102102
</select>
103103
</div>
104+
<div id="shipAndRankBoxes" class="flexBox hFlexContainer"></div>
104105
</div>
105106
</div>
106107
</section>

src/main/webapp/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ async function refreshDisplay() {
7676
}
7777

7878
function clearDisplay(){
79-
var elements = ["userBoxes", "Captain", "Engineer", "Officer"];
79+
var elements = ["userBoxes", "Captain", "Engineer", "Officer", "shipAndRankBoxes"]; //TODO this should use a .class
8080
for (let i = 0; i < elements.length; i++) {
8181
var usersDiv = document.getElementById(elements[i]);
8282
while (usersDiv.firstChild) {

src/main/webapp/js/find-by-ship-size-and-rank.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,21 @@
1212
async function refreshFindByShipSizeAndRank(shipSize, rank) {
1313
response = await fetch("db/crew/shipSize/" +shipSize+"/rank/" +rank);
1414

15+
if (response.ok) {
16+
const doc = await response.json();
17+
doc.forEach(addToCrewMembersFindByShipSizeAndRank);
18+
}
19+
}
20+
21+
function addToCrewMembersFindByShipSizeAndRank(entry){
22+
var userHtml = "<div>Name: " + entry.Name + "</div>" +
23+
"<div>ID: " + entry.CrewID + "</div>" +
24+
"<div>Ship: " + entry.Ship + "</div>";
25+
26+
var userDiv = document.createElement("div");
27+
userDiv.setAttribute("class","user flexbox");
28+
userDiv.setAttribute("id",entry.CrewID);
29+
userDiv.setAttribute("onclick","remove('"+entry.CrewID+"')");
30+
userDiv.innerHTML=userHtml;
31+
document.getElementById("shipAndRankBoxes").appendChild(userDiv);
1532
}

0 commit comments

Comments
 (0)