Raataar/pokedex
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tabellepflege abgeschlossen, Entwicklung eingebunden, Basiswerte und CSS-Fixes

Browse Source
This commit is contained in:
Hilmer, Carsten
2016-09-13 16:28:58 +02:00
parent 71867b9087
commit fa55d4fee9
94 changed files with 12014 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
www/templates/pokemonliste/html/pokemon-detail.html
View File

@@ -40,15 +40,13 @@
<div class="col-66 itemfontsize">Fluchtchance:</div>
<div class="col-33 itemfontsize">{{pokemon.pokemonfluchtchance}}%</div>
</div>
<div class="row">
<div class="row" ng-if="pokemon.pokemoneidistanz > 0">
<div class="col-66 itemfontsize">Ei-Distanz:</div>
<div class="col-33 itemfontsize">{{pokemon.pokemoneidistanz}} Km</div>
</div>
<div class="row">
<div class="col-100 itemfontsize">Entw. ab:</div>
</div>
<div class="row">
<div class="col-100 itemfontsize">{{pokemon.pokemonentwicklungtext}} Bonbons</div>
<div class="row" ng-if="pokemon.pokemonentwicklungtext > 0">
<div class="col-66 itemfontsize">Entwicklung:</div>
<div class="col-33 itemfontsize">{{pokemon.pokemonentwicklungtext}} <img src="img/bonbon.png" style="padding-top:3px;"></div>
</div>
</div>
</div>
@@ -75,29 +73,152 @@
</div>
</div>
<!-- Pokemon Detail ENDE -->
<!-- Pokemon Entwicklung -->
<div class="card">
<div class="item item-divider">
Entwicklung
</div>
<md-list>
<div class="row" ng-repeat="pokemonentwicklung in pokemonentwicklungliste" style="font-size: 10px;">
<div class="col-33 col-center"></div>
<div class="col-33 col-center">
<div>
<p ng-if="pokemonentwicklung.pokemonlistentyp == 2">{{ pokemonentwicklung.pokemonpokedexid }} Bonbons</p>
<div class="col-33 col-center"></div>
<div class="col-33 col-center">
<div class="divcenter">
<p ng-if="pokemonentwicklung.pokemonlistentyp == 2">{{ pokemonentwicklung.pokemonpokedexid }} Bonbons</p>
<img ng-if="pokemonentwicklung.pokemonlistentyp == 2" src="img/arrow_down.png" width="64" height="64">
<img ng-if="pokemonentwicklung.pokemonlistentyp == 1" src="{{pokemonentwicklung.pokemonimage}}" width="64" height="64">
<p ng-if="pokemonentwicklung.pokemonlistentyp == 1">{{ pokemonentwicklung.pokemonname }} </p>
</div>
</div>
<div class="col-33 col-center"></div>
</div>
<div class="row" style="font-size: 10px;">
<div ng-repeat="pokemonentwicklung in pokemonentwicklunglisteonestep" class="col col-center">
<div class="divcenter">
<img ng-if="pokemonentwicklung.pokemonlistentyp == 1" src="{{pokemonentwicklung.pokemonimage}}" width="64" height="64">
<p ng-if="pokemonentwicklung.pokemonlistentyp == 1">Pokedex-ID: {{ pokemonentwicklung.pokemonpokedexid }} </p>
<p ng-if="pokemonentwicklung.pokemonlistentyp == 1">{{ pokemonentwicklung.pokemonname }} </p>
</div>
</div>
<div class="col-33 col-center"></div>
</div>
</md-list>
</div>
<!-- Pokemon Entwicklung ENDE -->
<!-- Pokemon Standard Attacken -->
<div class="card">
<div class="item item-divider">
Standard Attacken
</div>
<div class="row" style="font-size: 10px;">
<div class="col-25 col-center">
<strong>Attacke</strong>
</div>
<div class="col-20 col-center">
<strong>Typ</strong>
</div>
<div class="col col-center mycenter">
<strong>Stärke</strong>
</div>
<div class="col col-center mycenter">
<strong>Energie</strong>
</div>
<div class="col col-center mycenter">
<strong>Dauer</strong>
</div>
</div>
<md-list>
<div class="row" ng-repeat="pokemonattacke in pokemonattackenliste" style="font-size: 10px;">
<div class="col-25 col-center">
{{ pokemonattacke.pokemonattacke }}
</div>
<div class="col-20 col-center">
<div class="pokemontypsx pokemontyp{{ pokemonattacke.pokemonattacketyp}}" style="margin: 0 auto; width:97%;">
<img src="img/typbilder/{{ pokemonattacke.pokemonattacketyp}}.png" alt="PokemonTyp" width="32" height="32">
{{ pokemonattacke.pokemonattacketyptext }}
</div>
</div>
<div class="col col-center mycenter">
{{ pokemonattacke.pokemonattackestaerke }}
</div>
<div class="col col-center mycenter">
{{ pokemonattacke.pokemonattackeenergie }}%
</div>
<div class="col col-center mycenter">
{{ pokemonattacke.pokemonattackedauer }} Sek.
</div>
</div>
</md-list>
</div>
<!-- Pokemon Standard Attacken ENDE-->
<!-- Pokemon Entlade Attacken -->
<div class="card">
<div class="item item-divider">
Entlade Attacken
</div>
<div class="row" style="font-size: 10px;">
<div class="col-25 col-center">
<strong>Attacke</strong>
</div>
<div class="col-20 col-center">
<strong>Typ</strong>
</div>
<div class="col col-center mycenter">
<strong>Stärke</strong>
</div>
<div class="col col-center mycenter">
<strong>Volltreffer</strong>
</div>
<div class="col col-center mycenter">
<strong>Energie</strong>
</div>
<div class="col col-center mycenter">
<strong>Dauer</strong>
</div>
</div>
<md-list>
<div class="row" ng-repeat="pokemonattacke in pokemonentladeattackenliste" style="font-size: 10px;">
<div class="col-25 col-center">
{{ pokemonattacke.pokemonattacke }}
</div>
<div class="col-20 col-center">
<div class="pokemontypsx pokemontyp{{ pokemonattacke.pokemonattacketyp}}" style="margin: 0 auto; width:97%;">
<img src="img/typbilder/{{ pokemonattacke.pokemonattacketyp}}.png" alt="PokemonTyp" width="32" height="32">
{{ pokemonattacke.pokemonattacketyptext }}
</div>
</div>
<div class="col col-center mycenter">
{{ pokemonattacke.pokemonattackestaerke }}
</div>
<div class="col col-center mycenter">
{{ pokemonattacke.pokemonattackevolltreffer }}%
</div>
<div class="col col-center mycenter">
{{ pokemonattacke.pokemonattackeenergie }}%
</div>
<div class="col col-center mycenter">
{{ pokemonattacke.pokemonattackedauer }} Sek.
</div>
</div>
</md-list>
</div>
<!-- Pokemon Entlade Attacken ENDE -->
<!-- Pokemon Schaden Tabelle -->
<div class="card">
<div class="item item-divider">
Schaden durch Attacken-Typ
@@ -155,56 +276,71 @@
</md-list-item>
</md-list>
</div>
<!-- Pokemon Schaden Tabelle ENDE-->
<!-- Pokemon Basis Werte -->
<div class="card">
<div class="item item-divider">
Standard Attacken
Basis-Statuswerte
</div>
<div class="row" style="font-size: 10px;">
<div class="col-50 col-center">
<canvas id="polar-area" class="chart chart-polar-area" chart-data="data" chart-labels="labels" legend="true" chart-options="options">
</canvas>
</div>
<div class="col-50 col-center">
<canvas id="pie" class="chart chart-pie"
chart-data="data" chart-labels="labels" chart-options="options">
</canvas>
</div>
</div>
<div class="row" style="font-size: 10px;">
<div class="col-100 col-center">
<canvas id="base" class="chart-horizontal-bar"
chart-data="datafull" chart-labels="labelsfull" >
</canvas>
</div>
</div>
</div>
<!-- Pokemon Basis Werte Ende-->
<!-- Pokemon Levelup Tabelle -->
<div class="card">
<div class="item item-divider">
Max. Statuswerte
</div>
<div class="row" style="font-size: 10px;">
<div class="col-25 col-center">
<strong>Attacke</strong>
</div>
<div class="col-20 col-center">
<strong>Typ</strong>
</div>
<div class="col-10 col-center mycenter">
<strong>Stärke</strong>
</div>
<div class="col-20 col-center mycenter">
<strong>Energie</strong>
</div>
<div class="col-20 col-center mycenter">
<strong>Dauer</strong>
</div>
<div class="col-50 col-center">
<strong>Trainer-Lever / Powerups</strong>
</div>
<div class="col-25 col-center">
<strong>Max. KP</strong>
</div>
<div class="col-25 col-center mycenter">
<strong>Max. WP</strong>
</div>
</div>
<md-list>
<div class="row" ng-repeat="pokemonattacke in pokemonattackenliste" style="font-size: 10px;">
<div class="row" ng-repeat="statuswert in pokemonmaxstatuswerteliste" style="font-size: 10px;" ng-class-odd="'listbackodd'" ng-class-even="'listbackeven'">
<div class="col-25 col-center">
{{ pokemonattacke.pokemonattacke }}
</div>
<div class="col-20 col-center">
<div class="pokemontypsx pokemontyp{{ pokemonattacke.pokemonattacketyp}}" style="margin: 0 auto; width:97%;">
<img src="img/typbilder/{{ pokemonattacke.pokemonattacketyp}}.png" alt="PokemonTyp" width="32" height="32">
{{ pokemonattacke.pokemonattacketyptext }}
<div class="col-50 col-center mycenter">
{{ statuswert.pokemontrainerlevel }}
</div>
<div class="col-25 col-center mycenter">
{{ statuswert.pokemonmaxkp }}
</div>
<div class="col-25 col-center mycenter">
{{ statuswert.pokemonmaxwp }}
</div>
</div>
<div class="col-10 col-center mycenter">
{{ pokemonattacke.pokemonattackestaerke }}
</div>
<div class="col-20 col-center mycenter">
{{ pokemonattacke.pokemonattackeenergie }}%
</div>
<div class="col-20 col-center mycenter">
{{ pokemonattacke.pokemonattackedauer }} Sek.
</div>
</div>
</md-list>
</div>
<!-- Pokemon Levelup Tabelle ENDE-->
</ion-content>
<div class="footer-fab-bar">

