From 46dd1b64fb28c6822c8377f09051be89e66106ee Mon Sep 17 00:00:00 2001
From: Lars Saalbach <lars.saalbach@googlemail.com>
Date: Fri, 15 Jun 2018 16:55:21 +0200
Subject: [PATCH 1/2] Integer fixing

---
 src/app/app.html                   |  2 +-
 src/app/app.module.ts              |  9 ++++-
 src/directive/preventCharacters.ts | 64 ++++++++++++++++++++++++++++++
 src/pages/brews/add/brews-add.html |  3 +-
 src/pages/brews/add/brews-add.ts   |  7 ++++
 src/services/uiHelper.ts           |  5 +++
 6 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 src/directive/preventCharacters.ts

diff --git a/src/app/app.html b/src/app/app.html
index 1f63aff92..9cabe1d24 100644
--- a/src/app/app.html
+++ b/src/app/app.html
@@ -4,7 +4,7 @@
       <ion-title>Menu</ion-title>
     </ion-toolbar>
   </ion-header>
-
+ 
   <ion-content class="navigation-menu">
     <ion-list class="no-label-margin">
       <button ion-item (click)="openPage($event,pages.home)" [class.active]="pages.home.active">
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 37c2c47ea..70cc3a6a1 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,6 +1,6 @@
 /**Core**/
 import {BrowserModule} from '@angular/platform-browser';
-import {ErrorHandler, NgModule} from '@angular/core';
+import {ErrorHandler, NgModule,CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 /**Ionic**/
 import {IonicApp, IonicErrorHandler, IonicModule} from 'ionic-angular';
 import {IonicStorageModule} from '@ionic/storage';
@@ -51,6 +51,9 @@ import {UIStatistic} from '../services/uiStatistic';
 import {FormatDatePipe} from '../pipes/formatDate';
 import {KeysPipe} from '../pipes/keys';
 import {ToDecimalPipe} from '../pipes/toDecimal';
+
+/**Directive**/
+import {PreventCharacterDirective} from '../directive/preventCharacters'
 /**Components**/
 import {TimerComponent} from '../components/timer/timer';
 
@@ -68,6 +71,7 @@ import {TimerComponent} from '../components/timer/timer';
     FormatDatePipe,
     KeysPipe,
     ToDecimalPipe,
+    PreventCharacterDirective,
     BrewsPage,
     BrewsAddModal, TimerComponent, BrewsEditModal,BrewsPhotoView,BrewsDetailsModal,BrewsPopover,
     AboutPage, ContactPage, LicencesPage
@@ -113,7 +117,8 @@ import {TimerComponent} from '../components/timer/timer';
     UIImage,
     UIBeanStorage, AppMinimize, {provide: ErrorHandler, useClass: IonicErrorHandler},
     MediaCapture, ImagePicker,AndroidPermissions, UIBrewStorage,UIStatistic
-  ]
+  ],exports:[PreventCharacterDirective],
+  schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
 })
 export class AppModule {
 }
diff --git a/src/directive/preventCharacters.ts b/src/directive/preventCharacters.ts
new file mode 100644
index 000000000..d2742f5d4
--- /dev/null
+++ b/src/directive/preventCharacters.ts
@@ -0,0 +1,64 @@
+/**Core**/
+import {Directive, Input, NgZone,EventEmitter,Output,ElementRef} from '@angular/core';
+import {NgModel} from '@angular/forms';
+
+@Directive({
+  selector: '[prevent-characters]',
+  providers: [(NgModel)],
+  host: {
+    '(keydown)': 'onKeyDown($event)',
+    '(blur)': 'blur()',
+  }
+})
+export class PreventCharacterDirective {
+  constructor(private model: NgModel, private _ngZone: NgZone, public _el:
+    ElementRef) {
+
+  }
+
+  @Input() get inputModel;
+
+  onKeyDown($event) {
+    let pressedKeyCode: number = $event.keyCode;
+
+    if ($event.shiftKey == false && $event.ctrlKey == false && (pressedKeyCode >= 48 && pressedKeyCode <= 57) || (pressedKeyCode >= 96 && pressedKeyCode <= 105)) {
+      // 0-9 only
+      //Its okay
+    }
+    else if (pressedKeyCode == 8) {
+      //Delete backspace ok
+    }
+    else if (pressedKeyCode == 190 || pressedKeyCode == 188) {
+      //Comma, Point support
+    }
+    else {
+      //Everything else we block
+      $event.preventDefault();
+      $event.stopPropagation();
+    }
+
+  }
+
+  blur() {
+
+    let val: any = this.model.control.value;
+    val = val + "";
+    console.log(val);
+    if (val == "") {
+      val = "0";
+    }
+    if (val.indexOf(',')) {
+      val = val.replace(/,/g, '.');
+    }
+
+    console.log("set new value");
+    this._ngZone.run(() => {
+      this._el.nativeElement.value=parseFloat(val);
+     // this.model.control.setValue(parseFloat(val));
+     // this.model.viewToModelUpdate(parseFloat(val));
+     // this.model.valueAccessor.writeValue(parseFloat(val));
+
+     // this.model.valueAccessor.writeValue(parseFloat(val) + "");
+    });
+  }
+}
diff --git a/src/pages/brews/add/brews-add.html b/src/pages/brews/add/brews-add.html
index 686efdbe1..faf875c68 100644
--- a/src/pages/brews/add/brews-add.html
+++ b/src/pages/brews/add/brews-add.html
@@ -17,8 +17,7 @@
     </ion-item>
     <ion-item *ngIf="settings.grind_weight === true">
       <ion-label floating>Gewicht</ion-label>
