From 0059ebb8f844864473862ff4416da7792b6c4285 Mon Sep 17 00:00:00 2001
From: g4s8 <g4s8.public@gmail.com>
Date: Fri, 2 Mar 2018 11:30:48 +0300
Subject: [PATCH 1/4] zerocracy/farm#258 - user options

---
 xml/pmo/options/-duplicates.xml | 21 ++++++++++
 xml/pmo/options/simple.xml      | 21 ++++++++++
 xsd/pmo/options.xsd             | 40 +++++++++++++++++++
 xsl/pmo/options.xsl             | 69 +++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+)
 create mode 100644 xml/pmo/options/-duplicates.xml
 create mode 100644 xml/pmo/options/simple.xml
 create mode 100644 xsd/pmo/options.xsd
 create mode 100644 xsl/pmo/options.xsl

diff --git a/xml/pmo/options/-duplicates.xml b/xml/pmo/options/-duplicates.xml
new file mode 100644
index 00000000..5fb34c78
--- /dev/null
+++ b/xml/pmo/options/-duplicates.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2016-2018 Zerocracy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to read
+the Software only. Permissions is hereby NOT GRANTED to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<options version="0.25" updated="2016-12-29T09:03:21.684Z">
+  <option name="maxJobs">10</option>
+  <option name="maxJobs">11</option>
+</options>
diff --git a/xml/pmo/options/simple.xml b/xml/pmo/options/simple.xml
new file mode 100644
index 00000000..12e31a3b
--- /dev/null
+++ b/xml/pmo/options/simple.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2016-2018 Zerocracy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to read
+the Software only. Permissions is hereby NOT GRANTED to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<options version="0.25" updated="2016-12-29T09:03:21.684Z">
+  <option name="maxJobs">10</option>
+  <option name="notifications">telegram</option>
+</options>
diff --git a/xsd/pmo/options.xsd b/xsd/pmo/options.xsd
new file mode 100644
index 00000000..1b8028ae
--- /dev/null
+++ b/xsd/pmo/options.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2016-2018 Zerocracy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to read
+the Software only. Permissions is hereby NOT GRANTED to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="SNAPSHOT" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:include schemaLocation="http://datum.zerocracy.com/SNAPSHOT/xsd/basics.xsd"/>
+  <xs:complexType name="option">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:attribute type="xs:string" name="name"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:element name="options">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="option" type="option" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="updated" use="required" type="xs:dateTime"/>
+      <xs:attribute name="version" use="required" type="version"/>
+    </xs:complexType>
+    <xs:unique name="uniqueName">
+      <xs:selector xpath="option"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+  </xs:element>
+</xs:schema>
diff --git a/xsl/pmo/options.xsl b/xsl/pmo/options.xsl
new file mode 100644
index 00000000..2c1bda00
--- /dev/null
+++ b/xsl/pmo/options.xsl
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2016-2018 Zerocracy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to read
+the Software only. Permissions is hereby NOT GRANTED to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+  <xsl:include href="../templates.xsl"/>
+  <xsl:template match="/">
+    <html lang="en">
+      <body>
+        <section>
+          <h1>
+            <xsl:text>Options</xsl:text>
+          </h1>
+          <xsl:apply-templates select="options"/>
+        </section>
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="options[not(option)]">
+    <p>
+      <xsl:text>There are no user options.</xsl:text>
+    </p>
+  </xsl:template>
+  <xsl:template match="options[option]">
+    <p>
+      <xsl:text>User options: </xsl:text>
+    </p>
+    <table data-sortable="true">
+      <thead>
+        <tr>
+          <th>
+            <xsl:text>name</xsl:text>
+          </th>
+          <th>
+            <xsl:text>value</xsl:text>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <xsl:apply-templates select="option"/>
+      </tbody>
+    </table>
+  </xsl:template>
+  <xsl:template match="option">
+    <tr>
+      <td>
+        <code>
+          <xsl:value-of select="@name"/>
+        </code>
+      </td>
+      <td>
+        <xsl:value-of select="text()"/>
+      </td>
+    </tr>
+  </xsl:template>
+</xsl:stylesheet>

From 78cf50d9798110f2d685e8151ece0905d34d36a0 Mon Sep 17 00:00:00 2001
From: g4s8 <g4s8.public@gmail.com>
Date: Mon, 5 Mar 2018 12:15:58 +0300
Subject: [PATCH 2/4] #258 - user options

---
 xml/pmo/options/-invalid-notifications.xml    | 24 +++++++++++
 .../{-duplicates.xml => -invalid-option.xml}  |  3 +-
 xml/pmo/options/-negative-jobs.xml            | 20 +++++++++
 xml/pmo/options/simple.xml                    |  8 +++-
 xsd/pmo/options.xsd                           | 24 ++++++-----
 xsl/pmo/options.xsl                           | 41 ++++---------------
 6 files changed, 71 insertions(+), 49 deletions(-)
 create mode 100644 xml/pmo/options/-invalid-notifications.xml
 rename xml/pmo/options/{-duplicates.xml => -invalid-option.xml} (92%)
 create mode 100644 xml/pmo/options/-negative-jobs.xml

