romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#55 added delete input style

Browse Source
This commit is contained in:
Nightblade73 2019-04-14 20:42:11 +04:00
parent 34499abd60
commit 8cfc64ea85
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/ru/ulstu/conference/controller/ConferenceController.java
View File

@ -52,8 +52,9 @@ public class ConferenceController {
@PostMapping(value = "/conference", params = "save") @PostMapping(value = "/conference", params = "save")
public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException { public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
filterEmptyDeadlines(conferenceDto); filterEmptyDeadlines(conferenceDto);
if (errors.hasErrors()) if (errors.hasErrors()) {
return CONFERENCE_PAGE; return CONFERENCE_PAGE;
}
conferenceService.save(conferenceDto); conferenceService.save(conferenceDto);
return String.format(REDIRECT_TO, CONFERENCES_PAGE); return String.format(REDIRECT_TO, CONFERENCES_PAGE);
@ -62,8 +63,9 @@ public class ConferenceController {
@PostMapping(value = "/conference", params = "addDeadline") @PostMapping(value = "/conference", params = "addDeadline")
public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) { public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) {
filterEmptyDeadlines(conferenceDto); filterEmptyDeadlines(conferenceDto);
if (errors.hasErrors()) if (errors.hasErrors()) {
return CONFERENCE_PAGE; return CONFERENCE_PAGE;
}
conferenceDto.getDeadlines().add(new Deadline()); conferenceDto.getDeadlines().add(new Deadline());
return CONFERENCE_PAGE; return CONFERENCE_PAGE;
} }
@ -71,13 +73,10 @@ public class ConferenceController {
@PostMapping(value = "/conference", params = "removeDeadline") @PostMapping(value = "/conference", params = "removeDeadline")
public String removeDeadline(@Valid ConferenceDto conferenceDto, Errors errors, public String removeDeadline(@Valid ConferenceDto conferenceDto, Errors errors,
@RequestParam(value = "removeDeadline") Integer deadlineIndex) throws IOException { @RequestParam(value = "removeDeadline") Integer deadlineIndex) throws IOException {
if (errors.hasErrors()) if (errors.hasErrors()) {
return CONFERENCE_PAGE; return CONFERENCE_PAGE;
conferenceService.removeDeadline(conferenceDto, deadlineIndex);
if (conferenceDto.getDeadlines().get(deadlineIndex).getId() != null) {
conferenceDto.getRemovedDeadlineIds().add(conferenceDto.getDeadlines().get(deadlineIndex).getId());
} }
conferenceDto.getDeadlines().remove(conferenceDto.getDeadlines().get(deadlineIndex)); conferenceService.removeDeadline(conferenceDto, deadlineIndex);
return CONFERENCE_PAGE; return CONFERENCE_PAGE;
} }

5
src/main/java/ru/ulstu/conference/service/ConferenceService.java
View File

@ -65,7 +65,10 @@ public class ConferenceService {
} }
public void removeDeadline(ConferenceDto conferenceDto, Integer deadlineIndex) throws IOException { public void removeDeadline(ConferenceDto conferenceDto, Integer deadlineIndex) throws IOException {
if (conferenceDto.getDeadlines().get(deadlineIndex).getId() != null) {
conferenceDto.getRemovedDeadlineIds().add(conferenceDto.getDeadlines().get(deadlineIndex).getId());
}
conferenceDto.getDeadlines().remove(conferenceDto.getDeadlines().get(deadlineIndex));
} }
private Conference copyFromDto(Conference conference, ConferenceDto conferenceDto) throws IOException { private Conference copyFromDto(Conference conference, ConferenceDto conferenceDto) throws IOException {

4
src/main/resources/public/css/conference.css
View File

@ -19,6 +19,7 @@ body {
.deadline { .deadline {
margin: 0; margin: 0;
height: 40px; height: 40px;
min-height: 40px;
} }
.deadline-text { .deadline-text {
@ -63,6 +64,9 @@ body {
.icon-delete { .icon-delete {
background-color: #f44; background-color: #f44;
background-image: url(/img/conference/delete.png);
background-repeat: round;
color: transparent !important;
} }
.icon-delete:hover { .icon-delete:hover {