From 9f21850767d9bc9d1bc7894df996ed2e6bac51a6 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Mon, 24 Feb 2020 13:53:33 +0400
Subject: [PATCH 1/4] move patronymic field

---
 .../META-INF/resources/admin/user.xhtml        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/META-INF/resources/admin/user.xhtml b/src/main/resources/META-INF/resources/admin/user.xhtml
index 5addc0e..c648537 100644
--- a/src/main/resources/META-INF/resources/admin/user.xhtml
+++ b/src/main/resources/META-INF/resources/admin/user.xhtml
@@ -41,15 +41,6 @@
                         <p:message for="firstName"/>
                     </p:column>
                 </p:row>
-                <p:row>
-                    <p:column>
-                        <h:outputLabel value="Фамилия:"/>
-                    </p:column>
-                    <p:column>
-                        <p:inputText id="lastName" required="true" value="#{userView.user.lastName}"/>
-                        <p:message for="lastName"/>
-                    </p:column>
-                </p:row>
                 <p:row>
                     <p:column>
                         <h:outputLabel value="Отчество:"/>
@@ -59,6 +50,15 @@
                         <p:message for="patr"/>
                     </p:column>
                 </p:row>
+                <p:row>
+                    <p:column>
+                        <h:outputLabel value="Фамилия:"/>
+                    </p:column>
+                    <p:column>
+                        <p:inputText id="lastName" required="true" value="#{userView.user.lastName}"/>
+                        <p:message for="lastName"/>
+                    </p:column>
+                </p:row>
                 <p:row>
                     <p:column>
                         <h:outputLabel value="Email:"/>

From 6b717f26d3a5e7968cb62ad5a943a5a0b2952c20 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 24 Apr 2020 13:06:06 +0400
Subject: [PATCH 2/4] fix selection

---
 .../META-INF/resources/paper/papers.xhtml     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/META-INF/resources/paper/papers.xhtml b/src/main/resources/META-INF/resources/paper/papers.xhtml
index cf3869c..a1d97ab 100644
--- a/src/main/resources/META-INF/resources/paper/papers.xhtml
+++ b/src/main/resources/META-INF/resources/paper/papers.xhtml
@@ -13,7 +13,10 @@
         <div class="ui-fluid">
             <div class="ui-g">
                 <div class="ui-md-5 ui-g-12">
-                    <p:inputText placeholder="Создать новую статью" value="#{papersView.newPaperTitle}"/>
+                    <p:inputText placeholder="Создать новую статью" id="newPaperName"
+                                 value="#{papersView.newPaperTitle}" required="true"
+                                 requiredMessage="Введите название новой статьи"/>
+                    <p:message for="newPaperName"/>
                 </div>
                 <div class="ui-md-2 ui-g-12">
                     <p:commandButton action="#{papersView.create}" value="Создать" ajax="true" process="@form"
@@ -23,8 +26,9 @@
                 <div class="ui-md-3 ui-g-12">
                     <p:commandButton value="Удалить выделенные" id="papersRemoveButton"
                                      disabled="#{papersView.selectedPapers.isEmpty()}"
-                                     action="#{papersView.deleteSelected}" ajax="true" process="@form"
-                                     update="messages @form">
+                                     action="#{papersView.deleteSelected}" ajax="true"
+                                     process="mainForm:papersRemoveButton"
+                                     update="messages mainForm:papersTable">
                         <p:confirm header="Подтверждение" message="Удалить выделенные статьи?"
                                    icon="pi pi-exclamation-triangle"/>
                     </p:commandButton>
@@ -32,7 +36,7 @@
                 <p:confirmDialog global="true" showEffect="fade" hideEffect="fade">
                     <p:commandButton value="Да" type="button" styleClass="ui-confirmdialog-yes" icon="pi pi-check"/>
                     <p:commandButton value="Нет" type="button" styleClass="ui-confirmdialog-no" icon="pi pi-times"/>
-                </p:confirmDialog>te
+                </p:confirmDialog>
             </div>
 
             <p:dataTable value="#{papersView.papers}" var="paper" paginator="true" paginatorPosition="bottom"
