From 241c9c5a19b2c7c731b1e110ae9fb9ee0dd0ab29 Mon Sep 17 00:00:00 2001
From: Sven Reimers <sven.reimers@gmail.com>
Date: Sun, 1 Oct 2023 18:21:48 +0200
Subject: [PATCH] VotedTalks view is now fully dynamic

---
 .../stepengine/steps/ShowTopRated.java        | 98 +++++++++++--------
 .../src/main/resources/ratedTalk.fxml         | 53 ----------
 .../src/main/resources/topratedtalktoday.fxml | 70 -------------
 .../src/main/resources/topratedtalkweek.fxml  | 70 -------------
 4 files changed, 59 insertions(+), 232 deletions(-)
 delete mode 100644 conference-stepengine/src/main/resources/ratedTalk.fxml
 delete mode 100644 conference-stepengine/src/main/resources/topratedtalktoday.fxml
 delete mode 100644 conference-stepengine/src/main/resources/topratedtalkweek.fxml

diff --git a/conference-stepengine/src/main/java/org/tweetwallfx/conference/stepengine/steps/ShowTopRated.java b/conference-stepengine/src/main/java/org/tweetwallfx/conference/stepengine/steps/ShowTopRated.java
index 176647fbc..f03f6286a 100644
--- a/conference-stepengine/src/main/java/org/tweetwallfx/conference/stepengine/steps/ShowTopRated.java
+++ b/conference-stepengine/src/main/java/org/tweetwallfx/conference/stepengine/steps/ShowTopRated.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 TweetWallFX
+ * Copyright (c) 2022-2023 TweetWallFX
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@
  */
 package org.tweetwallfx.conference.stepengine.steps;
 
-import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,22 +32,19 @@
 import java.util.Objects;
 import java.util.function.Function;
 import javafx.animation.ParallelTransition;
-import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
+import javafx.scene.CacheHint;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.FlowPane;
-import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.TextAlignment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.tweetwallfx.conference.api.Speaker;
 import org.tweetwallfx.controls.WordleSkin;
 import org.tweetwallfx.conference.stepengine.dataprovider.SpeakerImageProvider;
@@ -69,17 +65,14 @@
  */
 public class ShowTopRated implements Step {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ShowTopRated.class);
     private final Function<MachineContext, Collection<VotedTalk>> votedTalksConverter;
     private final Config config;
     private final String lookupId;