diff --git a/xml/pmo/options/-invalid-notifications.xml b/xml/pmo/options/-invalid-notifications.xml
new file mode 100644
index 00000000..ca362e90
--- /dev/null
+++ b/xml/pmo/options/-invalid-notifications.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2016-2018 Zerocracy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to read
+the Software only. Permissions is hereby NOT GRANTED to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<options version="0.25" updated="2016-12-29T09:03:21.684Z">
+  <notify>
+    <students>yes</students>
+    <rfps>no</rfps>
+    <publish>maybe</publish>
+  </notify>
+</options>
diff --git a/xml/pmo/options/-duplicates.xml b/xml/pmo/options/-invalid-option.xml
similarity index 92%
rename from xml/pmo/options/-duplicates.xml
rename to xml/pmo/options/-invalid-option.xml
index 5fb34c78..0aa6ffb6 100644
--- a/xml/pmo/options/-duplicates.xml
+++ b/xml/pmo/options/-invalid-option.xml
@@ -16,6 +16,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -->
 <options version="0.25" updated="2016-12-29T09:03:21.684Z">
-  <option name="maxJobs">10</option>
-  <option name="maxJobs">11</option>
+  <unknown>option</unknown>
 </options>
diff --git a/xml/pmo/options/-negative-jobs.xml b/xml/pmo/options/-negative-jobs.xml
new file mode 100644
index 00000000..fd15353b
--- /dev/null
+++ b/xml/pmo/options/-negative-jobs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2016-2018 Zerocracy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to read
+the Software only. Permissions is hereby NOT GRANTED to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<options version="0.25" updated="2016-12-29T09:03:21.684Z">
+  <maxJobsInAgenda>-10</maxJobsInAgenda>
+</options>
diff --git a/xml/pmo/options/simple.xml b/xml/pmo/options/simple.xml
index 12e31a3b..cff7cbb7 100644
--- a/xml/pmo/options/simple.xml
+++ b/xml/pmo/options/simple.xml
@@ -16,6 +16,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -->
 <options version="0.25" updated="2016-12-29T09:03:21.684Z">
-  <option name="maxJobs">10</option>
-  <option name="notifications">telegram</option>
+  <maxJobsInAgenda>10</maxJobsInAgenda>
+  <notify>
+    <students>false</students>
+    <rfps>false</rfps>
+    <publish>true</publish>
+  </notify>
 </options>
diff --git a/xsd/pmo/options.xsd b/xsd/pmo/options.xsd
index 1b8028ae..ed7168ec 100644
--- a/xsd/pmo/options.xsd
+++ b/xsd/pmo/options.xsd
@@ -17,24 +17,26 @@ SOFTWARE.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="SNAPSHOT" elementFormDefault="qualified" attributeFormDefault="unqualified">
   <xs:include schemaLocation="http://datum.zerocracy.com/SNAPSHOT/xsd/basics.xsd"/>
-  <xs:complexType name="option">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute type="xs:string" name="name"/>
-      </xs:extension>
-    </xs:simpleContent>
+  <xs:complexType name="notify">
+    <xs:sequence>
+      <xs:element name="students" type="xs:boolean" minOccurs="0"/>
+      <xs:element name="rfps" type="xs:boolean" minOccurs="0"/>
+      <xs:element name="publish" type="xs:boolean" minOccurs="0"/>
+    </xs:sequence>
   </xs:complexType>
+  <xs:simpleType name="jobLimit">
+    <xs:restriction base="xs:integer">
+      <xs:minInclusive value="1"/>
+    </xs:restriction>
+  </xs:simpleType>
   <xs:element name="options">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="option" type="option" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element name="maxJobsInAgenda" type="jobLimit" minOccurs="0"/>
+        <xs:element name="notify" type="notify" minOccurs="0"/>
       </xs:sequence>
       <xs:attribute name="updated" use="required" type="xs:dateTime"/>
       <xs:attribute name="version" use="required" type="version"/>
     </xs:complexType>
-    <xs:unique name="uniqueName">
-      <xs:selector xpath="option"/>
-      <xs:field xpath="@name"/>
-    </xs:unique>
   </xs:element>
 </xs:schema>
diff --git a/xsl/pmo/options.xsl b/xsl/pmo/options.xsl
index 2c1bda00..d987427d 100644
--- a/xsl/pmo/options.xsl
+++ b/xsl/pmo/options.xsl
@@ -29,41 +29,14 @@ SOFTWARE.
       </body>
     </html>
   </xsl:template>
-  <xsl:template match="options[not(option)]">
+  <xsl:template match="options">
     <p>
