Set automated activity progress in the controller

src/main/java/ua/be/wee/controller/EnactmentControllerMVC.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import ua.be.wee.controller.rest.PTController;
+import ua.be.wee.model.AutomatedActivityProgress;
 import ua.be.wee.model.EnactmentController;
 import ua.be.wee.model.nodes.Activity;
 import ua.be.wee.model.nodes.Artifact;
@@ -69,6 +71,10 @@ public class EnactmentControllerMVC {
 		} else {
 			model.addAttribute("hasEndpoint", false);
 		}
+        List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+        model.addAttribute("activities", automated_activity_progress);
         return "index";
     }
 
@@ -80,9 +86,17 @@ public class EnactmentControllerMVC {
     		model.addAttribute("pms", controller.getAllPMs());
     		model.addAttribute("traces",null);
     		model.addAttribute("current", "1");
+            List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+            model.addAttribute("activities", automated_activity_progress);
             return "pms";
 		} else {
 			model.addAttribute("error",true);
+            List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+            model.addAttribute("activities", automated_activity_progress);
 			return "index";
 		}
     }
@@ -98,6 +112,10 @@ public class EnactmentControllerMVC {
     	model.addAttribute("error",false);
 		model.addAttribute("pms", controller.getAllPMs());
 		model.addAttribute("current", iri);
+        List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+        model.addAttribute("activities", automated_activity_progress);
         return "pms";
     }
 
@@ -123,6 +141,10 @@ public class EnactmentControllerMVC {
 			request.getSession().setAttribute("automated",new ArrayList<AutomatedActivity>());
 			model.addAttribute("arts", null);
 			model.addAttribute("current", "1");
+            List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+            model.addAttribute("activities", automated_activity_progress);
 	        return "enact";
 		}
     }
@@ -164,6 +186,10 @@ public class EnactmentControllerMVC {
 			request.getSession().setAttribute("automated",new ArrayList<AutomatedActivity>());
 			model.addAttribute("arts", null);
 			model.addAttribute("current", "1");
+            List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+            automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+            model.addAttribute("activities", automated_activity_progress);
 	        return "enact";
 		}
     }
@@ -204,9 +230,7 @@ public class EnactmentControllerMVC {
 							}
 						}
 					}
-
 					result.addAll(findElements(trace.getPmEnacted(), findNextNodes));
-
 				}
 			}
 		}
@@ -237,7 +261,6 @@ public class EnactmentControllerMVC {
 			}
 		}
 		return result;
-
 	}
 
 	private List<Node> findEndActs(List<Event> events) {
@@ -271,6 +294,10 @@ public class EnactmentControllerMVC {
     	List<AutomatedActivity> automated = (List<AutomatedActivity>) request.getSession().getAttribute("automated");
     	PMTrigger element = findPMTrigger(acts,iri);
     	List<TraceArtifact> arts = (List<TraceArtifact>)request.getSession().getAttribute("arts");
+        List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+        model.addAttribute("activities", automated_activity_progress);
     	if (element.getPort() != null) {
     		ControlInputPort port = (ControlInputPort)element.getPort();
         	Activity activity = port.getActivity();
@@ -343,7 +370,11 @@ public class EnactmentControllerMVC {
     	request.getSession().setAttribute("previous", p.getIri());
 		model.addAttribute("arts", null);
 		model.addAttribute("current", "1");
-    	return "enact";
+        List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+        model.addAttribute("activities", automated_activity_progress);
+        return "enact";
     }
 
     @RequestMapping("/endselect")
@@ -361,7 +392,10 @@ public class EnactmentControllerMVC {
 		} else {
 			model.addAttribute("arts", null);
 		}
-
+        List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+        model.addAttribute("activities", automated_activity_progress);
     	return "enactEnd";
     }
 
@@ -403,13 +437,16 @@ public class EnactmentControllerMVC {
 			request.getSession().setAttribute("arts", null);
 		}
     	model.addAttribute("current", iri);
+        List<AutomatedActivityProgress> automated_activity_progress = new LinkedList<>();
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 1", true));
+        automated_activity_progress.add(new AutomatedActivityProgress("Example 2", false));
+        model.addAttribute("activities", automated_activity_progress);
     	return "enact";
     }
 
 
     // Helper methods
 
-
     private List<PMTrigger> findElements(PM pm, List<Pair<String, String>> iris) {
 		List<PMTrigger> acts = new ArrayList<PMTrigger>();
 		for (Pair<String,String> pair : iris) {
@@ -451,6 +488,4 @@ public class EnactmentControllerMVC {
 		}
 
 	}
-
-
 }

src/main/java/ua/be/wee/model/AutomatedActivityProgress.java

@@ -0,0 +1,12 @@
+package ua.be.wee.model;
+
+public class AutomatedActivityProgress {
+    private String name;
+    private Boolean completed;
+
+    public AutomatedActivityProgress(String name, Boolean completed) {
+
+        this.name = name;
+        this.completed = completed;
+    }
+}

src/main/resources/templates/enactEnd.html

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

src/main/resources/templates/endEnactment.html

@@ -5,22 +5,7 @@
 </head>
 <body>
 <main>
-  <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>
+  <article th:replace="fragments/automated.html :: activity(activities=${activities})"></article>
 
   <section class="pt-6 pb-6 pl-5 pr-5">
     <p th:inline="text">Enactment of the Process Model: <span class="accent">[[${session.pm.name}]]</span> has ended!</p>

src/main/resources/templates/pms.html

@@ -5,22 +5,7 @@
 </head>
 <body>
 <main>
-  <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>
+  <article th:replace="fragments/automated.html :: activity(activities=${activities})"></article>
 
   <section class="pt-6 pb-6 pl-5 pr-5">
     <form class="pt-3" th:action="@{/enactpm}" method="post">