Browse Source

Fix template issues

Arkadiusz Ryś 1 year ago
parent
commit
b7e3ae0a59

+ 89 - 76
src/main/resources/templates/enact.html

@@ -1,94 +1,107 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org" th:replace="base::layout(~{::title}, ~{::main})">
 <head>
-  <title>Wee! Workflow Enactment Engine</title>
+  <title>[[${session.trace.name}]] Enactment</title>
 </head>
 <body>
 <main>
   <section class="pt-6 pb-6 pl-5 pr-5">
-    <h2 class="is-size-3 is-capitalized">Workflow Enactment Engine</h2>
-    <div class="level-left">
-      <p th:inline="text">Enacting the Process Model:</p>
-      <div class="tags has-addons">
-        <span class="tag">PM</span>
-        <span class="tag is-primary">[[${session.pm.name}]]</span>
-      </div>
-    </div>
-
-    <div class="enactment pt-3">
-      <form class="form" th:action="@{/startAct}" method="post">
-        <th:block th:if="${session.acts != null && session.acts.size > 0}">
-          <!--  Options shown only when starting an activity  -->
-          <label for="activities">Select activity to start:</label>
-          <div class="field has-addons">
-            <div class="control is-expanded">
-              <div class="select is-fullwidth">
-                <select id="activities" name="iri" th:onchange="'window.location.href = \'' + @{/inarts} + '?iri=\' + encodeURIComponent(this.value) ' ">
-                  <option th:value="1">Select Activity</option>
-                  <option th:each="act: ${session.acts}" th:selected="${act.iri == current}" th:value="${act.iri}" th:text="${act.name}"></option>
-                </select>
+    <div class="columns">
+      <div class="column is-two-thirds">
+        <div class="tags are-large has-addons">
+          <span class="tag">PM</span>
+          <span class="tag is-primary">[[${session.pm.name}]]</span>
+        </div>
+        <div class="enactment pt-3">
+          <form class="form" th:action="@{/startAct}" method="post">
+            <th:block th:if="${session.acts != null && session.acts.size > 0}">
+              <!--  Options shown only when starting an activity  -->
+              <p>The selected Process Model supports the following activities. Choose the activity you want to start.</p>
+              <div class="field has-addons">
+                <div class="control is-expanded">
+                  <div class="select is-fullwidth">
+                    <select id="activities" name="iri"
+                            th:onchange="'window.location.href = \'' + @{/inarts} + '?iri=\' + encodeURIComponent(this.value) ' ">
+                      <option th:value="1">Select Activity</option>
+                      <option th:each="act: ${session.acts}" th:selected="${act.iri == current}" th:value="${act.iri}"
+                              th:text="${act.name}"></option>
+                    </select>
+                  </div>
+                </div>
+                <div class="control" th:unless="${session.arts != null}"><button id="startActivity" type="submit" class="button is-primary" disabled>Start Activity</button></div>
+                <div class="control" th:if="${session.arts != null}"><button id="startActivity" type="submit" class="button is-primary">Start Activity</button></div>
               </div>