-      <xsl:text>There are no user options.</xsl:text>
+      <xsl:text>You can download and upload options file here</xsl:text>
+      <!--
+        @todo #258:30min Add some controls to allow user to download and
+         upload options.xml file. On upload validation against xsd
+         schema should be performed.
+      -->
     </p>
   </xsl:template>
-  <xsl:template match="options[option]">
-    <p>
-      <xsl:text>User options: </xsl:text>
-    </p>
-    <table data-sortable="true">
-      <thead>
-        <tr>
-          <th>
-            <xsl:text>name</xsl:text>
-          </th>
-          <th>
-            <xsl:text>value</xsl:text>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <xsl:apply-templates select="option"/>
-      </tbody>
-    </table>
-  </xsl:template>
-  <xsl:template match="option">
-    <tr>
-      <td>
-        <code>
-          <xsl:value-of select="@name"/>
-        </code>
-      </td>
-      <td>
-        <xsl:value-of select="text()"/>
-      </td>
-    </tr>
-  </xsl:template>
 </xsl:stylesheet>

From d79f4d4d779d2c33ee2a95558ea5e7296a5458b5 Mon Sep 17 00:00:00 2001
From: g4s8 <g4s8.public@gmail.com>
Date: Tue, 6 Mar 2018 22:23:21 +0300
Subject: [PATCH 3/4] zerocracy/farm#258 - options improvements

---
 xsd/pmo/options.xsd | 13 ++++++------
 xsl/pmo/options.xsl | 49 +++++++++++++++++++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/xsd/pmo/options.xsd b/xsd/pmo/options.xsd
index ed7168ec..3f468433 100644
--- a/xsd/pmo/options.xsd
+++ b/xsd/pmo/options.xsd
@@ -24,15 +24,16 @@ SOFTWARE.
       <xs:element name="publish" type="xs:boolean" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
-  <xs:simpleType name="jobLimit">
-    <xs:restriction base="xs:integer">
-      <xs:minInclusive value="1"/>
-    </xs:restriction>
-  </xs:simpleType>
   <xs:element name="options">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="maxJobsInAgenda" type="jobLimit" minOccurs="0"/>
+        <xs:element name="maxJobsInAgenda" minOccurs="0">
+          <xs:simpleType xml:base="xs:integer">
+            <xs:restriction base="xs:integer">
+              <xs:minInclusive value="1"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
         <xs:element name="notify" type="notify" minOccurs="0"/>
       </xs:sequence>
       <xs:attribute name="updated" use="required" type="xs:dateTime"/>
diff --git a/xsl/pmo/options.xsl b/xsl/pmo/options.xsl
index d987427d..49b36cdf 100644
--- a/xsl/pmo/options.xsl
+++ b/xsl/pmo/options.xsl
@@ -31,12 +31,49 @@ SOFTWARE.
   </xsl:template>
   <xsl:template match="options">
     <p>
-      <xsl:text>You can download and upload options file here</xsl:text>
-      <!--
-        @todo #258:30min Add some controls to allow user to download and
-         upload options.xml file. On upload validation against xsd
-         schema should be performed.
-      -->
+      <xsl:text>Your options:</xsl:text>
     </p>
+    <table data-sortable="true">
+      <thead>
+        <tr>
+          <th>
+            <xsl:text>Option</xsl:text>
+          </th>
+          <th>
+            <xsl:text>Value</xsl:text>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <xsl:if test="maxJobsInAgenda">
+          <tr>
+            <td>
+              <xsl:text>Max jobs in agend</xsl:text>
+            </td>
+            <td>
+              <xsl:value-of select="maxJobsInAgenda"/>
+            </td>
+          </tr>
+        </xsl:if>
+        <xsl:if test="notify">
+          <tr>
+            <td>
+              <xsl:text>Notify</xsl:text>
+            </td>
+            <td>
+              <xsl:if test="notify/rfps">
+                <xsl:text>RFPS, </xsl:text>
+              </xsl:if>
+              <xsl:if test="notify/publish">
+                <xsl:text>publish, </xsl:text>
+              </xsl:if>
+              <xsl:if test="notify/students">
+                <xsl:text>students</xsl:text>
+              </xsl:if>
+            </td>
+          </tr>
+        </xsl:if>
+      </tbody>
+    </table>
   </xsl:template>
 </xsl:stylesheet>

From 839a501826f82cefafb00b360e3bfd33a9e0f98d Mon Sep 17 00:00:00 2001
From: g4s8 <g4s8.public@gmail.com>
Date: Tue, 13 Mar 2018 11:21:02 +0300
Subject: [PATCH 4/4] zercoracy/farm#258 - xsl 2.0

---
 xsl/pmo/options.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsl/pmo/options.xsl b/xsl/pmo/options.xsl
index 49b36cdf..bf8f3d99 100644
--- a/xsl/pmo/options.xsl
+++ b/xsl/pmo/options.xsl
@@ -15,7 +15,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="2.0">
   <xsl:include href="../templates.xsl"/>
   <xsl:template match="/">
     <html lang="en">