Skip to content

added view.jsp * created toHtml in ContactType #64

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
VladimirSafronov merged 1 commit into from
Jan 16, 2023
Merged

added view.jsp * created toHtml in ContactType #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 20 additions & 2 deletions src/ru/javawebinar/basejava/model/ContactType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,18 @@

public enum ContactType {
MOBILE_PHONE("Mobile phone"),
SKYPE("Skype"),
EMAIL("Email"),
SKYPE("Skype") {
@Override
public String toHtml0(String value) {
return "<a href='skype:" + value + "'>" + value + "</a>";
}
},
EMAIL("Email") {
@Override
public String toHtml0(String value) {
return "<a href='mailto:" + value + "'>" + value + "</a>";
}
},
LINKEDIN("LinkedIn profile"),
GITHUB("Github profile"),
STACKOVERFLOW("Stackoverflow profile"),
Expand All @@ -17,4 +27,12 @@ public enum ContactType {
public String getTitle() {
return title;
}

protected String toHtml0(String value) {
return title + ": " + value;
}

public String toHtml(String value) {
return value == null ? "" : toHtml0(value);
}
}
29 changes: 25 additions & 4 deletions src/ru/javawebinar/basejava/web/ResumeServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package ru.javawebinar.basejava.web;

import java.io.Writer;
import javax.servlet.*;
import javax.servlet.http.*;
import java.io.IOException;
import ru.javawebinar.basejava.Config;
import ru.javawebinar.basejava.model.ContactType;
import ru.javawebinar.basejava.model.Resume;
import ru.javawebinar.basejava.storage.Storage;

Expand All @@ -17,8 +15,31 @@ public class ResumeServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
request.setAttribute("resumes", storage.getAllSorted());
request.getRequestDispatcher("/WEB-INF/jsp/list.jsp").forward(request, response);
String uuid = request.getParameter("uuid");
String action = request.getParameter("action");
if (action == null) {
request.setAttribute("resumes", storage.getAllSorted());
request.getRequestDispatcher("/WEB-INF/jsp/list.jsp").forward(request, response);
return;
}
Resume resume = null;
switch (action) {
case "delete":
storage.delete(uuid);
response.sendRedirect("resume");
return;
case "view":
case "edit":
resume = storage.get(uuid);
break;
default:
throw new IllegalStateException("Action " + action + " is illegal!");
}
request.setAttribute("resume", resume);
request.getRequestDispatcher(
("view".equals(action) ? "/WEB-INF/jsp/view.jsp" : "/WEB-INF/jsp/edit.jsp")
).forward(request, response);

}

@Override
Expand Down
9 changes: 9 additions & 0 deletions web/WEB-INF/jsp/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Title</title>
</head>
<body>

</body>
</html>
8 changes: 6 additions & 2 deletions web/WEB-INF/jsp/list.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
<tr>
<th>Name</th>
<th>Email</th>
<th></th>
<th></th>
</tr>
<c:forEach items="${resumes}" var="resume">
<jsp:useBean id="resume" type="ru.javawebinar.basejava.model.Resume"/>
<tr>
<td><a href="resume?uuid=${resume.uuid}">${resume.fullName}</a></td>
<td>${resume.getContact(ContactType.EMAIL)}</td>
<td><a href="resume?uuid=${resume.uuid}&action=view">${resume.fullName}</a></td>
<td><%=ContactType.EMAIL.toHtml(resume.getContact(ContactType.EMAIL))%></td>
<td><a href="resume?uuid=${resume.uuid}&action=delete">Delete</a></td>
<td><a href="resume?uuid=${resume.uuid}&action=edit">Edit</a></td>
</tr>
</c:forEach>
</table>
Expand Down
25 changes: 25 additions & 0 deletions web/WEB-INF/jsp/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>

<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="css/style.css">
<jsp:useBean id="resume" type="ru.javawebinar.basejava.model.Resume" scope="request"/>
<title>Resume ${resume.fullName}</title>
</head>
<body>
<jsp:include page="fragments/header.jsp"/>
<section>
<h2>${resume.fullName}&nbsp;<a href="resume?uuid=${resume.uuid}&action=edit">Edit</a></h2>
<p>
<c:forEach var="contactEntry" items="${resume.contacts}">
<jsp:useBean id="contactEntry"
type="java.util.Map.Entry<ru.javawebinar.basejava.model.ContactType, java.lang.String>"/>
<%=contactEntry.getKey().toHtml(contactEntry.getValue())%><br/>
</c:forEach>
</p>
</section>
<jsp:include page="fragments/footer.jsp"/>
</body>
</html>