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

Bildauswahl vollstaendig eingebaut

Browse Source
This commit is contained in:
Carsten Hilmer 2016-09-24 00:59:02 +02:00
parent d99534a37a
commit 890079f133
3 changed files with 80 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@
</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 class="col-33 itemfontsize">{{pokemon.pokemonentwicklungtext}} <img src="img/bonbon.png"></div>
</div>
</div>
</div>
@ -380,8 +380,8 @@
<md-list-item>
<a class="md-default-theme md-bottom-sheet-list-item"
ng-click="deleteContract(contract,$event)">
<i class="ion-android-delete"></i>
ng-click="selectImage(1)">
<i class="ion-image"></i>
<span>Pokemon Bild setzen</span>
</a>
</md-list-item>

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

@ -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.

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

@ -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];