Browse Source

Use parameters in automated activity fragment

Arkadiusz Ryś 1 year ago
parent
commit
ae603e00ac

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

@@ -5,7 +5,7 @@
 </head>
 <body>
 <main>
-  <article th:replace="fragments/activities.html :: article"></article>
+  <article th:replace="fragments/automated.html :: activity(activities=${activities})"></article>
 
   <section class="pt-6 pb-6 pl-5 pr-5">
     <div class="columns">

+ 0 - 22
src/main/resources/templates/fragments/activities.html

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<article th:fragment="article" class="panel is-primary automated-activities">
-  <p class="panel-heading">Automated Activities</p>
-  <a class="panel-block automated-activity">
-    <progress class="progress is-medium is-success activity" value= "100" max="100"></progress>
-    <span>Example Completed Activity 1</span>
-  </a>
-
-  <a class="panel-block automated-activity">
-    <progress class="progress is-medium is-info activity" max="100"></progress>
-    <span>Example In Progress Activity 2</span>
-  </a>
-
-  <a class="panel-block">
-    <button class="button is-primary"><img class="refresh" width="32" height="32" th:src="@{/img/refresh.svg}" alt="Circular arrow"></button>
-  </a>
-</article>
-<body>
-
-</body>
-</html>

+ 23 - 0
src/main/resources/templates/fragments/automated.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<article th:fragment="activity (activities)" class="panel is-primary automated-activities">
+  <p class="panel-heading">Automated Activities</p>
+  <a th:each="activity: ${activities}" class="panel-block automated-activity">
+    <progress th:if="${activity.completed}" class="progress is-medium is-success activity" value= "100" max="100"></progress>
+    <progress th:unless="${activity.completed}" class="progress is-medium is-info activity" max="100"></progress>-->
+    <span th:text="${activity.name}"></span>
+  </a>
+
+<!--  <a class="panel-block automated-activity">-->
+<!--    <progress class="progress is-medium is-info activity" max="100"></progress>-->
+<!--    <span>Example In Progress Activity 2</span>-->
+<!--  </a>-->
+
+  <a class="panel-block">
+    <button class="button is-primary"><img class="refresh" width="32" height="32" th:src="@{/img/refresh.svg}" alt="Circular arrow"></button>
+  </a>
+</article>
+<body>
+
+</body>
+</html>