diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 825276a..fce7081 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -2,3 +2,4 @@ /student_contact_info/ /student_info/ /uic_classes/ +/vaccination_card/ diff --git a/build/classes/vaccination_card/dao/vaccination_cardDao.class b/build/classes/vaccination_card/dao/vaccination_cardDao.class index 0bf887b..d0c5210 100644 Binary files a/build/classes/vaccination_card/dao/vaccination_cardDao.class and b/build/classes/vaccination_card/dao/vaccination_cardDao.class differ diff --git a/build/classes/vaccination_card/service/vaccination_cardService.class b/build/classes/vaccination_card/service/vaccination_cardService.class index f06616d..11ca0cb 100644 Binary files a/build/classes/vaccination_card/service/vaccination_cardService.class and b/build/classes/vaccination_card/service/vaccination_cardService.class differ diff --git a/src/main/java/student_contact_info/web/servlet/findAll.java b/src/main/java/student_contact_info/web/servlet/findAll.java new file mode 100644 index 0000000..02a3856 --- /dev/null +++ b/src/main/java/student_contact_info/web/servlet/findAll.java @@ -0,0 +1,50 @@ +package student_contact_info.web.servlet; + +import java.io.IOException; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import student_contact_info.service.student_contact_infoService; + +/** + * Servlet implementation class findAll + */ + +//public class extends HttpServlet { +// private static final long serialVersionUID = 1L; +// +// protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { +// doPost(request,response); +// } +// +// /** +// * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) +// */ +// protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { +// UserService userservice = new UserService(); +// try { +// request.setAttribute("UserList", userservice.findall()); +// } catch (InstantiationException | IllegalAccessException +// | ClassNotFoundException e) { +// e.printStackTrace(); +// } +// try { +// List li = userservice.findall(); +// for(int i = 0; i < li.size();i++){ +// System.out.println(li.get(i).toString()); +// } +// +// } catch (InstantiationException | IllegalAccessException +// | ClassNotFoundException e) { +// e.printStackTrace(); +// } +// +// +// request.getRequestDispatcher("/jsps/user/q1_list_users.jsp").forward(request, response); +// } +// +//} diff --git a/src/main/java/vaccination_card/dao/vaccination_cardDao.java b/src/main/java/vaccination_card/dao/vaccination_cardDao.java index 11b785b..83be049 100644 --- a/src/main/java/vaccination_card/dao/vaccination_cardDao.java +++ b/src/main/java/vaccination_card/dao/vaccination_cardDao.java @@ -5,9 +5,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; - - +import user.domain.User; //import java.util.ArrayList; //import java.util.List; @@ -133,4 +134,31 @@ public void delete(String UIN_p) throws ClassNotFoundException, InstantiationExc throw new RuntimeException(e); } } + + + public List findDate() throws InstantiationException, IllegalAccessException, ClassNotFoundException{ + List list = new ArrayList<>(); + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + Connection connect = DriverManager.getConnection("jdbc:mysql://127.0.0.1:3306/uic_covid_database", MySQL_user, MySQL_password); + String sql = "select first_dose, second_dose from vaccination_card where Name = \"Vedant\""; + PreparedStatement preparestatement = connect.prepareStatement(sql); + ResultSet resultSet = preparestatement.executeQuery(); + while(resultSet.next()){ + + vaccination_card user = new vaccination_card(); + user.setFirst_dose( java.sql.Date.valueOf((resultSet.getString("first_dose"))) ); + user.setSecond_date( java.sql.Date.valueOf((resultSet.getString("second_dose"))) ); + + list.add(user); + } + connect.close(); + } catch(SQLException e) { + throw new RuntimeException(e); + } + return list; + + } + + } diff --git a/src/main/java/vaccination_card/domain/vaccination_card.java b/src/main/java/vaccination_card/domain/vaccination_card.java index d88d14c..fd50a8e 100644 --- a/src/main/java/vaccination_card/domain/vaccination_card.java +++ b/src/main/java/vaccination_card/domain/vaccination_card.java @@ -5,7 +5,7 @@ /** * User object * - * @author Aayush Makharia + * @author * */ public class vaccination_card { diff --git a/src/main/java/vaccination_card/service/vaccination_cardService.java b/src/main/java/vaccination_card/service/vaccination_cardService.java index 9dd7d12..0217bb3 100644 --- a/src/main/java/vaccination_card/service/vaccination_cardService.java +++ b/src/main/java/vaccination_card/service/vaccination_cardService.java @@ -1,6 +1,8 @@ package vaccination_card.service; +import java.util.List; + import vaccination_card.dao.vaccination_cardDao; import vaccination_card.domain.vaccination_card; @@ -25,4 +27,9 @@ public void create(vaccination_card form) throws vaccination_cardException, Clas if(entity1.getUIN()!=null && entity1.getUIN().equals(form.getUIN())) throw new vaccination_cardException("This UIN has been registered!"); entity1Dao.add(form); } + + public List findDate() throws InstantiationException, IllegalAccessException, ClassNotFoundException{ + return entity1Dao.findDate(); + + } } diff --git a/src/main/java/vaccination_card/web/servlet/displayDoseDate.java b/src/main/java/vaccination_card/web/servlet/displayDoseDate.java new file mode 100644 index 0000000..3ecd6cf --- /dev/null +++ b/src/main/java/vaccination_card/web/servlet/displayDoseDate.java @@ -0,0 +1,40 @@ +package vaccination_card.web.servlet; + +import java.io.IOException; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import vaccination_card.service.vaccination_cardService; + +/** + * Servlet implementation class findAll + */ + +public class displayDoseDate extends HttpServlet { + private static final long serialVersionUID = 1L; + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doPost(request,response); + } + + /** + * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) + */ + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + vaccination_cardService userservice = new vaccination_cardService(); + try { + request.setAttribute("vaccination_cardList", userservice.findDate()); + } catch (InstantiationException | IllegalAccessException + | ClassNotFoundException e) { + e.printStackTrace(); + } + + + request.getRequestDispatcher("/jsps/vaccination_card/displayDoseDate.jsp").forward(request, response); + } + +} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index dc99b81..22b6cb0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -59,6 +59,8 @@ UserServletRegister /UserServletRegister + + UserServletLogin @@ -82,6 +84,17 @@ /UserServletLogout + + + InitializeDB + InitializeDB + user.web.servlet.UserServletRegister + + + InitializeDB + /InitializeDB + + student_contact_infoServletCreate @@ -264,14 +277,25 @@ findAll - findAll - + findAll user.web.servlet.findAll findAll /findAll + + + + displayDoseDate + displayDoseDate + vaccination_card.web.servlet.displayDoseDate + + + displayDoseDate + /displayDoseDate + + index.html login.jsp diff --git a/src/main/webapp/jsps/initialize/init.jsp b/src/main/webapp/jsps/initialize/init.jsp new file mode 100644 index 0000000..32dfa69 --- /dev/null +++ b/src/main/webapp/jsps/initialize/init.jsp @@ -0,0 +1,33 @@ +<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + Initialize Database + + + + + + + + + + + + +

