diff --git a/www/css/custom_style.css b/www/css/custom_style.css index e58d601..3cee560 100644 --- a/www/css/custom_style.css +++ b/www/css/custom_style.css @@ -2,6 +2,15 @@ md-input-container { padding-bottom: 10px; } +.half-image { + width: 50%; +} + +.itemfontsize{ + font-size: 14px; +} + + .image-list-thumb { padding: 2px 2px 2px 2px; height: 64px; @@ -11,7 +20,7 @@ md-input-container { text-align: center; } - +/* Attacken Bewertung */ .typnormal{ border-color: #0a9dc7; background-color: #11c1f3; @@ -19,6 +28,7 @@ md-input-container { text-align: center; } +/* Attacken Bewertung */ .typnmittel{ border-color: #e6b500; background-color: #ffc900; @@ -26,6 +36,7 @@ md-input-container { text-align: center; } +/* Attacken Bewertung */ .typschwach{ border-color: #28a54c; background-color: #33cd5f; @@ -33,6 +44,7 @@ md-input-container { text-align: center; } +/* Attacken Bewertung */ .typstark{ border-color: #e42112; background-color: #ef473a; @@ -117,11 +129,14 @@ md-input-container { .pokemontypsx { display: inline-block; padding: 0 10px; - height: 16px; + height: 18px; font-size: 8px; line-height: 16px; border-radius: 5px; color: white; + border-style: solid; + border-color: white; + border-width: 1px; } .pokemontypsx img { float: left; @@ -134,11 +149,14 @@ md-input-container { .pokemontypsm { display: inline-block; padding: 0 25px; - height: 16px; + height: 18px; font-size: 10px; line-height: 16px; border-radius: 5px; color: white; + border-style: solid; + border-color:white; + border-width: 1px; } .pokemontypsm img { @@ -152,11 +170,14 @@ md-input-container { .pokemontypnor { display: inline-block; padding: 0 25px; - height: 22px; + height: 24px; font-size: 16px; line-height: 22px; border-radius: 6px; color: white; + border-style: solid; + border-color:white; + border-width: 1px; } .pokemontypnor img { diff --git a/www/pokedex.db b/www/pokedex.db index 0889450..d895d74 100644 Binary files a/www/pokedex.db and b/www/pokedex.db differ diff --git a/www/templates/imagedownload/js/controllers.js b/www/templates/imagedownload/js/controllers.js index 01f7611..47819d5 100644 --- a/www/templates/imagedownload/js/controllers.js +++ b/www/templates/imagedownload/js/controllers.js @@ -87,13 +87,13 @@ appControllers.controller('imageDownloadCtrl', function ($scope, $stateParams, $ console.log('Error. ' + error.code + ' ' + error.constant); }, function (progress) { //downloadprogress=(progress.loaded / progress.total) * 100; - $scope.progressprozent = Math.round(pokedexid / 721 * 100); + $scope.progressprozent = Math.round(pokedexid / 152 * 100); $scope.progressval = pokedexid; $scope.currentfile=filename; //+ downloadprogress; }); console.log(pokedexid); - if (pokedexid<721){ + if (pokedexid<152){ downloadtimer(); } else{ diff --git a/www/templates/pokemonliste/html/pokemon-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html index 0f2b58d..0954e20 100644 --- a/www/templates/pokemonliste/html/pokemon-detail.html +++ b/www/templates/pokemonliste/html/pokemon-detail.html @@ -24,47 +24,82 @@
- -

- {{pokemon.pokemontext}} -

-
- - -
-
- Beschreibung -
-
- This is a basic Card with some text. -
-
- - -
-
- Typ -
-
-
+
-
+ +
+
+

Trainer Infos:

+
+
Fangchance:
+
{{pokemon.pokemonfangchance}}%
+
+
+
Fluchtchance:
+
{{pokemon.pokemonfluchtchance}}%
+
+
+
Ei-Distanz:
+
{{pokemon.pokemoneidistanz}} Km
+
+
+
Entw. ab:
+
+
+
{{pokemon.pokemonentwicklungtext}} {{pokemon.pokemonname}}-Bonbons
+
+
+
+ +
+
+
PokemonTyp {{ pokemon.pokemontypaString }}
-
-
+
+
PokemonTyp {{ pokemon.pokemontypbString }}
+
+ +

Beschreibung:

+

{{pokemon.pokemontext}}

+

Fundorte:

+

{{pokemon.pokemonfundort}}

+
+ +
+ +
+
+ Entwicklung
+
+ +
+ +
+ +
+

{{ pokemonentwicklung.pokemonpokedexid }} Bonbons

+ +

Pokedex-ID: {{ pokemonentwicklung.pokemonpokedexid }}

+
+ +
+ +
+
+
Schaden durch Attacken-Typ @@ -73,7 +108,7 @@
-
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext1 }}
@@ -81,7 +116,7 @@
-
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext2 }}
@@ -89,7 +124,7 @@
-
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext3 }}
@@ -131,7 +166,7 @@
Attacke
-
+
Typ
@@ -151,8 +186,8 @@
{{ pokemonattacke.pokemonattacke }}
-
-
+
+
PokemonTyp {{ pokemonattacke.pokemonattacketyptext }}
@@ -171,14 +206,6 @@
-
-
- Evolution -
-
- {{ pokemon.pokemonentwa }} -
-
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js index 8defb4b..42964dc 100644 --- a/www/templates/pokemonliste/js/controllers.js +++ b/www/templates/pokemonliste/js/controllers.js @@ -94,11 +94,34 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas $scope.pokemonschwaechenliste = []; $scope.pokemonattackenliste = []; + $scope.pokemonentwicklungliste = []; // $scope.pokemon is the variable that store pokemon detail data that receive form pokemon list page. // Parameter : // $stateParams.pokemondetail(object) = pokemon that user select from pokemon list page. $scope.pokemon = $scope.getPokemonData($stateParams.pokemondetail); + var entwarr = $scope.pokemon.pokemonentwicklung.split("|"); + var entwkostenarr=$scope.pokemon.pokemonentwicklungkosten.split("|"); + 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 + }; + $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 () { @@ -120,6 +143,12 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas $scope.pokemonschwaechenliste = pokedexDB.getTypenEffekte(pokedexid); };//End getPokemonList. + // getPokemonList is for get all pokemons. + // By calling pokedexDB.all() service. + $scope.getPokemonImage = function (pokedexid) { + return pokedexDB.getPokemonImage(pokedexid); + };//End getPokemonList. + // getPokemonList is for get all pokemons. // By calling pokedexDB.all() service. $scope.getStandardAttacken = function (pokedexid) { diff --git a/www/templates/pokemonliste/js/services.js b/www/templates/pokemonliste/js/services.js index 4311850..4b6ad6c 100644 --- a/www/templates/pokemonliste/js/services.js +++ b/www/templates/pokemonliste/js/services.js @@ -40,6 +40,8 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) var pokemontypen = []; var pokemoneffektlist = []; var pokemonstandardattackenliste= []; + var pokemonfundorte = []; + var pokemonimages = []; return { // Select all data from sqlite @@ -47,6 +49,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) { pokemonList = []; pokemontypen = []; + pokemonfundorte = []; //Typen einlesen var query = "SELECT * FROM tblPokemonTyp order by ID ASC"; @@ -61,17 +64,34 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) } } }); + + //Typen einlesen + var query = "SELECT * FROM tblPokemonFundorte order by ID ASC"; + $cordovaSQLite.execute(db, query).then(function (res) + { + if (res.rows.length > 0) + { + pokemonfundorte.push(''); + for (var i = 0; i < res.rows.length; i++) + { + pokemonfundorte.push(res.rows.item(i).FUNDORT); + } + } + }); + // Variable for prepare query statement to select all contracts. - var query = "SELECT * FROM tblPokemon"; + var query = "SELECT * FROM tblPokemon order by POKEDEXID ASC"; // Execute query statement from query variable. $cordovaSQLite.execute(db, query).then(function (res) { if (res.rows.length > 0) { + pokemonimages.push(''); for (var i = 0; i < res.rows.length; i++) { var dummypokedexid=''; + var dummyfundort=''; dummypokedexid=res.rows.item(i).POKEDEXID.toString(); @@ -83,6 +103,14 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) dummypokedexid='0' + dummypokedexid; } + if (res.rows.item(i).POKEMONTYPA > 0 ){ + dummyfundort=dummyfundort + pokemonfundorte[res.rows.item(i).POKEMONTYPA]; + } + + if (res.rows.item(i).POKEMONTYPB > 0 ){ + dummyfundort=dummyfundort + " " + pokemonfundorte[res.rows.item(i).POKEMONTYPB]; + } + var dataItem = { id : res.rows.item(i).ID , pokedexid : res.rows.item(i).POKEDEXID , @@ -94,6 +122,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokemontypbString : pokemontypen[res.rows.item(i).POKEMONTYPB] , pokemonfangchance : res.rows.item(i).POKEMONFANGCHANCE , pokemonfluchtchance : res.rows.item(i).POKEMONFLUCHTCHANCE , + pokemonfundort : dummyfundort , pokemoneidistanz : res.rows.item(i).POKEMONEIDISTANZ , pokemonentwicklungtext : res.rows.item(i).POKEMONENTWICKLUNGTEXT , pokemonentwicklung : res.rows.item(i).POKEMONENTWICKLUNG , @@ -102,6 +131,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokemonnote : res.rows.item(i).POKEMONNOTE , pokemonimage : res.rows.item(i).POKEMONIMAGE }; + pokemonimages.push(res.rows.item(i).POKEMONIMAGE); pokemonList.push(dataItem); } } @@ -208,8 +238,10 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) }); return pokemoneffektlist; }, - - + getPokemonImage: function (pokedexid) + { + return pokemonimages[pokedexid]; + }, getStandardAttacken: function (pokedexid) { diff --git a/www/test.html b/www/test.html index 61ff168..3d69b9e 100644 --- a/www/test.html +++ b/www/test.html @@ -46,7 +46,7 @@ - +
PokemonTyp