From c349d66df1fddf6693c16f24c9fc25f086c59179 Mon Sep 17 00:00:00 2001
From: Beat Ottiger <ottigerb@gmail.com>
Date: Mon, 26 Feb 2018 13:43:15 +0100
Subject: [PATCH] org.optinomic.export.toolbox.v2.suedhang :: Improvements

---
 .../elements/_hotload.html                    | 310 +++++++++++++++---
 org.optinomic.cis.history/elements/app.html   |  17 +-
 .../elements/history-behaviour.html           |  44 ++-
 .../elements/history-entry.html               | 187 ++++++++++-
 .../elements/history.html                     |   1 +
 .../elements/element-export.html              | 273 +++++++--------
 6 files changed, 650 insertions(+), 182 deletions(-)

diff --git a/org.optinomic.cis.history/elements/_hotload.html b/org.optinomic.cis.history/elements/_hotload.html
index e0a5c6e46..292fe1443 100644
--- a/org.optinomic.cis.history/elements/_hotload.html
+++ b/org.optinomic.cis.history/elements/_hotload.html
@@ -3985,6 +3985,9 @@
 <script src="https://www.gstatic.com/firebasejs/4.9.0/firebase-firestore.js"></script>
 
 
+<link rel="import" href="vaadin-date-picker/vaadin-date-picker.html">
+
+
 <script>
     optinomicHISTORY = {
 
@@ -4018,8 +4021,8 @@
             firebase.auth().signInWithEmailAndPassword(atob('aW5mb0BvcHRpbm9taWMuY29t'), atob('Z280b3B0aW5vbWlj'))
 
                 .then(function (resp) {
-                    console.log(clinic + ' :: FB-Login-Success: ', resp.email);
                     this.set('fb_login', true);
+                    console.log(clinic + ' :: FB-Login-Success: ', resp.email);
                 }.bind(this))
 
                 .catch(function (error) {
@@ -4048,9 +4051,51 @@
                 var config = config_demo;
             };
 
+            if (!firebase.apps.length) {
+                firebase.initializeApp(config);
+                this.__firebase_login(clinic);
+            };
+
+
+        },
+
+
+        __addEvent: function (event) {
+
+            event = event || null;
+
+            var params = {
+                "userID": parseInt(helpers.getUserID()),
+                "patientID": parseInt(helpers.getPatientID()),
+                "stayID": parseInt(helpers.getStayID()),
+                "appName": helpers.getAppName(),
+                "appID": helpers.getAppID(),
+                "apiURL": helpers.getApiURL()
+            };
+
+            event = Object.assign(params, event);
+
+
+            if (event !== null) {
+                var db = firebase.firestore();
+
+                // Add a new document (UNIX Timestamp) in entries "PID"
+                var PID = helpers.getPatientID() + "";
+                var ms = new Date().valueOf() + "";
+
+                db.collection(PID).doc(ms).set(event)
+                    .then(function () {
+                        console.log("__addEvent :: Entry successfully written!", PID, event);
+                    })
+                    .catch(function (error) {
+                        console.error("__addEvent :: Error writing document: ", error);
+                    });
+
+
+            } else {
+                console.warn('__addEvent :: Event = Null');
+            };
 
-            firebase.initializeApp(config);
-            this.__firebase_login(clinic);
 
         },
 
@@ -4069,6 +4114,9 @@
         }
     };
 </script>
+
+
+
 <dom-module id="history-list">
     <template>
         <style include="optinomic-styles">
@@ -4088,14 +4136,8 @@
             }
         </style>
         <div class="fullscreen">
-            <template is="dom-if" if="[[fb_login]]">
                 <p>history-list</p>
-            </template>
-
-            <template is="dom-if" if="[[!fb_login]]">
-                <p>Connecting Database...</p>
-            </template>
-
+            
         </div>
     </template>
     <script>
@@ -4153,6 +4195,9 @@
         window.customElements.define(historyList.is, historyList);
     </script>
 </dom-module>
+
+
+
 <dom-module id="history-entry">
     <template>
         <style include="optinomic-styles">
@@ -4167,19 +4212,21 @@
                 min-height: calc(100vh);
             }
 
-            .page {
-                padding: 12px;
-            }
+            .form {}
         </style>
         <div class="fullscreen">
-            <template is="dom-if" if="[[fb_login]]">
+            <div class="form">
                 <p>history-entry</p>
-            </template>
+                <template is="dom-if" if="[[init_done]]" restamp="true">
 
-            <template is="dom-if" if="[[!fb_login]]">
-                <p>Connecting Database...</p>
-            </template>
+                    <div class="horizontal">
+                        <vaadin-date-picker id="" label="Datum" placeholder="Selektieren Sie ein Datum" i18n="[[i18n]]"></vaadin-date-picker>
+                        <paper-input value="{{d.date}}" label="Date"></paper-input>
+                    </div>
+                    <paper-button on-click="__addEntry">Speichern</paper-button>
+                </template>
 
