From f45258cebd253db96348f0011f2ce8ad8ef9487c Mon Sep 17 00:00:00 2001
From: TLRZ Seyfferth <christian.seyfferth@tlrz.thueringen.de>
Date: Fri, 12 Jan 2018 16:04:46 +0100
Subject: [PATCH] sub

---
 data/articles.json | 351 ++++++++++++++++++++++++++++++++++++++++-----
 index.html         |  44 +++---
 js/vue.js          |   5 +-
 3 files changed, 340 insertions(+), 60 deletions(-)

diff --git a/data/articles.json b/data/articles.json
index a6ee460..93a2a8b 100644
--- a/data/articles.json
+++ b/data/articles.json
@@ -1,38 +1,313 @@
-[
-        { 
-            "name" : "Edelpils", 
-            "dimension" : "l",
-            "content": {
-                "size" : 0.33
-            }, 
-            "portion": {
-                "size": 0.33,
-                "price": 3.50,
-                "type": "Fl."
-            }
-        },
-        { 
-            "name" : "Secco", 
-            "dimension" : "l",
-            "content": {
-                "size" : 0.75
-            }, 
-            "portion": {
-                "size": 0.1,
-                "price": 6,
-                "type": "Gl."
-            }
-        },
-        { 
-            "name" : "Amareno Cuvee",
-            "dimension" : "l", 
-            "content": {
-                "size" : 0.75
-            }, 
-            "portion": {
-                "size": 0.2,
-                "price": 6.50,
-                "type": "Gl."
-            }
-        }
-     ]
\ No newline at end of file
+[{
+    "name": "Edelpils",
+    "dimension": "l",
+    "content": {
+        "size": 0.33,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.33,
+        "price": 3.5,
+        "type": "Fl."
+    }
+}, {
+    "name": "Schwarzbier",
+    "dimension": "l",
+    "content": {
+        "size": 0.33,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.33,
+        "price": 3.5,
+        "type": "Fl."
+    }
+}, {
+    "name": "Schöfferhofer",
+    "dimension": "l",
+    "content": {
+        "size": 0.33,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.33,
+        "price": 3.5,
+        "type": "Fl."
+    }
+}, {
+    "name": "Bitburger af.",
+    "dimension": "l",
+    "content": {
+        "size": 0.33,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.33,
+        "price": 3.5,
+        "type": "Fl."
+    }
+}, {
+    "name": "Weiswein",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 6,
+        "type": "Gl."
+    }
+}, {
+    "name": "Rotwein",
+    "dimension": "l",
+    "content": {
+        "size": 0.75,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 6.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "Secco",
+    "dimension": "l",
+    "content": {
+        "size": 0.75,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.1,
+        "price": 6,
+        "type": "Gl."
+    }
+}, {
+    "name": "B-Saft",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 3.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "K-Saft",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 3.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "O-Saft",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 3.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "G-Saft",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 3.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "Vita Cola",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 2.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "Vita Orange",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 2.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "Vita Zitrone",
+    "dimension": "l",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.2,
+        "price": 2.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "Tonic",
+    "dimension": "l",
+    "content": {
+        "size": 0.25,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.25,
+        "price": 3,
+        "type": "Fl."
+    }
+}, {
+    "name": "Bitter Lemon",
+    "dimension": "l",
+    "content": {
+        "size": 0.25,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.25,
+        "price": 3,
+        "type": "Fl."
+    }
+}, {
+    "name": "Ginger Ale",
+    "dimension": "l",
+    "content": {
+        "size": 0.25,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.25,
+        "price": 3,
+        "type": "Fl."
+    }
+}, {
+    "name": "Apfelschorle",
+    "dimension": "l",
+    "content": {
+        "size": 0.25,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.25,
+        "price": 3,
+        "type": "Fl."
+    }
+}, {
+    "name": "TWQ naturell",
+    "dimension": "l",
+    "content": {
+        "size": 0.25,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.25,
+        "price": 2.5,
+        "type": "Fl."
+    }
+}, {
+    "name": "TWQ medium",
+    "dimension": "l",
+    "content": {
+        "size": 0.25,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.25,
+        "price": 2.5,
+        "type": "Fl."
+    }
+}, {
+    "name": "TWQ classic",
+    "dimension": "l",
+    "content": {
+        "size": 0.25,
+        "price": 0
+    },
+    "portion": {
+        "size": 0.25,
+        "price": 2.5,
+        "type": "Fl."
+    }
+}, {
+    "name": "Kaffee",
+    "dimension": "Tasse",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 1,
+        "price": 2.5,
+        "type": "T"
+    }
+}, {
+    "name": "Latte Macchiato",
+    "dimension": "Glas",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 1,
+        "price": 3.5,
+        "type": "Gl."
+    }
+}, {
+    "name": "dopp. Esp.",
+    "dimension": "Tasse",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 1,
+        "price": 3.5,
+        "type": "T"
+    }
+}, {
+    "name": "Brezel",
+    "dimension": "Stück",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 1,
+        "price": 2.5,
+        "type": "Stk."
+    }
+}, {
+    "name": "Schokoriegel",
+    "dimension": "Stück",
+    "content": {
+        "size": 1,
+        "price": 0
+    },
+    "portion": {
+        "size": 1,
+        "price": 2,
+        "type": "Stk."
+    }
+}]
\ No newline at end of file
diff --git a/index.html b/index.html
index aa53123..1fb7032 100644
--- a/index.html
+++ b/index.html
@@ -13,29 +13,26 @@
 </head>
 
 <body>
