diff --git a/www/css/custom_style.css b/www/css/custom_style.css index 3cee560..bebbffe 100644 --- a/www/css/custom_style.css +++ b/www/css/custom_style.css @@ -6,6 +6,10 @@ md-input-container { width: 50%; } +.Width95 { + width: 95%; +} + .itemfontsize{ font-size: 14px; } @@ -118,7 +122,7 @@ md-input-container { background-color: #705848; } /* Typ Stahl */ -.pokemontyp18{ +.pokemontyp17{ background-color: #B8B8D0; } /* Typ Flug */ diff --git a/www/js/app.js b/www/js/app.js index aaf53ad..7ea921e 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -341,7 +341,7 @@ angular.module('starter', ['ionic','ngIOS9UIWebViewPatch','starter.controllers', }) .state('app.pokemonlist', { url: "/pokemonlist", - cache: false, + cache: true, params:{ isAnimated:(ionic.Platform.isAndroid()==false) }, @@ -354,6 +354,7 @@ angular.module('starter', ['ionic','ngIOS9UIWebViewPatch','starter.controllers', }) .state('app.pokemondetail', { url: "/pokemondetail", + cache: false, params: { pokemondetail: null }, diff --git a/www/pokedex.db b/www/pokedex.db index d895d74..efcc986 100644 Binary files a/www/pokedex.db and b/www/pokedex.db differ diff --git a/www/templates/imagedownload/html/imagedownload.html b/www/templates/imagedownload/html/imagedownload.html index 9dda734..b9ce679 100644 --- a/www/templates/imagedownload/html/imagedownload.html +++ b/www/templates/imagedownload/html/imagedownload.html @@ -16,7 +16,7 @@ - +
{{ progressprozent }} %
Aktuelle Datei: {{ currentfile }}

diff --git a/www/templates/imagedownload/js/controllers.js b/www/templates/imagedownload/js/controllers.js index 47819d5..316fee6 100644 --- a/www/templates/imagedownload/js/controllers.js +++ b/www/templates/imagedownload/js/controllers.js @@ -15,7 +15,7 @@ // Controller of Contract List Page. appControllers.controller('imageDownloadCtrl', function ($scope, $stateParams, $mdBottomSheet, $timeout, $mdDialog, $cordovaFileTransfer, $cordovaFile, $state, pokedexDB) { - $scope.progressval = 0; + $scope.progressval = 0; $scope.currentfile = ''; $scope.progressprozent = 0; $scope.DownloadisVisible=true; diff --git a/www/templates/pokemonliste/html/pokemon-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html index 0954e20..ffef44f 100644 --- a/www/templates/pokemonliste/html/pokemon-detail.html +++ b/www/templates/pokemonliste/html/pokemon-detail.html @@ -48,20 +48,20 @@

Entw. ab:
-
{{pokemon.pokemonentwicklungtext}} {{pokemon.pokemonname}}-Bonbons
+
{{pokemon.pokemonentwicklungtext}} Bonbons
-
+
PokemonTyp {{ pokemon.pokemontypaString }}
-
+
PokemonTyp {{ pokemon.pokemontypbString }}
@@ -80,23 +80,21 @@
Entwicklung
-
-
+
-
- -
+
+
+

{{ pokemonentwicklung.pokemonpokedexid }} Bonbons

Pokedex-ID: {{ pokemonentwicklung.pokemonpokedexid }}

-
- +
+
-
@@ -154,6 +152,7 @@ Hinweis: Angriffe durch Starke Attacken (
) sollten vermieden werden.
+
diff --git a/www/templates/pokemonliste/html/pokemon-list.html b/www/templates/pokemonliste/html/pokemon-list.html index 4509f48..87e4e79 100644 --- a/www/templates/pokemonliste/html/pokemon-list.html +++ b/www/templates/pokemonliste/html/pokemon-list.html @@ -19,7 +19,7 @@
- +
@@ -29,9 +29,8 @@ - -
@@ -98,17 +97,29 @@
+
+

{{ pokemon.pokemonname }}

Pokedex-Id: {{ pokemon.pokedexidString }}
-
+
+
+
+
+
PokemonTyp {{ pokemon.pokemontypaString }}
-
+
+
+
PokemonTyp {{ pokemon.pokemontypbString }}
+
+ + +
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js index 42964dc..bf9df00 100644 --- a/www/templates/pokemonliste/js/controllers.js +++ b/www/templates/pokemonliste/js/controllers.js @@ -13,7 +13,7 @@ // http://ngcordova.com/docs/plugins/sqlite/ // // Controller of Pokemon List Page. -appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, pokedexDB) { +appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ionicScrollDelegate, $filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, pokedexDB) { // initialForm is the first activity in the controller. // It will initial all variable data and let the function works when page load. @@ -50,7 +50,7 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$fil jQuery('#pokemon-list-loading-progress').hide(); jQuery('#pokemon-list-content').fadeIn(); $scope.isLoading = false; - }, 3000);// End loading progress. + }, 1000);// End loading progress. };// End initialForm. @@ -67,6 +67,16 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$fil $scope.pokemons = pokedexDB.all(); };//End getPokemonList. + + //Scroll Trefferliste nach oben + //Wenn filtereingaben getÃĪtigt werden + $scope.scrollTop = function() { + if ($scope.filterText.length > 2){ + $ionicScrollDelegate.scrollTop(); + } + }; + + // navigateTo is for navigate to other page // by using targetPage to be the destination page // and sending objectData to the destination page. @@ -81,7 +91,10 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$fil },400); };// End navigateTo. - $scope.initialForm(); + $scope.$on('$ionicView.loaded', function(viewInfo, state){ + console.log('CTRL - $ionicView.loaded', viewInfo, state); + $scope.initialForm(); + }); });// End of Pokemon List Page Controller. @@ -99,29 +112,31 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas // Parameter : // $stateParams.pokemondetail(object) = pokemon that user select from pokemon list page. $scope.pokemon = $scope.getPokemonData($stateParams.pokemondetail); + console.debug($scope.pokemon); + var entwarr = $scope.pokemon.pokemonentwicklung.split("|"); var entwkostenarr=$scope.pokemon.pokemonentwicklungkosten.split("|"); - var index; - for (index = 0; index < entwarr.length; ++index) { + if (entwarr!=''){ + var index; + for (index = 0; index < entwarr.length; ++index) { - - var dataItemEntwicklung = { - pokemonpokedexid : entwarr[index] , - pokemonimage : $scope.getPokemonImage(entwarr[index]), - pokemonlistentyp : 1 - }; - $scope.pokemonentwicklungliste.push(dataItemEntwicklung); - - if (entwkostenarr[index]>0){ var dataItemEntwicklung = { - pokemonpokedexid : entwkostenarr[index] , - pokemonlistentyp : 2 + pokemonpokedexid : entwarr[index] , + pokemonimage : $scope.getPokemonImage(entwarr[index]), + pokemonlistentyp : 1 }; $scope.pokemonentwicklungliste.push(dataItemEntwicklung); - } - } + if (entwkostenarr[index]>0){ + var dataItemEntwicklung = { + pokemonpokedexid : entwkostenarr[index] , + pokemonlistentyp : 2 + }; + $scope.pokemonentwicklungliste.push(dataItemEntwicklung); + } + } + } //$scope.actionDelete is the variable for allow or not allow to delete data. // It will allow to delete data when have data in the database. $timeout(function () { diff --git a/www/templates/pokemonliste/js/services.js b/www/templates/pokemonliste/js/services.js index 4b6ad6c..03b04ff 100644 --- a/www/templates/pokemonliste/js/services.js +++ b/www/templates/pokemonliste/js/services.js @@ -50,7 +50,8 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokemonList = []; pokemontypen = []; pokemonfundorte = []; - + pokemonimages = []; + //Typen einlesen var query = "SELECT * FROM tblPokemonTyp order by ID ASC"; $cordovaSQLite.execute(db, query).then(function (res)