Skip to content

refactored Objective and Personal in edit.jsp #68

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

refactored Objective and Personal in edit.jsp #68

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
75 changes: 51 additions & 24 deletions web/WEB-INF/jsp/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<%@ page import="ru.javawebinar.basejava.model.SectionList" %>
<%@ page import="ru.javawebinar.basejava.model.SectionOrganization" %>
<%@ page import="ru.javawebinar.basejava.util.DateUtil" %>
<%@ page import="ru.javawebinar.basejava.model.SectionLine" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>

Expand All @@ -20,14 +21,18 @@
<input type="hidden" name="uuid" value="${resume.uuid}">
<h1>Name:</h1>
<dl>
<input type="text" name="fullName" size="50" value="${resume.fullName}">
<label>
<input type="text" name="fullName" size="50" value="${resume.fullName}">
</label>
</dl>
<h2>Contacts:</h2>
<c:forEach var="type" items="<%=ContactType.values()%>">
<dl>
<dt>${type.title}</dt>
<dd><input type="text" name="${type.name()}" size="30"
value="${resume.getContact(type)}"></dd>
<dd><label>
<input type="text" name="${type.name()}" size="30"
value="${resume.getContact(type)}">
</label></dd>
</dl>
</c:forEach>
<hr>
Expand All @@ -37,28 +42,40 @@
<h2><a>${type.title}</a></h2>
<c:choose>
<c:when test="${type=='OBJECTIVE'}">
<input type='text' name='${type}' size=75 value=<%=section%>>
<label>
<textarea name='${type}' cols=75
rows=5><%=((SectionLine) section).getContent()%></textarea>
</label>
</c:when>
<c:when test="${type=='PERSONAL'}">
<textarea name='${type}' cols=75 rows=5><%=section%></textarea>
<label>
<textarea name='${type}' cols=75
rows=5><%=((SectionLine) section).getContent()%></textarea>
</label>
</c:when>
<c:when test="${type=='QUALIFICATION' || type=='ACHIEVEMENT'}">
<textarea name='${type}' cols=75 rows=5>
<%=String.join("\n", ((SectionList) section).getContent())%></textarea>
<label>
<textarea name='${type}' cols=75 rows=5>
<%=String.join("\n", ((SectionList) section).getContent())%></textarea>
</label>
</c:when>
<c:when test="${type=='EXPERIENCE' || type=='EDUCATION'}">
<c:forEach var="org"
items="<%=((SectionOrganization) section).getOrganizations()%>"
varStatus="counter">
<dl>
<dt>Organization name:</dt>
<dd><input type="text" name='${type}' size=100
value="${org.homePage.name}"></dd>
<dd><label>
<input type="text" name='${type}' size=100
value="${org.homePage.name}">
</label></dd>
</dl>
<dl>
<dt>Organization url:</dt>
<dd><input type="text" name='${type}url' size=100
value="${org.homePage.url}"></dd>
<dd><label>
<input type="text" name='${type}url' size=100
value="${org.homePage.url}">
</label></dd>
</dl>
<br>
<div style="margin-left: 30px">
Expand All @@ -68,32 +85,42 @@
<dl>
<dt>Start date:</dt>
<dd>
<input type="text" name="${type}${counter.index}startDate"
size=10
value="<%=DateUtil.format(pos.getStartDate())%>"
placeholder="MM/yyyy">
<label>
<input type="text"
name="${type}${counter.index}startDate"
size=10
value="<%=DateUtil.format(pos.getStartDate())%>"
placeholder="MM/yyyy">
</label>
</dd>
</dl>
<dl>
<dt>End date:</dt>
<dd>
<input type="text" name="${type}${counter.index}endDate"
size=10
value="<%=DateUtil.format(pos.getEndDate())%>"
placeholder="MM/yyyy">
<label>
<input type="text" name="${type}${counter.index}endDate"
size=10
value="<%=DateUtil.format(pos.getEndDate())%>"
placeholder="MM/yyyy">
</label>
</dl>
<dl>
<dt>Position:</dt>
<dd>
<input type="text" name="${type}${counter.index}title"
size=75
value="${pos.title}">
<label>
<input type="text" name="${type}${counter.index}title"
size=75
value="${pos.title}">
</label>
</dl>
<dl>
<dt>Description:</dt>
<dd>
<textarea name="${type}${counter.index}description" rows=5
cols=75>${pos.description}</textarea>
<label>
<textarea name="${type}${counter.index}description"
rows=5
cols=75>${pos.description}</textarea>
</label>
</dd>
</dl>
</c:forEach>
Expand Down
22 changes: 11 additions & 11 deletions web/WEB-INF/jsp/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
<c:set var="section" value="${sectionEntry.value}"/>
<jsp:useBean id="section" type="ru.javawebinar.basejava.model.Section"/>
<tr>
<td><h3><a name="type.name">${type.title}</a></h3></td>
<c:if test="${type=='OBJECTIVE'}">
<td><h3><a name="type.name">${type.title}</a></h3></td>
<c:if test="${type=='OBJECTIVE'}">
<tr>
<td>
<h3><%=((SectionLine) section).getContent()%>
</h3>
<%=((SectionLine) section).getContent()%>
</td>
</c:if>
</tr>
</tr>
</c:if>
<c:if test="${type!='OBJECTIVE'}">
<c:choose>
<c:when test="${type=='PERSONAL'}">
Expand Down Expand Up @@ -69,12 +69,10 @@
<td>
<c:choose>
<c:when test="${empty org.homePage.url}">
<h3>${org.homePage.name}</h3>
${org.homePage.name}
</c:when>
<c:otherwise>
<h3>
<a href="${org.homePage.url}">${org.homePage.name}</a>
</h3>
<a href="${org.homePage.url}">${org.homePage.name}</a>
</c:otherwise>
</c:choose>
</td>
Expand All @@ -85,7 +83,9 @@
<tr>
<td><%=HtmlUtil.formatDates(position)%>
</td>
<td><b>${position.title}</b><br>${position.description}</td>
</tr>
<tr>
<td>${position.title}<br>${position.description}</td>
</tr>
</c:forEach>
</c:forEach>
Expand Down