From 311130675f9437156f685c2b8e4316e3ed944653 Mon Sep 17 00:00:00 2001 From: Carsten Hilmer Date: Thu, 8 Sep 2016 02:18:36 +0200 Subject: [PATCH] Datenbank Update, detailseite angepasst, Standard Attacken eingebaut --- www/css/custom_style.css | 374 ++++++++++++++++++ www/pokedex.db | Bin 69632 -> 81920 bytes .../pokemonliste/html/pokemon-detail.html | 91 ++++- www/templates/pokemonliste/js/controllers.js | 7 + www/templates/pokemonliste/js/services.js | 30 ++ 5 files changed, 487 insertions(+), 15 deletions(-) diff --git a/www/css/custom_style.css b/www/css/custom_style.css index a03dd67..fa4d87e 100644 --- a/www/css/custom_style.css +++ b/www/css/custom_style.css @@ -7,6 +7,38 @@ md-input-container { height: 64px; } +.mycenter { + text-align: center; +} + + +.typnormal{ + border-color: #0a9dc7; + background-color: #11c1f3; + color: #fff; + text-align: center; +} + +.typnmittel{ + border-color: #e6b500; + background-color: #ffc900; + color: #fff; + text-align: center; +} + +.typschwach{ + border-color: #28a54c; + background-color: #33cd5f; + color: #fff; + text-align: center; +} + +.typstark{ + border-color: #e42112; + background-color: #ef473a; + color: #fff; + text-align: center; +} .pokemontyp1 { display: inline-block; @@ -692,3 +724,345 @@ md-input-container { width: 16px; border-radius: 50%; } + +.pokemontyp1sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #D50000; + color: white; +} + +.pokemontyp1sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp2sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #C51162; + color: white; +} + +.pokemontyp2sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp3sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #AA00FF; + color: white; +} + +.pokemontyp3sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp4sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #6200EA; + color: white; +} + +.pokemontyp4sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp5sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #304FFE; + color: white; +} + +.pokemontyp5sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp6sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #2962FF; + color: white; +} + +.pokemontyp6sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp7sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #0091EA; + color: white; +} + +.pokemontyp7sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp8sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #00B8D4; + color: white; +} + +.pokemontyp8sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp9sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #00BFA5; + color: white; +} + +.pokemontyp9sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp10sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #1B5E20; + color: white; +} + +.pokemontyp10sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp11sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #33691E; + color: white; +} + +.pokemontyp11sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp12sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px;; + line-height: 16px; + border-radius: 5px; + background-color: #827717; + color: white; +} + +.pokemontyp12sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp13sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #F57F17; + color: white; +} + +.pokemontyp13sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp14sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #FF6F00; + color: white; +} + +.pokemontyp14sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp15sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #E65100; + color: white; +} + +.pokemontyp15sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp16sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #BF360C; + color: white; +} + +.pokemontyp16sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp17sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #3E2723; + color: white; +} + +.pokemontyp17sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} + +.pokemontyp18sx { + display: inline-block; + padding: 0 25px; + height: 16px; + font-size: 8px; + line-height: 16px; + border-radius: 5px; + background-color: #212121; + color: white; +} + +.pokemontyp18sx img { + float: left; + margin: 0 10px 0 -25px; + height: 16px; + width: 16px; + border-radius: 50%; +} \ No newline at end of file diff --git a/www/pokedex.db b/www/pokedex.db index 349d138b531dc65d797c87b0420aec13c278283a..0889450910a30f7b5f0d23b943932bcd62891113 100644 GIT binary patch literal 81920 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 PQD9`6eA7p6QNRHJYBxBt diff --git a/www/templates/pokemonliste/html/pokemon-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html index d8c6132..0f2b58d 100644 --- a/www/templates/pokemonliste/html/pokemon-detail.html +++ b/www/templates/pokemonliste/html/pokemon-detail.html @@ -67,47 +67,108 @@
- Schwächen + Schaden durch Attacken-Typ
-
-
+
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext1 }}
- {{ pokemonschwaeche.pokemontyp1 }} +

