From 7587ff7a5107e8680fc93aed882e86c832775ef6 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Sat, 23 Nov 2019 09:27:15 +0400
Subject: [PATCH] show paper type

---
 .../paper/controller/PaperTypeConverter.java  | 21 +++++++++++++++++++
 .../ru/ulstu/paper/controller/PaperView.java  |  4 ++++
 .../META-INF/resources/paper/paper.xhtml      | 13 ++++++++----
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/paper/controller/PaperTypeConverter.java

diff --git a/src/main/java/ru/ulstu/paper/controller/PaperTypeConverter.java b/src/main/java/ru/ulstu/paper/controller/PaperTypeConverter.java
new file mode 100644
index 0000000..5a2126b
--- /dev/null
+++ b/src/main/java/ru/ulstu/paper/controller/PaperTypeConverter.java
@@ -0,0 +1,21 @@
+package ru.ulstu.paper.controller;
+
+import ru.ulstu.paper.model.Paper;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+
+@FacesConverter(value = "paperTypeConverter")
+public class PaperTypeConverter implements Converter {
+    @Override
+    public Object getAsObject(FacesContext context, UIComponent component, String value) {
+        return Paper.PaperType.valueOf(value);
+    }
+
+    @Override
+    public String getAsString(FacesContext context, UIComponent component, Object value) {
+        return ((Paper.PaperType) value).getTypeName();
+    }
+}
diff --git a/src/main/java/ru/ulstu/paper/controller/PaperView.java b/src/main/java/ru/ulstu/paper/controller/PaperView.java
index 1b54e3d..13a362a 100644
--- a/src/main/java/ru/ulstu/paper/controller/PaperView.java
+++ b/src/main/java/ru/ulstu/paper/controller/PaperView.java
@@ -39,4 +39,8 @@ public class PaperView implements Serializable {
     public List<Paper.PaperStatus> getPaperStatuses() {
         return Arrays.asList(Paper.PaperStatus.values());
     }
+
+    public List<Paper.PaperType> getPaperTypes() {
+        return Arrays.asList(Paper.PaperType.values());
+    }
 }
diff --git a/src/main/resources/META-INF/resources/paper/paper.xhtml b/src/main/resources/META-INF/resources/paper/paper.xhtml
index 520fb29..12f1b92 100644
--- a/src/main/resources/META-INF/resources/paper/paper.xhtml
+++ b/src/main/resources/META-INF/resources/paper/paper.xhtml
@@ -13,7 +13,7 @@
                 <h:outputLabel for="name" value="Название:"/>
                 <p:inputText id="name" required="true" value="#{paperView.paper.title}"/>
 
-                <p:outputLabel for="status" value="Статус:"/>
+                <p:outputLabel for="@next" value="Статус:"/>
                 <p:selectOneMenu id="status" required="true" value="#{paperView.paper.status}"
                                  converter="paperStatusConverter">
                     <f:selectItems value="#{paperView.paperStatuses}"
@@ -21,9 +21,14 @@
                                    itemLabel="#{status.statusName}"
                                    itemValue="#{status}"/>
                 </p:selectOneMenu>
-
-                <p:outputLabel for="@next" value="Number:"/>
-                <p:spinner id="number" value="0"/>
+                <p:outputLabel for="@next" value="Тип:"/>
+                <p:selectOneMenu id="type" value="#{paperView.paper.type}"
+                                 converter="paperTypeConverter">
+                    <f:selectItems value="#{paperView.paperTypes}"
+                                   var="type"
+                                   itemLabel="#{type.typeName}"
+                                   itemValue="#{type}"/>
+                </p:selectOneMenu>
             </h:panelGrid>
         </p:panel>
     </ui:define>