From ee92417aa21f103751e9ea22a165d3a095feb40c Mon Sep 17 00:00:00 2001 From: magdalena Date: Wed, 27 Nov 2019 17:22:43 +0100 Subject: Charts up --- .../pl/edu/mimuw/cloudatlas/client/templates/attribChart.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/resources/pl/edu') diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html index 1a49261..630536a 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html @@ -72,8 +72,9 @@ -
+
+ -- cgit v1.2.3 From d3abaeb1d8a03676f9d9591dd40a29792494592d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Wed, 27 Nov 2019 19:44:18 +0100 Subject: Keep one row of attributes table --- .../resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/resources/pl/edu') diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html index 630536a..108f717 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html @@ -47,7 +47,7 @@ data.addColumn('string', col); } jsonData.shift(); - data.addRows(jsonData); + data.addRow(jsonData[0]); var table = new google.visualization.Table(document.getElementById('table_div')); -- cgit v1.2.3 From 36bf31fbbb516cc9fc4b311bb78af338db1f43b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Wed, 27 Nov 2019 21:39:03 +0100 Subject: Add interacitvity to numerical values chart --- .../cloudatlas/client/templates/attribChart.html | 72 ++++++++++++++++++++-- 1 file changed, 66 insertions(+), 6 deletions(-) (limited to 'src/main/resources/pl/edu') diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html index 108f717..3a9fd1d 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html @@ -9,10 +9,11 @@ -- cgit v1.2.3 From 27c8f61e15e63aa100ed8b7366784cd58b668064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Wed, 27 Nov 2019 22:30:25 +0100 Subject: Make frontend pretty --- .../cloudatlas/client/templates/attribChart.html | 26 ++++++++++++---------- .../cloudatlas/client/templates/attribForm.html | 5 +++-- .../cloudatlas/client/templates/contactsForm.html | 4 +++- .../cloudatlas/client/templates/queryForm.html | 13 +++++++---- 4 files changed, 29 insertions(+), 19 deletions(-) (limited to 'src/main/resources/pl/edu') diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html index 1d5c5f7..ab83053 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html @@ -6,8 +6,6 @@ Attributes chart - - @@ -116,8 +114,9 @@
-

-
+ +

+
@@ -129,13 +128,16 @@
-
-
-
+
+

Attribute values

+
+
+
-
+ + 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 e348a11..88842be 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 @@ -10,7 +10,9 @@
-
+ +

Add attributes

+
@@ -49,7 +51,6 @@ Time: 3600
Duration: 3600
Contact: { "/contactName" : [ 1, 1, 1, 1 ] }
- Query: { "&queryName" : "query" }
List: [ 1, 2, 3 ]
Set: [ [1, 2], [3, 4], [5, 6] ]
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 ba0a3a8..e20975f 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 @@ -10,7 +10,9 @@
-
+ +

Install fallback contacts

+
diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html index f31ef6b..af3a501 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html @@ -10,8 +10,9 @@
-
-

Install query

+ +

Install query

+
@@ -20,13 +21,17 @@
+ + Enter query in a Json format. Example: + Query: { "&queryName" : "query" }
+
-
-

Uninstall query

+

Uninstall query

+
-- cgit v1.2.3