Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added sorting to the list of pokemons #17

Merged
merged 1 commit into from
Jul 24, 2016
Merged

Added sorting to the list of pokemons #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<div class="card-content black-text">
<span class="card-title" id="subtitle">Submenu</span>
<span id="close">×</span>
<span id="sortButtons"></span>
<div id="subcontent"></div>
</div>
</div>
Expand Down
7 changes: 7 additions & 0 deletions main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ html, body {
z-index: 6;
display: none;
}
#sortButtons {
float: right;
margin: 9px 10px 0 0;
}
#sortButtons .chip {
margin-right: 3px;
}
#close {
float: right;
font-size: 32px;
Expand Down
129 changes: 108 additions & 21 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,9 @@ function buildMenu(user_id, menu) {
$("#submenu").show();
if (menu == 1) {
document.getElementById('subtitle').innerHTML = 'Trainer Info';

document.getElementById('sortButtons').innerHTML = "";

out = '';
var current_user_stats = user_data[users[user_id]].stats[0].inventory_item_data.player_stats;
out += '<div class="row"><div class="col s12"><h5>' +
Expand Down Expand Up @@ -469,6 +472,9 @@ function buildMenu(user_id, menu) {
if (menu == 2) {
var current_user_bag_items = user_data[users[user_id]].bagItems;
document.getElementById('subtitle').innerHTML = current_user_bag_items.length+" items in Bag";

document.getElementById('sortButtons').innerHTML = "";

out = '<div class="row items">';
for (i = 0; i < current_user_bag_items.length; i++) {
out += '<div class="col s12 m4 l3 center" style="float: left"><img src="image/items/' +
Expand All @@ -485,31 +491,23 @@ function buildMenu(user_id, menu) {
if (menu == 3) {
pkmnTotal = user_data[users[user_id]].bagPokemon.length;
document.getElementById('subtitle').innerHTML = pkmnTotal+" Pokemons";
out = '<div class="row items">';
user_data[users[user_id]].bagPokemon.sort(function(a, b){return b.inventory_item_data.pokemon_data.cp - a.inventory_item_data.pokemon_data.cp;});
for (i = 0; i < user_data[users[user_id]].bagPokemon.length; i++) {
var current_pokemon_data = user_data[users[user_id]].bagPokemon[i].inventory_item_data.pokemon_data;
if (current_pokemon_data.is_egg) {
continue;
} else {
pkmnNum = current_pokemon_data.pokemon_id;
pkmnImage = pad_with_zeroes(current_pokemon_data.pokemon_id, 3) + '.png';
pkmnName = pokemonArray[pkmnNum-1].Name;
pkmnCP = "CP "+current_pokemon_data.cp;
pkmnIVA = current_pokemon_data.individual_attack || 0;
pkmnIVD = current_pokemon_data.individual_defense || 0;
pkmnIVS = current_pokemon_data.individual_stamina || 0;
pkmnIV = ((pkmnIVA + pkmnIVD + pkmnIVS) / 45.0).toFixed(2);
}
out += '<div class="col s12 m4 l3 center" style="float: left;"><img src="image/pokemon/' + pkmnImage + '" class="png_img"><br><b>' + pkmnName +
'</b><br>' + pkmnCP + '<br>IV '+pkmnIV+'</div>';
}
out += '</div>';
document.getElementById('subcontent').innerHTML = out;

sortButtons = '<div style="float: right">Sort : ';
sortButtons += '<div class="chip"><a href="javascript:sortAndShowBagPokemon(\'cp\',' + user_id + ')">CP</a></div>';
sortButtons += '<div class="chip"><a href="javascript:sortAndShowBagPokemon(\'iv\',' + user_id + ')">IV</a></div>';
sortButtons += '<div class="chip"><a href="javascript:sortAndShowBagPokemon(\'name\',' + user_id + ')">Name</a></div>';
sortButtons += '<div class="chip"><a href="javascript:sortAndShowBagPokemon(\'id\',' + user_id + ')">ID</a></div>';
sortButtons += '</div>';

document.getElementById('sortButtons').innerHTML = sortButtons;

sortAndShowBagPokemon('cp', user_id);
}
if (menu == 4) {
pkmnTotal = user_data[users[user_id]].pokedex.length;
document.getElementById('subtitle').innerHTML = "Pokedex "+ pkmnTotal + ' / 151';

document.getElementById('sortButtons').innerHTML = "";

out = '<div class="row items">';
for (i = 0; i < user_data[users[user_id]].pokedex.length; i++) {
Expand All @@ -532,4 +530,93 @@ function buildMenu(user_id, menu) {
out += '</div>';
document.getElementById('subcontent').innerHTML = out;
}
}

function sortAndShowBagPokemon(sortOn, user_id) {

user_id = user_id || 0;

if(!user_data[users[user_id]].bagPokemon.length) return;

sortOn = sortOn || 'cp';

var sortedPokemon = [];

var eggs = 0;

out = '<div class="row items">';

for (var i = 0; i < user_data[users[user_id]].bagPokemon.length; i++) {

if( user_data[users[user_id]].bagPokemon[i].inventory_item_data.pokemon_data.is_egg) {
eggs++;
continue;
}

pkmID = user_data[users[user_id]].bagPokemon[i].inventory_item_data.pokemon_data.pokemon_id;

pkmnName = pokemonArray[pkmID-1].Name;

pkmCP = user_data[users[user_id]].bagPokemon[i].inventory_item_data.pokemon_data.cp;

pkmIVA = user_data[users[user_id]].bagPokemon[i].inventory_item_data.pokemon_data.individual_attack || 0;
pkmIVD = user_data[users[user_id]].bagPokemon[i].inventory_item_data.pokemon_data.individual_defense || 0;
pkmIVS = user_data[users[user_id]].bagPokemon[i].inventory_item_data.pokemon_data.individual_stamina || 0;
pkmIV = ((pkmIVA + pkmIVD + pkmIVS) / 45.0).toFixed(2);

sortedPokemon.push({
"name": pkmnName,
"id":pkmID,
"cp": pkmCP,
"iv": pkmIV
});
}

switch(sortOn) {
case 'name':
sortedPokemon.sort(function(a, b){
if(a.name < b.name) return -1;
if(a.name > b.name) return 1;
return 0;
});
break;
case 'id':
sortedPokemon.sort(function(a, b){
return a.id - b.id
});
break;
case 'cp':
sortedPokemon.sort(function(a, b){
if (a.cp > b.cp) return -1
if(a.cp < b.cp) return 1
return 0
});
break;
case 'iv':
sortedPokemon.sort(function(a, b){
if (a.iv > b.iv) return -1
if(a.iv < b.iv) return 1
return 0
});
break;
}

for (var i = 0; i < sortedPokemon.length; i++) {

pkmnNum = sortedPokemon[i].id;
pkmnImage = pad_with_zeroes(pkmnNum, 3) + '.png';
pkmnName = pokemonArray[pkmnNum-1].Name;
pkmnCP = sortedPokemon[i].cp;
pkmnIV = sortedPokemon[i].iv;

out += '<div class="col s12 m4 l3 center" style="float: left;"><img src="image/pokemon/' + pkmnImage + '" class="png_img"><br><b>' + pkmnName +
'</b><br>' + pkmnCP + '<br>IV '+pkmnIV+'</div>';
}

// Add number of eggs
out += '<div class="col s12 m4 l3 center" style="float: left;"><img src="image/pokemon/Egg.png" class="png_img"><br><b>You have ' + eggs + ' eggs</div>';

out += '</div>';

document.getElementById('subcontent').innerHTML = out;
}