-            </div>
-            <div class="control">
-              <button th:unless="${session.arts != null}" id="startActivity" type="submit" class="button is-primary" disabled>Start Activity</button>
-              <button th:if="${session.arts != null}" id="startActivity" type="submit" class="button is-primary">Start Activity</button>
-            </div>
-          </div>
-        </th:block>
-        <th:block th:if="${session.endacts != null && session.endacts.size > 0}">
-          <!--  Options shown only when ending an activity  -->
-          <label for="activitiesend">Select activity to end:</label>
-          <div class="field has-addons">
-            <div class="control is-expanded">
-              <div class="select is-fullwidth">
-                <select id="activitiesend" name="activityend" th:onchange="'window.location.href = \'' + @{/endselect} + '?iri=\' + encodeURIComponent(this.value) ' ">
-                  <option th:value="1">Select Activity</option>
-                  <option th:each="actend: ${session.endacts}" th:selected="${actend.iri == currentend}" th:value="${actend.iri}" th:text="${actend.name}"></option>
-                </select>
+            </th:block>
+            <th:block th:if="${session.endacts != null && session.endacts.size > 0}">
+              <!--  Options shown only when ending an activity  -->
+              <p>The selected Process Model supports the following activities. Choose the activity you want to end.</p>
+              <div class="field has-addons">
+                <div class="control is-expanded">
+                  <div class="select is-fullwidth">
+                    <select id="activitiesend" name="activityend"
+                            th:onchange="'window.location.href = \'' + @{/endselect} + '?iri=\' + encodeURIComponent(this.value) ' ">
+                      <option th:value="1">Select Activity</option>
+                      <option th:each="actend: ${session.endacts}" th:selected="${actend.iri == currentend}"
+                              th:value="${actend.iri}" th:text="${actend.name}"></option>
+                    </select>
+                  </div>
+                </div>
               </div>
+            </th:block>
+            <div class="control">
+              <button type="submit" class="button is-primary" id="endEnactment" th:if="${endBool}">End Enactment</button>
             </div>
+          </form>
+
+          <div class="artifacts pt-6" th:if="${session.arts != null && session.arts.size > 0}">
+            <p class="is-size-4 is-capitalized">Artifacts</p>
+            <th:block th:each="art : ${session.arts}">
+              <article class="media">
+                <figure class="media-left">
+                  <p class="image is-64x64">
+                    <img src="https://bulma.io/images/placeholders/128x128.png" alt="Download arrow">
+                  </p>
+                </figure>
+                <div class="media-content">
+                  <div class="content">
+                    <p>
+                      <strong th:text="${art.relatesTo.name}"></strong> <small th:text="${art.relatesTo.type}"></small>
+                      <br>
+                      <a
+                        th:if="${art.fileExtension == 'xopp' || art.fileExtension == 'csv' || art.fileExtension == 'drawio'}"
+                        th:href="@{|${storageURL}/files/${art.fileExtension}/${art.location}|}">Download</a>
+                      <a
+                        th:if="${art.fileExtension != null && art.fileExtension != 'xopp' && art.fileExtension != 'csv' && art.fileExtension != 'drawio'}"
+                        th:href="@{|${storageURL}/files/file/${art.location}|}">Download</a>
+                    </p>
+                  </div>
+                </div>
+              </article>
+            </th:block>
           </div>
-        </th:block>
-        <div class="control">
-          <button type="submit" class="button is-primary" id="endEnactment" th:if="${endBool}">End Enactment</button>
         </div>
-      </form>
-
-      <div class="details">
-        <p th:inline="text"><strong>Trace: </strong><span class="accent">[[${session.trace.name}]]</span></p>
-        <p th:inline="text"><strong>Started at: </strong><span class="accent">[[${session.trace.events[0].timestampF}]]</span></p>
-        <th:block th:each="ev : ${session.trace.events}">
-          <p th:if="${ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}"><strong>Begin: </strong><span class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
-          <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent'}"><strong>End: </strong><span class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
-          <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent' || ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}"><strong>Port: </strong><span class="accent">[[${ev.relatesTo.name}]]</span></p>
-        </th:block>
       </div>
