From 38583577f69c9fc79d5172fbedefe16d5fc47738 Mon Sep 17 00:00:00 2001
From: unknown <carsten_hilmer@hilmerarts.com>
Date: Fri, 29 Jan 2016 00:56:13 +0100
Subject: [PATCH] =?UTF-8?q?Debug-Infos=20entfernt,=20vollstaendige=20Kaufa?=
 =?UTF-8?q?bwicklung=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 www/css/style.css                |  35 ++++++++++-
 www/js/app.js                    |   1 +
 www/js/controllers.js            | 105 +++++++++++++++++++------------
 www/templates/image-popover.html |   3 +
 www/templates/tab-buys.html      |   2 +-
 www/templates/tab-dash.html      |   4 --
 6 files changed, 105 insertions(+), 45 deletions(-)
 create mode 100644 www/templates/image-popover.html

diff --git a/www/css/style.css b/www/css/style.css
index 7c66e53..a25d01b 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -81,4 +81,37 @@
 
 .tab-item{
 	background-color: #A50505 !important;
-		}
\ No newline at end of file
+		}
+
+.image-list-thumb {
+    padding: 2px 2px 2px 2px;
+    height: 100px;
+}
+ 
+.image-modal {
+    width: 100% !important;
+    height: 100%;
+    top: 0 !important;
+    left: 0 !important;
+}
+ 
+.transparent {
+    background: transparent !important;
+}
+ 
+.fullscreen-image {
+    max-width: 100%;
+    max-height: 100%;
+    bottom: 0;
+    left: 0;
+    margin: auto;
+    overflow: auto;
+    position: fixed;
+    right: 0;
+    top: 0;
+}
+ 
+.slider {
+    width: 100%;
+    height: 100%;
+}
\ No newline at end of file
diff --git a/www/js/app.js b/www/js/app.js
index 32ae3bc..8508d4b 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -121,6 +121,7 @@ angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter
     }
   })
 
+
   .state('tab.buys', {
       url: '/buys',
       views: {
diff --git a/www/js/controllers.js b/www/js/controllers.js
index d268c1c..9fd40e8 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -1,6 +1,6 @@
 angular.module('starter.controllers', [])
 
-.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile) {
+.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state) {
 
   $scope.preis="";
   $scope.name="";
@@ -9,6 +9,17 @@ angular.module('starter.controllers', [])
   $scope.item=[];
 
 
+$scope.show = function() {
+    $ionicLoading.show({
+      template: '<p>Kauf wird abgeschlossen.</p><ion-spinner></ion-spinner>'
+    });
+  };
+
+  $scope.hide = function(){
+        $ionicLoading.hide();
+  };
+
+
   $scope.validate = function() {
 
     var link = 'http://api.raataar.de/rosen/vorschau.php';
@@ -22,38 +33,12 @@ angular.module('starter.controllers', [])
   };
 
 
-
-  $scope.loaddata = function() {
-  $scope.items=[];
-  $database.getAllBuys().then(function (result) {
-      if(result.length>0){
-        alert("daten da");
-        for(i=0;i<result.length;i++){
-          $scope.items.push(result[i]);
-          alert(i);
-        }
-
-      } else {
-        $scope.items=[];
-      }
-  });
-
-
-
-  };
-
-  $scope.savedata = function() {
-    $scope.item={name: $scope.name, bild: "test"};
-    $scope.items.push($scope.item);
-    $database.setBuys($scope.name,"test");
-  };
-
   function successBuyHandler (result) {
       $timeout(consumesuccessHandler, 1000);
   }
 
   function successConsumeHandler (result) {
-
+      $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){
@@ -98,14 +83,15 @@ angular.module('starter.controllers', [])
               // error
               });
 
-
+              $scope.hide($ionicLoading);
+              $state.go('tab.buys');
 
           }, function (error) {
             console.log('Error');
           }, function (progress) {
             // PROGRESS HANDLING GOES HERE
           });
-
+          
           return false;
       });
     