58
www/templates/pokemonliste/js/controllers.js
View File

@@ -106,6 +106,14 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
$scope.pokemonschwaechenliste = [];
$scope.pokemonattackenliste = [];
$scope.pokemonentwicklungliste = [];
$scope.pokemonentwicklunglisteonestep = [];
$scope.pokemonmaxstatuswerteliste = [];
$scope.pokemonentladeattackenliste = [];
$scope.labels=[];
$scope.data=[];
$scope.datafull=[];
$scope.labelsfull=[];
// $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.
@@ -115,7 +123,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
if (entwarr!=''){
var entwarr = $scope.pokemon.pokemonentwicklung.split("|");
var entwkostenarr=$scope.pokemon.pokemonentwicklungkosten.split("|");
var index;
var index,indexonestep;
for (index = 0; index < entwarr.length; ++index) {
@@ -126,6 +134,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
var dataItemEntwicklung = {
pokemonpokedexid : entwarr[index] ,
pokemonimage : $scope.getPokemonImage(entwarr[index]),
pokemonname : $scope.getPokemonName(entwarr[index]),
pokemonentwickstufe :1,
pokemonlistentyp : 1
};
@@ -142,21 +151,29 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
}
}//if
else{
var res=dummystring.replace("#", "");
var dataItemEntwicklung = {
pokemonpokedexid : res ,
pokemonimage : $scope.getPokemonImage(res),
pokemonentwickstufe :2,
pokemonlistentyp : 1
};
$scope.pokemonentwicklungliste.push(dataItemEntwicklung);
var entwarronstep = dummystring.split("#");
for (indexonestep = 1; indexonestep < entwarronstep.length; ++indexonestep) {
var dataItemEntwicklung = {
pokemonpokedexid : entwarronstep[indexonestep] ,
pokemonimage : $scope.getPokemonImage(entwarronstep[indexonestep]),
pokemonname : $scope.getPokemonName(entwarronstep[indexonestep]),
pokemonentwickstufe :2,
pokemonlistentyp : 1
};
$scope.pokemonentwicklunglisteonestep.push(dataItemEntwicklung);
}//for2
}
}//for
$scope.labels = ["KP", "Angriff", "Verteidigung"];
$scope.data = [$scope.pokemon.pokemonkp, $scope.pokemon.pokemonattack, $scope.pokemon.pokemondefense];
$scope.labelsfull = ["KP (" + $scope.pokemon.pokemonkp + ")", "Angriff (" + $scope.pokemon.pokemonattack + ")", "Verteidigung (" + $scope.pokemon.pokemondefense + ")", "Summe"];
$scope.datafull = [$scope.pokemon.pokemonkp, $scope.pokemon.pokemonattack, $scope.pokemon.pokemondefense, $scope.pokemon.pokemonsumme];
}
//$scope.actionDelete is the variable for allow or not allow to delete data.
@@ -164,6 +181,8 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
$timeout(function () {
$scope.getTypenEffekt($scope.pokemon.pokedexid);
$scope.getStandardAttacken($scope.pokemon.pokedexid);
$scope.getEntladeAttacken($scope.pokemon.pokedexid);
$scope.getMaxStatuswerte($scope.pokemon.pokedexid);
}, 1000);
}; //End initialForm.
@@ -186,11 +205,30 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
return pokedexDB.getPokemonImage(pokedexid);
};//End getPokemonList.
// getPokemonList is for get all pokemons.
// By calling pokedexDB.all() service.
$scope.getPokemonName = function (pokedexid) {
return pokedexDB.getPokemonName(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.
// getPokemonList is for get all pokemons.
// By calling pokedexDB.all() service.
$scope.getEntladeAttacken = function (pokedexid) {
$scope.pokemonentladeattackenliste = pokedexDB.getEntladeAttacken(pokedexid);
};//End getPokemonList.
// getPokemonList is for get all pokemons.
// By calling pokedexDB.all() service.
$scope.getMaxStatuswerte = function (pokedexid) {
$scope.pokemonmaxstatuswerteliste = pokedexDB.getMaxStatuswerte(pokedexid);
};//End getPokemonList.
// showListBottomSheet is for showing the bottom sheet.
// Parameter :
// $event(object) = position of control that user tap.

71
www/templates/pokemonliste/js/services.js
View File

@@ -42,6 +42,10 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
var pokemonstandardattackenliste= [];
var pokemonfundorte = [];
var pokemonimages = [];
var pokemonmaxstatuswerte = [];
var pokemonentladeattackenliste = [];
var pokemonname = [];
return {
// Select all data from sqlite
@@ -51,7 +55,8 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
pokemontypen = [];
pokemonfundorte = [];
pokemonimages = [];
pokemonname = [];
//Typen einlesen
var query = "SELECT * FROM tblPokemonTyp order by ID ASC";
$cordovaSQLite.execute(db, query).then(function (res)
@@ -89,6 +94,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
if (res.rows.length > 0)
{
pokemonimages.push('');
pokemonname.push('');
for (var i = 0; i < res.rows.length; i++)
{
var dummypokedexid='';
@@ -128,11 +134,16 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
pokemonentwicklungtext : res.rows.item(i).POKEMONENTWICKLUNGTEXT ,
pokemonentwicklung : res.rows.item(i).POKEMONENTWICKLUNG ,
pokemonentwicklungkosten : res.rows.item(i).POKEMONENTWICKLUNGKOSTEN ,
pokemonkp : res.rows.item(i).POKEMONKP ,
pokemonattack : res.rows.item(i).POKEMONATTACK ,
pokemondefense : res.rows.item(i).POKEMONDEFENSE ,
pokemonsumme : res.rows.item(i).POKEMONKP + res.rows.item(i).POKEMONATTACK + res.rows.item(i).POKEMONDEFENSE ,
pokemontext : res.rows.item(i).POKEMONTEXT ,
pokemonnote : res.rows.item(i).POKEMONNOTE ,
pokemonimage : res.rows.item(i).POKEMONIMAGE
};
pokemonimages.push(res.rows.item(i).POKEMONIMAGE);
pokemonname.push(res.rows.item(i).POKEMONNAME);
pokemonList.push(dataItem);
}
}
@@ -243,6 +254,10 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
{
return pokemonimages[pokedexid];
},
getPokemonName: function (pokedexid)
{
return pokemonname[pokedexid];
},
getStandardAttacken: function (pokedexid)
{
@@ -271,6 +286,60 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
});
return pokemonstandardattackenliste;
},
getEntladeAttacken: function (pokedexid)
{
pokemonentladeattackenliste = [];
var query = "SELECT * FROM tblPokemonEntladeAttacken 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 ,
pokemonattackevolltreffer : res.rows.item(i).VOLLTREFFER ,
pokemonattackeenergie : res.rows.item(i).ENERGIE ,
pokemonattackedauer : res.rows.item(i).DAUER
};
pokemonentladeattackenliste.push(dataItem);
}
}
});
return pokemonentladeattackenliste;
},
getMaxStatuswerte: function (pokedexid)
{
pokemonmaxstatuswerte = [];
var query = "SELECT * FROM tblPokemonMaxStatuswerte WHERE POKEDEXID= ? ORDER BY ID ASC";
// 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 = {
pokemontrainerlevel : res.rows.item(i).TRAINERLEVELPOPUP ,
pokemonmaxkp : res.rows.item(i).MAXKP ,
pokemonmaxwp : res.rows.item(i).MAXWP
};
pokemonmaxstatuswerte.push(dataItem);
}
}
});
return pokemonmaxstatuswerte;
},
// To add data to sqlite.
// It will receive newContract from controller then insert it into sqlite.
add: function (newContract)