-
-      <div class="artifacts pt-6" th:if="${session.arts != null && session.arts.size > 0}">
-        <p class="is-size-4 is-capitalized">Artifacts</p>
-        <th:block th:each="art : ${session.arts}">
-        <article class="media">
-          <figure class="media-left">
-            <p class="image is-64x64">
-              <img src="https://bulma.io/images/placeholders/128x128.png" alt="Download arrow">
-            </p>
-          </figure>
-          <div class="media-content">
-            <div class="content">
-              <p>
-                <strong th:text="${art.relatesTo.name}"></strong> <small th:text="${art.relatesTo.type}"></small>
-                <br>                
-                <a th:if="${art.fileExtension == 'xopp' || art.fileExtension == 'csv' || art.fileExtension == 'drawio'}" th:href="@{|${storageURL}/files/${art.fileExtension}/${art.location}|}">Download</a>
-                <a th:if="${art.fileExtension != null && art.fileExtension != 'xopp' && art.fileExtension != 'csv' && art.fileExtension != 'drawio'}" th:href="@{|${storageURL}/files/file/${art.location}|}">Download</a>                
-              </p>
-            </div>
-          </div>
-        </article>
-        </th:block>
+      <div class="column">
+        <div class="tags are-large has-addons">
+          <span class="tag">PT</span>
+          <span class="tag is-primary">[[${session.trace.name}]]</span>
+        </div>
+        <div class="details">
+          <p th:inline="text"><strong>Started at: </strong><span
+            class="accent">[[${session.trace.events[0].timestampF}]]</span></p>
+          <th:block th:each="ev : ${session.trace.events}">
+            <p th:if="${ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}"><strong>Begin: </strong><span
+              class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
+            <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent'}"><strong>End: </strong><span
+              class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
+            <p
+              th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent' || ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}">
+              <strong>Port: </strong><span class="accent">[[${ev.relatesTo.name}]]</span></p>
+          </th:block>
+        </div>
       </div>
     </div>
-
   </section>
 </main>
 </body>
-</html>
+</html>

+ 61 - 52
src/main/resources/templates/enactEnd.html

@@ -1,71 +1,80 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org" th:replace="base::layout(~{::title}, ~{::main})">
 <head>
-  <title>Wee! Workflow Enactment Engine</title>
+  <title>[[${session.trace.name}]] Enactment</title>
 </head>
 <body>
 <main>
   <section class="pt-6 pb-6 pl-5 pr-5">
-    <h2 class="is-size-3 is-capitalized">Workflow Enactment Engine</h2>
-    <div class="level-left">
-      <p th:inline="text">Enacting the Process Model:</p>
-      <div class="tags has-addons">
-        <span class="tag">PM</span>
-        <span class="tag is-primary">[[${session.pm.name}]]</span>
-      </div>
-    </div>
-
-    <div class="enactment pt-3">
-      <form class="form" id="form" th:action="@{/endAct}" method="post" enctype="multipart/form-data">
-        <div class="level-left">
-          <p th:inline="text">Select output port of Activity:</p>
-          <div class="tags has-addons">
-            <span class="tag">ACTIVITY</span>
-            <span class="tag is-primary">[[${act.name}]]</span>
-          </div>
+    <div class="columns">
+      <div class="column is-two-thirds">
+        <div class="tags are-large has-addons">
+          <span class="tag">PM</span>
+          <span class="tag is-primary">[[${session.pm.name}]]</span>
         </div>
-        <div class="select">
-          <select id="portSelect" name="port" th:onchange="showDiv(this)">
-            <option th:value="1">select port</option>
-            <option th:each="port: ${act.ctrlOutPorts}" th:value="${port.iri}" th:text="${port.name}"></option>
-          </select>
-        </div>
-        <input type="hidden" th:value="${act.iri}" name="activity"/>
+        <div class="enactment pt-3">
+          <form class="form" id="form" th:action="@{/endAct}" method="post" enctype="multipart/form-data">
+            <div class="tags are-large has-addons">
+              <span class="tag">ACTIVITY</span>
+              <span class="tag is-primary">[[${act.name}]]</span>
+            </div>
+            <p>Choose the output port for the selected Process Model and Activity.</p>
+
+            <div class="select">
+              <select id="portSelect" name="port" th:onchange="showDiv(this)">
+                <option th:value="1">select port</option>
+                <option th:each="port: ${act.ctrlOutPorts}" th:value="${port.iri}" th:text="${port.name}"></option>
+              </select>
+            </div>
+            <input type="hidden" th:value="${act.iri}" name="activity"/>
 
