diff --git a/www/templates/pokemonliste/html/pokemon-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html
index 8fa0e92..a5932cc 100644
--- a/www/templates/pokemonliste/html/pokemon-detail.html
+++ b/www/templates/pokemonliste/html/pokemon-detail.html
@@ -46,7 +46,7 @@
Entwicklung:
-
{{pokemon.pokemonentwicklungtext}}

+
{{pokemon.pokemonentwicklungtext}}

@@ -380,8 +380,8 @@
-
+ ng-click="selectImage(1)">
+
Pokemon Bild setzen
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js
index 1935f5a..5b281b5 100644
--- a/www/templates/pokemonliste/js/controllers.js
+++ b/www/templates/pokemonliste/js/controllers.js
@@ -166,7 +166,7 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ion
});// End of Pokemon List Page Controller.
// Controller of pokemon Detail Page.
-appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToast, $scope, $stateParams, $state, $filter, $mdDialog, $ionicHistory,$timeout, pokedexDB) {
+appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToast, $scope, $stateParams, $state, $filter, $mdDialog, $ionicHistory,$timeout, pokedexDB, $cordovaImagePicker) {
var dummypokemon=[];
@@ -184,6 +184,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
$scope.data=[];
$scope.datafull=[];
$scope.labelsfull=[];
+ //$scope.imageList = [];
// $scope.pokemon is the variable that store pokemon detail data that receive form pokemon list page.
// Parameter :
@@ -191,7 +192,36 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
$scope.pokemon = $scope.getPokemonData($stateParams.pokemondetail);
console.debug($scope.pokemon);
- if (entwarr!=''){
+ $scope.getEntwicklung();
+
+
+ $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.
+ // It will allow to delete data when have data in the database.
+ $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.
+
+
+ // getPokemonList is for get all pokemons.
+ // By calling pokedexDB.all() service.
+ $scope.getEntwicklung = function () {
+
+ $scope.pokemonentwicklungliste = [];
+ $scope.pokemonentwicklunglisteonestep = [];
+
+
var entwarr = $scope.pokemon.pokemonentwicklung.split("|");
var entwkostenarr=$scope.pokemon.pokemonentwicklungkosten.split("|");
var index,indexonestep;
@@ -241,24 +271,7 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
}//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.
- // It will allow to delete data when have data in the database.
- $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.
+ };//End getPokemonList.
// getPokemonData is for get pokemon detail data.
$scope.getPokemonData = function (pokemonDetail) {
@@ -344,6 +357,46 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas
},100);
};// End navigateTo.
+
+
+ $scope.selectImage = function (limit) {
+ //hide BottomSheet.
+ $mdBottomSheet.hide();
+ // Set options for select image from mobile gallery.
+ var options = {
+ maximumImagesCount: limit,
+ width: 475,
+ height: 475,
+ quality: 100
+ };
+ $cordovaImagePicker.getPictures(options)
+ .then(function (results) {
+
+ var tempPokemon = {
+ pokedexid: null,
+ image: ''
+ }
+ // store image data to imageList.
+ //$scope.imageList = [];
+ for (var i = 0; i < results.length; i++) {
+ //$scope.imageList.push(results[i]);
+ console.log(results[i]);
+ tempPokemon.image=results[i];
+ tempPokemon.pokedexid=$scope.pokemon.pokedexid;
+ pokedexDB.setPokemonImage(tempPokemon);
+ pokedexDB.setPokemonImageArray($scope.pokemon.pokedexid,results[i]);
+ $scope.pokemon.pokemonimage=results[i];
+ }
+
+ $timeout(function(){
+ $scope.getEntwicklung();
+ },100);
+
+
+ }, function (error) {
+ console.log(error);
+ });
+ };
$scope.initialForm();
});// End Contract Detail page Controller.
diff --git a/www/templates/pokemonliste/js/services.js b/www/templates/pokemonliste/js/services.js
index a2a2ba1..f44282f 100644
--- a/www/templates/pokemonliste/js/services.js
+++ b/www/templates/pokemonliste/js/services.js
@@ -333,6 +333,10 @@ appServices.factory('pokedexDB', function ($cordovaSQLite)
{
return pokemonimages[pokedexid];
},
+ setPokemonImageArray: function (pokedexid,image)
+ {
+ pokemonimages[pokedexid]=image;
+ },
getPokemonName: function (pokedexid)
{
return pokemonname[pokedexid];