diff --git a/src/main/java/de/hsel/spm/baudas/web/ShoppingTimesDiagram.java b/src/main/java/de/hsel/spm/baudas/web/ShoppingTimesDiagram.java index ed40db8..11b6c69 100644 --- a/src/main/java/de/hsel/spm/baudas/web/ShoppingTimesDiagram.java +++ b/src/main/java/de/hsel/spm/baudas/web/ShoppingTimesDiagram.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.UUID; -import java.util.regex.Pattern; /** * changes data from shopping times diagram into a readable format for chart.js @@ -35,8 +34,6 @@ import java.util.regex.Pattern; @WebServlet("/shopping_times") public class ShoppingTimesDiagram extends HttpServlet { - private static Map cache = new HashMap<>(); - private static final long serialVersionUID = 6567531484L; @Override @@ -53,21 +50,13 @@ public class ShoppingTimesDiagram extends HttpServlet { Gson gson = new Gson(); - String id = req.getParameter("id"); - boolean match = Pattern.matches("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}", id); - if (id == null || !match) { + + if (req.getParameter("id") == null) { + result.put("labels", definedOrder); + out.print(gson.toJson(result)); return; } - - UUID uuid = UUID.fromString(id); - - - if(cache.containsKey(uuid)) { - out.print(gson.toJson(cache.get(uuid))); - return; - } - - + UUID uuid = UUID.fromString(req.getParameter("id")); File file = Data.get(uuid); ShoppingTimes shoppingTimes = new ShoppingTimes(file); @@ -92,7 +81,7 @@ public class ShoppingTimesDiagram extends HttpServlet { } } - cache.put(uuid, result); + out.print(gson.toJson(result)); } diff --git a/src/main/java/de/hsel/spm/baudas/web/TopFlopArticleDiagram.java b/src/main/java/de/hsel/spm/baudas/web/TopFlopArticleDiagram.java index 660d6e3..2d6692f 100644 --- a/src/main/java/de/hsel/spm/baudas/web/TopFlopArticleDiagram.java +++ b/src/main/java/de/hsel/spm/baudas/web/TopFlopArticleDiagram.java @@ -13,7 +13,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.*; -import java.util.regex.Pattern; /** * @author Johannes Theiner @@ -24,8 +23,6 @@ import java.util.regex.Pattern; @WebServlet("/top_flop") public class TopFlopArticleDiagram extends HttpServlet { - private static Map cache = new HashMap<>(); - private static final long serialVersionUID = 6567531464214L; @Override @@ -37,19 +34,7 @@ public class TopFlopArticleDiagram extends HttpServlet { Gson gson = new Gson(); - String id = req.getParameter("id"); - boolean match = Pattern.matches("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}", id); - if(id == null || !match) { - return; - } - - UUID uuid = UUID.fromString(id); - - if(cache.containsKey(uuid)) { - out.println(gson.toJson(cache.get(uuid))); - return; - } - + UUID uuid = UUID.fromString(req.getParameter("id")); File file = Data.get(uuid); TopFlopArticle articles = new TopFlopArticle(file); @@ -68,8 +53,6 @@ public class TopFlopArticleDiagram extends HttpServlet { result.put("labels", labels); result.put("data", data); - - cache.put(uuid, result); out.print(gson.toJson(result)); } } \ No newline at end of file diff --git a/src/main/java/de/hsel/spm/baudas/web/Upload.java b/src/main/java/de/hsel/spm/baudas/web/Upload.java index 11f7794..28f7c9d 100644 --- a/src/main/java/de/hsel/spm/baudas/web/Upload.java +++ b/src/main/java/de/hsel/spm/baudas/web/Upload.java @@ -48,5 +48,7 @@ public class Upload extends HttpServlet { } Files.copy(inputStream, path, StandardCopyOption.REPLACE_EXISTING); + + resp.sendRedirect(""); } } \ No newline at end of file diff --git a/src/main/java/de/hsel/spm/baudas/web/WeekOverviewDiagram.java b/src/main/java/de/hsel/spm/baudas/web/WeekOverviewDiagram.java index 6f8534f..9230839 100644 --- a/src/main/java/de/hsel/spm/baudas/web/WeekOverviewDiagram.java +++ b/src/main/java/de/hsel/spm/baudas/web/WeekOverviewDiagram.java @@ -19,7 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.regex.Pattern; /** * changes data from week overview into readable format for chart.js @@ -31,8 +30,6 @@ import java.util.regex.Pattern; @WebServlet("/week_overview") public class WeekOverviewDiagram extends HttpServlet { - private static Map cache = new HashMap<>(); - private static final long serialVersionUID = 8484151844118L; @@ -48,20 +45,16 @@ public class WeekOverviewDiagram extends HttpServlet { Gson gson = new Gson(); - String id = req.getParameter("id"); - boolean match = Pattern.matches("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}", id); - - if (id == null || !match) { - return; - } - - UUID uuid = UUID.fromString(id); - if(cache.containsKey(uuid)) { - out.println(gson.toJson(cache.get(uuid))); + if (req.getParameter("id") == null) { + result.put("labels", definedOrder); + result.put("count", new ArrayList<>()); + result.put("revenue", new ArrayList<>()); + out.print(gson.toJson(result)); return; } + UUID uuid = UUID.fromString(req.getParameter("id")); File file = Data.get(uuid); WeekOverview overview = new WeekOverview(file); @@ -86,7 +79,6 @@ public class WeekOverviewDiagram extends HttpServlet { result.put("count", count); result.put("revenue", revenue); - cache.put(uuid, result); out.print(gson.toJson(result)); } } \ No newline at end of file diff --git a/src/main/webapp/footer.jsp b/src/main/webapp/footer.jsp index 175265d..5e91340 100644 --- a/src/main/webapp/footer.jsp +++ b/src/main/webapp/footer.jsp @@ -12,7 +12,6 @@ M.AutoInit(); - diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp index a3a8979..5cd9784 100644 --- a/src/main/webapp/header.jsp +++ b/src/main/webapp/header.jsp @@ -12,7 +12,6 @@ media="screen,projection"/> - @@ -38,7 +37,7 @@
    @@ -78,13 +77,13 @@
    • -
    +

  • File - +
    @@ -92,80 +91,9 @@
  • -
    - +
    +
    • - -
- - - - - - - + \ No newline at end of file diff --git a/src/main/webapp/js/cache.js b/src/main/webapp/js/cache.js index b83aeb6..8876e59 100644 --- a/src/main/webapp/js/cache.js +++ b/src/main/webapp/js/cache.js @@ -1,33 +1,4 @@ -let loading = $('#loading'); - -Chart.plugins.register({ - afterDraw: function(chart) { - if (chart.data.datasets[0].data.length === 0) { - // No data is present - var ctx = chart.chart.ctx; - var width = chart.chart.width; - var height = chart.chart.height; - chart.clear(); - - ctx.save(); - ctx.textAlign = 'center'; - ctx.textBaseline = 'middle'; - ctx.font = "16px normal 'Helvetica Nueue'"; - ctx.fillText('Kein Datenset ausgewählt', width / 2, height / 2); - ctx.restore(); - } - } -}); - $(document).ready(function () { - updateDatasets(); -}); - -function clearSelected(){ - $('#dataset').prop('selectedIndex', -1); -} - -function updateDatasets() { let dataset = $('#dataset'); request('files').then(results => { dataset.empty(); @@ -40,7 +11,7 @@ function updateDatasets() { dataset.formSelect(); }); updateCache(); -} +}); /** * update all charts with correct values for dataset diff --git a/src/main/webapp/js/shopping_times.js b/src/main/webapp/js/shopping_times.js index 1f29752..c5d85dc 100644 --- a/src/main/webapp/js/shopping_times.js +++ b/src/main/webapp/js/shopping_times.js @@ -3,10 +3,10 @@ let shopping_result; let shopping_chart = new Chart(document.getElementById("shopping_times_chart"), { type: 'bar', data: { - labels: [], + labels: [1, 2, 3, 4, 5], datasets: [{ label: 'Anzahl verkaufter Artikel', - data: [], + data: [0, 0, 0, 0, 0], backgroundColor: [ 'rgba(143, 170, 220, 0.9)', 'rgba(143, 170, 220, 0.9)', diff --git a/src/main/webapp/js/upload.js b/src/main/webapp/js/upload.js deleted file mode 100644 index 11d344d..0000000 --- a/src/main/webapp/js/upload.js +++ /dev/null @@ -1,38 +0,0 @@ -let form = document.getElementById("upload"); - -form.onsubmit = function (event) { - event.preventDefault(); - let formData = new FormData(form); - - formData.append('file', document.getElementById("file")); - - let xhr = new XMLHttpRequest(); - - xhr.onloadstart = function(e) { - loading.removeClass("hide"); - $('.sidenav').sidenav('close'); - loading.modal('open'); - } - - xhr.upload.addEventListener("progress", function (event) { - if (event.lengthComputable) { - self.progress = Math.round(100 / event.total * event.loaded); - } else if (this.explicitTotal) { - self.progress = Math.min(1, event.loaded / self.explicitTotal); - } else { - self.progress = 0; - } - - }, false); - - xhr.onloadend = function (e) { - clearSelected(); - updateDatasets(); - form.reset(); - }; - - xhr.open('POST', form.getAttribute('action'), true); - xhr.send(formData); - - return false; -}; diff --git a/src/main/webapp/js/week_overview.js b/src/main/webapp/js/week_overview.js index ec9ac12..ee3d77c 100644 --- a/src/main/webapp/js/week_overview.js +++ b/src/main/webapp/js/week_overview.js @@ -3,16 +3,16 @@ let week_result; let week_overview = new Chart($("#overview_chart"), { type: 'line', data: { - labels: [], + labels: [0, 0, 0, 0, 0], datasets: [{ label: "Warenanzahl", - data: [], + data: [0, 0, 0, 0, 0], fill: true, backgroundColor: 'rgba(104, 216, 154, 0.5)', lineTension: 0 }, { label: "Einnahmen in €", - data: [], + data: [0, 0, 0, 0, 0], fill: true, backgroundColor: 'rgba(113, 114, 231, 1)', lineTension: 0 @@ -71,5 +71,5 @@ function updateWeekOverview() { week_overview.data.datasets[0].data = week_result.count; week_overview.data.datasets[1].data = week_result.revenue; week_overview.update(); - loading.modal('close'); + } \ No newline at end of file