-        <div id="hidden_div" class="is-hidden">
-          <div th:if="${arts != null && arts.size > 0}">
-            <p class="is-size-4 pt-4">Artifacts</p>
-            <th:block th:each="art : ${arts}">
-              <p th:inline="text"><strong>Name: </strong><span class="accent">[[${art.name}]]</span></p>
-              <p th:inline="text"><strong>Type: </strong><span class="accent">[[${art.type}]]</span></p>
-              <div class="file has-name">
-                <label class="file-label">
-                  <input class="file-input" type="file" th:name="${art.name}" id="input-file-${art.name}">
-                    <span class="file-cta">
+            <div id="hidden_div" class="is-hidden">
+              <div th:if="${arts != null && arts.size > 0}">
+                <p class="is-size-4 pt-4">Artifacts</p>
+                <p>The selected action requires you to upload the artifact created by the Activity.</p>
+                <th:block th:each="art : ${arts}">
+                  <p th:inline="text"><strong>Name: </strong><span class="accent">[[${art.name}]]</span></p>
+                  <p th:inline="text"><strong>Type: </strong><span class="accent">[[${art.type}]]</span></p>
+                  <div class="file has-name">
+                    <label class="file-label">
+                      <input class="file-input" type="file" th:name="${art.name}" id="input-file-${art.name}">
+                      <span class="file-cta">
                       <span class="file-icon">
                         <i class="fas fa-upload"></i>
                       </span>
                     <span class="file-label">Choose a file…</span>
                   </span>
-                  <span class="file-name">file.extension</span>
-                </label>
+                      <span class="file-name">[[${art.type}]]</span>
+                    </label>
+                  </div>
+                </th:block>
               </div>
-            </th:block>
-          </div>
-          <div class="control pt-4">
-            <button type="submit" class="button is-primary">End Activity</button>
-          </div>
+              <div class="control pt-4">
+                <button type="submit" class="button is-primary">End Activity</button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+      <div class="column">
+        <div class="tags are-large has-addons">
+          <span class="tag">PT</span>
+          <span class="tag is-primary">[[${session.trace.name}]]</span>
+        </div>
+        <div class="details">
+          <p th:inline="text"><strong>Trace: </strong><span class="accent">[[${session.trace.name}]]</span></p>
+          <p th:inline="text"><strong>Started at: </strong><span class="accent">[[${session.trace.events[0].timestampF}]]</span>
+          </p>
+          <th:block th:each="ev : ${session.trace.events}">
+            <p th:if="${ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}"><strong>Begin: </strong><span
+              class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
+            <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent'}"><strong>End: </strong><span
+              class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
+            <p
+              th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent' || ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}">
+              <strong>Port: </strong><span class="accent">[[${ev.relatesTo.name}]]</span></p>
+          </th:block>
         </div>
-      </form>
-
-      <div class="details">
-        <p th:inline="text"><strong>Trace: </strong><span class="accent">[[${session.trace.name}]]</span></p>
-        <p th:inline="text"><strong>Started at: </strong><span class="accent">[[${session.trace.events[0].timestampF}]]</span></p>
-        <th:block th:each="ev : ${session.trace.events}">
-          <p th:if="${ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}"><strong>Begin: </strong><span class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
-          <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent'}"><strong>End: </strong><span class="accent" th:text="${ev.relatesTo.activity.name}"></span></p>
-          <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent' || ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}"><strong>Port: </strong><span class="accent">[[${ev.relatesTo.name}]]</span></p>
-        </th:block>
       </div>
     </div>
   </section>

+ 12 - 11
src/main/resources/templates/endEnactment.html

@@ -1,25 +1,26 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org" th:replace="base::layout(~{::title}, ~{::main})">
 <head>