-    
     <div id="app">
-        <nav class="nav-extended teal ">
+        <nav class="nav-extended teal" >
             <div class="nav-wrapper container">
                 <a href="#" class="brand-logo">Inventur</a>
-                <a href="#" data-activates="mobile" class="sidenav-trigger"><i class="material-icons">menu</i></a>
-                <ul id="nav-mobile" class="right hide-on-med-and-down">
-                    <li><a href="#"></a></li>
-                </ul>
-                <ul id="mobile" class="sidenav">
-                    <li><a href="#"></a></li>
-                </ul>
             </div>
             <div class="nav-content container">
                 <ul class="tabs tabs-transparent">
-                    <li class="tab"><a href="#article">Artikelliste</a></li>
-                    <li class="tab"><a href="#inventory" class="active">Inventur</a></li>
-                    <li class="tab"><a href="#calc">Rechner</a></li>
+                    <li class="tab"><a href="#article" @click="view = 'article';">Artikelliste</a></li>
+                    <li class="tab"><a href="#inventory" class="active" @click="view = 'inventur';">Inventur</a></li>
+                    <li class="tab"><a href="#calc" @click="view = 'calc';">Rechner</a></li>
                 </ul>
             </div>
         </nav>
         <div class="container">
-            <div class="col s12" id="article">
+            <div class="valign-wrapper" style="height: 90vh" v-if="!ready">
+                <div class="progress">
+                    <div class="indeterminate"></div>
+                </div>
+            </div>
+            <div class="col s12" id="article" v-if="ready">
                 <div v-for="(a, index) in articles" class="card">
                     <div class="card-content row">
                         <span class="card-title">{{ a.name }}</span>
@@ -79,8 +76,7 @@
                     
                 </div>
             </div>
-        
-            <div class="col s12" id="inventory">
+            <div class="col s12" id="inventory" v-if="ready">
                 <div v-for="(a, index) in inventory.ug" class="card hoverable">
                     <div class="card-content row">
                         <div class="col s12 m2">{{ a.article.name }}</div>
@@ -105,12 +101,12 @@
                     
                 </div>
                 <div class="card teal lighten-2 white-text">
-                    <div class="card-content right-align">
+                    <div class="card-content">
                         <h5>Gesamtsumme: {{ sales_ug | currency }}</h5>
                     </div>
                 </div>
             </div>
-            <div class="col s12" id="calc">
+            <div class="col s12" id="calc" v-if="ready">
                 <div class="row">
                     <div class="col s12 m4 card darken-4 grey grey-text text-lighten-2">
                         <table class="card-content">
@@ -142,20 +138,26 @@
     
             </div>
         </div>
-        
         <div class="fixed-action-btn">
-            <a href="#" class="btn-floating btn-large teal">
+            <a href="#" class="btn-floating btn-large" :class="[ view == 'article' ? 'orange' : (view == 'inventur' ? 'teal' : 'brown') ]">
                 <i class="large material-icons">more</i>
             </a>
             <ul>
-                <li>
+                <li v-if="view == 'article'">
                     <a href="#" class="btn-floating tooltipped" data-position="left" @click="storeArticles" data-tooltip="Artikelliste speichern"><i class="material-icons">save</i></a>
                 </li>
-                <li>
+                <li v-if="view == 'article'">
+                    <a href="#" class="btn-floating tooltipped" data-position="left" @click="addArticle" data-tooltip="Artikel hinzufügen"><i class="material-icons">add</i></a>
+                </li>
+                <li v-if="view == 'inventur'">
+                    <a href="#" class="btn-floating tooltipped" data-position="left" @click="storeArticles" data-tooltip="Artikelliste speichern"><i class="material-icons">save</i></a>
+                </li>
+                <li v-if="view == 'inventur'">
                     <a href="#" class="btn-floating tooltipped" data-position="left" @click="addArticle" data-tooltip="Artikel hinzufügen"><i class="material-icons">add</i></a>
                 </li>
             </ul>
         </div>
+        
     </div>
     <script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-alpha.3/js/materialize.min.js"></script>
diff --git a/js/vue.js b/js/vue.js
index 39b7e06..477059a 100644
--- a/js/vue.js
+++ b/js/vue.js
@@ -22,7 +22,9 @@ var app = new Vue({
             mob : [],
             stud : []
         },
-        bon: []
+        bon: [],
+        view: 'inventur',
+        ready: false,
     },
     computed: {
       sales_ug: function (){
@@ -72,6 +74,7 @@ var app = new Vue({
                 });
             }).then( x => {
                 M.updateTextFields();
+                this.ready = true;
             });
         },
         resetBon: function(article) {