From a657f79f49668bf84929325beed7d885ffb64715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= <mag.grodzinska@gmail.com>
Date: Sun, 24 Nov 2019 15:24:46 +0100
Subject: Extend submission forms
---
.../cloudatlas/client/templates/attribForm.html | 21 ++++++++++++++++++++-
.../cloudatlas/client/templates/contactsForm.html | 9 +++++++--
2 files changed, 27 insertions(+), 3 deletions(-)
(limited to 'src/main/resources/pl/edu/mimuw/cloudatlas/client/templates')
diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribForm.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribForm.html
index 0499bc8..ed6dcd2 100644
--- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribForm.html
+++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribForm.html
@@ -31,11 +31,30 @@
<option th:value="Duration" th:text="Duration"></option>
<option th:value="Contact" th:text="Contact"></option>
<option th:value="Query" th:text="Query"></option>
+ <option th:value="List" th:text="List"></option>
+ <option th:value="Set" th:text="Set"></option>
</select>
</div>
<div class="form-group">
- <label for="Textarea1">Enter attribute value as a Json</label>
+ <label for="TypeSelect1">Enter optional complex type</label>
+ <input type="text" class="form-control" id="ComplexType1" rows="3" th:field="*{attributeComplexType}"/>
+ <small id="passwordHelpBlock" class="form-text text-muted">
+ If set or list was chosen in the previous option, please enter whole nested type as a comma-separated list, including wrapper type speccified above. Example: [List, Set, String]
+ </small>
+ </div>
+ <div class="form-group">
+ <label for="Textarea1">Enter attribute value</label>
<textarea class="form-control" id="Textarea1" rows="3" th:field="*{valueString}"></textarea>
+ <small id="attributeValueHelpBlock" class="form-text text-muted">
+ Use Json list for complex types and stick to proper format in duration and time. <br> Examples: <br>
+ Time: 3600 <br>
+ Duration (version 1): 3600 <br>
+ Duration (version 2): +0 00:00:00.001 <br>
+ Contact: { "contactName" : [ 1, 1, 1, 1 ] } <br>
+ Query: { "&queryName" : "query" } <br>
+ List: [ 1, 2, 3 ] <br>
+ Set: [ [1, 2], [3, 4], [5, 6] ] <br>
+ </small>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/contactsForm.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/contactsForm.html
index 40af9b4..79a9f5f 100644
--- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/contactsForm.html
+++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/contactsForm.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
- <title>Query form</title>
+ <title>Contacts query form</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
</head>
@@ -13,8 +13,13 @@
<div id="queryForm">
<form action="#" th:action="@{/contacts}" th:object="${contactsObject}" method="post">
<div class="form-group">
- <label for="Textarea1">Enter contacts as a Json map with string key and integer list as value</label>
+ <label for="Textarea1">Enter contacts</label>
<textarea class="form-control" id="Textarea1" rows="3" th:field="*{string}"></textarea>
+ <small id="attributeValueHelpBlock" class="form-text text-muted">
+ Use Json format for entering contacts. Examples: <br>
+ Contact: { "contactName" : [ 1, 1, 1, 1 ] } <br>
+ Contact: { "contactName1" : [ 1, 1, 1, 1 ], "contactName2" : [ 2, 2, 2, 2 ] }
+ </small>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
--
cgit v1.2.3