-      <ion-input type="number" [ngModel]="data.grind_weight"
-                 (ngModelChange)="data.grind_weight = uiHelper.convertToNumber($event)" step="0.1" pattern="[0-9,.]*" step="any"></ion-input>
+      <ion-input [prevent-characters]  type="text" [ngModel]="data.grind_weight" ></ion-input>
     </ion-item>
     <ion-item *ngIf="settings.brew_temperature === true">
       <ion-label floating>Temperatur</ion-label>
diff --git a/src/pages/brews/add/brews-add.ts b/src/pages/brews/add/brews-add.ts
index 45672569e..e0722e93e 100644
--- a/src/pages/brews/add/brews-add.ts
+++ b/src/pages/brews/add/brews-add.ts
@@ -41,6 +41,11 @@ export class BrewsAddModal {
   public method_of_preparations: Array<IPreparation> = [];
   beans: Array<IBean> = [];
 
+  public keyDownHandler(event: Event) {
+
+    //  event.preventDefault();
+  }
+
   constructor(private viewCtrl: ViewController, private uiBeanStorage: UIBeanStorage, private uiPreparationStorage: UIPreparationStorage,
               private uiBrewStorage: UIBrewStorage, private uiImage: UIImage, private uiSettingsStorage:UISettingsStorage, public uiHelper:UIHelper) {
     //Initialize to standard in dropdowns
@@ -61,6 +66,8 @@ export class BrewsAddModal {
   }
 
   public finish() {
+    console.log("finish");
+    console.log(this.data);
     this.stopTimer();
     this.uiBrewStorage.add(this.data);
     this.dismiss();
diff --git a/src/services/uiHelper.ts b/src/services/uiHelper.ts
index aa67faf16..b58e8d319 100644
--- a/src/services/uiHelper.ts
+++ b/src/services/uiHelper.ts
@@ -81,6 +81,11 @@ export class UIHelper {
     if (event == ""){
       return event;
     }
+    if (event.indexOf(','))
+    {
+      event =  event.replace(/,/g,'.');
+    }
+
 
     return parseFloat(event);
     // return parseFloat(event);

From 7cb03f947e0b242313b0ba6bf0373d72b44aacd2 Mon Sep 17 00:00:00 2001
From: Lars Saalbach <lars.saalbach@googlemail.com>
Date: Thu, 21 Jun 2018 15:54:52 +0200
Subject: [PATCH 2/2] Fix + features

Set last brew as default.
Choose which params should be set
Fixed integer
---
 src/classes/settings/settings.ts              |   8 +
 .../settingsDefaultLastCoffeeParameter.ts     |  36 ++++
 src/components/timer/timer.html               |   2 +-
 src/components/timer/timer.ts                 |   6 +
 src/directive/preventCharacters.ts            |  30 ++-
 .../settings/iDefaultLastCoffeeParameters.ts  |  21 ++
 src/interfaces/settings/iSettings.ts          |   4 +
 src/pages/beans/add/beans-add.html            |   9 +-
 src/pages/beans/edit/beans-edit.html          |   8 +-
 src/pages/brews/add/brews-add.html            |  13 +-
 src/pages/brews/add/brews-add.ts              |  92 +++++++--
 src/pages/brews/edit/brews-edit.html          |  18 +-
 .../preparations/add/preparations-add.html    |   4 +-
 .../preparations/edit/preparations-edit.html  |   4 +-
 src/pages/settings/settings.html              | 194 ++++++++++++------
 src/pages/settings/settings.ts                |   2 -
 src/services/uiHelper.ts                      |   7 +-
 17 files changed, 328 insertions(+), 130 deletions(-)
 create mode 100644 src/classes/settings/settingsDefaultLastCoffeeParameter.ts
 create mode 100644 src/interfaces/settings/iDefaultLastCoffeeParameters.ts

diff --git a/src/classes/settings/settings.ts b/src/classes/settings/settings.ts
index c9c1516e1..a630f317a 100644
--- a/src/classes/settings/settings.ts
+++ b/src/classes/settings/settings.ts
@@ -4,6 +4,8 @@ import {ISettings} from "../../interfaces/settings/iSettings";
 import {Config} from "../objectConfig/objectConfig";
 /**Enums**/
 import {BREW_VIEW_ENUM} from '../../enums/settings/brewView';
+
+import {DefaultLastCoffeeParameters} from "./settingsDefaultLastCoffeeParameter";
 export class Settings implements ISettings {
   public brew_view: BREW_VIEW_ENUM;
   public brew_time: boolean;
@@ -20,6 +22,8 @@ export class Settings implements ISettings {
   public coffee_concentration: boolean;
   public coffee_first_drip_time: boolean;
   public coffee_blooming_time: boolean;
+  public set_last_coffee_brew:boolean;
+  public default_last_coffee_parameters:DefaultLastCoffeeParameters;
   public config: Config;
 
 
@@ -43,7 +47,11 @@ export class Settings implements ISettings {
     this.note = true;
     this.attachments = true;
     this.rating = true;
+    this.set_last_coffee_brew = false;
     this.config = new Config();
+
+    this.default_last_coffee_parameters = new DefaultLastCoffeeParameters();
+
   }
 
 
diff --git a/src/classes/settings/settingsDefaultLastCoffeeParameter.ts b/src/classes/settings/settingsDefaultLastCoffeeParameter.ts
new file mode 100644
index 000000000..32877fbc2
--- /dev/null
+++ b/src/classes/settings/settingsDefaultLastCoffeeParameter.ts
@@ -0,0 +1,36 @@
+/**Interfacdes**/
+
+import {IDefaultLastCoffeeParameters} from "../../interfaces/settings/iDefaultLastCoffeeParameters";
+
+export class DefaultLastCoffeeParameters implements IDefaultLastCoffeeParameters {
+ public brew_time: boolean;
+  public  grind_size: boolean;
+  public grind_weight: boolean;
+  public method_of_preparation: boolean;
+  public brew_quantity: boolean;
+  public bean_type: boolean;
+  public brew_temperature:boolean;
+  public note: boolean;
+  public coffee_type:boolean;
+  public coffee_concentration:boolean;
+  public coffee_first_drip_time:boolean;
+  public coffee_blooming_time:boolean;
+  public rating:boolean;
+
+  constructor() {
+    this.bean_type = true;
+    this.brew_time = true;
+    this.grind_size = true;
+    this.grind_weight = true;
+    this.method_of_preparation = true;
+    this.brew_quantity = true;
+    this.bean_type = true;
+    this.brew_temperature = true;
+    this.note = false;
+    this.coffee_type = true;
+    this.coffee_concentration = true;
+    this.coffee_first_drip_time = true;
+    this.coffee_blooming_time = true;
+    this.rating = false;
+  }
+}
diff --git a/src/components/timer/timer.html b/src/components/timer/timer.html
index aa08cd105..886593615 100644
--- a/src/components/timer/timer.html
+++ b/src/components/timer/timer.html
@@ -1,6 +1,6 @@
 <ion-item class="no-bottom-border item">
   <ion-label stacked>Zeit</ion-label>
-  <ion-input type="number"  [(ngModel)]="timer.seconds"></ion-input>
+  <ion-input [prevent-characters] type="number" [(ngModel)]="timer.seconds"></ion-input>
   <button ion-button icon-left clear color="danger" small (click)="initTimer()" item-right
           *ngIf="!timer.runTimer && (timer.hasStarted || timer.hasFinished) || timer.hasFinished">
     <ion-icon name="refresh"></ion-icon>
diff --git a/src/components/timer/timer.ts b/src/components/timer/timer.ts
index cd5211e4f..86736d350 100644
--- a/src/components/timer/timer.ts
+++ b/src/components/timer/timer.ts
@@ -22,6 +22,12 @@ export class TimerComponent {
     return this.timer.hasFinished;
   }
 
+  public setTime(seconds:number){
+    this.timer.seconds = seconds;
+
+    this.timer.displayTime = this.getSecondsAsDigitalClock(this.timer.seconds);
+  }
+
   initTimer() {
     if(!this.timeInSeconds) { this.timeInSeconds = 0; }
 
diff --git a/src/directive/preventCharacters.ts b/src/directive/preventCharacters.ts
index d2742f5d4..545f1fd0c 100644
--- a/src/directive/preventCharacters.ts
+++ b/src/directive/preventCharacters.ts
@@ -1,22 +1,24 @@
 /**Core**/
-import {Directive, Input, NgZone,EventEmitter,Output,ElementRef} from '@angular/core';
+import {Directive} from '@angular/core';
 import {NgModel} from '@angular/forms';
 
 @Directive({
-  selector: '[prevent-characters]',
-  providers: [(NgModel)],
+  selector: '[ngModel][prevent-characters]',
+  providers: [NgModel],
   host: {
     '(keydown)': 'onKeyDown($event)',
-    '(blur)': 'blur()',
+    "(ionBlur)": 'blur()'
   }
 })
 export class PreventCharacterDirective {
-  constructor(private model: NgModel, private _ngZone: NgZone, public _el:
-    ElementRef) {
+
+
+  //@Output() ngModelChange:EventEmitter<any> = new EventEmitter();
+
+  constructor(private model: NgModel) {
 
   }
 
-  @Input() get inputModel;
 
   onKeyDown($event) {
     let pressedKeyCode: number = $event.keyCode;
@@ -39,7 +41,7 @@ export class PreventCharacterDirective {
 
   }
 
-  blur() {
+  blur(){
 
     let val: any = this.model.control.value;
     val = val + "";
@@ -51,14 +53,10 @@ export class PreventCharacterDirective {
       val = val.replace(/,/g, '.');
     }
 
-    console.log("set new value");
-    this._ngZone.run(() => {
-      this._el.nativeElement.value=parseFloat(val);
-     // this.model.control.setValue(parseFloat(val));
-     // this.model.viewToModelUpdate(parseFloat(val));
-     // this.model.valueAccessor.writeValue(parseFloat(val));
+    //Emit worked aswell but I don't know what its doing in depth
+    //this.ngModelChange.emit(parseFloat(val));
+
+    this.model.control.setValue(parseFloat(val));
 
-     // this.model.valueAccessor.writeValue(parseFloat(val) + "");
-    });
   }
 }
diff --git a/src/interfaces/settings/iDefaultLastCoffeeParameters.ts b/src/interfaces/settings/iDefaultLastCoffeeParameters.ts
new file mode 100644
index 000000000..4be1cb8c7
--- /dev/null
+++ b/src/interfaces/settings/iDefaultLastCoffeeParameters.ts
@@ -0,0 +1,21 @@
+/**Interfaces**/
+
+
+export interface IDefaultLastCoffeeParameters {
+ //Properties
+  brew_time: boolean,
+  grind_size: boolean,
+  grind_weight: boolean,
+  method_of_preparation: boolean,
+  brew_quantity: boolean,
+  bean_type: boolean,
+  brew_temperature:boolean,
+  note: boolean,
+  coffee_type:boolean,
+  coffee_concentration:boolean,
+  coffee_first_drip_time:boolean,
+  coffee_blooming_time:boolean,
+  rating:boolean;
+}
+
+
diff --git a/src/interfaces/settings/iSettings.ts b/src/interfaces/settings/iSettings.ts
index 096dcc84f..7cbcc74db 100644
--- a/src/interfaces/settings/iSettings.ts
+++ b/src/interfaces/settings/iSettings.ts
@@ -2,6 +2,7 @@
 import {IConfig} from '../objectConfig/iObjectConfig';
 /**Enums**/
 import {BREW_VIEW_ENUM} from '../../enums/settings/brewView';
+import {IDefaultLastCoffeeParameters} from "./iDefaultLastCoffeeParameters";
 
 export interface ISettings {
  //Properties
@@ -18,9 +19,12 @@ export interface ISettings {
   coffee_concentration:boolean,
   coffee_first_drip_time:boolean,
   coffee_blooming_time:boolean,
+  set_last_coffee_brew:boolean,
   attachments:boolean;
   rating:boolean;
 
+  default_last_coffee_parameters:IDefaultLastCoffeeParameters;
+
   config:IConfig;
 }
 
diff --git a/src/pages/beans/add/beans-add.html b/src/pages/beans/add/beans-add.html
index 45b411c14..ad4f49998 100644
--- a/src/pages/beans/add/beans-add.html
+++ b/src/pages/beans/add/beans-add.html
@@ -12,14 +12,13 @@
 <ion-content>
   <form #addBeanForm="ngForm" novalidate>
     <ion-item>
-      <ion-label fixed >Name*</ion-label>
+      <ion-label floating >Name*</ion-label>
       <ion-input [(ngModel)]="data.name" name="name" type="text" #name="ngModel" spellcheck="false"
                  autocapitalize="off" required>
       </ion-input>
     </ion-item>
      <ion-item>
-
-      <ion-label>Röstgrad*</ion-label>
+      <ion-label floating>Röstgrad*</ion-label>
       <ion-select  [(ngModel)]="data.roast"  name="roast" #roast="ngModel">
         <ion-option *ngFor="let key of roastsEnum | keys" value="{{key}}">{{roastsEnum[key]}}</ion-option>
 
@@ -27,12 +26,12 @@
     </ion-item>
 
     <ion-item>
-      <ion-label fixed >Röstdatum*</ion-label>
+      <ion-label floating>Röstdatum*</ion-label>
       <ion-datetime min="2000-01-01" max="2999-12-31" displayFormat="DD.MM.YYYY" [(ngModel)]="data.roastingDate" name="roastingDate"
                     #roastingDate="ngModel"></ion-datetime>
     </ion-item>
     <ion-item>
-      <ion-label fixed>Notizen</ion-label>
+      <ion-label floating>Notizen</ion-label>
       <ion-textarea autocomplete="true" spellcheck="true" autocorrect="true" name="note" #note="ngModel" rows="5" [(ngModel)]="data.note"></ion-textarea>
     </ion-item>
     <button ion-item (click)="addImage()">
diff --git a/src/pages/beans/edit/beans-edit.html b/src/pages/beans/edit/beans-edit.html
index f12e5ce2b..ea5d72c6c 100644
--- a/src/pages/beans/edit/beans-edit.html
+++ b/src/pages/beans/edit/beans-edit.html
@@ -12,26 +12,26 @@
 <ion-content>
   <form #editBeanForm="ngForm" novalidate>
     <ion-item>
-      <ion-label fixed>Name*</ion-label>
+      <ion-label floating>Name*</ion-label>
       <ion-input [(ngModel)]="data.name" name="name" type="text" #name="ngModel" spellcheck="false"
                  autocapitalize="off" required>
       </ion-input>
     </ion-item>
     <ion-item>
-      <ion-label>Röstgrad*</ion-label>
+      <ion-label floating>Röstgrad*</ion-label>
       <ion-select [(ngModel)]="data.roast" name="roast" #roast="ngModel">
         <ion-option *ngFor="let key of roastsEnum | keys" value="{{key}}">{{roastsEnum[key]}}</ion-option>
 
       </ion-select>
     </ion-item>
     <ion-item>
-      <ion-label fixed>Röstdatum*</ion-label>
+      <ion-label floating>Röstdatum*</ion-label>
       <ion-datetime min="2000-01-01" max="2999-12-31" displayFormat="DD.MM.YYYY" [(ngModel)]="data.roastingDate"
                     name="roastingDate"
                     #roastingDate="ngModel"></ion-datetime>
     </ion-item>
     <ion-item>
-      <ion-label fixed>Notizen</ion-label>
+      <ion-label floating>Notizen</ion-label>
       <ion-textarea autocomplete="true" spellcheck="true" autocorrect="true" name="note" #note="ngModel" rows="5"
                     [(ngModel)]="data.note"></ion-textarea>
     </ion-item>
diff --git a/src/pages/brews/add/brews-add.html b/src/pages/brews/add/brews-add.html
index faf875c68..97047d2b4 100644
--- a/src/pages/brews/add/brews-add.html
+++ b/src/pages/brews/add/brews-add.html
@@ -17,11 +17,11 @@
     </ion-item>
     <ion-item *ngIf="settings.grind_weight === true">
       <ion-label floating>Gewicht</ion-label>
-      <ion-input [prevent-characters]  type="text" [ngModel]="data.grind_weight" ></ion-input>
+      <ion-input [prevent-characters] [(ngModel)]="data.grind_weight"   type="text" ></ion-input>
     </ion-item>
     <ion-item *ngIf="settings.brew_temperature === true">
       <ion-label floating>Temperatur</ion-label>
-      <ion-input type="number" [ngModel]="data.brew_temperature" (ngModelChange)="data.brew_temperature = uiHelper.convertToNumber($event)" step="0.1" pattern="[0-9,.]*" step="any"></ion-input>
+      <ion-input [prevent-characters] [(ngModel)]="data.brew_temperature" type="text"></ion-input>
     </ion-item>
     <ion-item *ngIf="settings.method_of_preparation === true">
       <ion-label floating>Zubereitungsmethode</ion-label>
@@ -41,8 +41,7 @@
     <timer #timer timeInSeconds="0" *ngIf="settings.brew_time === true"></timer>
     <ion-item *ngIf="settings.coffee_blooming_time === true">
       <ion-label stacked>Blooming-Zeit / Preinfusion</ion-label>
-      <ion-input type="number" [ngModel]="data.coffee_blooming_time"
-                 (ngModelChange)="data.coffee_blooming_time = uiHelper.convertToNumber($event)"></ion-input>
+      <ion-input [prevent-characters] [(ngModel)]="data.coffee_blooming_time" type="text" ></ion-input>
       <button ion-button icon-left clear small color="primary" (click)="setCoffeeBloomingTime()" item-right>
         <ion-icon name="time"></ion-icon>
         Zeit!
@@ -50,8 +49,7 @@
     </ion-item>
     <ion-item *ngIf="settings.coffee_first_drip_time === true">
       <ion-label stacked>Erster Kaffeetropfen</ion-label>
-      <ion-input type="number" [ngModel]="data.coffee_first_drip_time"
-                 (ngModelChange)="data.coffee_first_drip_time = uiHelper.convertToNumber($event)"></ion-input>
+      <ion-input [prevent-characters] [(ngModel)]="data.coffee_first_drip_time" type="text"></ion-input>
       <button ion-button icon-left clear small color="primary" (click)="setCoffeeDripTime()" item-right>
         <ion-icon name="time"></ion-icon>
         Zeit!
@@ -59,8 +57,7 @@
     </ion-item>
     <ion-item *ngIf="settings.brew_quantity === true">
       <ion-label floating>Bezugsmenge</ion-label>
-      <ion-input type="number" [ngModel]="data.brew_quantity"
-                 (ngModelChange)="data.brew_quantity = uiHelper.convertToNumber($event)" step="0.1" pattern="[0-9,.]*" step="any"></ion-input>
+      <ion-input [prevent-characters] [(ngModel)]="data.brew_quantity" type="text"></ion-input>
     </ion-item>
     <ion-item *ngIf="settings.coffee_type=== true">
       <ion-label floating>Kaffeetyp</ion-label>
diff --git a/src/pages/brews/add/brews-add.ts b/src/pages/brews/add/brews-add.ts
index e0722e93e..b50982299 100644
--- a/src/pages/brews/add/brews-add.ts
+++ b/src/pages/brews/add/brews-add.ts
@@ -1,7 +1,7 @@
 /**Core**/
 import {Component, ViewChild} from '@angular/core';
 /**Ionic**/
-import {ViewController,Slides} from 'ionic-angular';
+import {ViewController, Slides} from 'ionic-angular';
 
 /**Services**/
 import {UIBeanStorage} from '../../../services/uiBeanStorage';
@@ -36,7 +36,7 @@ export class BrewsAddModal {
   public data: Brew = new Brew();
 
   public BREW_VIEW_ENUM = BREW_VIEW_ENUM;
-  public settings:ISettings;
+  public settings: ISettings;
 
   public method_of_preparations: Array<IPreparation> = [];
   beans: Array<IBean> = [];
@@ -47,7 +47,7 @@ export class BrewsAddModal {
   }
 
   constructor(private viewCtrl: ViewController, private uiBeanStorage: UIBeanStorage, private uiPreparationStorage: UIPreparationStorage,
-              private uiBrewStorage: UIBrewStorage, private uiImage: UIImage, private uiSettingsStorage:UISettingsStorage, public uiHelper:UIHelper) {
+              private uiBrewStorage: UIBrewStorage, private uiImage: UIImage, private uiSettingsStorage: UISettingsStorage, public uiHelper: UIHelper) {
     //Initialize to standard in dropdowns
 
     this.settings = this.uiSettingsStorage.getSettings();
@@ -57,8 +57,72 @@ export class BrewsAddModal {
     //Get first entry
     this.data.bean = this.beans[0].config.uuid;
     this.data.method_of_preparation = this.method_of_preparations[0].config.uuid;
+
+
   }
 
+  ionViewDidEnter(){
+    this.__loadLastBrew();
+  }
+
+  private __loadLastBrew() {
+    if (this.settings.set_last_coffee_brew === true) {
+      let brews: Array<Brew> = this.uiBrewStorage.getAllEntries();
+      if (brews.length > 0) {
+        let lastBrew: Brew = brews[brews.length - 1];
+
+
+        if (this.settings.default_last_coffee_parameters.bean_type===true){
+          this.data.bean = lastBrew.bean;
+        }
+
+        if (this.settings.default_last_coffee_parameters.grind_size===true) {
+          this.data.grind_size = lastBrew.grind_size;
+        }
+        if (this.settings.default_last_coffee_parameters.grind_weight===true) {
+          this.data.grind_weight = lastBrew.grind_weight;
+        }
+        if (this.settings.default_last_coffee_parameters.method_of_preparation===true) {
+          this.data.method_of_preparation = lastBrew.method_of_preparation;
+        }
+        if (this.settings.default_last_coffee_parameters.brew_temperature===true) {
+          this.data.brew_temperature = lastBrew.brew_temperature;
+        }
+
+        if (this.timer){
+          if (this.settings.default_last_coffee_parameters.brew_time===true) {
+            this.data.brew_time = lastBrew.brew_time;
+            this.timer.setTime(this.data.brew_time);
+          }
+        }
+
+        if (this.settings.default_last_coffee_parameters.brew_quantity===true) {
+          this.data.brew_quantity = lastBrew.brew_quantity;
+        }
+        if (this.settings.default_last_coffee_parameters.coffee_type===true) {
+          this.data.coffee_type = lastBrew.coffee_type;
+        }
+        if (this.settings.default_last_coffee_parameters.coffee_concentration===true) {
+          this.data.coffee_concentration = lastBrew.coffee_concentration;
+        }
+        if (this.settings.default_last_coffee_parameters.coffee_first_drip_time===true) {
+          this.data.coffee_first_drip_time = lastBrew.coffee_first_drip_time;
+        }
+        if (this.settings.default_last_coffee_parameters.coffee_blooming_time===true) {
+          this.data.coffee_blooming_time = lastBrew.coffee_blooming_time;
+        }
+
+
+        if (this.settings.default_last_coffee_parameters.rating===true) {
+          this.data.rating = lastBrew.rating;
+        }
+        if (this.settings.default_last_coffee_parameters.note===true) {
+          this.data.note = lastBrew.note;
+        }
+
+      }
+    }
+  }
 
 
   dismiss() {
@@ -66,22 +130,26 @@ export class BrewsAddModal {
   }
 
   public finish() {
-    console.log("finish");
-    console.log(this.data);
+
     this.stopTimer();
     this.uiBrewStorage.add(this.data);
     this.dismiss();
   }
 
 
-  public getTime():number{
-    return this.timer.getSeconds();
+  public getTime(): number {
+    if (this.timer){
+      return this.timer.getSeconds();
+    }
+    return 0;
+
   }
 
-  public setCoffeeDripTime(){
+  public setCoffeeDripTime() {
     this.data.coffee_first_drip_time = this.getTime();
   }
-  public setCoffeeBloomingTime(){
+
+  public setCoffeeBloomingTime() {
     this.data.coffee_blooming_time = this.getTime();
   }
 
@@ -121,17 +189,15 @@ export class BrewsAddModal {
   }
 
   public stopTimer() {
-    if (this.timer){
+    if (this.timer) {
       this.timer.pauseTimer();
       this.data.brew_time = this.timer.getSeconds();
     }
-    else{
+    else {
       this.data.brew_time = 0;
     }
 
   }
 
 
-
-
 }
diff --git a/src/pages/brews/edit/brews-edit.html b/src/pages/brews/edit/brews-edit.html
index 1166b6853..4187fa15c 100644
--- a/src/pages/brews/edit/brews-edit.html
+++ b/src/pages/brews/edit/brews-edit.html
@@ -18,13 +18,11 @@
   </ion-item>
   <ion-item>
     <ion-label stacked>Gewicht</ion-label>
-    <ion-input type="number" [ngModel]="data.grind_weight"
-               (ngModelChange)="data.grind_weight = uiHelper.convertToNumber($event)"  step="0.1" pattern="[0-9,.]*" step="any"></ion-input>
+    <ion-input [prevent-characters] [(ngModel)]="data.grind_weight" type="text"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label stacked>Temperatur</ion-label>
-    <ion-input type="number" [ngModel]="data.brew_temperature"
-               (ngModelChange)="data.brew_temperature = uiHelper.convertToNumber($event)"  step="0.1" pattern="[0-9,.]*" step="any"></ion-input>
+    <ion-input [prevent-characters] [(ngModel)]="data.brew_temperature" type="text"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label>Zubereitungsmethode</ion-label>
@@ -42,23 +40,19 @@
   </ion-item>
   <ion-item>
     <ion-label stacked>Zeit</ion-label>
-    <ion-input type="number" [ngModel]="data.brew_time"
-               (ngModelChange)="data.brew_time = uiHelper.convertToNumber($event)"></ion-input>
+    <ion-input [prevent-characters] [(ngModel)]="data.brew_time" type="text"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label stacked>Blooming-Zeit / Preinfusion</ion-label>
-    <ion-input type="number" [ngModel]="data.coffee_blooming_time"
-               (ngModelChange)="data.coffee_blooming_time = uiHelper.convertToNumber($event)"></ion-input>
+    <ion-input [prevent-characters] [(ngModel)]="data.coffee_blooming_time" type="text"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label stacked>Erster Kaffeetropfen</ion-label>
-    <ion-input type="number" [ngModel]="data.coffee_first_drip_time"
-               (ngModelChange)="data.coffee_first_drip_time = uiHelper.convertToNumber($event)"></ion-input>
+    <ion-input [prevent-characters] [(ngModel)]="data.coffee_first_drip_time" type="text"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label stacked>Bezugsmenge</ion-label>
-    <ion-input type="number" [ngModel]="data.brew_quantity"
-               (ngModelChange)="data.brew_quantity = uiHelper.convertToNumber($event)"  step="0.1" pattern="[0-9,.]*" step="any"></ion-input>
+    <ion-input [prevent-characters] [(ngModel)]="data.brew_quantity" type="text"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label stacked>Kaffeetyp</ion-label>
diff --git a/src/pages/preparations/add/preparations-add.html b/src/pages/preparations/add/preparations-add.html
index fe94b586c..4a4b7037e 100644
--- a/src/pages/preparations/add/preparations-add.html
+++ b/src/pages/preparations/add/preparations-add.html
@@ -12,13 +12,13 @@
 <ion-content>
   <form #addBeanForm="ngForm" novalidate>
     <ion-item>
-      <ion-label fixed >Name*</ion-label>
+      <ion-label floating>Name*</ion-label>
       <ion-input [(ngModel)]="data.name" name="name" type="text" #name="ngModel" spellcheck="false"
                  autocapitalize="off" required>
       </ion-input>
     </ion-item>
     <ion-item>
-      <ion-label fixed>Notizen</ion-label>
+      <ion-label floating>Notizen</ion-label>
       <ion-textarea autocomplete="true" spellcheck="true" autocorrect="true" name="note" #note="ngModel" rows="5" [(ngModel)]="data.note"></ion-textarea>
     </ion-item>
     <ion-row>
diff --git a/src/pages/preparations/edit/preparations-edit.html b/src/pages/preparations/edit/preparations-edit.html
index 65cae8383..45831ed9b 100644
--- a/src/pages/preparations/edit/preparations-edit.html
+++ b/src/pages/preparations/edit/preparations-edit.html
@@ -12,13 +12,13 @@
 <ion-content>
   <form #editBeanForm="ngForm" novalidate>
     <ion-item>
-      <ion-label fixed >Name*</ion-label>
+      <ion-label floating>Name*</ion-label>
       <ion-input [(ngModel)]="data.name" name="name" type="text" #name="ngModel" spellcheck="false"
                  autocapitalize="off" required>
       </ion-input>
     </ion-item>
     <ion-item>
-      <ion-label fixed>Notizen</ion-label>
+      <ion-label floating>Notizen</ion-label>
       <ion-textarea autocomplete="true" spellcheck="true" autocorrect="true" name="note" #note="ngModel" rows="5"  [(ngModel)]="data.note"></ion-textarea>
     </ion-item>
     <ion-row>
diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html
index c85c66cb4..a2873b855 100644
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -16,70 +16,138 @@
       <p>Hier findest du alle spezifischen Einstellungen der App</p>
     </ion-card-content>
   </ion-card>
-  <ion-item>
-    <ion-label>Ansicht</ion-label>
-    <ion-select [(ngModel)]="settings.brew_view" (ngModelChange)="saveSettings($event)">
-      <ion-option value="{{BREW_VIEWS.SINGLE_PAGE}}">Eine Seite</ion-option>
-      <ion-option value="{{BREW_VIEWS.MULTIPLE_PAGE}}" disabled>Paging</ion-option>
-    </ion-select>
-  </ion-item>
-  <ion-item>
-    <ion-label>Zeit</ion-label>
-    <ion-checkbox [(ngModel)]="settings.brew_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Mahlgrad</ion-label>
-    <ion-checkbox [(ngModel)]="settings.grind_size" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Output: Gewicht/Menge</ion-label>
-    <ion-checkbox [(ngModel)]="settings.grind_weight" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Notizen</ion-label>
-    <ion-checkbox [(ngModel)]="settings.note" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Zubereitungsmethode</ion-label>
-    <ion-checkbox [(ngModel)]="settings.method_of_preparation" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Bezugsmenge</ion-label>
-    <ion-checkbox [(ngModel)]="settings.brew_quantity" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Bohnensorte</ion-label>
-    <ion-checkbox [(ngModel)]="settings.bean_type" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Brühtemperatur</ion-label>
-    <ion-checkbox [(ngModel)]="settings.brew_temperature" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Kaffeetyp</ion-label>
-    <ion-checkbox [(ngModel)]="settings.coffee_type" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Kaffee-Konzentration</ion-label>
-    <ion-checkbox [(ngModel)]="settings.coffee_concentration" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Erster Kaffeetropfen</ion-label>
-    <ion-checkbox [(ngModel)]="settings.coffee_first_drip_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Blooming-Zeit / Preinfusion</ion-label>
-    <ion-checkbox [(ngModel)]="settings.coffee_blooming_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
+  <ion-list>
+    <ion-item-divider color="light">Allgemeine Einstellungen</ion-item-divider>
+    <ion-item>
+      <ion-label>Ansicht</ion-label>
+      <ion-select [(ngModel)]="settings.brew_view" (ngModelChange)="saveSettings($event)">
+        <ion-option value="{{BREW_VIEWS.SINGLE_PAGE}}">Eine Seite</ion-option>
+        <ion-option value="{{BREW_VIEWS.MULTIPLE_PAGE}}" disabled>Paging</ion-option>
+      </ion-select>
+    </ion-item>
+  </ion-list>
+  <ion-list>
+    <ion-item>
+      <ion-label>Letzen Bezug vorbelegen?</ion-label>
+      <ion-checkbox [(ngModel)]="settings.set_last_coffee_brew" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <div *ngIf="settings.set_last_coffee_brew==true">
+    <ion-item-divider color="light">Welche Parameter sollen vorbelegt werden?</ion-item-divider>
+    <ion-item>
+      <ion-label>Zeit</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.brew_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Mahlgrad</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.grind_size" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Output: Gewicht/Menge</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.grind_weight" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Notizen</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.note" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Zubereitungsmethode</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.method_of_preparation" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Bezugsmenge</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.brew_quantity" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Bohnensorte</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.bean_type" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Brühtemperatur</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.brew_temperature" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Kaffeetyp</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.coffee_type" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Kaffee-Konzentration</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.coffee_concentration" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Erster Kaffeetropfen</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.coffee_first_drip_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Blooming-Zeit / Preinfusion</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.coffee_blooming_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Bewertung</ion-label>
+      <ion-checkbox [(ngModel)]="settings.default_last_coffee_parameters.rating" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    </div>
+  </ion-list>
 
 
-  <ion-item>
-    <ion-label>Anhänge</ion-label>
-    <ion-checkbox [(ngModel)]="settings.attachments" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
-  <ion-item>
-    <ion-label>Bewertung</ion-label>
-    <ion-checkbox [(ngModel)]="settings.rating" (ngModelChange)="saveSettings($event)"></ion-checkbox>
-  </ion-item>
+  <ion-list>
 
+
+    <ion-item-divider color="light">Anzuzeigende Bezugsparameter</ion-item-divider>
+    <ion-item>
+      <ion-label>Zeit</ion-label>
+      <ion-checkbox [(ngModel)]="settings.brew_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Mahlgrad</ion-label>
+      <ion-checkbox [(ngModel)]="settings.grind_size" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Output: Gewicht/Menge</ion-label>
+      <ion-checkbox [(ngModel)]="settings.grind_weight" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Notizen</ion-label>
+      <ion-checkbox [(ngModel)]="settings.note" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Zubereitungsmethode</ion-label>
+      <ion-checkbox [(ngModel)]="settings.method_of_preparation" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Bezugsmenge</ion-label>
+      <ion-checkbox [(ngModel)]="settings.brew_quantity" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Bohnensorte</ion-label>
+      <ion-checkbox [(ngModel)]="settings.bean_type" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Brühtemperatur</ion-label>
+      <ion-checkbox [(ngModel)]="settings.brew_temperature" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Kaffeetyp</ion-label>
+      <ion-checkbox [(ngModel)]="settings.coffee_type" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Kaffee-Konzentration</ion-label>
+      <ion-checkbox [(ngModel)]="settings.coffee_concentration" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Erster Kaffeetropfen</ion-label>
+      <ion-checkbox [(ngModel)]="settings.coffee_first_drip_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Blooming-Zeit / Preinfusion</ion-label>
+      <ion-checkbox [(ngModel)]="settings.coffee_blooming_time" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Anhänge</ion-label>
+      <ion-checkbox [(ngModel)]="settings.attachments" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+    <ion-item>
+      <ion-label>Bewertung</ion-label>
+      <ion-checkbox [(ngModel)]="settings.rating" (ngModelChange)="saveSettings($event)"></ion-checkbox>
+    </ion-item>
+  </ion-list>
 </ion-content>
diff --git a/src/pages/settings/settings.ts b/src/pages/settings/settings.ts
index 7c33525c1..90e35b609 100644
--- a/src/pages/settings/settings.ts
+++ b/src/pages/settings/settings.ts
@@ -18,8 +18,6 @@ export class SettingsPage {
   public BREW_VIEWS = BREW_VIEW_ENUM;
   constructor(public uiSettingsStorage:UISettingsStorage) {
     this.settings = this.uiSettingsStorage.getSettings();
-
-
   }
 
   public saveSettings(_event:any){
diff --git a/src/services/uiHelper.ts b/src/services/uiHelper.ts
index b58e8d319..a0d8548c8 100644
--- a/src/services/uiHelper.ts
+++ b/src/services/uiHelper.ts
@@ -109,8 +109,11 @@ export class UIHelper {
         console.log("Error: " + e);
         reject();
       };
-      var blob = new Blob([csvContent], {type: 'text/csv;charset=UTF-8'});
-      if (this.platform.is("android")) {
+
+      //Fixed umlaut issue
+      //Thanks to: https://stackoverflow.com/questions/31959487/utf-8-encoidng-issue-when-exporting-csv-file-javascript
+      var blob = new Blob(["\ufeff"+ csvContent], {type: 'text/csv;charset=UTF-8;'});
+      if (this.platform.is("android") || this.platform.is("ios")) {
         let storageLocation: string = "";
 
         switch (device.platform) {