Initialize Database

+ +

${msg }

+
+ + + +
+ + diff --git a/src/main/webapp/jsps/top.jsp b/src/main/webapp/jsps/top.jsp index fea45a0..25b67ae 100644 --- a/src/main/webapp/jsps/top.jsp +++ b/src/main/webapp/jsps/top.jsp @@ -39,6 +39,7 @@ LoginRegister |  + <%-- Initialize Database |   --%> diff --git a/src/main/webapp/jsps/user/q1_list_users.jsp b/src/main/webapp/jsps/user/q1_list_users.jsp index c691b7b..aca5ffa 100644 --- a/src/main/webapp/jsps/user/q1_list_users.jsp +++ b/src/main/webapp/jsps/user/q1_list_users.jsp @@ -22,4 +22,4 @@ - + \ No newline at end of file diff --git a/src/main/webapp/jsps/user/queries.jsp b/src/main/webapp/jsps/user/queries.jsp index 03a41cc..e2e05bb 100644 --- a/src/main/webapp/jsps/user/queries.jsp +++ b/src/main/webapp/jsps/user/queries.jsp @@ -25,7 +25,7 @@

Welcome to the Demo


Please list all the user in the table   - - +
+ Find the First Dose and Second Dose Date   diff --git a/src/main/webapp/jsps/vaccination_card/displayDoseDate.jsp b/src/main/webapp/jsps/vaccination_card/displayDoseDate.jsp new file mode 100644 index 0000000..7c135f1 --- /dev/null +++ b/src/main/webapp/jsps/vaccination_card/displayDoseDate.jsp @@ -0,0 +1,28 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + +

Display Dose Date

+ + + + + + + + + + + +
First_DoseSecond_Dose
${vaccination_card.first_dose}${vaccination_card.second_date}
+ + + + +