Merge pull request #75 from fdm-monster/fix/74-printcompletion-page-d…

…oes-not-list-printers-and-printer-namesfloors-are-not-visible

Fix/74 printcompletion page does not list printers and printer namesfloors are not visible

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fdm-monster/client",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "private": false,
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",

src/components/Generic/NavigationDrawer.vue

@@ -45,7 +45,7 @@ export default defineComponent({
         ["home", "Devices", "/"],
         ["printer", "Printers", "/printers"],
         ["settings", "Settings", "/settings"],
-        ["timeline", "PrintScheduling", "/scheduling"],
+        ["timeline", "PrintStatistics", "/statistics"],
         ["contact_support", "About", "/about"],
       ],
     };

src/components/PrintTimeline/PrintCompletionTimeline.vue → src/components/PrintStatistics/PrintStatistics.vue

@@ -175,6 +175,7 @@ export default defineComponent({
       this.loadedCompletions = [];
       this.shownCompletions = [];
       this.loadedCompletions = await PrintCompletionsService.getCompletions();
+      this.updateFloors();
       this.updatePrinters();
     },
     printer(printerId: string) {
@@ -184,37 +185,36 @@ export default defineComponent({
       return this.printersStore.floorOfPrinter(printerId);
     },
     updateFloors() {
-      // TODO fix
-      // if (!this.filteredFloors?.length) {
-      //   this.printers = this.availablePrinterGroups;
-      //   return;
-      // }
-      // const flattenedGroupIds = this.filteredFloors.flatMap((f) => {
-      //   return f.printers.map((pg) => pg.printerGroupId);
-      // });
-      // this.printerGroups = this.availablePrinterGroups.filter((pg) => {
-      //   if (!pg._id) return false;
-      //   return flattenedGroupIds.includes(pg._id);
-      // });
+      if (!this.filteredFloors?.length) {
+        this.floorFdmPrinters = this.printersStore.printers;
+        return;
+      }
+      const flattenedPrinterIds = this.filteredFloors.flatMap((f) => {
+        return f.printers.map((fp) => fp.printerId);
+      });
+      this.floorFdmPrinters = this.printersStore.printers.filter((fp) => {
+        if (!fp.id) return false;
+        return flattenedPrinterIds.includes(fp.id);
+      });
     },
     updatePrinters() {
       const pIds = this.filteredFdmPrinters.map((p) => p.id);
-      const preSearchPrinters = pIds.length
+      const preSearchPrints = pIds.length
         ? this.loadedCompletions.filter((c) => pIds.includes(c._id))
         : this.loadedCompletions;
 
-      const preSortPrinters = this.printerNameSearch?.length
-        ? preSearchPrinters.filter((p) => {
+      const preSortPrints = this.printerNameSearch?.length
+        ? preSearchPrints.filter((p) => {
             const printer = this.floorFdmPrinters.find((f) => f.id === p._id);
             if (!printer) return false;
 
             return (printer.printerName + printer.printerURL)
               .toLowerCase()
               .includes(this.printerNameSearch.toLowerCase());
           })
-        : preSearchPrinters;
+        : preSearchPrints;
 
-      this.shownCompletions = preSortPrinters.sort((p1, p2) => {
+      this.shownCompletions = preSortPrints.sort((p1, p2) => {
         if (p1.failureCount === p2.failureCount) {
           return p1.printCount > p2.printCount ? -1 : 1;
         }

src/components/PrintStatistics/PrintStatisticsView.vue

@@ -0,0 +1,15 @@
+<template>
+  <v-container>
+    <PrintStatistics />
+  </v-container>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import PrintStatistics from "@/components/PrintStatistics/PrintStatistics.vue";
+
+export default defineComponent({
+  name: "PrintStatisticsView",
+  components: { PrintStatistics },
+});
+</script>

src/router/index.ts

@@ -4,7 +4,7 @@ import HomePrinterGrid from "@/views/PrinterGridView.vue";
 import PrintersView from "@/components/PrinterList/PrintersView.vue";
 import Settings from "@/views/SettingsView.vue";
 import About from "@/views/AboutView.vue";
-import PrintTimeline from "@/views/PrintTimelineView.vue";
+import PrintStatisticsView from "@/components/PrintStatistics/PrintStatisticsView.vue";
 import FdmSettings from "@/components/Settings/FdmSettings.vue";
 import ServerRelatedSettings from "@/components/Settings/ServerRelatedSettings.vue";
 import UserManagementSettings from "@/components/Settings/UserManagementSettings.vue";
@@ -50,9 +50,9 @@ const routes: Array<RouteConfig> = [
     ],
   },
   {
-    path: "/scheduling",
-    name: "Print Timeline",
-    component: PrintTimeline,
+    path: "/statistics",
+    name: "Print Statistics",
+    component: PrintStatisticsView,
   },
   {
     path: "/about",