hintergrundauswahl eingbaut, Vorschau jetzt modal.

platforms/android/.idea/workspace.xml

@@ -41,8 +41,8 @@
       <file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.8160535">
+            <state vertical-scroll-proportion="0.59384614">
-              <caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
+              <caret line="77" column="52" selection-start-line="77" selection-start-column="52" selection-end-line="77" selection-end-column="52" />
               <folding>
                 <element signature="e#0#38645#0" expanded="false" />
                 <element signature="imports" expanded="false" />
@@ -56,7 +56,7 @@
         <entry file="file://$PROJECT_DIR$/assets/www/js/app.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="90" column="34" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
+              <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -66,7 +66,7 @@
         <entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="477" column="0" selection-start-line="477" selection-start-column="0" selection-end-line="477" selection-end-column="0" />
+              <caret line="532" column="0" selection-start-line="532" selection-start-column="0" selection-end-line="532" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -76,7 +76,7 @@
         <entry file="file://$PROJECT_DIR$/assets/www/templates/tab-dash.html">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+              <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -1264,7 +1264,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="5817832518370" />
+        <entry key="$PROJECT_DIR$" value="5817982802969" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -1646,7 +1646,7 @@
     <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1696" />
-    <option name="height" value="922" />
+    <option name="height" value="962" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -1852,11 +1852,11 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1696" height="922" extended-state="6" />
+    <frame x="-8" y="-8" width="1696" height="962" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.57310706" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5620347" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1930,7 +1930,7 @@
     <entry file="file://$PROJECT_DIR$/assets/www/templates/tab-dash.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -1938,7 +1938,7 @@
     <entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="477" column="0" selection-start-line="477" selection-start-column="0" selection-end-line="477" selection-end-column="0" />
+          <caret line="532" column="0" selection-start-line="532" selection-start-column="0" selection-end-line="532" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -1946,7 +1946,7 @@
     <entry file="file://$PROJECT_DIR$/assets/www/js/app.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="90" column="34" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
+          <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
           <folding />
         </state>
       </provider>
@@ -1961,8 +1961,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8160535">
+        <state vertical-scroll-proportion="0.59384614">
-          <caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
+          <caret line="77" column="52" selection-start-line="77" selection-start-column="52" selection-end-line="77" selection-end-column="52" />
           <folding>
             <element signature="e#0#38645#0" expanded="false" />
             <element signature="imports" expanded="false" />

platforms/android/assets/www/index.html

@@ -17,6 +17,7 @@
 
     <!-- ionic/angularjs js -->
     <script src="lib/ionic/js/ionic.bundle.js"></script>
+    <script src="js/ionic-modal-select.min.js"></script>
     <script src="js/ng-cordova.min.js"></script>
     <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>

platforms/android/assets/www/js/app.js

@@ -7,7 +7,7 @@
 // 'starter.controllers' is found in controllers.js
 var db;
 
-angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter.services'])
+angular.module('starter', ['ionic', 'ngCordova', 'ionic-modal-select', 'starter.controllers', 'starter.services'])
 
 .run(function($ionicPlatform, $window, $ionicHistory, $database, $ionicPopup, $state, $localstorage, $rootScope) {
   $ionicPlatform.ready(function() {

platforms/android/assets/www/js/controllers.js

@@ -1,6 +1,6 @@
 angular.module('starter.controllers', [])
 
-.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter) {
+.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter,$ionicModal) {
 
   $scope.preis="";
   $scope.name="";
@@ -8,6 +8,22 @@ angular.module('starter.controllers', [])
   $scope.items=[];
   $scope.item=[];
 
+
+  $scope.backgroundpic = "1";
+  $scope.backgrounds =  [
+      { name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"}, 
+      { name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"}, 
+      { name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"}, 
+      { name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"}, 
+      { name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"}, 
+      { name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"}, 
+      { name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"}, 
+      { name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"}, 
+      { name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"}, 
+      { name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
+    ];
+
+
   $scope.producitems=[];
 
   $scope.rosen1titel="";
@@ -55,17 +71,52 @@ $scope.show = function() {
   $scope.validate = function() {
 
     var link = 'http://api.raataar.de/rosen/vorschau.php';
-
+    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
-    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
         $scope.response = res.data;
-        window.open($scope.response, '_system', 'location=yes'); 
+        //window.open($scope.response, '_system', 'location=yes'); 
+        //return false;
+        $scope.showVorschauImages($scope.response);
         return false;
     });
     
   };
 
 
+  /*
+  * Vorschau-Modal
+  */
+  $scope.showVorschauImages = function(imagesrc) {
+    //Bild im dialog anzeigen
+    $scope.imagesrc=imagesrc;
+    $scope.showVorschauModal('templates/image-vorschau-popover.html');
+  }
  
+  $scope.showVorschauModal = function(templateUrl) {
+    $ionicModal.fromTemplateUrl(templateUrl, {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  }
+ 
+  // Close the modal
+  $scope.closeVorschauModal = function() {
+    $scope.modal.hide();
+    $scope.modal.remove()
+  };
+  /*
+  * Vorschau-Modal ENDE
+  */
+
+  //Getter für Selectbox
+  $scope.getBackgroundOpt = function(option){
+    $scope.backgroundpic=option.backvalue;
+    return option.backvalue;
+  };
+
+  //Flatrate resetten DEBUGGING
   $scope.resetflat = function() {
     inappbilling.consumePurchase(function(result) {}, function(result) {}, 'rosenflatrate');
     $rootScope.flatrate=0;
@@ -74,6 +125,9 @@ $scope.show = function() {
   };
 
 
+  /*
+  * Zitat in Text-Box laden
+  */
   $scope.loadzitat = function() {
 
     $http({
@@ -149,9 +203,9 @@ $scope.show = function() {
     if($rootScope.flatrate==1) {
 
       $scope.showflatrate = false;
-      $scope.rosen1preistag="kostenlos -  Flaterate";
+      $scope.rosen1preistag="kostenlos -  Flatrate";
-      $scope.rosen3preistag="kostenlos -  Flaterate";
+      $scope.rosen3preistag="kostenlos -  Flatrate";
-      $scope.rosen9preistag="kostenlos -  Flaterate";
+      $scope.rosen9preistag="kostenlos -  Flatrate";
           
     }
 
@@ -177,7 +231,7 @@ $scope.show = function() {
   }
 
 
-  $timeout(getProducts, 1000);
+  $timeout(getProducts, 2000);
   /*
   * Produkt-Details abrufen ENDE
   */
@@ -226,7 +280,7 @@ $scope.show = function() {
     }
 
   function errorBuyHandler (error) {
-
+      /*
       var strResult = "";
       var returnBool=false;
 
@@ -235,7 +289,7 @@ $scope.show = function() {
       } else {
         strResult = error;
       }
-
+      */
       /*
       * Prüfen ob Kauf schonmal durchgeführt wurde, aber noch nicht konsumiert
       */
@@ -276,9 +330,9 @@ $scope.show = function() {
     $rootScope.flatrate=1;
     $scope.showflatrate = false;
 
-    $scope.rosen1preistag="kostenlos -  Flaterate";
+    $scope.rosen1preistag="kostenlos -  Flatrate";
-    $scope.rosen3preistag="kostenlos -  Flaterate";
+    $scope.rosen3preistag="kostenlos -  Flatrate";
-    $scope.rosen9preistag="kostenlos -  Flaterate";
+    $scope.rosen9preistag="kostenlos -  Flatrate";
 
     $timeout(getProducts, 300);
 
@@ -297,7 +351,7 @@ $scope.show = function() {
       $scope.show($ionicLoading);
       var link = 'http://api.raataar.de/rosen/kauf.php';
 
-      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
+      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
           $scope.filetodownload = res.data;
           
           // File for download
@@ -372,7 +426,7 @@ $scope.show = function() {
       inappbilling.consumePurchase(successConsumeHandler, errorConsumeHandler, $scope.preis);
   }
   /*
-  * Rosen konsuieren ENDE
+  * Rosen konsumieren ENDE
   */
 
 })

platforms/android/assets/www/templates/image-vorschau-popover.html

@@ -0,0 +1,3 @@
+<div class="modal image-modal transparent" ng-click="closeVorschauModal()">
+            <img ng-src="{{imagesrc}}" class="fullscreen-image"/>
+</div>

platforms/android/assets/www/templates/tab-dash.html

@@ -46,6 +46,16 @@
           </ion-list>
          </div>
 		
+    <div style="padding-bottom:15px;">
+      <button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
+        {{ 'Hintergrund: ' +  backgroundpic || 'Hintergrund'}}
+          <div class="option">
+            <h2>{{option.name}}</h2>
+            <p>{{option.beschreibung}}</p>
+        </div>
+      </button>
+    </div>
+
 		<div class="list card">
         <div class="item item-divider oleo">Rosen jetzt kaufen?</div>
   

platforms/android/build/intermediates/assets/debug/www/index.html

@@ -17,6 +17,7 @@
 
     <!-- ionic/angularjs js -->
     <script src="lib/ionic/js/ionic.bundle.js"></script>
+    <script src="js/ionic-modal-select.min.js"></script>
     <script src="js/ng-cordova.min.js"></script>
     <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>

platforms/android/build/intermediates/assets/debug/www/js/app.js

@@ -7,7 +7,7 @@
 // 'starter.controllers' is found in controllers.js
 var db;
 
-angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter.services'])
+angular.module('starter', ['ionic', 'ngCordova', 'ionic-modal-select', 'starter.controllers', 'starter.services'])
 
 .run(function($ionicPlatform, $window, $ionicHistory, $database, $ionicPopup, $state, $localstorage, $rootScope) {
   $ionicPlatform.ready(function() {

platforms/android/build/intermediates/assets/debug/www/js/controllers.js

@@ -1,6 +1,6 @@
 angular.module('starter.controllers', [])
 
-.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter) {
+.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter,$ionicModal) {
 
   $scope.preis="";
   $scope.name="";
@@ -8,6 +8,22 @@ angular.module('starter.controllers', [])
   $scope.items=[];
   $scope.item=[];
 
+
+  $scope.backgroundpic = "1";
+  $scope.backgrounds =  [
+      { name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"}, 
+      { name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"}, 
+      { name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"}, 
+      { name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"}, 
+      { name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"}, 
+      { name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"}, 
+      { name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"}, 
+      { name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"}, 
+      { name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"}, 
+      { name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
+    ];
+
+
   $scope.producitems=[];
 
   $scope.rosen1titel="";
@@ -55,17 +71,52 @@ $scope.show = function() {
   $scope.validate = function() {
 
     var link = 'http://api.raataar.de/rosen/vorschau.php';
-
+    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
-    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
         $scope.response = res.data;
-        window.open($scope.response, '_system', 'location=yes'); 
+        //window.open($scope.response, '_system', 'location=yes'); 
+        //return false;
+        $scope.showVorschauImages($scope.response);
         return false;
     });
     
   };
 
 
+  /*
+  * Vorschau-Modal
+  */
+  $scope.showVorschauImages = function(imagesrc) {
+    //Bild im dialog anzeigen
+    $scope.imagesrc=imagesrc;
+    $scope.showVorschauModal('templates/image-vorschau-popover.html');
+  }
  
+  $scope.showVorschauModal = function(templateUrl) {
+    $ionicModal.fromTemplateUrl(templateUrl, {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  }
+ 
+  // Close the modal
+  $scope.closeVorschauModal = function() {
+    $scope.modal.hide();
+    $scope.modal.remove()
+  };
+  /*
+  * Vorschau-Modal ENDE
+  */
+
+  //Getter für Selectbox
+  $scope.getBackgroundOpt = function(option){
+    $scope.backgroundpic=option.backvalue;
+    return option.backvalue;
+  };
+
+  //Flatrate resetten DEBUGGING
   $scope.resetflat = function() {
     inappbilling.consumePurchase(function(result) {}, function(result) {}, 'rosenflatrate');
     $rootScope.flatrate=0;
@@ -74,6 +125,9 @@ $scope.show = function() {
   };
 
 
+  /*
+  * Zitat in Text-Box laden
+  */
   $scope.loadzitat = function() {
 
     $http({
@@ -149,9 +203,9 @@ $scope.show = function() {
     if($rootScope.flatrate==1) {
 
       $scope.showflatrate = false;
-      $scope.rosen1preistag="kostenlos -  Flaterate";
+      $scope.rosen1preistag="kostenlos -  Flatrate";
-      $scope.rosen3preistag="kostenlos -  Flaterate";
+      $scope.rosen3preistag="kostenlos -  Flatrate";
-      $scope.rosen9preistag="kostenlos -  Flaterate";
+      $scope.rosen9preistag="kostenlos -  Flatrate";
           
     }
 
@@ -177,7 +231,7 @@ $scope.show = function() {
   }
 
 
-  $timeout(getProducts, 1000);
+  $timeout(getProducts, 2000);
   /*
   * Produkt-Details abrufen ENDE
   */
@@ -226,7 +280,7 @@ $scope.show = function() {
     }
 
   function errorBuyHandler (error) {
-
+      /*
       var strResult = "";
       var returnBool=false;
 
@@ -235,7 +289,7 @@ $scope.show = function() {
       } else {
         strResult = error;
       }
-
+      */
       /*
       * Prüfen ob Kauf schonmal durchgeführt wurde, aber noch nicht konsumiert
       */
@@ -276,9 +330,9 @@ $scope.show = function() {
     $rootScope.flatrate=1;
     $scope.showflatrate = false;
 
-    $scope.rosen1preistag="kostenlos -  Flaterate";
+    $scope.rosen1preistag="kostenlos -  Flatrate";
-    $scope.rosen3preistag="kostenlos -  Flaterate";
+    $scope.rosen3preistag="kostenlos -  Flatrate";
-    $scope.rosen9preistag="kostenlos -  Flaterate";
+    $scope.rosen9preistag="kostenlos -  Flatrate";
 
     $timeout(getProducts, 300);
 
@@ -297,7 +351,7 @@ $scope.show = function() {
       $scope.show($ionicLoading);
       var link = 'http://api.raataar.de/rosen/kauf.php';
 
-      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
+      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
           $scope.filetodownload = res.data;
           
           // File for download
@@ -372,7 +426,7 @@ $scope.show = function() {
       inappbilling.consumePurchase(successConsumeHandler, errorConsumeHandler, $scope.preis);
   }
   /*
-  * Rosen konsuieren ENDE
+  * Rosen konsumieren ENDE
   */
 
 })

platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html

@@ -46,6 +46,16 @@
           </ion-list>
          </div>
 		
+    <div style="padding-bottom:15px;">
+      <button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
+        {{ 'Hintergrund: ' +  backgroundpic || 'Hintergrund'}}
+          <div class="option">
+            <h2>{{option.name}}</h2>
+            <p>{{option.beschreibung}}</p>
+        </div>
+      </button>
+    </div>
+
 		<div class="list card">
         <div class="item item-divider oleo">Rosen jetzt kaufen?</div>
   

platforms/android/build/intermediates/assets/release/www/index.html

@@ -17,6 +17,7 @@
 
     <!-- ionic/angularjs js -->
     <script src="lib/ionic/js/ionic.bundle.js"></script>
+    <script src="js/ionic-modal-select.min.js"></script>
     <script src="js/ng-cordova.min.js"></script>
     <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>

platforms/android/build/intermediates/assets/release/www/js/app.js

@@ -7,7 +7,7 @@
 // 'starter.controllers' is found in controllers.js
 var db;
 
-angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter.services'])
+angular.module('starter', ['ionic', 'ngCordova', 'ionic-modal-select', 'starter.controllers', 'starter.services'])
 
 .run(function($ionicPlatform, $window, $ionicHistory, $database, $ionicPopup, $state, $localstorage, $rootScope) {
   $ionicPlatform.ready(function() {

platforms/android/build/intermediates/assets/release/www/js/controllers.js

@@ -1,6 +1,6 @@
 angular.module('starter.controllers', [])
 
-.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter) {
+.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter,$ionicModal) {
 
   $scope.preis="";
   $scope.name="";
@@ -8,6 +8,22 @@ angular.module('starter.controllers', [])
   $scope.items=[];
   $scope.item=[];
 
+
+  $scope.backgroundpic = "1";
+  $scope.backgrounds =  [
+      { name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"}, 
+      { name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"}, 
+      { name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"}, 
+      { name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"}, 
+      { name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"}, 
+      { name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"}, 
+      { name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"}, 
+      { name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"}, 
+      { name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"}, 
+      { name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
+    ];
+
+
   $scope.producitems=[];
 
   $scope.rosen1titel="";
@@ -55,17 +71,52 @@ $scope.show = function() {
   $scope.validate = function() {
 
     var link = 'http://api.raataar.de/rosen/vorschau.php';
-
+    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
-    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
         $scope.response = res.data;
-        window.open($scope.response, '_system', 'location=yes'); 
+        //window.open($scope.response, '_system', 'location=yes'); 
+        //return false;
+        $scope.showVorschauImages($scope.response);
         return false;
     });
     
   };
 
 
+  /*
+  * Vorschau-Modal
+  */
+  $scope.showVorschauImages = function(imagesrc) {
+    //Bild im dialog anzeigen
+    $scope.imagesrc=imagesrc;
+    $scope.showVorschauModal('templates/image-vorschau-popover.html');
+  }
  
+  $scope.showVorschauModal = function(templateUrl) {
+    $ionicModal.fromTemplateUrl(templateUrl, {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  }
+ 
+  // Close the modal
+  $scope.closeVorschauModal = function() {
+    $scope.modal.hide();
+    $scope.modal.remove()
+  };
+  /*
+  * Vorschau-Modal ENDE
+  */
+
+  //Getter für Selectbox
+  $scope.getBackgroundOpt = function(option){
+    $scope.backgroundpic=option.backvalue;
+    return option.backvalue;
+  };
+
+  //Flatrate resetten DEBUGGING
   $scope.resetflat = function() {
     inappbilling.consumePurchase(function(result) {}, function(result) {}, 'rosenflatrate');
     $rootScope.flatrate=0;
@@ -74,6 +125,9 @@ $scope.show = function() {
   };
 
 
+  /*
+  * Zitat in Text-Box laden
+  */
   $scope.loadzitat = function() {
 
     $http({
@@ -149,9 +203,9 @@ $scope.show = function() {
     if($rootScope.flatrate==1) {
 
       $scope.showflatrate = false;
-      $scope.rosen1preistag="kostenlos -  Flaterate";
+      $scope.rosen1preistag="kostenlos -  Flatrate";
-      $scope.rosen3preistag="kostenlos -  Flaterate";
+      $scope.rosen3preistag="kostenlos -  Flatrate";
-      $scope.rosen9preistag="kostenlos -  Flaterate";
+      $scope.rosen9preistag="kostenlos -  Flatrate";
           
     }
 
@@ -177,7 +231,7 @@ $scope.show = function() {
   }
 
 
-  $timeout(getProducts, 1000);
+  $timeout(getProducts, 2000);
   /*
   * Produkt-Details abrufen ENDE
   */
@@ -226,7 +280,7 @@ $scope.show = function() {
     }
 
   function errorBuyHandler (error) {
-
+      /*
       var strResult = "";
       var returnBool=false;
 
@@ -235,7 +289,7 @@ $scope.show = function() {
       } else {
         strResult = error;
       }
-
+      */
       /*
       * Prüfen ob Kauf schonmal durchgeführt wurde, aber noch nicht konsumiert
       */
@@ -276,9 +330,9 @@ $scope.show = function() {
     $rootScope.flatrate=1;
     $scope.showflatrate = false;
 
-    $scope.rosen1preistag="kostenlos -  Flaterate";
+    $scope.rosen1preistag="kostenlos -  Flatrate";
-    $scope.rosen3preistag="kostenlos -  Flaterate";
+    $scope.rosen3preistag="kostenlos -  Flatrate";
-    $scope.rosen9preistag="kostenlos -  Flaterate";
+    $scope.rosen9preistag="kostenlos -  Flatrate";
 
     $timeout(getProducts, 300);
 
@@ -297,7 +351,7 @@ $scope.show = function() {
       $scope.show($ionicLoading);
       var link = 'http://api.raataar.de/rosen/kauf.php';
 
-      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
+      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
           $scope.filetodownload = res.data;
           
           // File for download
@@ -372,7 +426,7 @@ $scope.show = function() {
       inappbilling.consumePurchase(successConsumeHandler, errorConsumeHandler, $scope.preis);
   }
   /*
-  * Rosen konsuieren ENDE
+  * Rosen konsumieren ENDE
   */
 
 })

platforms/android/build/intermediates/assets/release/www/templates/tab-dash.html

@@ -46,6 +46,16 @@
           </ion-list>
          </div>
 		
+    <div style="padding-bottom:15px;">
+      <button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
+        {{ 'Hintergrund: ' +  backgroundpic || 'Hintergrund'}}
+          <div class="option">
+            <h2>{{option.name}}</h2>
+            <p>{{option.beschreibung}}</p>
+        </div>
+      </button>
+    </div>
+
 		<div class="list card">
         <div class="item item-divider oleo">Rosen jetzt kaufen?</div>
   

platforms/android/build/outputs/lint-results-release-fatal.html

@@ -18,7 +18,7 @@ document.getElementById(id+'Link').style.display = 'none';
 <body>
 <h1>Lint Report</h1>
 <div class="titleSeparator"></div>
-Check performed at Wed Feb 03 14:31:51 CET 2016.<br/>
+Check performed at Thu Feb 04 11:24:33 CET 2016.<br/>
 6 errors and 0 warnings found:<br/><br/>
 <table class="overview">
 <tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a>

www/index.html

@@ -17,6 +17,7 @@
 
     <!-- ionic/angularjs js -->
     <script src="lib/ionic/js/ionic.bundle.js"></script>
+    <script src="js/ionic-modal-select.min.js"></script>
     <script src="js/ng-cordova.min.js"></script>
     <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>

www/js/app.js

@@ -7,7 +7,7 @@
 // 'starter.controllers' is found in controllers.js
 var db;
 
-angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter.services'])
+angular.module('starter', ['ionic', 'ngCordova', 'ionic-modal-select', 'starter.controllers', 'starter.services'])
 
 .run(function($ionicPlatform, $window, $ionicHistory, $database, $ionicPopup, $state, $localstorage, $rootScope) {
   $ionicPlatform.ready(function() {

www/js/controllers.js

@@ -1,6 +1,6 @@
 angular.module('starter.controllers', [])
 
-.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter) {
+.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$filter,$ionicModal) {
 
   $scope.preis="";
   $scope.name="";
@@ -8,6 +8,22 @@ angular.module('starter.controllers', [])
   $scope.items=[];
   $scope.item=[];
 
+
+  $scope.backgroundpic = "1";
+  $scope.backgrounds =  [
+      { name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"}, 
+      { name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"}, 
+      { name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"}, 
+      { name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"}, 
+      { name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"}, 
+      { name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"}, 
+      { name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"}, 
+      { name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"}, 
+      { name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"}, 
+      { name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
+    ];
+
+
   $scope.producitems=[];
 
   $scope.rosen1titel="";
@@ -55,17 +71,52 @@ $scope.show = function() {
   $scope.validate = function() {
 
     var link = 'http://api.raataar.de/rosen/vorschau.php';
-
+    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
-    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
         $scope.response = res.data;
-        window.open($scope.response, '_system', 'location=yes'); 
+        //window.open($scope.response, '_system', 'location=yes'); 
+        //return false;
+        $scope.showVorschauImages($scope.response);
         return false;
     });
     
   };
 
 
+  /*
+  * Vorschau-Modal
+  */
+  $scope.showVorschauImages = function(imagesrc) {
+    //Bild im dialog anzeigen
+    $scope.imagesrc=imagesrc;
+    $scope.showVorschauModal('templates/image-vorschau-popover.html');
+  }
  
+  $scope.showVorschauModal = function(templateUrl) {
+    $ionicModal.fromTemplateUrl(templateUrl, {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  }
+ 
+  // Close the modal
+  $scope.closeVorschauModal = function() {
+    $scope.modal.hide();
+    $scope.modal.remove()
+  };
+  /*
+  * Vorschau-Modal ENDE
+  */
+
+  //Getter für Selectbox
+  $scope.getBackgroundOpt = function(option){
+    $scope.backgroundpic=option.backvalue;
+    return option.backvalue;
+  };
+
+  //Flatrate resetten DEBUGGING
   $scope.resetflat = function() {
     inappbilling.consumePurchase(function(result) {}, function(result) {}, 'rosenflatrate');
     $rootScope.flatrate=0;
@@ -74,6 +125,9 @@ $scope.show = function() {
   };
 
 
+  /*
+  * Zitat in Text-Box laden
+  */
   $scope.loadzitat = function() {
 
     $http({
@@ -149,9 +203,9 @@ $scope.show = function() {
     if($rootScope.flatrate==1) {
 
       $scope.showflatrate = false;
-      $scope.rosen1preistag="kostenlos -  Flaterate";
+      $scope.rosen1preistag="kostenlos -  Flatrate";
-      $scope.rosen3preistag="kostenlos -  Flaterate";
+      $scope.rosen3preistag="kostenlos -  Flatrate";
-      $scope.rosen9preistag="kostenlos -  Flaterate";
+      $scope.rosen9preistag="kostenlos -  Flatrate";
           
     }
 
@@ -177,7 +231,7 @@ $scope.show = function() {
   }
 
 
-  $timeout(getProducts, 1000);
+  $timeout(getProducts, 2000);
   /*
   * Produkt-Details abrufen ENDE
   */
@@ -226,7 +280,7 @@ $scope.show = function() {
     }
 
   function errorBuyHandler (error) {
-
+      /*
       var strResult = "";
       var returnBool=false;
 
@@ -235,7 +289,7 @@ $scope.show = function() {
       } else {
         strResult = error;
       }
-
+      */
       /*
       * Prüfen ob Kauf schonmal durchgeführt wurde, aber noch nicht konsumiert
       */
@@ -276,9 +330,9 @@ $scope.show = function() {
     $rootScope.flatrate=1;
     $scope.showflatrate = false;
 
-    $scope.rosen1preistag="kostenlos -  Flaterate";
+    $scope.rosen1preistag="kostenlos -  Flatrate";
-    $scope.rosen3preistag="kostenlos -  Flaterate";
+    $scope.rosen3preistag="kostenlos -  Flatrate";
-    $scope.rosen9preistag="kostenlos -  Flaterate";
+    $scope.rosen9preistag="kostenlos -  Flatrate";
 
     $timeout(getProducts, 300);
 
@@ -297,7 +351,7 @@ $scope.show = function() {
       $scope.show($ionicLoading);
       var link = 'http://api.raataar.de/rosen/kauf.php';
 
-      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
+      $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
           $scope.filetodownload = res.data;
           
           // File for download
@@ -372,7 +426,7 @@ $scope.show = function() {
       inappbilling.consumePurchase(successConsumeHandler, errorConsumeHandler, $scope.preis);
   }
   /*
-  * Rosen konsuieren ENDE
+  * Rosen konsumieren ENDE
   */
 
 })

www/templates/image-vorschau-popover.html

@@ -0,0 +1,3 @@
+<div class="modal image-modal transparent" ng-click="closeVorschauModal()">
+            <img ng-src="{{imagesrc}}" class="fullscreen-image"/>
+</div>

www/templates/tab-dash.html

@@ -46,6 +46,16 @@
           </ion-list>
          </div>
 		
+    <div style="padding-bottom:15px;">
+      <button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
+        {{ 'Hintergrund: ' +  backgroundpic || 'Hintergrund'}}
+          <div class="option">
+            <h2>{{option.name}}</h2>
+            <p>{{option.beschreibung}}</p>
+        </div>
+      </button>
+    </div>
+
 		<div class="list card">
         <div class="item item-divider oleo">Rosen jetzt kaufen?</div>