@@ -158,8 +144,8 @@ angular.module('starter.controllers', [])
 
           if ($rootScope.storeinit==1){
             //Wegenbug ausgehebelt
-            //inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);  
-            successConsumeHandler();
+            inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);  
+            //successConsumeHandler();
           }
           else{
                var alertPopup = $ionicPopup.alert({
@@ -178,12 +164,21 @@ angular.module('starter.controllers', [])
 
 })
 
-.controller('BuysCtrl', function($scope, $database,$location) {
-  $scope.items=[];
-  //$scope.items=$localstorage.getObject('items');
+.controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading) {
 
   $scope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
-  if ($location.path() == "/tab/buys") {
+  
+    if ($location.path() == "/tab/buys") {
+      $scope.show($ionicLoading);
+      fill_list();
+      $scope.hide($ionicLoading);
+    }
+
+  });
+
+
+function fill_list(){
+      $scope.items=[];
       $database.getAllBuys().then(function (result) {
       if(result.length>0){
         for(i=0;i<result.length;i++){
@@ -192,10 +187,42 @@ angular.module('starter.controllers', [])
       } else {
         $scope.items=[];
       }
-  });
-  }
+      });
+}
+
+
+$scope.show = function() {
+    $ionicLoading.show({
+      template: '<p>Lade...</p><ion-spinner></ion-spinner>'
+    });
+  };
+
+  $scope.hide = function(){
+        $ionicLoading.hide();
+  };
+
+
+  $scope.showImages = function(imagesrc) {
+    $scope.imagesrc=imagesrc;
+    $scope.showModal('templates/image-popover.html');
+  }
+ 
+  $scope.showModal = function(templateUrl) {
+    $ionicModal.fromTemplateUrl(templateUrl, {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  }
+ 
+  // Close the modal
+  $scope.closeModal = function() {
+    $scope.modal.hide();
+    $scope.modal.remove()
+  };
 
-  });
 
 })
 
diff --git a/www/templates/image-popover.html b/www/templates/image-popover.html
new file mode 100644
index 0000000..1187278
--- /dev/null
+++ b/www/templates/image-popover.html
@@ -0,0 +1,3 @@
+<div class="modal image-modal transparent" ng-click="closeModal()">
+            <img ng-src="{{imagesrc}}" class="fullscreen-image"/>
+</div>
\ No newline at end of file
diff --git a/www/templates/tab-buys.html b/www/templates/tab-buys.html
index d4e3e18..1bd09a5 100644
--- a/www/templates/tab-buys.html
+++ b/www/templates/tab-buys.html
@@ -21,7 +21,7 @@
 
 		<div class="item tabs tabs-secondary tabs-icon-left">
 		<a href="#" class="tab-item"><i class="icon ion-trash-a button-custom"></i>Löschen</a>
-		<a href="#" class="tab-item"><i class="icon ion-android-image button-custom"></i>Anzeigen</a>
+		<a href="#" class="tab-item" ng-click="showImages(i.appimgpublicpath)"><i class="icon ion-android-image button-custom"></i>Anzeigen</a>
 		<a href="#" class="tab-item"><i class="icon ion-share button-custom"></i>Teilen</a>
 		</div>
 		
diff --git a/www/templates/tab-dash.html b/www/templates/tab-dash.html
index 0373c0a..7ebbf2d 100644
--- a/www/templates/tab-dash.html
+++ b/www/templates/tab-dash.html
@@ -33,10 +33,6 @@
           <div class="col col-50"><button class="button button-full button-small icon-left ion-social-euro button-custom" ng-disabled="!$parent.preis || !$parent.freitext || !$parent.name" ng-click="buyRose()">Jetzt Kaufen</button></div>
         </div>
 
-        <div class="row">
-          <div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-disabled="!$parent.preis || !$parent.name || !$parent.freitext" ng-click="loaddata()">Laden</button></div>
-          <div class="col col-50"><button class="button button-full button-small icon-left ion-social-euro button-custom" ng-disabled="!$parent.preis || !$parent.freitext || !$parent.name" ng-click="savedata()">Speichern</button></div>
-        </div>
        </div>
 
       </div>