+            </div>
         </div>
     </template>
     <script>
@@ -4199,18 +4246,34 @@
             static get properties() {
                 return {
 
-                    _app_state: {
+                    language: {
                         type: String,
-                        value: 'start'
+                        value: 'de'
+                    },
+
+                    _action: {
+                        type: String,
+                        value: 'create'
                     }
 
+
+
                 };
             }
 
             // --------------- Functions ---------------
 
-            _something() {
+            __addEntry(e) {
+
+                var data = {
+                    "datum": "Irgendwas",
+                    "tarmed_knr": "02.00",
+                    "tarmed_lnr": "02.0020",
+                    "text": "Ein längerer Eintrag."
+                };
 
+                this.__addEvent(data);
+                console.log('__addEntry', this._action);
             }
 
 
@@ -4218,7 +4281,165 @@
 
             _init() {
 
-                console.warn('_init :: <history-entry>');
+                var i18n_e = {
+                    // An array with the full names of months starting
+                    // with January.
+                    monthNames: [
+                        'January', 'February', 'March', 'April', 'May',
+                        'June', 'July', 'August', 'September',
+                        'October', 'November', 'December'
+                    ],
+
+                    // An array of weekday names starting with Sunday. Used
+                    // in screen reader announcements.
+                    weekdays: [
+                        'Sunday', 'Monday', 'Tuesday', 'Wednesday',
+                        'Thursday', 'Friday', 'Saturday'
+                    ],
+
+                    // An array of short weekday names starting with Sunday.
+                    // Displayed in the calendar.
+                    weekdaysShort: [
+                        'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
+                    ],
+
+                    // An integer indicating the first day of the week
+                    // (0 = Sunday, 1 = Monday, etc.).
+                    firstDayOfWeek: 0,
+
+                    // Used in screen reader announcements along with week
+                    // numbers, if they are displayed.
+                    week: 'Week',
+
+                    // Translation of the Calendar icon button title.
+                    calendar: 'Calendar',
+
+                    // Translation of the Clear icon button title.
+                    clear: 'Clear',
+
+                    // Translation of the Today shortcut button text.
+                    today: 'Today',
+
+                    // Translation of the Cancel button text.
+                    cancel: 'Cancel',
+
+                    // A function to format given `Object` as
+                    // date string. Object is in the format `{ day: ..., month: ..., year: ... }`
+                    formatDate: d => {
+                        // returns a string representation of the given
+                        // object in 'MM/DD/YYYY' -format
+                    },
+
+                    // A function to parse the given text to an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                    // Must properly parse (at least) text
+                    // formatted by `formatDate`.
+                    // Setting the property to null will disable
+                    // keyboard input feature.
+                    parseDate: text => {
+                        // Parses a string in 'MM/DD/YY', 'MM/DD' or 'DD' -format to
+                        // an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                    },
+
+                    // A function to format given `monthName` and
+                    // `fullYear` integer as calendar title string.
+                    formatTitle: (monthName, fullYear) => {
+                        return monthName + ' ' + fullYear;
+                    }
+                };
+
+                var i18n_de = {
+                    // An array with the full names of months starting
+                    // with January.
+                    monthNames: [
+                        'Januar', 'Februar', 'März', 'April', 'Mai',
+                        'Juni', 'Juli', 'August', 'September',
+                        'Oktober', 'November', 'Dezember'
+                    ],
+
+                    // An array of weekday names starting with Sunday. Used
+                    // in screen reader announcements.
+                    weekdays: [
+                        'Sonntag', 'Montag', 'Dienstag', 'Mittwoch',
+                        'Donnerstag', 'Freitag', 'Samstag'
+                    ],
+
+                    // An array of short weekday names starting with Sunday.
+                    // Displayed in the calendar.
+                    weekdaysShort: [
+                        'So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'
+                    ],
+
+                    // An integer indicating the first day of the week
+                    // (0 = Sunday, 1 = Monday, etc.).
+                    firstDayOfWeek: 1,
+
+                    // Used in screen reader announcements along with week
+                    // numbers, if they are displayed.
+                    week: 'Woche',
+
+                    // Translation of the Calendar icon button title.
+                    calendar: 'Kalender',
+
+                    // Translation of the Clear icon button title.
+                    clear: 'Löschen',
+
+                    // Translation of the Today shortcut button text.
+                    today: 'Heute',
+
+                    // Translation of the Cancel button text.
+                    cancel: 'Abbrechen',
+
+                    // A function to format given `Object` as
+                    // date string. Object is in the format `{ day: ..., month: ..., year: ... }`
+                    formatDate: d => {
+                        
+                        
+                        // returns a string representation of the given
+                        // object in 'MM/DD/YYYY' -format
+                        //console.error('????? formatDate', d.toISOString());
+                        
+                        return d;
+                        
+                    },
+
+                    // A function to parse the given text to an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                    // Must properly parse (at least) text
+                    // formatted by `formatDate`.
+                    // Setting the property to null will disable
+                    // keyboard input feature.
+                    parseDate: text => {
+                        // Parses a string in 'MM/DD/YY', 'MM/DD' or 'DD' -format to
+                        // an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                        
+                        // console.error('????? parseDate', text);
+                        // 
+                        return new Date(text);
+                        
+                        
+                    },
+
+                    // A function to format given `monthName` and
+                    // `fullYear` integer as calendar title string.
+                    formatTitle: (monthName, fullYear) => {
+                        return monthName + ' ' + fullYear;
+                    }
+                }
+
+                var d = {
+                    "date": new Date()
+                };
+this.set('d', d);
+                
+
+                if (this.language === 'de') {
+                    this.set('i18n', i18n_de);
+                } else {
+                    this.set('i18n', i18n_e);
+                };
+
+                
+                this.set('init_done', true);
+                console.warn('_init :: <history-entry>', this.d, this.i18n);
             }
 
             constructor() {
@@ -4238,6 +4459,7 @@
     </script>
 </dom-module>
 
+
 <link rel="import" href="polymer/polymer-element.html">
 <link rel="import" href="iron-pages/iron-pages.html">
 <link rel="import" href="optinomic-elements/optinomic-title/optinomic-title.html">
@@ -4260,6 +4482,8 @@
 <link rel="import" href="vaadin-split-layout/vaadin-split-layout.html">
 <link rel="import" href="vaadin-dialog/vaadin-dialog.html">
 <link rel="import" href="vaadin-combo-box/vaadin-combo-box.html">
+
+
 <dom-module id="optinomic-template">
     <template>
         <style include="optinomic-styles">
@@ -4294,30 +4518,42 @@
 
             <vaadin-split-layout id="tarmed" class="fullscreen">
                 <div class="left_bar">
-                    <template is="dom-if" if="{{_isAppState('start')}}" restamp="true">
-                        <paper-button on-click="__openEditmode">Edit</paper-button>
-                    </template>
-                    <template is="dom-if" if="{{_isAppState('edit')}}" restamp="true">
-                        <paper-button on-click="__openEditmode">Start</paper-button>
-                    </template>
+
+                    
+                    <p>[[_app_state]]</p>
+                    
+                    <iron-pages selected="[[_app_state]]" attr-for-selected="name" fallback-selection="start" role="main">
+                        <div name="start">
+                            <paper-button on-click="__openEditmode">Edit</paper-button>
+                        </div>
+                        <div name="edit">
+                            <paper-button on-click="__closeEditmode">Start</paper-button>
+                        </div>
+                    </iron-pages>
+
                 </div>
                 <div class="right_bar">
-                    <template is="dom-if" if="{{_isAppState('start')}}" restamp="true">
-                        <history-list></history-list>
-                    </template>
-                    <template is="dom-if" if="{{_isAppState('edit')}}" restamp="true">
-                        <history-entry></history-entry>
-                    </template>
+
+                    <iron-pages selected="[[_app_state]]" attr-for-selected="name" fallback-selection="start" role="main">
+                        <div name="start">
+                            <h2>LIST</h2>
+                            <history-list></history-list>
+                        </div>
+                        <div name="edit">
+                            <h2>EDIT</h2>
+                            <history-entry></history-entry>
+                        </div>
+                    </iron-pages>
+
 
                 </div>
             </vaadin-split-layout>
-            <p>Hallo</p>
-            <history-app></history-app>
+
         </div>
     </template>
     <script>
         class optinomicTemplate extends Polymer.mixinBehaviors([
-            opappBehavior
+            opappBehavior, optinomicHISTORY
         ], ReduxBehavior(Polymer.Element)) {
 
             static get is() {
diff --git a/org.optinomic.cis.history/elements/app.html b/org.optinomic.cis.history/elements/app.html
index b59eddfcb..335a6251b 100644
--- a/org.optinomic.cis.history/elements/app.html
+++ b/org.optinomic.cis.history/elements/app.html
@@ -55,13 +55,18 @@
             <vaadin-split-layout id="tarmed" class="fullscreen">
                 <div class="left_bar">
 
-                        <template is="dom-if" if="[[!fb_login]]">
-                                <p>Connecting Database...</p>
-                            </template>
-                
+                    
                     <p>[[_app_state]]</p>
-                    <paper-button on-click="__openEditmode">Edit</paper-button>
-                    <paper-button on-click="__openEditmode">Start</paper-button>
+                    
+                    <iron-pages selected="[[_app_state]]" attr-for-selected="name" fallback-selection="start" role="main">
+                        <div name="start">
+                            <paper-button on-click="__openEditmode">Edit</paper-button>
+                        </div>
+                        <div name="edit">
+                            <paper-button on-click="__closeEditmode">Start</paper-button>
+                        </div>
+                    </iron-pages>
+
                 </div>
                 <div class="right_bar">
 
diff --git a/org.optinomic.cis.history/elements/history-behaviour.html b/org.optinomic.cis.history/elements/history-behaviour.html
index 81b71e46f..6f5615f8f 100644
--- a/org.optinomic.cis.history/elements/history-behaviour.html
+++ b/org.optinomic.cis.history/elements/history-behaviour.html
@@ -31,8 +31,8 @@
             firebase.auth().signInWithEmailAndPassword(atob('aW5mb0BvcHRpbm9taWMuY29t'), atob('Z280b3B0aW5vbWlj'))
 
                 .then(function (resp) {
-                    console.log(clinic + ' :: FB-Login-Success: ', resp.email);
                     this.set('fb_login', true);
+                    console.log(clinic + ' :: FB-Login-Success: ', resp.email);
                 }.bind(this))
 
                 .catch(function (error) {
@@ -67,6 +67,46 @@
             };
 
 
+        },
+        
+        
+        __addEvent: function (event) {
+            
+            event = event || null;
+            
+            var params = {
+              "userID": parseInt(helpers.getUserID()),
+              "patientID": parseInt(helpers.getPatientID()),
+              "stayID": parseInt(helpers.getStayID()),
+              "appName": helpers.getAppName(),
+              "appID": helpers.getAppID(),
+              "apiURL": helpers.getApiURL()
+            };
+                
+            event = Object.assign(params, event);
+
+            
+            if (event !== null) {
+                var db = firebase.firestore();
+                    
+                // Add a new document (UNIX Timestamp) in entries "PID"
+                var PID = helpers.getPatientID() + "";
+                var ms = new Date().valueOf() + "";
+                
+                db.collection(PID).doc(ms).set(event)
+                .then(function() {
+                    console.log("__addEvent :: Entry successfully written!", PID, event);
+                })
+                .catch(function(error) {
+                    console.error("__addEvent :: Error writing document: ", error);
+                });
+            
+                
+            } else {
+                console.warn('__addEvent :: Event = Null');
+            };
+            
+            
         },
 
         // --------------------------------
@@ -83,4 +123,4 @@
 
         }
     };
-</script>
\ No newline at end of file
+</script>
diff --git a/org.optinomic.cis.history/elements/history-entry.html b/org.optinomic.cis.history/elements/history-entry.html
index fdfe0f255..855030bf5 100644
--- a/org.optinomic.cis.history/elements/history-entry.html
+++ b/org.optinomic.cis.history/elements/history-entry.html
@@ -12,12 +12,21 @@
                 min-height: calc(100vh);
             }
 
-            .page {
-                padding: 12px;
-            }
+            .form {}
         </style>
         <div class="fullscreen">
-            <p>history-entry</p>
+            <div class="form">
+                <p>history-entry</p>
+                <template is="dom-if" if="[[init_done]]" restamp="true">
+
+                    <div class="horizontal">
+                        <vaadin-date-picker id="" label="Datum" placeholder="Selektieren Sie ein Datum" i18n="[[i18n]]"></vaadin-date-picker>
+                        <paper-input value="{{d.date}}" label="Date"></paper-input>
+                    </div>
+                    <paper-button on-click="__addEntry">Speichern</paper-button>
+                </template>
+
+            </div>
         </div>
     </template>
     <script>
@@ -37,18 +46,34 @@
             static get properties() {
                 return {
 
-                    _app_state: {
+                    language: {
+                        type: String,
+                        value: 'de'
+                    },
+
+                    _action: {
                         type: String,
-                        value: 'start'
+                        value: 'create'
                     }
 
+
+
                 };
             }
 
             // --------------- Functions ---------------
 
-            _something() {
+            __addEntry(e) {
 
+                var data = {
+                    "datum": "Irgendwas",
+                    "tarmed_knr": "02.00",
+                    "tarmed_lnr": "02.0020",
+                    "text": "Ein längerer Eintrag."
+                };
+
+                this.__addEvent(data);
+                console.log('__addEntry', this._action);
             }
 
 
@@ -56,7 +81,153 @@
 
             _init() {
 
-                console.warn('_init :: <history-entry>');
+                var i18n_e = {
+                    // An array with the full names of months starting
+                    // with January.
+                    monthNames: [
+                        'January', 'February', 'March', 'April', 'May',
+                        'June', 'July', 'August', 'September',
+                        'October', 'November', 'December'
+                    ],
+
+                    // An array of weekday names starting with Sunday. Used
+                    // in screen reader announcements.
+                    weekdays: [
+                        'Sunday', 'Monday', 'Tuesday', 'Wednesday',
+                        'Thursday', 'Friday', 'Saturday'
+                    ],
+
+                    // An array of short weekday names starting with Sunday.
+                    // Displayed in the calendar.
+                    weekdaysShort: [
+                        'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
+                    ],
+
+                    // An integer indicating the first day of the week
+                    // (0 = Sunday, 1 = Monday, etc.).
+                    firstDayOfWeek: 0,
+
+                    // Used in screen reader announcements along with week
+                    // numbers, if they are displayed.
+                    week: 'Week',
+
+                    // Translation of the Calendar icon button title.
+                    calendar: 'Calendar',
+
+                    // Translation of the Clear icon button title.
+                    clear: 'Clear',
+
+                    // Translation of the Today shortcut button text.
+                    today: 'Today',
+
+                    // Translation of the Cancel button text.
+                    cancel: 'Cancel',
+
+                    // A function to format given `Object` as
+                    // date string. Object is in the format `{ day: ..., month: ..., year: ... }`
+                    formatDate: d => {
+                        // returns a string representation of the given
+                        // object in 'MM/DD/YYYY' -format
+                    },
+
+                    // A function to parse the given text to an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                    // Must properly parse (at least) text
+                    // formatted by `formatDate`.
+                    // Setting the property to null will disable
+                    // keyboard input feature.
+                    parseDate: text => {
+                        // Parses a string in 'MM/DD/YY', 'MM/DD' or 'DD' -format to
+                        // an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                    },
+
+                    // A function to format given `monthName` and
+                    // `fullYear` integer as calendar title string.
+                    formatTitle: (monthName, fullYear) => {
+                        return monthName + ' ' + fullYear;
+                    }
+                };
+
+                var i18n_de = {
+                    // An array with the full names of months starting
+                    // with January.
+                    monthNames: [
+                        'Januar', 'Februar', 'März', 'April', 'Mai',
+                        'Juni', 'Juli', 'August', 'September',
+                        'Oktober', 'November', 'Dezember'
+                    ],
+
+                    // An array of weekday names starting with Sunday. Used
+                    // in screen reader announcements.
+                    weekdays: [
+                        'Sonntag', 'Montag', 'Dienstag', 'Mittwoch',
+                        'Donnerstag', 'Freitag', 'Samstag'
+                    ],
+
+                    // An array of short weekday names starting with Sunday.
+                    // Displayed in the calendar.
+                    weekdaysShort: [
+                        'So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'
+                    ],
+
+                    // An integer indicating the first day of the week
+                    // (0 = Sunday, 1 = Monday, etc.).
+                    firstDayOfWeek: 1,
+
+                    // Used in screen reader announcements along with week
+                    // numbers, if they are displayed.
+                    week: 'Woche',
+
+                    // Translation of the Calendar icon button title.
+                    calendar: 'Kalender',
+
+                    // Translation of the Clear icon button title.
+                    clear: 'Löschen',
+
+                    // Translation of the Today shortcut button text.
+                    today: 'Heute',
+
+                    // Translation of the Cancel button text.
+                    cancel: 'Abbrechen',
+
+                    // A function to format given `Object` as
+                    // date string. Object is in the format `{ day: ..., month: ..., year: ... }`
+                    formatDate: d => {
+                        // returns a string representation of the given
+                        // object in 'MM/DD/YYYY' -format
+                    },
+
+                    // A function to parse the given text to an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                    // Must properly parse (at least) text
+                    // formatted by `formatDate`.
+                    // Setting the property to null will disable
+                    // keyboard input feature.
+                    parseDate: text => {
+                        // Parses a string in 'MM/DD/YY', 'MM/DD' or 'DD' -format to
+                        // an `Object` in the format `{ day: ..., month: ..., year: ... }`.
+                    },
+
+                    // A function to format given `monthName` and
+                    // `fullYear` integer as calendar title string.
+                    formatTitle: (monthName, fullYear) => {
+                        return monthName + ' ' + fullYear;
+                    }
+                }
+
+                var d = {
+                    "date": new Date()
+                };
+
+
+                if (this.language === 'de') {
+                    this.set('i18n', i18n_de);
+                } else {
+                    this.set('i18n', i18n_e);
+                };
+
+                this.set('d', d);
+                
+                this.set('init_done', true);
+                console.warn('_init :: <history-entry>', d, i18n);
             }
 
             constructor() {
diff --git a/org.optinomic.cis.history/elements/history.html b/org.optinomic.cis.history/elements/history.html
index b139641ba..1ea828789 100644
--- a/org.optinomic.cis.history/elements/history.html
+++ b/org.optinomic.cis.history/elements/history.html
@@ -3,6 +3,7 @@
 <link rel="import" href="vaadin-combo-box/vaadin-combo-box.html">
 <link rel="import" href="vaadin-grid/vaadin-grid.html">
 <link rel="import" href="vaadin-grid/vaadin-grid-sorter.html">
+<link rel="import" href="vaadin-date-picker/vaadin-date-picker.html">
 <link rel="import" href="iron-icon/iron-icon.html">
 <link rel="import" href="iron-flex-layout/iron-flex-layout.html">
 <link rel="import" href="paper-styles/color.html">
diff --git a/org.optinomic.export.toolbox.v2.suedhang/elements/element-export.html b/org.optinomic.export.toolbox.v2.suedhang/elements/element-export.html
index df885ce51..ef5ea14bf 100644
--- a/org.optinomic.export.toolbox.v2.suedhang/elements/element-export.html
+++ b/org.optinomic.export.toolbox.v2.suedhang/elements/element-export.html
@@ -86,24 +86,31 @@ <h4 style="margin:0;color:#3F51B5">[[definition.options.name]]</h4>
                     </template>
                 </div>
                 <div>
-                    <template is="dom-if" if="[[_data_ready]]" restamp="true">
-                        <template is="dom-if" if="[[_created_CSV]]" restamp="true">
-                            <div class="horizontal">
-                                <file-download file="[[_csv_file]]" stringify="false" extension="csv" name="[[definition.options.name]]" tooltip="left" button-color="indigo"></file-download>
-                                <file-download icon="file-download" button-color="indigo" file="[[_json_file]]" extension="json" name="[[definition.options.name]]" tooltip="left"></file-download>
-                            </div>
-                        </template>
-                        <template is="dom-if" if="[[!_created_CSV]]" restamp="true">
-                            <paper-spinner active></paper-spinner>
-                        </template>
+                    <template is="dom-if" if="[[_error]]" restamp="true">
+                        <p class="red" style="margin-right:24px;">&nbsp; Error &nbsp;</p>
                     </template>
-                    <template is="dom-if" if="[[!_data_ready]]" restamp="true">
-                        <template is="dom-if" if="[[!_loading]]" restamp="true">
-                            <paper-button class="grey" on-click="_loadData">Anfordern</paper-button>
-                        </template>
+                    <template is="dom-if" if="[[!_error]]" restamp="true">
+                        <div class="horizontal">
+                            <template is="dom-if" if="[[_data_ready]]" restamp="true">
+                                <template is="dom-if" if="[[_created_CSV]]" restamp="true">
+                                    <div class="horizontal">
+                                        <file-download file="[[_csv_file]]" stringify="false" extension="csv" name="[[definition.options.name]]" tooltip="left" button-color="indigo"></file-download>
+                                        <file-download icon="file-download" button-color="indigo" file="[[_json_file]]" extension="json" name="[[definition.options.name]]" tooltip="left"></file-download>
+                                    </div>
+                                </template>
+                                <template is="dom-if" if="[[!_created_CSV]]" restamp="true">
+                                    <paper-spinner active></paper-spinner>
+                                </template>
+                            </template>
+                            <template is="dom-if" if="[[!_data_ready]]" restamp="true">
+                                <template is="dom-if" if="[[!_loading]]" restamp="true">
+                                    <paper-button class="grey" on-click="_loadData">Anfordern</paper-button>
+                                </template>
+                            </template>
+                            <paper-icon-button icon="more-vert" on-click="_showMore" class="grey"></paper-icon-button>
+                        </div>
                     </template>
                 </div>
-                <paper-icon-button icon="more-vert" on-click="_showMore" class="grey"></paper-icon-button>
             </div>
             <iron-collapse id="collapse">
                 <div class="horizontal">
@@ -451,163 +458,169 @@ <h4 style="margin:0;color:#3F51B5">[[definition.options.name]]</h4>
             Polymer.RenderStatus.afterNextRender(this, function() {
 
                 if ((this._sr !== undefined) && (this._sr !== null)) {
-                    if (this._sr.survey_responses.length > 0) {
 
-                        // We have data -> Proceed.
-                        var _sr = Object.assign({}, this.get('_sr'));
-                        if ("survey_responses" in _sr) {
+                    if ("survey_responses" in this._sr) {
+                        if (this._sr.survey_responses.length > 0) {
 
-                            var file_responses = [];
-                            if (filtered) {
-                                // filter responses
+                            // We have data -> Proceed.
+                            var _sr = Object.assign({}, this.get('_sr'));
+                            if ("survey_responses" in _sr) {
 
-                                var date_rules = false;
-                                var pg_rules = false;
+                                var file_responses = [];
+                                if (filtered) {
+                                    // filter responses
 
-                                if ((this.filter !== null) && (this.filter !== undefined)) {
-                                    if (this.filter.erhungszeitraum.active) {
-                                        date_rules = true;
-                                        // console.log('date_rules', date_rules, this.filter.erhungszeitraum);
-                                    };
-                                    if ((this.filter.pg.active) && (this.filter.pg.rules.length > 0)) {
-                                        pg_rules = true;
-                                        // console.log('pg_rules', pg_rules, this.filter.pg.rules);
-                                    };
-                                };
+                                    var date_rules = false;
+                                    var pg_rules = false;
 
-                                _sr.survey_responses.forEach(function(sr, srID) {
+                                    if ((this.filter !== null) && (this.filter !== undefined)) {
+                                        if (this.filter.erhungszeitraum.active) {
+                                            date_rules = true;
+                                            // console.log('date_rules', date_rules, this.filter.erhungszeitraum);
+                                        };
+                                        if ((this.filter.pg.active) && (this.filter.pg.rules.length > 0)) {
+                                            pg_rules = true;
+                                            // console.log('pg_rules', pg_rules, this.filter.pg.rules);
+                                        };
+                                    };
 
-                                    // Patientengruppen Regeln
-                                    if (pg_rules) {
-                                        var to_add = null;
-                                        this.filter.pg.rules.forEach(function(r, rID) {
-                                            if (r.operator === "IN") {
-                                                if ((r.criterion === "AND") || (r.criterion === null)) {
-                                                    if ((to_add === true) || (to_add === null)) {
-                                                        to_add = check_pg_group(sr.patient_groups.patient_in_group.yes, r.pg);
-                                                    };
-                                                } else {
-                                                    if ((to_add === false)) {
-                                                        to_add = check_pg_group(sr.patient_groups.patient_in_group.yes, r.pg);
+                                    _sr.survey_responses.forEach(function(sr, srID) {
+
+                                        // Patientengruppen Regeln
+                                        if (pg_rules) {
+                                            var to_add = null;
+                                            this.filter.pg.rules.forEach(function(r, rID) {
+                                                if (r.operator === "IN") {
+                                                    if ((r.criterion === "AND") || (r.criterion === null)) {
+                                                        if ((to_add === true) || (to_add === null)) {
+                                                            to_add = check_pg_group(sr.patient_groups.patient_in_group.yes, r.pg);
+                                                        };
+                                                    } else {
+                                                        if ((to_add === false)) {
+                                                            to_add = check_pg_group(sr.patient_groups.patient_in_group.yes, r.pg);
+                                                        };
                                                     };
-                                                };
 
-                                            } else {
-                                                if ((r.criterion === "AND") || (r.criterion === null)) {
-                                                    if ((to_add === true) || (to_add === null)) {
-                                                        to_add = check_pg_group(sr.patient_groups.patient_in_group.no, r.pg);
-                                                    };
                                                 } else {
-                                                    if ((to_add === false)) {
-                                                        to_add = check_pg_group(sr.patient_groups.patient_in_group.no, r.pg);
+                                                    if ((r.criterion === "AND") || (r.criterion === null)) {
+                                                        if ((to_add === true) || (to_add === null)) {
+                                                            to_add = check_pg_group(sr.patient_groups.patient_in_group.no, r.pg);
+                                                        };
+                                                    } else {
+                                                        if ((to_add === false)) {
+                                                            to_add = check_pg_group(sr.patient_groups.patient_in_group.no, r.pg);
+                                                        };
                                                     };
                                                 };
-                                            };
-                                        });
+                                            });
 
-                                        if (to_add) {
-                                            file_responses.push(sr);
+                                            if (to_add) {
+                                                file_responses.push(sr);
+                                            };
+                                        } else {
+                                            // all responses
+                                            file_responses = _sr.survey_responses;
                                         };
-                                    } else {
-                                        // all responses
-                                        file_responses = _sr.survey_responses;
-                                    };
-                                }.bind(this));
+                                    }.bind(this));
 
-                                // Erhebungszeitraum Regeln
-                                if (date_rules) {
-                                    var stored_responses = file_responses.slice(0);
-                                    file_responses = [];
-                                    stored_responses.forEach(function(sr, rID) {
+                                    // Erhebungszeitraum Regeln
+                                    if (date_rules) {
+                                        var stored_responses = file_responses.slice(0);
+                                        file_responses = [];
+                                        stored_responses.forEach(function(sr, rID) {
 
-                                        var filled = sr.survey_response.filled;
-                                        var filter = this.filter.erhungszeitraum;
+                                            var filled = sr.survey_response.filled;
+                                            var filter = this.filter.erhungszeitraum;
 
-                                        var eintritt_in_range = dateCheck(filter.from, filter.to, sr.stay.start);
-                                        var austritt_in_range = dateCheck(filter.from, filter.to, sr.stay.stop);
+                                            var eintritt_in_range = dateCheck(filter.from, filter.to, sr.stay.start);
+                                            var austritt_in_range = dateCheck(filter.from, filter.to, sr.stay.stop);
 
-                                        // Falltyp: Alle
-                                        if (filter.typ === "Alle") {
-                                            if (dateCheck(filter.from, filter.to, filled)) {
-                                                file_responses.push(sr);
+                                            // Falltyp: Alle
+                                            if (filter.typ === "Alle") {
+                                                if (dateCheck(filter.from, filter.to, filled)) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // Falltyp: A1
-                                        if (filter.typ === "A1") {
-                                            if ((eintritt_in_range === true) && (austritt_in_range === true)) {
-                                                file_responses.push(sr);
+                                            // Falltyp: A1
+                                            if (filter.typ === "A1") {
+                                                if ((eintritt_in_range === true) && (austritt_in_range === true)) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // Falltyp: A2
-                                        if (filter.typ === "A2") {
-                                            if ((eintritt_in_range === false) && (austritt_in_range === true)) {
-                                                file_responses.push(sr);
+                                            // Falltyp: A2
+                                            if (filter.typ === "A2") {
+                                                if ((eintritt_in_range === false) && (austritt_in_range === true)) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // Falltyp: B
-                                        if (filter.falltyp === "B") {
-                                            if ((eintritt_in_range === true) && (austritt_in_range === false)) {
-                                                file_responses.push(sr);
+                                            // Falltyp: B
+                                            if (filter.falltyp === "B") {
+                                                if ((eintritt_in_range === true) && (austritt_in_range === false)) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // Falltyp: C
-                                        if (filter.typ === "C") {
-                                            if ((eintritt_in_range === true) && (austritt_in_range === false)) {
-                                                file_responses.push(sr);
+                                            // Falltyp: C
+                                            if (filter.typ === "C") {
+                                                if ((eintritt_in_range === true) && (austritt_in_range === false)) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // Falltyp: S1
-                                        if (filter.typ === "S1") {
-                                            if (eintritt_in_range === true) {
-                                                file_responses.push(sr);
+                                            // Falltyp: S1
+                                            if (filter.typ === "S1") {
+                                                if (eintritt_in_range === true) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // Falltyp: S2
-                                        if (filter.typ === "S2") {
-                                            if (austritt_in_range === true) {
-                                                file_responses.push(sr);
+                                            // Falltyp: S2
+                                            if (filter.typ === "S2") {
+                                                if (austritt_in_range === true) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // Falltyp: S3
-                                        if (filter.typ === "S3") {
-                                            if ((eintritt_in_range === true) || (austritt_in_range === true)) {
-                                                file_responses.push(sr);
+                                            // Falltyp: S3
+                                            if (filter.typ === "S3") {
+                                                if ((eintritt_in_range === true) || (austritt_in_range === true)) {
+                                                    file_responses.push(sr);
+                                                };
                                             };
-                                        };
 
-                                        // console.log('Erhebungszeitraum', filled, eintritt_in_range, austritt_in_range);
+                                            // console.log('Erhebungszeitraum', filled, eintritt_in_range, austritt_in_range);
 
-                                    }.bind(this));
-                                };
+                                        }.bind(this));
+                                    };
 
 
-                            } else {
-                                // all responses
-                                file_responses = _sr.survey_responses;
-                            };
+                                } else {
+                                    // all responses
+                                    file_responses = _sr.survey_responses;
+                                };
 
-                            this.set('_json_file', null);
-                            this.set('_json_file', create_json(file_responses, this._dataDive));
-                            this.set('_created_JSON', true);
+                                this.set('_json_file', null);
+                                this.set('_json_file', create_json(file_responses, this._dataDive));
+                                this.set('_created_JSON', true);
 
-                            this.set('_csv_file', null);
-                            this.set('_csv_file', create_csv(this._json_file));
-                            this.set('_created_CSV', true);
+                                this.set('_csv_file', null);
+                                this.set('_csv_file', create_csv(this._json_file));
+                                this.set('_created_CSV', true);
 
-                            // console.log('_createCSVandJSONFile', this._csv_file, this._json_file);
+                                // console.log('_createCSVandJSONFile', this._csv_file, this._json_file);
 
-                            this.dispatchEvent(new CustomEvent('json', { detail: this._json_file }));
+                                this.dispatchEvent(new CustomEvent('json', { detail: this._json_file }));
 
-                            this.dispatchEvent(new CustomEvent('csv', { detail: this._csv_file }));
+                                this.dispatchEvent(new CustomEvent('csv', { detail: this._csv_file }));
 
+                            };
                         };
+                    } else {
+                        console.warn('ERROR:', this._sr);
+                        this.set('_error', true);
                     };
                 };
             });
@@ -728,6 +741,8 @@ <h4 style="margin:0;color:#3F51B5">[[definition.options.name]]</h4>
         _init() {
             this.set('_loading', false);
             this.set('_data_ready', false);
+            this.set('_error', false);
+
             // console.warn('_init :: Export-Toolbox', this.definition);
         }