diff --git a/stuff/TypenSVG/boden.svg b/stuff/TypenSVG/boden.svg new file mode 100644 index 0000000..1a6bfc0 --- /dev/null +++ b/stuff/TypenSVG/boden.svg @@ -0,0 +1,1712 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/drache.svg b/stuff/TypenSVG/drache.svg new file mode 100644 index 0000000..6af2425 --- /dev/null +++ b/stuff/TypenSVG/drache.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/stuff/TypenSVG/eis.svg b/stuff/TypenSVG/eis.svg new file mode 100644 index 0000000..4809970 --- /dev/null +++ b/stuff/TypenSVG/eis.svg @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/stuff/TypenSVG/elektro.svg b/stuff/TypenSVG/elektro.svg new file mode 100644 index 0000000..f33f123 --- /dev/null +++ b/stuff/TypenSVG/elektro.svg @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/fee.svg b/stuff/TypenSVG/fee.svg new file mode 100644 index 0000000..60b549a --- /dev/null +++ b/stuff/TypenSVG/fee.svg @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/stuff/TypenSVG/feuer.svg b/stuff/TypenSVG/feuer.svg new file mode 100644 index 0000000..2a97ffd --- /dev/null +++ b/stuff/TypenSVG/feuer.svg @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/flug.svg b/stuff/TypenSVG/flug.svg new file mode 100644 index 0000000..03ec6af --- /dev/null +++ b/stuff/TypenSVG/flug.svg @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/geist.svg b/stuff/TypenSVG/geist.svg new file mode 100644 index 0000000..83063d0 --- /dev/null +++ b/stuff/TypenSVG/geist.svg @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/gestein.svg b/stuff/TypenSVG/gestein.svg new file mode 100644 index 0000000..4870b93 --- /dev/null +++ b/stuff/TypenSVG/gestein.svg @@ -0,0 +1,421 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/gift.svg b/stuff/TypenSVG/gift.svg new file mode 100644 index 0000000..c76d6de --- /dev/null +++ b/stuff/TypenSVG/gift.svg @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/kaefer.svg b/stuff/TypenSVG/kaefer.svg new file mode 100644 index 0000000..217d8cf --- /dev/null +++ b/stuff/TypenSVG/kaefer.svg @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/kampf.svg b/stuff/TypenSVG/kampf.svg new file mode 100644 index 0000000..422d8a9 --- /dev/null +++ b/stuff/TypenSVG/kampf.svg @@ -0,0 +1,1327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/normal.svg b/stuff/TypenSVG/normal.svg new file mode 100644 index 0000000..3c6d9ed --- /dev/null +++ b/stuff/TypenSVG/normal.svg @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/stuff/TypenSVG/pflanze.svg b/stuff/TypenSVG/pflanze.svg new file mode 100644 index 0000000..1fdb267 --- /dev/null +++ b/stuff/TypenSVG/pflanze.svg @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/psycho.svg b/stuff/TypenSVG/psycho.svg new file mode 100644 index 0000000..b2c4466 --- /dev/null +++ b/stuff/TypenSVG/psycho.svg @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/stuff/TypenSVG/stahl.svg b/stuff/TypenSVG/stahl.svg new file mode 100644 index 0000000..f8439e1 --- /dev/null +++ b/stuff/TypenSVG/stahl.svg @@ -0,0 +1,473 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/unlicht.svg b/stuff/TypenSVG/unlicht.svg new file mode 100644 index 0000000..39581d0 --- /dev/null +++ b/stuff/TypenSVG/unlicht.svg @@ -0,0 +1,747 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stuff/TypenSVG/wasser.svg b/stuff/TypenSVG/wasser.svg new file mode 100644 index 0000000..244f5e4 --- /dev/null +++ b/stuff/TypenSVG/wasser.svg @@ -0,0 +1,357 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/www/css/custom_style.css b/www/css/custom_style.css index bbe9565..0c685f7 100644 --- a/www/css/custom_style.css +++ b/www/css/custom_style.css @@ -3,17 +3,342 @@ height: 100px; } -.chip { + +.pokemontyp1 { display: inline-block; padding: 0 25px; height: 50px; font-size: 16px; line-height: 50px; border-radius: 25px; - background-color: #f1f1f1; + background-color: #D50000; + color: white; } -.chip img { +.pokemontyp1 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp2 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #C51162; + color: white; +} + +.pokemontyp2 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp3 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #AA00FF; + color: white; +} + +.pokemontyp3 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp4 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #6200EA; + color: white; +} + +.pokemontyp4 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp5 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #304FFE; + color: white; +} + +.pokemontyp5 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp6 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #2962FF; + color: white; +} + +.pokemontyp6 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp7 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #0091EA; + color: white; +} + +.pokemontyp7 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp8 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #00B8D4; + color: white; +} + +.pokemontyp8 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp9 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #00BFA5; + color: white; +} + +.pokemontyp9 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp10 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #1B5E20; + color: white; +} + +.pokemontyp10 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp11 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #33691E; + color: white; +} + +.pokemontyp11 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp12 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #827717; + color: white; +} + +.pokemontyp12 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp13 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #F57F17; + color: white; +} + +.pokemontyp13 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp14 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #FF6F00; + color: white; +} + +.pokemontyp14 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp15 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #E65100; + color: white; +} + +.pokemontyp15 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp16 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #BF360C; + color: white; +} + +.pokemontyp16 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp17 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #3E2723; + color: white; +} + +.pokemontyp17 img { + float: left; + margin: 0 10px 0 -25px; + height: 50px; + width: 50px; + border-radius: 50%; +} + +.pokemontyp18 { + display: inline-block; + padding: 0 25px; + height: 50px; + font-size: 16px; + line-height: 50px; + border-radius: 25px; + background-color: #212121; + color: white; +} + +.pokemontyp18 img { float: left; margin: 0 10px 0 -25px; height: 50px; diff --git a/www/img/typbilder/1.png b/www/img/typbilder/1.png new file mode 100644 index 0000000..d980234 Binary files /dev/null and b/www/img/typbilder/1.png differ diff --git a/www/img/typbilder/10.png b/www/img/typbilder/10.png new file mode 100644 index 0000000..a093c3f Binary files /dev/null and b/www/img/typbilder/10.png differ diff --git a/www/img/typbilder/11.png b/www/img/typbilder/11.png new file mode 100644 index 0000000..2203613 Binary files /dev/null and b/www/img/typbilder/11.png differ diff --git a/www/img/typbilder/12.png b/www/img/typbilder/12.png new file mode 100644 index 0000000..5b264c7 Binary files /dev/null and b/www/img/typbilder/12.png differ diff --git a/www/img/typbilder/13.png b/www/img/typbilder/13.png new file mode 100644 index 0000000..b11fcb9 Binary files /dev/null and b/www/img/typbilder/13.png differ diff --git a/www/img/typbilder/14.png b/www/img/typbilder/14.png new file mode 100644 index 0000000..7097a38 Binary files /dev/null and b/www/img/typbilder/14.png differ diff --git a/www/img/typbilder/15.png b/www/img/typbilder/15.png new file mode 100644 index 0000000..f6f751f Binary files /dev/null and b/www/img/typbilder/15.png differ diff --git a/www/img/typbilder/16.png b/www/img/typbilder/16.png new file mode 100644 index 0000000..a934acc Binary files /dev/null and b/www/img/typbilder/16.png differ diff --git a/www/img/typbilder/17.png b/www/img/typbilder/17.png new file mode 100644 index 0000000..53a60a9 Binary files /dev/null and b/www/img/typbilder/17.png differ diff --git a/www/img/typbilder/18.png b/www/img/typbilder/18.png new file mode 100644 index 0000000..49a5c1d Binary files /dev/null and b/www/img/typbilder/18.png differ diff --git a/www/img/typbilder/2.png b/www/img/typbilder/2.png new file mode 100644 index 0000000..21ed4c8 Binary files /dev/null and b/www/img/typbilder/2.png differ diff --git a/www/img/typbilder/3.png b/www/img/typbilder/3.png new file mode 100644 index 0000000..169f99a Binary files /dev/null and b/www/img/typbilder/3.png differ diff --git a/www/img/typbilder/4.png b/www/img/typbilder/4.png new file mode 100644 index 0000000..00e4896 Binary files /dev/null and b/www/img/typbilder/4.png differ diff --git a/www/img/typbilder/5.png b/www/img/typbilder/5.png new file mode 100644 index 0000000..6bd1989 Binary files /dev/null and b/www/img/typbilder/5.png differ diff --git a/www/img/typbilder/6.png b/www/img/typbilder/6.png new file mode 100644 index 0000000..477eda4 Binary files /dev/null and b/www/img/typbilder/6.png differ diff --git a/www/img/typbilder/7.png b/www/img/typbilder/7.png new file mode 100644 index 0000000..b75ac39 Binary files /dev/null and b/www/img/typbilder/7.png differ diff --git a/www/img/typbilder/8.png b/www/img/typbilder/8.png new file mode 100644 index 0000000..7093c69 Binary files /dev/null and b/www/img/typbilder/8.png differ diff --git a/www/img/typbilder/9.png b/www/img/typbilder/9.png new file mode 100644 index 0000000..31dbe95 Binary files /dev/null and b/www/img/typbilder/9.png differ diff --git a/www/pokedex.db b/www/pokedex.db index d69b93f..54541a7 100644 Binary files a/www/pokedex.db and b/www/pokedex.db differ diff --git a/www/templates/application-storage/sqLite/html/contract-list.html b/www/templates/application-storage/sqLite/html/contract-list.html index fff55d7..82dca62 100644 --- a/www/templates/application-storage/sqLite/html/contract-list.html +++ b/www/templates/application-storage/sqLite/html/contract-list.html @@ -18,8 +18,12 @@

Pokedex Helper

-

Dein Trainertool deluxe

+ + + + +
- - - - - -
@@ -46,13 +44,14 @@
-

{{ pokemon.pokemonname }}

-
- PokemonTyp +

{{ pokemon.pokemonname }}

+

Nr.: {{ pokemon.pokedexidString }}

+
+ PokemonTyp {{ pokemon.pokemontypaString }}
-
- PokemonTyp +
+ PokemonTyp {{ pokemon.pokemontypbString }}
@@ -64,14 +63,55 @@ - Edit + Details anzeigen - - Call {{pokemon.telephone}} + + {{pokemon.pokemonname}} zu Lesezeichen hinzufügen + + + {{pokemon.pokemonname}} zu Favoriten hinzufügen + + + + + {{pokemon.pokemonname}} zum Vergleich öffnen + + + + + + Zeige alle vom gleichen Typ + + + + + + Zeige alle vom gleichen Typ {{ pokemon.pokemontypaString }} + + + + + + Zeige alle vom gleichen Typ {{ pokemon.pokemontypbString }} + + + + + + Zeige alle stärke Pokemon + + + + + + Zeige alle schwächeren Pokemon + + +
diff --git a/www/templates/application-storage/sqLite/js/services.js b/www/templates/application-storage/sqLite/js/services.js index 1e66e8e..565fb90 100644 --- a/www/templates/application-storage/sqLite/js/services.js +++ b/www/templates/application-storage/sqLite/js/services.js @@ -68,9 +68,22 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) { for (var i = 0; i < res.rows.length; i++) { + var dummypokedexid=''; + + dummypokedexid=res.rows.item(i).POKEDEXID; + + if (dummypokedexid.length==1){ + dummypokedexid='00' + dummypokedexid; + } + + if (dummypokedexid.length==2){ + dummypokedexid='0' + dummypokedexid; + } + var dataItem = { id : res.rows.item(i).ID , pokedexid : res.rows.item(i).POKEDEXID , + pokedexidString : dummypokedexid , pokemonname : res.rows.item(i).POKEMONNAME , pokemontypa : res.rows.item(i).POKEMONTYPA , pokemontypb : res.rows.item(i).POKEMONTYPB ,