-  <title>Wee! Workflow Enactment Engine</title>
+  <title>[[${session.trace.name}]] Enactment End</title>
 </head>
 <body>
 <main>
   <section class="pt-6 pb-6 pl-5 pr-5">
-    <h2 class="is-size-3 is-capitalized">Workflow Enactment Engine</h2>
-    <p th:inline="text">Enactment of the Process Model: [[${session.pm.name}]] has ended!</p>
-    <a th:href="@{/}">HOME</a>
-    <p th:inline="text">Trace: [[${session.trace.name}]]</p>
-    <p th:inline="text">Started at: [[${session.trace.events[0].timestampF}]]</p>
+    <p th:inline="text">Enactment of the Process Model: <span class="accent">[[${session.pm.name}]]</span> has ended!</p>
+    <p>You can review the details about the Process Trace.</p>
+    <div class="tags are-large has-addons">
+      <span class="tag">PT</span>
+      <span class="tag is-primary">[[${session.trace.name}]]</span>
+    </div>
+    <p th:inline="text"><strong>Started at: </strong><span class="accent">[[${session.trace.events[0].timestampF}]]</span></p>
     <th:block th:each="ev : ${session.trace.events}">
-      <p th:if="${ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}">Begin:</p>
-      <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent'}">End:</p>
+      <p th:if="${ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}"><strong>Begin: </strong></p>
+      <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent'}"><strong>End: </strong></p>
       <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent' || ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}" th:text="${ev.relatesTo.activity.name}"></p>
-      <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndTraceEvent'}">End of Trace at:</p>
-      <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndTraceEvent'}" th:text="${ev.timestampF}"></p>
       <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndActivityEvent' || ev.class.name == 'ua.be.wee.model.pt.StartActivityEvent'}">port: [[${ev.relatesTo.name}]]</p>
+      <p th:if="${ev.class.name == 'ua.be.wee.model.pt.EndTraceEvent'}"><strong>Ended at: </strong><span class="accent">[[${ev.timestampF}]]</span></p>
     </th:block>
   </section>
 </main>
 </body>
-</html>
+</html>

+ 13 - 10
src/main/resources/templates/error.html

@@ -1,13 +1,16 @@
 <!DOCTYPE html>
-<html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" th:replace="base::layout(~{::title}, ~{::main})">
+<head>
+  <title>Enactment Error</title>
+</head>
 <body>
-<center>
-<h1>Sorry, WEE have weeed and something went wrong </h1>
-<img id="img" class="wee-meme-image" src="../static/img/slip-and-fall.png" th:src="@{/img/slip-and-fall.png}" alt="Logo of person slipping">
-<h2>Let us know about it and we will try to fix ASAP </h2>
-<a href="/" >
-<img id="home" src="../static/img/home-button.png" th:src="@{/img/home-button.png}" alt="Home icon"> 
-</a>
-</center>
+<main>
+  <section class="pt-6 pb-6 pl-5 pr-5">
+    <h1>Sorry, WEE have weeed and something went wrong </h1>
+    <img id="img" class="wee-meme-image" src="../static/img/slip-and-fall.png" th:src="@{/img/slip-and-fall.png}" alt="Logo of person slipping">
+    <h2>Let us know about it and we will try to fix ASAP</h2>
+    <a href="/"><img src="../static/img/home-button.png" th:src="@{/img/home-button.png}" alt="Home icon"></a>
+  </section>
+</main>
 </body>
-</html>
+</html>

+ 1 - 1
src/main/resources/templates/pms.html

@@ -41,7 +41,7 @@
           <th th:text="${trace.name}"></th>
           <td th:text="${trace.iri}"></td>
           <td th:text="${trace.timestampF}"></td>
-          <td><button class="button is-primary is-small"><span class="icon is-small"><i class="fas fa-check"></i></span><span>Continue Enactment</span></button></td>
+          <td><button class="button is-primary is-small">Continue Enactment</button></td>
         </tr>
         </tbody>
       </table>