-    private final String fxmlResourcePath;
 
     private ShowTopRated(
             final Function<MachineContext, Collection<VotedTalk>> votedTalksConverter,
             final Config config,
-            final String lookupId,
-            final String fxmlResourcePath) {
+            final String lookupId) {
         this.votedTalksConverter = Objects.requireNonNull(
                 votedTalksConverter,
                 "votedTalksConverter must not be null");
@@ -89,9 +82,6 @@ private ShowTopRated(
         this.lookupId = Objects.requireNonNull(
                 lookupId,
                 "lookupId must not be null");
-        this.fxmlResourcePath = Objects.requireNonNull(
-                fxmlResourcePath,
-                "fxmlResourcePath must not be null");
     }
 
     @Override
@@ -99,29 +89,47 @@ public void doStep(final MachineContext context) {
         WordleSkin wordleSkin = (WordleSkin) context.get("WordleSkin");
 
         List<FlipInXTransition> transitions = new ArrayList<>();
-        try {
-            Node scheduleNode = FXMLLoader.<Node>load(this.getClass().getResource(fxmlResourcePath));
-            transitions.add(new FlipInXTransition(scheduleNode));
-            scheduleNode.setLayoutX(config.layoutX);
-            scheduleNode.setLayoutY(config.layoutY);
-//            scheduleNode.layoutXProperty().bind(Bindings.multiply(150.0 / 1920.0, wordleSkin.getSkinnable().widthProperty()));
-//            scheduleNode.layoutYProperty().bind(Bindings.multiply(200.0 / 1280.0, wordleSkin.getSkinnable().heightProperty()));
-            wordleSkin.getPane().getChildren().add(scheduleNode);
-
-            GridPane grid = (GridPane) scheduleNode.lookup("#sessionGrid");
-            int col = 0;
-            int row = 0;
+        if (null == wordleSkin.getNode().lookup("#topRatedeNode")) {
+            Pane topRatedNode = new Pane();
+            topRatedNode.getStyleClass().add("votedTalk");
+            topRatedNode.setId("topRatedeNode");
+            topRatedNode.setOpacity(0);
+
+            var title = new Label(config.getTopVotedType().getTitle());
+
+            title.setPrefWidth(config.width);
+            title.getStyleClass().add("title");
+            title.setPrefHeight(config.titleHeight);
+            title.setAlignment(Pos.CENTER);
+
+            topRatedNode.getChildren().add(title);
+
+            transitions.add(new FlipInXTransition(topRatedNode));
+            topRatedNode.setLayoutX(config.layoutX);
+            topRatedNode.setLayoutY(config.layoutY);
+            topRatedNode.setMinWidth(config.width);
+            topRatedNode.setMaxWidth(config.width);
+            topRatedNode.setPrefWidth(config.width);
+            topRatedNode.setCacheHint(CacheHint.SPEED);
+            topRatedNode.setCache(true);
+
+            wordleSkin.getPane().getChildren().add(topRatedNode);
 
             Iterator<VotedTalk> iterator = votedTalksConverter.apply(context).iterator();
+            int row = 0;
             while (iterator.hasNext()) {
-                var pane = createTalkNode(context, iterator.next());
-                grid.getChildren().add(pane);
-                GridPane.setColumnIndex(pane, col);
-                GridPane.setRowIndex(pane, row);
-                row += 1;
+                var talkPane = createTalkNode(context, iterator.next());
+                double talkWidth = config.width;
+                talkPane.setMinWidth(talkWidth);
+                talkPane.setMaxWidth(talkWidth);
+                talkPane.setPrefWidth(talkWidth);
+                talkPane.setMinHeight(config.talkHeight);
+                talkPane.setMaxHeight(config.talkHeight);
+                talkPane.setPrefHeight(config.talkHeight);
+                talkPane.setLayoutY(config.titleHeight + config.talkVGap + (config.talkHeight + config.talkVGap) * row);
+                topRatedNode.getChildren().add(talkPane);
+                row++;
             }
-        } catch (IOException ex) {
-            LOGGER.error("{}", ex);
         }
         ParallelTransition flipIns = new ParallelTransition();
         flipIns.getChildren().addAll(transitions);
@@ -131,7 +139,7 @@ public void doStep(final MachineContext context) {
     }
 
     private Pane createTalkNode(final MachineContext context, final VotedTalk votedTalk) {
-        var ratingAverageScore = new Label("" + votedTalk.ratingAverageScore);
+        var ratingAverageScore = new Label(String.format("%.2f",votedTalk.ratingAverageScore));
         ratingAverageScore.getStyleClass().add("ratingAverageScore");
 
         var ratingTotalVotes = new Label("" + votedTalk.ratingTotalVotes);
@@ -294,15 +302,13 @@ public ShowTopRated create(final StepEngineSettings.StepDefinition stepDefinitio
                     return new ShowTopRated(
                             mc -> mc.getDataProvider(TopTalksTodayDataProvider.class).getFilteredSessionData(),
                             stepDefinition.getConfig(Config.class),
-                            "#topRatedToday",
-                            "/topratedtalktoday.fxml");
+                            "#topRatedToday");
 
                 case WEEK:
                     return new ShowTopRated(
                             mc -> mc.getDataProvider(TopTalksWeekDataProvider.class).getFilteredSessionData(),
                             stepDefinition.getConfig(Config.class),
-                            "#topRatedWeek",
-                            "/topratedtalkweek.fxml");
+                            "#topRatedWeek");
 
                 default:
                     throw new IllegalArgumentException("TopVotedType " + topVotedType + " is not supported");
@@ -345,6 +351,10 @@ public static class Config extends AbstractConfig {
         public int avatarSpacing = 4;
         public double layoutX = 0;
         public double layoutY = 0;
+        public double width = 800;
+        public double titleHeight = 60;
+        public double talkVGap = 10;
+        public double talkHeight = 200;
         public boolean circularAvatar = true;
         public boolean showCompanyName = false;
         public boolean showAvatar = true;
@@ -380,10 +390,20 @@ public static enum TopVotedType {
         /**
          * The Top Voted Session of Today.
          */
-        TODAY,
+        TODAY("Top Rated Talks of the Day"),
         /**
          * The Top Voted Session of the Week.
          */
-        WEEK;
+        WEEK("Top Rated Talks of the Week");
+
+        private final String title;
+
+        TopVotedType(String title) {
+            this.title = title;
+        }
+
+        public String getTitle() {
+            return this.title;
+        }
     }
 }
diff --git a/conference-stepengine/src/main/resources/ratedTalk.fxml b/conference-stepengine/src/main/resources/ratedTalk.fxml
deleted file mode 100644
index 3734e4a07..000000000
--- a/conference-stepengine/src/main/resources/ratedTalk.fxml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The MIT License
-
-    Copyright 2022 TweetWallFX
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.effect.DropShadow?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.text.TextFlow?>
-
-<AnchorPane prefHeight="131.0" prefWidth="587.0" style="-fx-background-color: devoxx_gradient; -fx-background-radius: 5;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-   <children>
-      <TextFlow layoutX="178.0" layoutY="86.0" maxHeight="-Infinity" maxWidth="-Infinity" nodeOrientation="LEFT_TO_RIGHT" prefHeight="38.0" prefWidth="417.0" textAlignment="RIGHT" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="178.0" AnchorPane.rightAnchor="5.0">
-         <children>
-            <Text id="title" strokeType="OUTSIDE" strokeWidth="0.0" style="-fx-fill: #060b33; -fx-font-size: 12pt;" text="How the MyDevoxx Mobile app is created (in Java)." wrappingWidth="280.796875" />
-         </children>
-      </TextFlow>
-      <TextFlow maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="33.0" prefWidth="209.0" textAlignment="RIGHT" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0">
-         <children>
-            <Text id="speakers" strokeType="OUTSIDE" strokeWidth="0.0" style="-fx-fill: blanchedalmond;" text="Johan Vos, Erwin Morrhey, Joeri Sykora, José Pereda" />
-         </children>
-      </TextFlow>
-      <Label id="averageVote" layoutX="13.0" layoutY="6.0" style="-fx-text-fill: #060b33; -fx-font-weight: bold; -fx-font-size: 14pt; -fx-border-radius: 30; -fx-border-color: black; -fx-padding: 10; -fx-border-width: 3;" text="5.0" AnchorPane.leftAnchor="13.0" AnchorPane.topAnchor="6.0" />
-      <Label id="voteCount" layoutX="10.0" layoutY="60.0" text="1234 Votes" style="-fx-text-fill: #060b33" textAlignment="CENTER" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="60.0" />
-      <ImageView id="speakerImage" fitHeight="64.0" fitWidth="64.0" layoutX="94.0" layoutY="14.0" pickOnBounds="true" preserveRatio="true" />
-   </children>
-   <effect>
-      <DropShadow color="#060b33" offsetX="2.0" offsetY="2.0" />
-   </effect>
-</AnchorPane>
diff --git a/conference-stepengine/src/main/resources/topratedtalktoday.fxml b/conference-stepengine/src/main/resources/topratedtalktoday.fxml
deleted file mode 100644
index dc01189d4..000000000
--- a/conference-stepengine/src/main/resources/topratedtalktoday.fxml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The MIT License
-
-    Copyright 2022 TweetWallFX
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.effect.DropShadow?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-
-<BorderPane id="topRatedToday" prefHeight="600.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-   <center>
-      <GridPane id="sessionGrid" hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="561.0" prefWidth="600.0" style="-fx-background-color: none;" vgap="10.0">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-      </GridPane>
-   </center>
-   <padding>
-      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-   </padding>
-   <top>
-      <AnchorPane style="-fx-background-color: devoxx_gradient; -fx-background-radius: 10;" BorderPane.alignment="CENTER">
-         <children>
-            <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="36.0" prefWidth="205.0" style="-fx-text-fill: #060b33; -fx-font-size: 20pt; -fx-font-weight: bold;" text="Top Rated Talks of the Day" textAlignment="CENTER" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0" />
-         </children>
-         <opaqueInsets>
-            <Insets />
-         </opaqueInsets>
-         <BorderPane.margin>
-            <Insets bottom="5.0" />
-         </BorderPane.margin>
-         <effect>
-            <DropShadow color="#060b33" offsetX="2.0" offsetY="2.0" />
-         </effect>
-      </AnchorPane>
-   </top>
-</BorderPane>
diff --git a/conference-stepengine/src/main/resources/topratedtalkweek.fxml b/conference-stepengine/src/main/resources/topratedtalkweek.fxml
deleted file mode 100644
index e9be037fe..000000000
--- a/conference-stepengine/src/main/resources/topratedtalkweek.fxml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The MIT License
-
-    Copyright 2022 TweetWallFX
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.effect.DropShadow?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-
-<BorderPane id="topRatedWeek" prefHeight="600.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-   <center>
-      <GridPane id="sessionGrid" hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="561.0" prefWidth="600.0" style="-fx-background-color: none;" vgap="10.0">
-        <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-        </columnConstraints>
-        <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-        </rowConstraints>
-      </GridPane>
-   </center>
-   <padding>
-      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-   </padding>
-   <top>
-      <AnchorPane style="-fx-background-color: devoxx_gradient; -fx-background-radius: 10;" BorderPane.alignment="CENTER">
-         <children>
-            <Label alignment="CENTER" contentDisplay="CENTER" prefHeight="36.0" prefWidth="205.0" style="-fx-text-fill: #060b33; -fx-font-size: 20pt; -fx-font-weight: bold;" text="Top Rated Talks of the Week" textAlignment="CENTER" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0" />
-         </children>
-         <opaqueInsets>
-            <Insets />
-         </opaqueInsets>
-         <BorderPane.margin>
-            <Insets bottom="5.0" />
-         </BorderPane.margin>
-         <effect>
-            <DropShadow color="#060b33" offsetX="2.0" offsetY="2.0" />
-         </effect>
-      </AnchorPane>
-   </top>
-</BorderPane>