@@ -46,10 +50,11 @@
                                      placeholder="Строка поиска..."/>
                     </p:outputPanel>
                 </f:facet>
-                <p:ajax event="rowSelect" update="mainForm:papersRemoveButton" process="@form"/>
-                <p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
-                <p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton" process="@form"/>
-                <p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="@form"/>
+                <p:ajax event="rowSelect" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/>
+                <p:ajax event="rowSelectCheckbox" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/>
+                <p:ajax event="rowUnselectCheckbox" update="mainForm:papersRemoveButton"
+                        process="mainForm:papersTable"/>
+                <p:ajax event="rowUnselect" update="mainForm:papersRemoveButton" process="mainForm:papersTable"/>
                 <p:column selectionMode="multiple" style="width:16px;text-align:center"/>
                 <p:column headerText="Название" filterBy="#{paper.title}" filterMatchMode="contains">
                     <h:outputLink value="/paper/paper.xhtml">

From e167a68bc66b2f17c9943eb17d66e231166988c0 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 24 Apr 2020 13:48:28 +0400
Subject: [PATCH 3/4] add conference button

---
 src/main/resources/META-INF/resources/paper/paper.xhtml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/META-INF/resources/paper/paper.xhtml b/src/main/resources/META-INF/resources/paper/paper.xhtml
index a1bde3d..51b12f2 100644
--- a/src/main/resources/META-INF/resources/paper/paper.xhtml
+++ b/src/main/resources/META-INF/resources/paper/paper.xhtml
@@ -41,7 +41,12 @@
                         <p:message for="name"/>
                     </p:column>
                     <p:column>
-                        <p:link href="/conference/conferenceList.xhtml" value="Статья участвует в конференции"/>
+                        <p:link href="/conference/conferenceList.xhtml?id=paperView.paper.conferences[0].id"
+                                value="Статья участвует в конференции"
+                                rendered="#{not empty paperView.paper.conferences}"/>
+
+                        <p:commandButton value="Привязать к конференции"
+                                         rendered="#{empty paperView.paper.conferences}"/>
                     </p:column>
                 </p:row>
                 <p:row>

From ae0a1f353279f7d7ba0ed5c418e3cd6c48fe32c6 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 24 Apr 2020 18:23:34 +0400
Subject: [PATCH 4/4] 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 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:p="http://primefaces.org/ui"
-      xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
+      xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+>
 <ui:composition template="/basicTemplate.xhtml">
     <ui:define name="header">
         Редактирование статьи
@@ -32,28 +33,31 @@
         </style>
         <p:panel id="panel" header="Статья" style="margin-bottom:10px;">
             <p:panelGrid cellpadding="5" id="paperPanel">
-                <p:row>
-                    <p:column>
+
+
+            </p:panelGrid>
+            <div class="ui-fluid">
+                <div class="ui-g">
+                    <div class="ui-md-3 ui-g-12">
                         <h:outputLabel value="Название:"/>
-                    </p:column>
-                    <p:column>
+                    </div>
+                    <div class="ui-md-7 ui-g-12">
                         <p:inputText id="name" required="true" value="#{paperView.paper.title}"/>
                         <p:message for="name"/>
-                    </p:column>
-                    <p:column>
+                    </div>
+                    <div class="ui-md-2 ui-g-12">
                         <p:link href="/conference/conferenceList.xhtml?id=paperView.paper.conferences[0].id"
                                 value="Статья участвует в конференции"
                                 rendered="#{not empty paperView.paper.conferences}"/>
 
                         <p:commandButton value="Привязать к конференции"
-                                         rendered="#{empty paperView.paper.conferences}"/>
-                    </p:column>
-                </p:row>
-                <p:row>
-                    <p:column>
+                                         rendered="#{empty paperView.paper.conferences}"
+                                         disabled="true"/>
+                    </div>
+                    <div class="ui-md-3 ui-g-12">
                         <p:outputLabel for="paperStatus" value="Статус:"/>
-                    </p:column>
-                    <p:column>
+                    </div>
+                    <div class="ui-md-7 ui-g-12">
                         <p:panelGrid columns="2" id="paperStatus">
                             <p:selectOneMenu id="status" required="true" value="#{paperView.paper.status}"
                                              converter="paperStatusConverter">
