Skip to content

Fixed Unit Logic To Display All Weapons #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harteagabran merged 2 commits into from
Feb 28, 2024
Merged

Fixed Unit Logic To Display All Weapons #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53ff5e1
Fixed Unit Logic To Display All Weapons
daj0606 Feb 28, 2024
41a34c4
Merge branch 'harteagabran:main' into main
daj0606 Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/controller/AddUnitServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
UnitHelper dao = new UnitHelper();
dao.insertUnit(u);

getServletContext().getRequestDispatcher("/add-unit.html").forward(request, response);
getServletContext().getRequestDispatcher("/add-unit.jsp").forward(request, response);
}

/**
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/controller/UnitNavigationServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package controller;

import java.io.IOException;
import java.util.List;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import model.Unit;
import model.Weapon;

/**
* Servlet implementation class UnitNavigationServlet
Expand Down Expand Up @@ -42,6 +45,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
// TODO Auto-generated method stub
UnitHelper dao = new UnitHelper();
WeaponHelper wao = new WeaponHelper();
String act = request.getParameter("doThisToUnit");

String path = "/viewAllUnitsServlet";
Expand All @@ -66,7 +70,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
System.out.println("Forgot to select an unit");
}
} else if (act.equals("add")) {
path = "/add-unit.html";
List<Weapon> allWeapons = wao.showAllWeapons();
request.setAttribute("allWeapons", allWeapons);
path = "/add-unit.jsp";
}

getServletContext().getRequestDispatcher(path).forward(request, response);
Expand Down
24 changes: 0 additions & 24 deletions src/main/webapp/add-unit.html
View file
Open in desktop

This file was deleted.

35 changes: 35 additions & 0 deletions src/main/webapp/add-unit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Add Unit</title>
</head>
<body>
<form action="addUnitServlet" method="post">
Name: <input type="text" name="unitName">
Level: <input type="number" name="level" min="0" value="0">
Hitpoints: <input type="number" name="hitpoints" min="0" value="0">
Strength: <input type="number" name="strength" min="0" value="0">
Magic: <input type="number" name="magic" min="0" value="0">
Skill: <input type="number" name="skill" min="0" value="0">
SP: <input type="number" name="sp" min="0" value="0">
Luck: <input type="number" name="luck" min="0" value="0">
Defense: <input type="number" name="defense" min="0" value="0">
Resistence: <input type="number" name="resistence" min="0" value="0">
<c:forEach items="${requestScope.allWeapons}" var="currentWeapon">
<tr>
<td>
${currentWeapon.weaponName}
</td>
</tr>
</c:forEach>
<input type="submit" value="Add Item">
</form> <br />

<a href="unit-menu.html">Back</a>
</body>
</body>
</html>
2 changes: 1 addition & 1 deletion src/main/webapp/unit-menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<h1 class="display-4 text-light">Fire Emblem Unit Manager</h1>
</div>
<div class="menu d-flex flex-column justify-content-around">
<a href="add-unit.html" class="atag btn btn-primary rounded-pill text-center" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-title="Add a New Unit" data-bs-content="This option lets you add a new Unit to the Database." data-bs-placement="bottom" data-bs-custom-class="custom-popover">Add Unit</a>
<a href="unitNavigationServlet" class="atag btn btn-primary rounded-pill text-center" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-title="Add a New Unit" data-bs-content="This option lets you add a new Unit to the Database." data-bs-placement="bottom" data-bs-custom-class="custom-popover" value="add" name="doThisToUnit">Add Unit</a>
<a href="viewAllUnitsServlet" class="atag btn btn-primary rounded-pill text-center" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-title="View All Units" data-bs-content="See all of the units you have created or edited." data-bs-placement="bottom" data-bs-custom-class="custom-popover">View Unit List</a>
<a href="editUnitServlet" class="atag btn btn-primary rounded-pill" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-title="Edit a Unit" data-bs-content="Here you can modify a Unit's stats, weapons, name, or classes." data-bs-placement="bottom" data-bs-custom-class="custom-popover">Edit Unit</a>
<a href="editUnitServlet" class="atag btn btn-primary rounded-pill" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-title="Delete a Unit" data-bs-content="You can delete a Unit permanantly from the database, be careful, this is PERMANENT." data-bs-placement="bottom" data-bs-custom-class="custom-popover">Delete Unit</a>
Expand Down
2 changes: 1 addition & 1 deletion ...e-wtp/web-resources/META-INF/maven/JavaII_Mini_Project/JavaII_Mini_Project/pom.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
#Tue Feb 27 08:54:41 CST 2024
#Tue Feb 27 18:10:53 CST 2024
m2e.projectLocation=C\:\\Users\\chumb\\eclipse-workspace\\JavaII_Mini_Project
m2e.projectName=JavaII_Mini_Project
groupId=JavaII_Mini_Project
Expand Down