{{ pokemonschwaeche.pokemontyp1 }}

-
-
+
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext2 }}
- {{ pokemonschwaeche.pokemontyp2 }} +

{{ pokemonschwaeche.pokemontyp2 }}

-
-
+
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext3 }}
- {{ pokemonschwaeche.pokemontyp3 }} +

{{ pokemonschwaeche.pokemontyp3 }}

- +
+
+ Legende: +
+
+ Wenig
+
+
+ Normal
+
+
+ Mittel
+
+
+ Stark
+
+
+
+
+ Hinweis: Angriffe durch Starke Attacken (
) sollten vermieden werden. +
+
- Basiswerte -
-
- This is a basic Card with some text. + Standard Attacken
+
+ +
+ Attacke +
+
+ Typ +
+
+ Stärke +
+
+ Energie +
+
+ Dauer +
+ +
+ +
+ +
+ {{ pokemonattacke.pokemonattacke }} +
+
+
+ PokemonTyp + {{ pokemonattacke.pokemonattacketyptext }} +
+
+
+ {{ pokemonattacke.pokemonattackestaerke }} +
+
+ {{ pokemonattacke.pokemonattackeenergie }}% +
+
+ {{ pokemonattacke.pokemonattackedauer }} Sek. +
+ +
+
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js index 54f4069..8defb4b 100644 --- a/www/templates/pokemonliste/js/controllers.js +++ b/www/templates/pokemonliste/js/controllers.js @@ -93,6 +93,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas $scope.initialForm = function () { $scope.pokemonschwaechenliste = []; + $scope.pokemonattackenliste = []; // $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. @@ -102,6 +103,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas // It will allow to delete data when have data in the database. $timeout(function () { $scope.getTypenEffekt($scope.pokemon.pokedexid); + $scope.getStandardAttacken($scope.pokemon.pokedexid); }, 1000); }; //End initialForm. @@ -118,6 +120,11 @@ 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.getStandardAttacken = function (pokedexid) { + $scope.pokemonattackenliste = pokedexDB.getStandardAttacken(pokedexid); + };//End getPokemonList. // showListBottomSheet is for showing the bottom sheet. // Parameter : // $event(object) = position of control that user tap. diff --git a/www/templates/pokemonliste/js/services.js b/www/templates/pokemonliste/js/services.js index 094eff4..4311850 100644 --- a/www/templates/pokemonliste/js/services.js +++ b/www/templates/pokemonliste/js/services.js @@ -39,6 +39,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) var pokemonList = []; var pokemontypen = []; var pokemoneffektlist = []; + var pokemonstandardattackenliste= []; return { // Select all data from sqlite @@ -208,6 +209,35 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) return pokemoneffektlist; }, + + getStandardAttacken: function (pokedexid) + { + + pokemonstandardattackenliste = []; + + var query = "SELECT * FROM tblPokemonStandardAttacken WHERE POKEDEXID= ?"; + // Execute query statement from query variable. + $cordovaSQLite.execute(db, query,[pokedexid]).then(function (res) + { + if (res.rows.length > 0) + { + for (var i = 0; i < res.rows.length; i++) + { + var dataItem = { + pokemonattacke : res.rows.item(i).ATTACKE , + pokemonattacketyp : res.rows.item(i).TYP , + pokemonattacketyptext : pokemontypen[res.rows.item(i).TYP] , + pokemonattackestaerke : res.rows.item(i).STAERKE , + pokemonattackeenergie : res.rows.item(i).ENERGIE , + pokemonattackedauer : res.rows.item(i).DAUER + }; + pokemonstandardattackenliste.push(dataItem); + + } + } + }); + return pokemonstandardattackenliste; + }, // To add data to sqlite. // It will receive newContract from controller then insert it into sqlite. add: function (newContract)