@@ -68,13 +72,11 @@
                                 <ui:param name="shortMode" value="true"/>
                             </ui:include>
                         </p:panelGrid>
-                    </p:column>
-                </p:row>
-                <p:row>
-                    <p:column>
+                    </div>
+                    <div class="ui-md-3 ui-g-12">
                         <p:outputLabel for="type" value="Тип:"/>
-                    </p:column>
-                    <p:column>
+                    </div>
+                    <div class="ui-md-7 ui-g-12">
                         <p:selectOneMenu id="type" value="#{paperView.paper.type}"
                                          converter="paperTypeConverter">
                             <f:selectItems value="#{paperView.paperTypes}"
@@ -82,23 +84,11 @@
                                            itemLabel="#{type.typeName}"
                                            itemValue="#{type}"/>
                         </p:selectOneMenu>
-                    </p:column>
-                </p:row>
-
-                <p:row>
-                    <p:column>
-                        <p:outputLabel for="comment" value="Комментарий:"/>
-                    </p:column>
-                    <p:column>
-                        <p:editor id="comment" widgetVar="editor2" value="#{paperView.paper.comment}" height="300"
-                                  style="margin-bottom:10px" placeholder="Комментарий"/>
-                    </p:column>
-                </p:row>
-                <p:row>
-                    <p:column>
+                    </div>
+                    <div class="ui-md-3 ui-g-12">
                         <p:outputLabel for="authors" value="Авторы:"/>
-                    </p:column>
-                    <p:column>
+                    </div>
+                    <div class="ui-md-7 ui-g-12">
                         <p:selectCheckboxMenu id="authors" value="#{paperView.paper.authors}" multiple="true"
                                               converter="#{userConverter}">
                             <f:attribute name="collectionType" value="java.util.HashSet"/>
@@ -107,16 +97,46 @@
                                            itemLabel="#{author.userAbbreviate}"
                                            itemValue="#{author}"/>
                         </p:selectCheckboxMenu>
-                    </p:column>
-                </p:row>
+                    </div>
+                    <div class="ui-md-3 ui-g-12">
+                        <p:outputLabel for="authors" value="Ключевые даты:"/>
+                    </div>
+                    <div class="ui-md-7 ui-g-12">
+                        <div class="ui-fluid">
+                            <div class="ui-g">
+                                <ui:repeat value="#{paperView.paper.deadlines}" var="deadline">
+                                    <div class="ui-md-5 ui-g-12">
+                                        <p:datePicker value="#{deadline.date}" pattern="dd.MM.yyyy"/>
+                                    </div>
+                                    <div class="ui-md-5 ui-g-12">
+                                        <p:inputText value="#{deadline.description}"/>
+                                    </div>
+                                </ui:repeat>
+                                <div class="ui-md-5 ui-g-12">
+                                    <p:datePicker value="#{paperView.newDeadlineDate}" placeholder="Введите дату"
+                                                  pattern="dd.MM.yyyy"/>
+                                </div>
+                                <div class="ui-md-5 ui-g-12">
+                                    <p:inputText value="#{paperView.newDeadlineDescription}"
+                                                 placeholder="Описание ключевой даты"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
 
-                <p:row>
-                    <p:column>
+                    <div class="ui-md-3 ui-g-12">
+                        <p:outputLabel for="comment" value="Комментарий:"/>
+                    </div>
+                    <div class="ui-md-7 ui-g-12">
+                        <p:editor id="comment" widgetVar="editor2" value="#{paperView.paper.comment}" height="300"
+                                  style="margin-bottom:10px" placeholder="Комментарий"/>
+                    </div>
+                    <div class="ui-md-5 ui-g-12">
                         <p:commandButton action="#{paperView.save}" value="Сохранить" ajax="true" process="@form"
                                          update="messages @form"/>
-                    </p:column>
-                </p:row>
-            </p:panelGrid>
+                    </div>
+                </div>
+            </div>
         </p:panel>
     </ui:define>
 </ui:composition>