diff --git a/pom.xml b/pom.xml index 9ac628a38d8625d3ce239e91fa7991397fbae5ed..5ccc5a8ebc8267b09d04699f3b3896b5cb9f160b 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,6 @@ <fontawesome.version>5.0.10</fontawesome.version> <sortablejs.version>1.8.1</sortablejs.version> <mousetrap.version>1.6.1</mousetrap.version> - <plotly.version>1.48.3</plotly.version> <moment.version>2.24.0</moment.version> <webdrivermanager.version>2.2.1</webdrivermanager.version> <selenium.version>3.141.59</selenium.version> @@ -191,11 +190,6 @@ <artifactId>mousetrap</artifactId> <version>${mousetrap.version}</version> </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>plotly.js</artifactId> - <version>${plotly.version}</version> - </dependency> <dependency> <groupId>org.webjars</groupId> <artifactId>momentjs</artifactId> diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java index 8a5f169692fb1a56a0831697202dddf4dbdc3d91..02494383a806728fdf19b06323e9746821aa1d41 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java @@ -28,7 +28,11 @@ import java.util.List; @Controller public class ChartController extends BaseController { - private static final Gson GSON = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().registerTypeAdapter(DateTime.class, (JsonSerializer<DateTime>) (json, typeOfSrc, context) -> new JsonPrimitive(ISODateTimeFormat.date().print(json))).create(); + private static final Gson GSON = new GsonBuilder() + .excludeFieldsWithoutExposeAnnotation() + .setPrettyPrinting() + .registerTypeAdapter(DateTime.class, (JsonSerializer<DateTime>) (json, typeOfSrc, context) -> new JsonPrimitive(ISODateTimeFormat.date().print(json))) + .create(); private final ChartService chartService; private final HelpersService helpers; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java index b839c70bce6a200a36cd1370ad35d0f1bad3fe3e..e1a9c19bbe136d9bcc012243624e1c587bf53d1f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java @@ -90,7 +90,11 @@ public class DatabaseService Database database = new Database(categories, accounts, filteredTransactions); LOGGER.debug("Created database JSON with " + database.getTransactions().size() + " transactions, " + database.getCategories().size() + " categories and " + database.getAccounts().size() + " accounts"); - Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().registerTypeAdapter(DateTime.class, (JsonSerializer<DateTime>) (json, typeOfSrc, context) -> new JsonPrimitive(ISODateTimeFormat.date().print(json))).create(); + Gson gson = new GsonBuilder() + .excludeFieldsWithoutExposeAnnotation() + .setPrettyPrinting() + .registerTypeAdapter(DateTime.class, (JsonSerializer<DateTime>) (json, typeOfSrc, context) -> new JsonPrimitive(ISODateTimeFormat.date().print(json))) + .create(); return gson.toJson(database); } diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl index d307a78a16aed8525ed3bd0f277bebe01dcf5cfa..19441af8cd5e07409bd8b21a1df5e3b46134aebb 100644 --- a/src/main/resources/templates/charts/charts.ftl +++ b/src/main/resources/templates/charts/charts.ftl @@ -156,7 +156,7 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/plotly/1.48.3/dist/plotly.min.js'/>"></script> + <script src="<@s.url '/js/plotly.min.js'/>"></script> <script src="<@s.url '/webjars/momentjs/2.24.0/min/moment.min.js'/>"></script> <script src="<@s.url '/js/charts.js'/>"></script> <script src="<@s.url '/js/filter.js'/>"></script>