From ae0a1f353279f7d7ba0ed5c418e3cd6c48fe32c6 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Fri, 24 Apr 2020 18:23:34 +0400 Subject: [PATCH] fix layout --- .../ru/ulstu/paper/controller/PaperView.java | 21 ++++ .../META-INF/resources/paper/paper.xhtml | 106 +++++++++++------- 2 files changed, 84 insertions(+), 43 deletions(-) diff --git a/src/main/java/ru/ulstu/paper/controller/PaperView.java b/src/main/java/ru/ulstu/paper/controller/PaperView.java index a6bc9eb..a6e627f 100644 --- a/src/main/java/ru/ulstu/paper/controller/PaperView.java +++ b/src/main/java/ru/ulstu/paper/controller/PaperView.java @@ -13,6 +13,7 @@ import javax.inject.Inject; import javax.inject.Named; import java.io.Serializable; import java.util.Arrays; +import java.util.Date; import java.util.List; @Named @@ -26,6 +27,10 @@ public class PaperView implements Serializable { private Paper paper; + private Date newDeadlineDate; + + private String newDeadlineDescription; + @PostConstruct public void init() { paper = paperService.findPaperById(Integer.valueOf(FacesUtil.getRequestParams().get("id"))); @@ -57,4 +62,20 @@ public class PaperView implements Serializable { FacesUtil.showInfoMessage("Статья сохранена", ""); return Page.PAPER_LIST + "?faces-redirect=true"; } + + public Date getNewDeadlineDate() { + return newDeadlineDate; + } + + public void setNewDeadlineDate(Date newDeadlineDate) { + this.newDeadlineDate = newDeadlineDate; + } + + public String getNewDeadlineDescription() { + return newDeadlineDescription; + } + + public void setNewDeadlineDescription(String newDeadlineDescription) { + this.newDeadlineDescription = newDeadlineDescription; + } } diff --git a/src/main/resources/META-INF/resources/paper/paper.xhtml b/src/main/resources/META-INF/resources/paper/paper.xhtml index 51b12f2..bb3668f 100644 --- a/src/main/resources/META-INF/resources/paper/paper.xhtml +++ b/src/main/resources/META-INF/resources/paper/paper.xhtml @@ -2,7 +2,8 @@ + xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://java.sun.com/jsf/core" +> Редактирование статьи @@ -32,28 +33,31 @@ - - + + + +
+
+
- - +
+
- - +
+
- - - - + rendered="#{empty paperView.paper.conferences}" + disabled="true"/> +
+
- - +
+
@@ -68,13 +72,11 @@ - - - - +
+
- - +
+
- - - - - - - - - - - - - +
+
- - +
+
@@ -107,16 +97,46 @@ itemLabel="#{author.userAbbreviate}" itemValue="#{author}"/> - - +
+
+ +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+
- - +
+ +
+
+ +
+
- - - +
+
+