Merge pull request #520 from scireum/aha/chartz

Aha/chartz

pom.xml

@@ -14,7 +14,7 @@
     <description>Provides a modern and scalable web server as SIRIUS module</description>
 
     <properties>
-        <sirius.kernel>12.0-rc31</sirius.kernel>
+        <sirius.kernel>12.0-rc34</sirius.kernel>
     </properties>
 
     <dependencies>

src/main/java/sirius/tagliatelle/macros/I18nMacro.java

@@ -48,7 +48,7 @@ public void verifyArguments(List<Expression> args) {
             if (exp instanceof ConstantString) {
                 String key = (String) exp.eval(null);
                 if (Strings.isFilled(key) && NLS.getTranslationEngine()
-                                                .getTranslations(key)
+                                                .getEntriesStartingWith(key)
                                                 .noneMatch(t -> key.equals(t.getKey()))) {
                     throw new IllegalArgumentException(Strings.apply("No translation found for key: %s", key));
                 }
@@ -64,7 +64,12 @@ public boolean isConstant(Expression[] args) {
 
     @Override
     public Object eval(LocalRenderContext ctx, Expression[] args) {
-        return NLS.get((String) args[0].eval(ctx));
+        String key = (String) args[0].eval(ctx);
+        if (Strings.isFilled(key)) {
+            return NLS.get(key);
+        } else {
+            return "";
+        }
     }
 
     @Nonnull

src/main/java/sirius/web/crunchlog/Crunchlog.java

@@ -45,6 +45,7 @@
  * <p>
  * To disable the crunchlog entirely, set <tt>frameworks.crunchlog = false</tt> in the system config.
  */
+@Deprecated
 @Register(classes = Crunchlog.class)
 public class Crunchlog {
 

src/main/java/sirius/web/crunchlog/CrunchlogKernel.java

@@ -65,6 +65,7 @@
  * indefinitely large nor having the filesystem run out of free space is feasible for a server system.
  */
 @Framework("web.crunchlog")
+@Deprecated
 @Register(classes = {CrunchlogKernel.class, BackgroundLoop.class, Stoppable.class, MetricProvider.class, Command.class})
 public class CrunchlogKernel extends BackgroundLoop implements Command, Stoppable, MetricProvider {
 

src/main/java/sirius/web/crunchlog/DeleteOldCrunchlogs.java

@@ -23,6 +23,7 @@
  */
 @Framework("web.crunchlog")
 @Register
+@Deprecated
 public class DeleteOldCrunchlogs implements EveryDay {
 
     private static final int ONE_YEAR = 365;

src/main/java/sirius/web/tasks/ManagedTask.java

@@ -26,6 +26,7 @@
  * which mainly reports the state of running tasks.
  * </p>
  */
+@Deprecated
 public interface ManagedTask {
 
     /**

src/main/java/sirius/web/tasks/ManagedTaskContext.java

@@ -23,6 +23,7 @@
  *
  * @see ManagedTask
  */
+@Deprecated
 public interface ManagedTaskContext extends TaskContextAdapter {
 
     /**

src/main/java/sirius/web/tasks/ManagedTaskExecution.java

@@ -39,6 +39,7 @@
  * This acts as a bridge between the actual execution withing {@link Tasks}, the {@link ManagedTasks} framework and the
  * task being executed itself.
  */
+@Deprecated
 class ManagedTaskExecution implements Runnable, ManagedTaskContext, ManagedTask {
 
     protected final String taskId;

src/main/java/sirius/web/tasks/ManagedTaskSetup.java

@@ -15,6 +15,7 @@
 /**
  * A builder pattern to create a {@link ManagedTask}.
  */
+@Deprecated
 public class ManagedTaskSetup {
     protected ManagedTasks managedTasks;
     protected String name;

src/main/java/sirius/web/tasks/ManagedTasks.java

@@ -35,6 +35,7 @@
  * @see ManagedTask
  */
 @Register(classes = ManagedTasks.class)
+@Deprecated
 public class ManagedTasks {
 
     /**

src/main/java/sirius/web/tasks/ManagedTasksController.java

@@ -31,6 +31,7 @@
  * Used to view and manage tasks.
  */
 @Register(classes = Controller.class)
+@Deprecated
 public class ManagedTasksController extends BasicController {
 
     /**

src/main/java/sirius/web/tasks/TaskLogEntry.java

@@ -15,6 +15,7 @@
 /**
  * Represents a log entry for a managed task.
  */
+@Deprecated
 public class TaskLogEntry {
 
     /**

src/main/resources/default/taglib/w/doughnutChart.html.pasta

@@ -10,16 +10,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         @raw {
-            new Chart($('#@name').get(0).getContext("2d"), {
-                data: {
-                    datasets: [{
-                        data: [ @data ],
-                        backgroundColor: ["#5cbae6","#b6d957","#fac364","#8cd3ff","#d998cb","#f2d249","#93b9c6","#ccc5a8","#52bacc","#dbdb46","#98aafb"]
-                    }],
-                    labels: [ @labels ]
-                },
-                type: 'doughnut'
-            });
+            dougnutChart('#@name', [ @labels ], [ @data ]);
         }
     });
-</script>
+</script>

src/main/resources/default/taglib/w/lineChart.html.pasta

@@ -14,53 +14,8 @@
 </div>
 <script type="text/javascript">
     $(document).ready(function () {
-        var options = {
-            responsive: true,
-            maintainAspectRatio: false,
-            bezierCurve: true,
-            legend: {
-                display: false
-            },
-            scales: {
-                yAxes: [{
-                    ticks: {
-                        beginAtZero: true,
-
-                    }
-                }],
-                xAxes: [{
-                    ticks: {
-                        autoSkip: false
-                    }
-                }]
-            }
-        };
-
         @raw {
-            var labels = [ @labels ];
-            var data = [ @data ];
-
+            lineChart('#@name', [ @labels ], [ {data: @data } ]);
         }
-
-        var selector = '#@name';
-        new Chart($(selector).get(0).getContext("2d"),
-            {
-                type: 'line',
-                data: {
-                    labels: labels,
-                    datasets: [
-                        {
-                            fillColor: "rgba(151,187,205,0.2)",
-                            borderColor: "rgba(151,187,205,1)",
-                            pointColor: "rgba(151,187,205,1)",
-                            pointStrokeColor: "#fff",
-                            pointHighlightFill: "#fff",
-                            pointHighlightStroke: "rgba(151,187,205,1)",
-                            data: data
-                        }
-                    ]
-                },
-                options: options
-            });
     });
 </script>

src/main/resources/default/taglib/w/polarAreaChart.html.pasta

@@ -15,19 +15,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         @raw {
-            new Chart($('#@name').get(0).getContext("2d"), {
-                data: {
-                    datasets: [{
-                        data: [ @data ],
-                        backgroundColor: ["#5cbae6","#b6d957","#fac364","#8cd3ff","#d998cb","#f2d249","#93b9c6","#ccc5a8","#52bacc","#dbdb46","#98aafb"]
-                    }],
-                    labels: [ @labels ]
-                },
-                type: 'polarArea',
-                options: {
-                    startAngle: -0.55 * Math.PI
-                }
-            });
+            polarAreaChart('#@name', [ @labels ], [ @data ]);
         }
     });
 </script>

src/main/resources/default/taglib/w/table.html.pasta

@@ -1,11 +1,12 @@
 <i:arg type="java.lang.Object" name="data" />
 <i:arg type="boolean" name="colorized" default="false" />
+<i:arg type="String" name="class" default="" />
 
 <i:pragma name="inline" value="true" />
 <i:pragma name="description" value="Renders table within a Wondergem template" />
 
 <i:if test="(data.is(Page.class) && !data.as(Page.class).getItems().isEmpty()) || (data.is(java.util.Collection.class) && !data.as(java.util.Collection.class).isEmpty())">
-    <table class="table table-striped @if (colorized) { table-colorized }">
+    <table class="table table-striped @if (colorized) { table-colorized } @class">
         <i:render name="body" />
     </table>
     <i:else>
@@ -15,4 +16,4 @@
             </tr>
         </table>
     </i:else>
-</i:if>
+</i:if>