Update v1.0.2

Took 37 minutes

public/stylesheets/settings.css

@@ -0,0 +1,6 @@
+#settings {
+    display: grid;
+    grid-template-columns: repeat(4, calc(90% / 4));
+    grid-template-rows: repeat(5, calc(90% / 5));
+    grid-gap: 10% 5%;
+}

public/stylesheets/style.css

@@ -5,6 +5,7 @@
 @import url("/stylesheets/menu.css");
 @import url("/stylesheets/main.css");
 @import url("/stylesheets/setup.css");
+@import url("/stylesheets/settings.css");
 @import url("/stylesheets/containers.css");
 
 
@@ -223,10 +224,3 @@ h2 {
 }
 
 
-#settings {
-    display: none;
-    background-color: red;
-    width: 100vw;
-    height: 100vh;
-}
-

src/Utils.ts

@@ -40,7 +40,13 @@ export class Utils {
 
     static deleteImage( id )
     {
+        try {
             fs.unlinkSync("./public/images/" + id + ".png");
+        } catch( e )
+        {
+
+        }
+
     }
 
     static checkForImage( id )

src/WebSocketHandler.ts

@@ -8,6 +8,9 @@ import Drink from "./database/Drink";
 import {IDrink} from "./database/IDrink";
 import Ingredient from "./database/Ingredient";
 import {RequestType} from "./RequestType";
+import debug from "debug";
+
+const log = debug("itender:WShandler");
 
 export class WebSocketHandler {
     private static _ws: WebSocket;
@@ -24,6 +27,7 @@ export class WebSocketHandler {
         return new Promise(async (resolve, reject) => {
             try {
                 if (this.ws && this.ws.readyState == 1) {
+                    log("Sending " + payload.event);
                     await this.ws.send(payload.toString());
                     resolve();
                 }

src/iTender.ts

@@ -24,9 +24,6 @@ const log = debug("itender:station");
 const mixLog = debug("itender:mix");
 
 export class iTender {
-    static get containers(): { container: IContainer, sensor: HCSR04 | HX711, pump: null }[] {
-        return this._containers;
-    }
 
     static get drinks(): IDrink[] {
         return this._drinks;
@@ -45,11 +42,6 @@ export class iTender {
         return this._internetConnection;
     }
 
-    /**
-     * @Deprecated
-     * @private
-     */
-    private static _containers: { container: IContainer, sensor: HCSR04 | HX711, pump: null }[] = [];
     private static _drinks: IDrink[];
 
     static setStatus(status: iTenderStatus) {
@@ -245,9 +237,9 @@ export class iTender {
 
                 let drinkAccept = true;
                 for (let i of d.ingredients) {
-                    let c = await Container.findOne({content: i["type"]});
+                    let c = await Container.findOne({$and: [{content: i.type}, {content: {$ne: null}}]});
 
-                    if (!c) {
+                    if (!c || c.content != i.type) {
                         drinkAccept = false;
                         break;
                     }

src/main.ts

@@ -6,6 +6,7 @@ import {iTender} from "./iTender";
 import {iTenderStatus} from "./iTenderStatus";
 import {Utils} from "./Utils";
 import {Settings} from "./Settings";
+import Drink from "./database/Drink";
 
 const log = debug("itender:server");
 
@@ -39,7 +40,7 @@ const wsApp = new WebsocketApp();
                 }
                 Settings.saveSettings();
 
-
+                log("Check OK, starting...");
                 await init();
                 setInterval(refresh, 1000 * 60);
                 iTender.setStatus(iTenderStatus.READY);
@@ -62,7 +63,8 @@ function init(): Promise<void> {
         setTimeout( async () => {
             // Network
             await iTender.checkNetwork();
-            if (iTender.internetConnection && iTender.status == iTenderStatus.READY) {
+            let drinkCount = await Drink.countDocuments({});
+            if (iTender.internetConnection && iTender.status == iTenderStatus.READY && drinkCount < 3 ) {
                 await iTender.refreshFromServer();
             }
         }, 1000 * 20 ) ;

views/index.pug

@@ -53,5 +53,6 @@ block settings
     // Settings
     button.btn.btn-primary#settings_refreshDrinks Getränke herunterladen
 
+
 block main
     // Main is build dynamically