diff --git a/config.xml b/config.xml index 0148f9a65..c043cbeea 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Beanconqueror Lars Saalbach @@ -76,22 +76,19 @@ - - - - - + - + + diff --git a/package-lock.json b/package-lock.json index 2293e3f23..95d0a02c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "beanconqueror", - "version": "1.1.0", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -92,44 +92,44 @@ } }, "@ionic-native/android-permissions": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/android-permissions/-/android-permissions-4.7.0.tgz", - "integrity": "sha512-IasnHoenr5upz4Y8h8s1eUfKioANFGs6dOEweeZbH/ZxcPq6D0hrDeg4guf/xLtMB0sQZFgcg4HJlLvlwmDSQA==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/android-permissions/-/android-permissions-4.9.0.tgz", + "integrity": "sha512-+1WfxxkhcZbGNzPjOPdIa8hnoUTIYqWMvuH00tsZsy0sc57DJjFqmxdnSehRXjoIFBmrspKGfEXaRItLOsRnVA==" }, "@ionic-native/app-minimize": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/app-minimize/-/app-minimize-4.7.0.tgz", - "integrity": "sha512-8fr0i1sUv+YTos0WN4i8/QZcV/O2y/Ae0zr+ALo9uqgpGXUTQeJYW42goFosC44aUeY5iZAY0nA/Ra5bl/yXYA==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/app-minimize/-/app-minimize-4.9.0.tgz", + "integrity": "sha512-UIP52NhQ4dOFna9FYxCn0ydthfhA3RN2ojHPRQhHSlhXr7ojwsXj+WXWrYD42+l4qs5XA/qODWiS7daRW236bQ==" }, "@ionic-native/app-version": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/app-version/-/app-version-4.7.0.tgz", - "integrity": "sha512-P0NMfs1OORy6jm/H9Mx9Og1NLjpD3CeWOiUoBJI2HeyDMBUWjTpyXlN1wa01mgzlidyVIgDouRhbOUcRID7Eew==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/app-version/-/app-version-4.9.0.tgz", + "integrity": "sha512-072ToXewM5dzTCtzqtOVUC6QiXAKmpQg/13RktWalYB/X1FAeKLQpLAO98YTjDTdLZ4S9hAShIkNeEdp5yunYw==" }, "@ionic-native/core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-4.7.0.tgz", - "integrity": "sha512-BT4a9qIl3qfJMukcfMPtXDAAsOrYIAoVQvCodDZhqGExTakIx0/JlOr+lZa6KEU46CoA1SEctcBjj0N+nNcWOw==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-4.9.0.tgz", + "integrity": "sha512-lqM2DRiice2oyrkJR5O1cPP9qVCCPi2w1fDHcy2IhJeAuAqtx8LBrWFaXLUuy/355OhX+/dSaGErf43RLZjCeA==" }, "@ionic-native/image-picker": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/image-picker/-/image-picker-4.7.0.tgz", - "integrity": "sha512-ds6ZQoydXbTwKIGkEYbScBrNGh49MicJAUv0OhMR8bC1+eebIlhBPw7bwRUoWPdkqTrG1Q/Gc1NqggVHXxMxSA==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/image-picker/-/image-picker-4.9.0.tgz", + "integrity": "sha512-qFX+x3xkHowIlZV5yaeKm99WlXCO9MdQ4UjhBh2Je8CBwec1hR7QhqPNeJ5vBvdtWRL0/hACKuo9UUdhKWgbEQ==" }, "@ionic-native/media-capture": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-4.7.0.tgz", - "integrity": "sha512-31iLJFO+3RNs+mA8rLW5uI3SST8wIl9gtrRCEjvbcnuXaPIS145K6hqsaQUgv0V6BzFRemMxT/cAfV2r2k7Nlw==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/media-capture/-/media-capture-4.9.0.tgz", + "integrity": "sha512-PsXa+Yb6iTa3gWs72yNKMxlBE9Bgyz9aP/ljcG3dlgt9IeCsWh3HPpmmYTMbeVxABAg6O5Izdud+2ceylBdupw==" }, "@ionic-native/splash-screen": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-4.7.0.tgz", - "integrity": "sha512-3kh/FiXzgvhbgLoJXHXuNwirVMgsVlw2x95sdwMSHAN3sfUEjg9sNu57WbsIMzzlTbxZ6wdeWIErH9SVDFC/sw==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-4.9.0.tgz", + "integrity": "sha512-YeHJemRoBfTxehyxYO4rIc+sprlskGq0ddUuJcZERGTPgo46Fnor2OpzQwQKYJVsbfHYWXIQ/kCjlVYGy24VmA==" }, "@ionic-native/status-bar": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-4.7.0.tgz", - "integrity": "sha512-sUQhWH0Wv6k7tFCBwR3s89NUyzLSrxutRerzMGVHnE8s2o4cNV1yM7zRSjIS6VQxUDnAyEv4CLFbuZmNvqooFw==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-4.9.0.tgz", + "integrity": "sha512-Q0yE6vlkgU1SqKYvqe3C6NOONojJF+2rw3UGdhbYzBLTHEO1bydZtxVOwyj9i8btvydSYx+pkrAF9NSogdMAZw==" }, "@ionic/app-scripts": { "version": "3.1.10", @@ -583,9 +583,9 @@ "dev": true }, "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "optional": true, "requires": { @@ -707,9 +707,9 @@ "dev": true }, "browser-resolve": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz", - "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", + "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", "dev": true, "requires": { "resolve": "1.1.7" @@ -885,9 +885,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000853", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000853.tgz", - "integrity": "sha512-vMrE8BED4MJC9IhDJKP8ok6bJUfn5+YHvxwXMYfiPqQOJ3r2B9ihcArlUnXu6yPWf7b3jHqiEBwXZEbrbiFUqg==", + "version": "1.0.30000864", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000864.tgz", + "integrity": "sha512-8fuGh8n3MIQ7oBkO/ck7J4LXhV5Sz5aLyFmfpChWpK+rJhqYrOsGDdbBVDdyKIRBWamZpy6iM4OmLCFVudOOhg==", "dev": true }, "caseless": { @@ -1052,9 +1052,9 @@ } }, "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", + "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==", "dev": true }, "component-emitter": { @@ -1126,12 +1126,11 @@ "dev": true }, "cordova-android": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-6.4.0.tgz", - "integrity": "sha1-VK6NpXKKjX5e/MYXLT3MoXvH/n0=", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-6.2.3.tgz", + "integrity": "sha1-JJ8hts5fHxyEenq4OxaQnb7Vqig=", "requires": { - "android-versions": "^1.2.1", - "cordova-common": "^2.1.0", + "cordova-common": "^2.0.1", "elementtree": "0.1.6", "nopt": "^3.0.1", "properties-parser": "^0.2.3", @@ -1143,16 +1142,12 @@ "version": "1.1.0", "bundled": true }, - "android-versions": { - "version": "1.2.1", - "bundled": true - }, "ansi": { "version": "0.3.1", "bundled": true }, "balanced-match": { - "version": "1.0.0", + "version": "0.4.2", "bundled": true }, "base64-js": { @@ -1160,7 +1155,7 @@ "bundled": true }, "big-integer": { - "version": "1.6.25", + "version": "1.6.22", "bundled": true }, "bplist-parser": { @@ -1171,10 +1166,10 @@ } }, "brace-expansion": { - "version": "1.1.8", + "version": "1.1.7", "bundled": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "^0.4.1", "concat-map": "0.0.1" } }, @@ -1183,13 +1178,13 @@ "bundled": true }, "cordova-common": { - "version": "2.1.0", + "version": "2.0.2", "bundled": true, "requires": { "ansi": "^0.3.1", "bplist-parser": "^0.1.0", "cordova-registry-mapper": "^1.1.8", - "elementtree": "0.1.6", + "elementtree": "^0.1.6", "glob": "^5.0.13", "minimatch": "^3.0.0", "osenv": "^0.1.3", @@ -1240,10 +1235,10 @@ "bundled": true }, "minimatch": { - "version": "3.0.4", + "version": "3.0.3", "bundled": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^1.0.0" } }, "nopt": { @@ -1303,7 +1298,7 @@ "bundled": true }, "semver": { - "version": "5.4.1", + "version": "5.3.0", "bundled": true }, "shelljs": { @@ -1919,11 +1914,6 @@ } } }, - "cordova-plugin-allow-backup": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/cordova-plugin-allow-backup/-/cordova-plugin-allow-backup-0.0.2.tgz", - "integrity": "sha1-bodMB2J4ms49y/MJXbaHnoFMZQY=" - }, "cordova-plugin-android-permissions": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cordova-plugin-android-permissions/-/cordova-plugin-android-permissions-1.0.0.tgz", @@ -1970,8 +1960,9 @@ "integrity": "sha1-gQKKt2Q+YVWT0n8q0CRFYR8ZRrY=" }, "cordova-plugin-statusbar": { - "version": "git+https://github.com/apache/cordova-plugin-statusbar.git#b8e0b0188839265088bbef6372dd4eb855f4a677", - "from": "git+https://github.com/apache/cordova-plugin-statusbar.git" + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.2.tgz", + "integrity": "sha1-/B+9wNjXAzp+jh8ff/FnrJvU+vY=" }, "cordova-plugin-telerik-imagepicker": { "version": "2.2.1", @@ -2290,9 +2281,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.48", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz", - "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=", + "version": "1.3.51", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.51.tgz", + "integrity": "sha1-akK0nar38ipbN7mR2vlJ8029ubU=", "dev": true }, "elliptic": { @@ -2354,9 +2345,9 @@ } }, "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { "is-arrayish": "^0.2.1" @@ -2472,12 +2463,6 @@ "resolved": "https://registry.npmjs.org/esmangle-evaluator/-/esmangle-evaluator-1.0.1.tgz", "integrity": "sha1-Yg2GbvSGGzMR91dm1SqFcrs8YzY=" }, - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true - }, "esprima-fb": { "version": "3001.1.0-dev-harmony-fb", "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz", @@ -2855,13 +2840,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2874,18 +2857,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -2988,8 +2968,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -2999,7 +2978,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3012,7 +2990,6 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3118,8 +3095,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -3129,7 +3105,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3235,7 +3210,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3609,9 +3583,9 @@ "dev": true }, "hosted-git-info": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", - "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz", + "integrity": "sha512-Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==", "dev": true }, "http-errors": { @@ -3891,23 +3865,6 @@ "kind-of": "^3.0.2" } }, - "is-odd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", - "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", - "dev": true, - "requires": { - "is-number": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true - } - } - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -4010,6 +3967,14 @@ "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" + }, + "dependencies": { + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + } } }, "jsbn": { @@ -4227,6 +4192,12 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", + "dev": true + }, "lodash.mergewith": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", @@ -4501,9 +4472,9 @@ "dev": true }, "nanomatch": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { "arr-diff": "^4.0.0", @@ -4511,7 +4482,6 @@ "define-property": "^2.0.2", "extend-shallow": "^3.0.2", "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", "is-windows": "^1.0.2", "kind-of": "^6.0.2", "object.pick": "^1.3.0", @@ -5082,9 +5052,9 @@ "dev": true }, "postcss": { - "version": "6.0.22", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", - "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", + "version": "6.0.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", + "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -5444,9 +5414,9 @@ "dev": true }, "resolve": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", - "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", + "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { "path-parse": "^1.0.5" @@ -5512,9 +5482,9 @@ }, "dependencies": { "acorn": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz", - "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", + "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", "dev": true } } @@ -6346,9 +6316,9 @@ } }, "tsutils": { - "version": "2.27.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.27.1.tgz", - "integrity": "sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w==", + "version": "2.27.2", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.27.2.tgz", + "integrity": "sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==", "dev": true, "requires": { "tslib": "^1.8.1" @@ -6515,9 +6485,9 @@ } }, "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, "unpipe": { @@ -6650,9 +6620,9 @@ "dev": true }, "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", "dev": true }, "validate-npm-package-license": { @@ -6768,23 +6738,24 @@ } }, "chokidar": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", - "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", + "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "dev": true, "requires": { "anymatch": "^2.0.0", "async-each": "^1.0.0", "braces": "^2.3.0", - "fsevents": "^1.1.2", + "fsevents": "^1.2.2", "glob-parent": "^3.1.0", "inherits": "^2.0.1", "is-binary-path": "^1.0.0", "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", "normalize-path": "^2.1.1", "path-is-absolute": "^1.0.0", "readdirp": "^2.0.0", - "upath": "^1.0.0" + "upath": "^1.0.5" } }, "expand-brackets": { @@ -7089,9 +7060,9 @@ }, "dependencies": { "acorn": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz", - "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", + "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", "dev": true }, "ansi-regex": { diff --git a/package.json b/package.json index c8f3563d6..ac4650ca9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "beanconqueror", - "version": "1.1.0", + "version": "1.2.0", "author": "Lars Saalbach, Richard Polzin", "homepage": "https://github.com/graphefruit/beanconqueror", "private": true, @@ -24,32 +24,31 @@ "@angular/http": "5.2.11", "@angular/platform-browser": "5.2.11", "@angular/platform-browser-dynamic": "5.2.11", - "@ionic-native/android-permissions": "^4.4.2", - "@ionic-native/app-minimize": "^4.3.1", - "@ionic-native/app-version": "^4.5.2", - "@ionic-native/core": "4.7.0", - "@ionic-native/image-picker": "^4.4.2", - "@ionic-native/media-capture": "^4.3.1", - "@ionic-native/splash-screen": "4.7.0", - "@ionic-native/status-bar": "4.7.0", + "@ionic-native/android-permissions": "4.9.0", + "@ionic-native/app-minimize": "4.9.0", + "@ionic-native/app-version": "4.9.0", + "@ionic-native/core": "4.9.0", + "@ionic-native/image-picker": "4.9.0", + "@ionic-native/media-capture": "4.9.0", + "@ionic-native/splash-screen": "4.9.0", + "@ionic-native/status-bar": "4.9.0", "@ionic/storage": "2.1.3", - "com.synconset.imagepicker": "~2.1.8", - "cordova-android": "^6.2.3", + "com.synconset.imagepicker": "^2.1.10", + "cordova-android": "6.2.3", "cordova-browser": "5.0.3", - "cordova-plugin-allow-backup": "0.0.2", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", "cordova-plugin-appminimize": "^1.0.0", - "cordova-plugin-compat": "^1.0.0", - "cordova-plugin-device": "^1.1.4", - "cordova-plugin-file": "^4.0.0", - "cordova-plugin-ionic-webview": "^1.1.11", + "cordova-plugin-compat": "^1.2.0", + "cordova-plugin-device": "^1.1.7", + "cordova-plugin-file": "^4.3.3", + "cordova-plugin-ionic-webview": "^1.2.1", "cordova-plugin-media-capture": "^1.4.3", - "cordova-plugin-splashscreen": "^4.0.3", - "cordova-plugin-statusbar": "git+https://github.com/apache/cordova-plugin-statusbar.git", + "cordova-plugin-splashscreen": "^4.1.0", + "cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-telerik-imagepicker": "^2.1.8", - "cordova-plugin-whitelist": "^1.3.1", - "cordova-sqlite-storage": "^2.0.4", + "cordova-plugin-whitelist": "^1.3.3", + "cordova-sqlite-storage": "^2.3.2", "ionic-angular": "3.9.2", "ionic-plugin-keyboard": "^2.2.1", "ionicons": "3.0.0", @@ -59,7 +58,7 @@ "zone.js": "0.8.26" }, "devDependencies": { - "@ionic/app-scripts": "3.1.10", + "@ionic/app-scripts": "^3.1.10", "typescript": "~2.6.2" }, "description": "App for Coffee Enthusiasts", @@ -74,17 +73,14 @@ "cordova-plugin-statusbar": {}, "cordova-plugin-whitelist": {}, "ionic-plugin-keyboard": {}, - "cordova-plugin-allow-backup": { - "BACKUP": "true" - }, + "cordova-plugin-android-permissions": {}, + "cordova-plugin-app-version": {}, "com.synconset.imagepicker": { "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Bitte um Freigabe" - }, - "cordova-plugin-android-permissions": {}, - "cordova-plugin-app-version": {} + } }, "platforms": [ "android" ] } -} +} \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 70cc3a6a1..90af3272c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -33,6 +33,7 @@ import {PreparationsEditModal} from '../pages/preparations/edit/preparations-edi import {BrewsAddModal} from '../pages/brews/add/brews-add'; import {BrewsEditModal} from '../pages/brews/edit/brews-edit'; import {BrewsDetailsModal} from '../pages/brews/details/brews-details'; +import {BrewsTableModal} from '../pages/brews/table/brews-table'; import {BrewsPhotoView} from '../pages/brews/photo-view/brews-photo-view'; import { BrewsPopover } from '../pages/brews/popover/brews-popover'; @@ -73,7 +74,7 @@ import {TimerComponent} from '../components/timer/timer'; ToDecimalPipe, PreventCharacterDirective, BrewsPage, - BrewsAddModal, TimerComponent, BrewsEditModal,BrewsPhotoView,BrewsDetailsModal,BrewsPopover, + BrewsAddModal, TimerComponent, BrewsEditModal,BrewsPhotoView,BrewsDetailsModal,BrewsTableModal,BrewsPopover, AboutPage, ContactPage, LicencesPage ], @@ -101,7 +102,7 @@ import {TimerComponent} from '../components/timer/timer'; PreparationsPage, PreparationsAddModal, PreparationsEditModal, - BrewsPage, BrewsAddModal, TimerComponent, BrewsEditModal,BrewsPhotoView,BrewsDetailsModal,BrewsPopover, + BrewsPage, BrewsAddModal, TimerComponent, BrewsEditModal,BrewsPhotoView,BrewsDetailsModal,BrewsTableModal,BrewsPopover, AboutPage, ContactPage, LicencesPage, ], providers: [ diff --git a/src/app/app.scss b/src/app/app.scss index 8094dccd3..6caf08b01 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -102,3 +102,8 @@ ion-list.no-label-margin ion-label { justify-content: flex-start; } +pre{ + font-family:inherit!important; + margin:0px!important; + white-space: pre-wrap; +} diff --git a/src/classes/brew/brew.ts b/src/classes/brew/brew.ts index 4b2db8da1..4fe02ebb5 100644 --- a/src/classes/brew/brew.ts +++ b/src/classes/brew/brew.ts @@ -12,6 +12,8 @@ import moment from 'moment'; /**Services**/ import {UIBeanStorage} from '../../services/uiBeanStorage'; import {UIPreparationStorage} from '../../services/uiPreparationStorage'; +import {BREW_QUANTITY_TYPES_ENUM} from "../../enums/brews/brewQuantityTypes"; + export class Brew implements IBrew { public grind_size: string; @@ -21,6 +23,7 @@ export class Brew implements IBrew { public brew_temperature: number; public brew_time: number; public brew_quantity: number; + public brew_quantity_type:BREW_QUANTITY_TYPES_ENUM; public note: string; public rating: number; public coffee_type: string; @@ -44,6 +47,7 @@ export class Brew implements IBrew { this.brew_temperature = 0; this.brew_time = 0; this.brew_quantity = 0; + this.brew_quantity_type = "GR"; this.note = ""; this.rating = 1; this.coffee_type = ""; @@ -66,6 +70,10 @@ export class Brew implements IBrew { return uiPreparationStorage; } + public getBrewQuantityTypeName():string{ + return BREW_QUANTITY_TYPES_ENUM[this.brew_quantity_type]; + } + public getBean(): Bean { let iBean: IBean = this.getBeanStorageInstance().getByUUID(this.bean); let bean: Bean = new Bean(); diff --git a/src/enums/beans/roasts.ts b/src/enums/beans/roasts.ts index 5f20a98a4..c2168c5fd 100644 --- a/src/enums/beans/roasts.ts +++ b/src/enums/beans/roasts.ts @@ -24,3 +24,4 @@ export enum ROASTS_ENUM { VIEANNA_ROAST='Vienna Roast', FRENCH_ROAST='French Roast', } + diff --git a/src/enums/brews/brewQuantityTypes.ts b/src/enums/brews/brewQuantityTypes.ts new file mode 100644 index 000000000..a0ee2c8d5 --- /dev/null +++ b/src/enums/brews/brewQuantityTypes.ts @@ -0,0 +1,9 @@ +/** + * Inherits all roasting types + */ +export enum BREW_QUANTITY_TYPES_ENUM { + + GR='gr', + ML='ml', +} + diff --git a/src/interfaces/brew/iBrew.ts b/src/interfaces/brew/iBrew.ts index bc4ffb944..42f3f919d 100644 --- a/src/interfaces/brew/iBrew.ts +++ b/src/interfaces/brew/iBrew.ts @@ -2,6 +2,7 @@ * Created by lars on 10/18/2017. */ import {IConfig} from '../objectConfig/iObjectConfig'; +import {BREW_QUANTITY_TYPES_ENUM} from '../../enums/brews/brewQuantityTypes'; export interface IBrew { //Properties /** @@ -33,6 +34,11 @@ export interface IBrew { * Inherits the output (user specific in g or ml) */ brew_quantity:number, + + /** + * Inherits the type of the brew quantity + */ + brew_quantity_type:BREW_QUANTITY_TYPES_ENUM, /** * Inherits the notes the user doing during or after the shot */ diff --git a/src/pages/beans/beans.html b/src/pages/beans/beans.html index 92572165b..5a8d260ce 100644 --- a/src/pages/beans/beans.html +++ b/src/pages/beans/beans.html @@ -23,7 +23,7 @@ {{bean.name}} - {{bean.note}} + 
{{bean.note}}
 diff --git a/src/pages/brews/add/brews-add.html b/src/pages/brews/add/brews-add.html index 97047d2b4..8fafd2c7e 100644 --- a/src/pages/brews/add/brews-add.html +++ b/src/pages/brews/add/brews-add.html @@ -17,12 +17,23 @@ Gewicht - - - - Temperatur - + + + + + + Temperatur + + + + + + + + + + Zubereitungsmethode @@ -41,7 +52,7 @@ Blooming-Zeit / Preinfusion - + - - Bezugsmenge - - + + + + Bezugsmenge + + + + + + + + {{brewQuantityTypeEnums[key]}} + + + + + Kaffeetyp @@ -94,10 +119,13 @@ - + + + + diff --git a/src/pages/brews/add/brews-add.ts b/src/pages/brews/add/brews-add.ts index b50982299..29d40a74a 100644 --- a/src/pages/brews/add/brews-add.ts +++ b/src/pages/brews/add/brews-add.ts @@ -24,6 +24,9 @@ import {Brew} from '../../../classes/brew/brew'; import {IPreparation} from '../../../interfaces/preparation/iPreparation'; import {IBean} from '../../../interfaces/bean/iBean'; import {ISettings} from '../../../interfaces/settings/iSettings'; +/**Enums**/ + +import {BREW_QUANTITY_TYPES_ENUM} from '../../../enums/brews/brewQuantityTypes'; @Component({ selector: 'brews-add', @@ -38,6 +41,8 @@ export class BrewsAddModal { public BREW_VIEW_ENUM = BREW_VIEW_ENUM; public settings: ISettings; + public brewQuantityTypeEnums = BREW_QUANTITY_TYPES_ENUM; + public method_of_preparations: Array = []; beans: Array = []; @@ -59,6 +64,8 @@ export class BrewsAddModal { this.data.method_of_preparation = this.method_of_preparations[0].config.uuid; + + } ionViewDidEnter(){ @@ -98,6 +105,7 @@ export class BrewsAddModal { if (this.settings.default_last_coffee_parameters.brew_quantity===true) { this.data.brew_quantity = lastBrew.brew_quantity; + this.data.brew_quantity_type = lastBrew.brew_quantity_type; } if (this.settings.default_last_coffee_parameters.coffee_type===true) { this.data.coffee_type = lastBrew.coffee_type; @@ -120,6 +128,8 @@ export class BrewsAddModal { this.data.note = lastBrew.note; } + + } } } diff --git a/src/pages/brews/brews.html b/src/pages/brews/brews.html index d26400463..d5ab927a2 100644 --- a/src/pages/brews/brews.html +++ b/src/pages/brews/brews.html @@ -66,7 +66,7 @@

Um einen Bezug zu starten, lege bitte eine Bohnensorte Notizen:
- {{brew.note}} + 
{{brew.note}}
 diff --git a/src/pages/brews/brews.scss b/src/pages/brews/brews.scss index fae1bdcf5..e7bda591e 100644 --- a/src/pages/brews/brews.scss +++ b/src/pages/brews/brews.scss @@ -17,4 +17,5 @@ brews { .error-text{ color:red; } + } diff --git a/src/pages/brews/brews.ts b/src/pages/brews/brews.ts index 82b324a40..9b159bcad 100644 --- a/src/pages/brews/brews.ts +++ b/src/pages/brews/brews.ts @@ -29,6 +29,7 @@ import {BrewsEditModal} from '../brews/edit/brews-edit'; import {BrewsDetailsModal} from '../brews/details/brews-details'; import {BrewsPhotoView} from '../brews/photo-view/brews-photo-view'; +import {BrewsTableModal} from "./table/brews-table"; @Component({ templateUrl: 'brews.html', selector: 'brews' @@ -145,6 +146,7 @@ export class BrewsPage { let brew: Brew = this.brews[i]; let entry: Array<{ VALUE: any, LABEL: string }> = [ + {"VALUE": this.uiHelper.formateDate(brew.config.unix_timestamp, "DD.MM.YYYY HH:mm"), "LABEL":"Tag"}, {"VALUE": brew.grind_size, "LABEL": "Mahlgrad"}, {"VALUE": brew.grind_weight, "LABEL": "Output: Gewicht/Menge"}, {"VALUE": brew.getPreparation().name, "LABEL": "Zubereitungsmethode"}, @@ -152,6 +154,7 @@ export class BrewsPage { {"VALUE": brew.brew_temperature, "LABEL": "Brühtemperatur"}, {"VALUE": brew.brew_time, "LABEL": "Brühzeit"}, {"VALUE": brew.brew_quantity, "LABEL": "Bezugsmenge"}, + {"VALUE": brew.getBrewQuantityTypeName(), "LABEL": "Bezugsmenge-Typ"}, {"VALUE": brew.note, "LABEL": "Notizen"}, {"VALUE": brew.rating, "LABEL": "Bewertung"}, {"VALUE": brew.coffee_type, "LABEL": "Kaffeetyp"}, @@ -202,6 +205,13 @@ export class BrewsPage { this.downloadCSV(); } + else if (data == BrewsPopover.ACTIONS.TABLE){ + let tableModal = this.modalCtrl.create(BrewsTableModal, {}); + tableModal.onDidDismiss(() => { + + }); + tableModal.present({animate: false}); + } }); popover.present({ diff --git a/src/pages/brews/details/brews-details.html b/src/pages/brews/details/brews-details.html index 9688a496a..1e159c87f 100644 --- a/src/pages/brews/details/brews-details.html +++ b/src/pages/brews/details/brews-details.html @@ -46,7 +46,7 @@ Bezugsmenge:
- {{data.brew_quantity}} + {{data.brew_quantity}} ({{data.getBrewQuantityTypeName()}}) Kaffeetyp:
@@ -62,7 +62,7 @@ Notizen:
- {{data.note}} + 
{{data.note}}
 Bohnenalter:
diff --git a/src/pages/brews/details/brews-details.scss b/src/pages/brews/details/brews-details.scss index e9734b607..290d9b848 100644 --- a/src/pages/brews/details/brews-details.scss +++ b/src/pages/brews/details/brews-details.scss @@ -2,4 +2,5 @@ brews-details { .header-label{ font-size:0.8em; } + } diff --git a/src/pages/brews/edit/brews-edit.html b/src/pages/brews/edit/brews-edit.html index 4187fa15c..0e02c5627 100644 --- a/src/pages/brews/edit/brews-edit.html +++ b/src/pages/brews/edit/brews-edit.html @@ -50,10 +50,21 @@ Erster Kaffeetropfen - - Bezugsmenge - - + + + + Bezugsmenge + + + + + + + {{brewQuantityTypeEnums[key]}} + + + + Kaffeetyp @@ -91,6 +102,9 @@ + + + @@ -98,8 +112,6 @@ - + - - diff --git a/src/pages/brews/edit/brews-edit.ts b/src/pages/brews/edit/brews-edit.ts index 5582ebc72..8a6d86e96 100644 --- a/src/pages/brews/edit/brews-edit.ts +++ b/src/pages/brews/edit/brews-edit.ts @@ -17,6 +17,9 @@ import {IPreparation} from '../../../interfaces/preparation/iPreparation'; import {IBean} from '../../../interfaces/bean/iBean'; import {IBrew} from '../../../interfaces/brew/iBrew'; +/**Enums**/ +import {BREW_QUANTITY_TYPES_ENUM} from "../../../enums/brews/brewQuantityTypes"; + @Component({ selector: 'brews-edit', @@ -29,7 +32,7 @@ export class BrewsEditModal { private brew: IBrew; - + public brewQuantityTypeEnums = BREW_QUANTITY_TYPES_ENUM; method_of_preparations: Array = []; beans: Array = []; activeIndex: number = 0; diff --git a/src/pages/brews/popover/brews-popover.html b/src/pages/brews/popover/brews-popover.html index b9c8b3aa5..0bce280d9 100644 --- a/src/pages/brews/popover/brews-popover.html +++ b/src/pages/brews/popover/brews-popover.html @@ -3,4 +3,8 @@ Export + diff --git a/src/pages/brews/popover/brews-popover.ts b/src/pages/brews/popover/brews-popover.ts index 0d398c5e8..5b2891ae7 100644 --- a/src/pages/brews/popover/brews-popover.ts +++ b/src/pages/brews/popover/brews-popover.ts @@ -8,7 +8,8 @@ import {ViewController, NavParams} from 'ionic-angular'; export class BrewsPopover { public static ACTIONS: any = { - "DOWNLOAD": "DOWNLOAD" + "DOWNLOAD": "DOWNLOAD", + "TABLE":"TABLE", }; constructor(private navParams: NavParams, public viewCtrl: ViewController) { @@ -20,5 +21,9 @@ export class BrewsPopover { } + public table(){ + this.viewCtrl.dismiss(BrewsPopover.ACTIONS.TABLE); + } + } diff --git a/src/pages/brews/table/brews-table.html b/src/pages/brews/table/brews-table.html new file mode 100644 index 000000000..8a70d8fc6 --- /dev/null +++ b/src/pages/brews/table/brews-table.html @@ -0,0 +1,140 @@ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Tag + + Mahlgrad + + Gewicht + + Zubereitungs-
methode + 		+ Bohne + + Brüh-
+ temperatur + 		+ Brühzeit + + Bezugsmenge + + Notizen + + Bewertung + + Kaffeetyp + + Kaffee-
+ Konzentration + 		+ Erster
+ Kaffeetropfen + 		+ Blooming-Zeit
+ / Preinfusion + 		+ Bohnenalter + + Brührate +
+ {{brew.config.unix_timestamp | formatDate:["DD.MM.YYYY HH:mm"] }} + + {{ brew.grind_size}} + + {{ brew.grind_weight}} + + {{ brew.getPreparation().name}} + + {{ brew.getBean().name}} + + {{ brew.brew_temperature}} + + {{ brew.brew_time}} + + {{ brew.brew_quantity}} ( {{ brew.getBrewQuantityTypeName()}}) + + 
{{ brew.note}}
+ 		+ {{ brew.rating}} + + {{ brew.coffee_type}} + + {{ brew.coffee_concentration}} + + {{ brew.coffee_first_drip_time}} + + {{ brew.coffee_blooming_time}} + + {{ brew.getCalculatedBeanAge()}} + + {{brew.getBrewRatio()}} +
+
+ + + + + + + + + diff --git a/src/pages/brews/table/brews-table.scss b/src/pages/brews/table/brews-table.scss new file mode 100644 index 000000000..293c1bb09 --- /dev/null +++ b/src/pages/brews/table/brews-table.scss @@ -0,0 +1,34 @@ +brews-table { +table{ + margin:10px; + border-left: 1px solid #ddd; + border-top: 1px solid #ddd; + +} +thead{ + tr{ + + th{ + padding-right:3px; + text-align: left; + padding-left:3px; + + } + } +} + tbody{ + tr{ + + td{ + text-align:left; + padding-left:3px; + } + } + } + th, td { + border-bottom: 1px solid #ddd; + border-right: 1px solid #ddd; + } + + +} diff --git a/src/pages/brews/table/brews-table.ts b/src/pages/brews/table/brews-table.ts new file mode 100644 index 000000000..f4f8eeee6 --- /dev/null +++ b/src/pages/brews/table/brews-table.ts @@ -0,0 +1,93 @@ +/**Core**/ +import {Component, ViewChild, ElementRef,Renderer2} from '@angular/core'; +/**Ionic**/ +import {ViewController, NavParams, Slides} from 'ionic-angular'; +/**Services**/ +import {UIBeanStorage} from '../../../services/uiBeanStorage'; +import {UISettingsStorage} from '../../../services/uiSettingsStorage'; +import {UIPreparationStorage} from '../../../services/uiPreparationStorage'; +import {UIHelper} from '../../../services/uiHelper'; +import {UIImage} from '../../../services/uiImage'; + +/**Classes**/ +import {Brew} from '../../../classes/brew/brew'; +import {Settings} from '../../../classes/settings/settings'; + +/**Interfaces**/ +import {IPreparation} from '../../../interfaces/preparation/iPreparation'; +import {IBean} from '../../../interfaces/bean/iBean'; +import {IBrew} from '../../../interfaces/brew/iBrew'; +import {BrewView} from "../../../classes/brew/brewView"; +import {UIBrewStorage} from "../../../services/uiBrewStorage"; + + +@Component({ + selector: 'brews-table', + templateUrl: 'brews-table.html', +}) +export class BrewsTableModal { + + @ViewChild("tableEl", ) tableEl: ElementRef; + public brews: Array=[]; + + + + private startingFontSize:number=14; + + method_of_preparations: Array = []; + beans: Array = []; + + public settings:Settings; + + + constructor(private viewCtrl: ViewController, private navParams: NavParams, private uiBeanStorage: UIBeanStorage, + private uiPreparationStorage: UIPreparationStorage, + public uiHelper: UIHelper, private uiImage: UIImage, private uiSettingsStorage:UISettingsStorage, private uiBrewStorage:UIBrewStorage, private renderer:Renderer2) { + this.settings = this.uiSettingsStorage.getSettings(); + + //Moved from ionViewDidEnter, because of Ionic issues with ion-range + + this.method_of_preparations = this.uiPreparationStorage.getAllEntries(); + this.beans = this.uiBeanStorage.getAllEntries(); + this.__initializeBrews(); + } + + + scaleFontBigger(){ + this.startingFontSize ++; + this.renderer.setStyle(this.tableEl.nativeElement,"fontSize",this.startingFontSize + "px"); + + } + scaleFontSmaller(){ + this.startingFontSize--; + if (this.startingFontSize <6) + { + this.startingFontSize = 6; + } + this.renderer.setStyle(this.tableEl.nativeElement,"fontSize",this.startingFontSize + "px"); + } + + dismiss() { + this.viewCtrl.dismiss("", null, {animate: false}); + } + + private __initializeBrews() { + this.brews = this.uiBrewStorage.getAllEntries(); + + + //sort latest to top. + this.brews = this.brews.sort((obj1, obj2) => { + if (obj1.config.unix_timestamp < obj2.config.unix_timestamp) { + return 1; + } + if (obj1.config.unix_timestamp > obj2.config.unix_timestamp) { + return -1; + } + return 0; + }); + + + } + + +} diff --git a/src/pages/preparations/preparations.html b/src/pages/preparations/preparations.html index f36eaddae..9e950ca6e 100644 --- a/src/pages/preparations/preparations.html +++ b/src/pages/preparations/preparations.html @@ -21,7 +21,7 @@ {{preparation.name}} - {{preparation.note}} + 
{{preparation.note}}
 diff --git a/tsconfig.json b/tsconfig.json index 29e289ff9..c3d72db2f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,11 +18,11 @@ ], "exclude": [ "node_modules", - "src/**/*.spec.ts", + "src/**/*.spec.ts", "src/**/__tests__/*.ts" ], "compileOnSave": false, "atom": { "rewriteTsconfig": false } -} \ No newline at end of file +}