wip #101

vinnymac · Jan 16, 2017 · a7a25bb · a7a25bb
1 parent e64a65d
commit a7a25bb
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 29 deletions.
diff --git a/app/actions/trainer.js b/app/actions/trainer.js
@@ -220,8 +220,8 @@ function parseInventory(inventory) {
   // TODO use map
   speciesList.forEach((s) => {
     const pokemonSetting = pokemonSettings[s.pokemon_id - 1]
-    const candyToEvolve = pokemonSetting ? pokemonSetting.candy_to_evolve : 0
-    s.evolves = utils.getEvolvesCount(candyToEvolve, s)
+    s.candyToEvolve = pokemonSetting ? pokemonSetting.candy_to_evolve : 0
+    s.evolves = utils.getEvolvesCount(s.candyToEvolve, s.candy, s.count)
   })
 
   return {

diff --git a/app/screens/Detail/components/Nickname.js b/app/screens/Detail/components/Nickname.js
@@ -64,7 +64,7 @@ class Nickname extends React.Component {
   render() {
     const {
       editing,
-      newNickname
+      newNickname,
     } = this.state
 
     if (editing) {

diff --git a/app/screens/Table/components/PokemonRow.js b/app/screens/Table/components/PokemonRow.js
@@ -5,13 +5,6 @@ import { ipcRenderer } from 'electron'
 import $ from 'jquery'
 import utils from '../../../utils'
 
-// import { bindActionCreators } from 'redux'
-// import { connect } from 'react-redux'
-// import {
-//   toggleFavoritePokemon,
-//   powerUpPokemon
-// } from '../../../actions'
-
 import renderModal from '../../Detail'
 import Tooltip from '../../Tooltip'
 
@@ -26,18 +19,10 @@ class PokemonRow extends React.PureComponent {
   static displayName = 'PokemonRow'
 
   static propTypes = {
-    // speciesIndex: PropTypes.number,
-    // sortBy: PropTypes.string,
-    // sortDir: PropTypes.string,
-    // sortPokemonBy: PropTypes.func.isRequired,
-    // onCheckedChange: PropTypes.func.isRequired,
     species: PropTypes.object.isRequired,
     pokemon: PropTypes.object.isRequired,
     getPokemonState: PropTypes.func.isRequired,
     onCheckedChange: PropTypes.func.isRequired,
-    // checkAll: PropTypes.bool.isRequired,
-    // onCheckAll: PropTypes.func.isRequired,
-    // getPokemonState: PropTypes.func.isRequired,
     toggleFavoritePokemon: PropTypes.func.isRequired,
     powerUpPokemon: PropTypes.func.isRequired,
   }

diff --git a/app/screens/Table/components/PokemonTableHead.js b/app/screens/Table/components/PokemonTableHead.js
@@ -38,7 +38,7 @@ class PokemonTableHead extends React.PureComponent {
             colSpan="1"
             aria-controls="pokemon-data"
             aria-label="Favorite: activate to sort column ascending"
-            onClick={this.handleSortPokemon.bind(this, 'favorite')}
+            onClick={this.createHandleSortPokemon('favorite')}
           >
             <span className="fa fa-star favorite-yellow" />
           </th>
@@ -53,7 +53,7 @@ class PokemonTableHead extends React.PureComponent {
             colSpan="1"
             aria-controls="pokemon-data"
             aria-label="Name: activate to sort column ascending"
-            onClick={this.handleSortPokemon.bind(this, 'name')}
+            onClick={this.createHandleSortPokemon('name')}
           >
             Name
           </th>
@@ -64,7 +64,7 @@ class PokemonTableHead extends React.PureComponent {
             colSpan="1"
             aria-controls="pokemon-data"
             aria-label="Nickname: activate to sort column ascending"
-            onClick={this.handleSortPokemon.bind(this, 'nickname')}
+            onClick={this.createHandleSortPokemon('nickname')}
           >
             Nickname
           </th>
@@ -75,7 +75,7 @@ class PokemonTableHead extends React.PureComponent {
             colSpan="1"
             aria-controls="pokemon-data"
             aria-label="CP: activate to sort column ascending"
-            onClick={this.handleSortPokemon.bind(this, 'cp')}
+            onClick={this.createHandleSortPokemon('cp')}
           >
             CP
           </th>
@@ -86,7 +86,7 @@ class PokemonTableHead extends React.PureComponent {
             colSpan="1"
             aria-controls="pokemon-data"
             aria-label="Level: activate to sort column ascending"
-            onClick={this.handleSortPokemon.bind(this, 'level')}
+            onClick={this.createHandleSortPokemon('level')}
           >
             Level
           </th>
@@ -97,7 +97,7 @@ class PokemonTableHead extends React.PureComponent {
             colSpan="1"
             aria-controls="pokemon-data"
             aria-label="IV: activate to sort column ascending"
-            onClick={this.handleSortPokemon.bind(this, 'iv')}
+            onClick={this.createHandleSortPokemon('iv')}
           >
             IV
           </th>
@@ -115,10 +115,10 @@ class PokemonTableHead extends React.PureComponent {
     onCheckAll(species)
   }
 
-  handleSortPokemon = (sortBy) => {
+  createHandleSortPokemon = (sortBy) => () => {
     const {
       speciesIndex,
-      sortPokemonBy
+      sortPokemonBy,
     } = this.props
 
     sortPokemonBy(sortBy, speciesIndex)
@@ -127,7 +127,7 @@ class PokemonTableHead extends React.PureComponent {
   getSortDirectionClassName = (key) => {
     const {
       sortBy,
-      sortDir
+      sortDir,
     } = this.props
 
     if (sortBy === key) {

diff --git a/app/screens/Table/components/Species.js b/app/screens/Table/components/Species.js
@@ -142,6 +142,20 @@ class Species extends React.Component {
         sortDir
       } = speciesState[specie.pokemon_id]
 
+      let extraCandyNeededSpan
+
+      if (specie.evolves > 0) {
+        const totalCandyNeeded = specie.candyToEvolve * specie.count
+        const extraCandyNeeded = totalCandyNeeded - specie.candy
+        if (extraCandyNeeded > 0) {
+          extraCandyNeededSpan = (
+            <span>
+              {` +${extraCandyNeeded}`}
+            </span>
+          )
+        }
+      }
+
       return ([
         <tr
           className={collapsed ? '' : 'shown'}
@@ -161,7 +175,12 @@ class Species extends React.Component {
           </td>
           <td>{specie.name}</td>
           <td>{specie.count}</td>
-          <td>{specie.candy}</td>
+          <td>
+            <span>
+              {specie.candy}
+            </span>
+            {extraCandyNeededSpan}
+          </td>
           <td>{specie.evolves}</td>
         </tr>, this.getPokemonTable(specie, i, sortBy, sortDir, collapsed, pokemonState, checkAll)
       ])

diff --git a/app/utils.js b/app/utils.js
@@ -343,7 +343,7 @@ const utils = {
     return Math.round(utils.getADS(pokemon) / 45 * 10000) / 100
   },
 
-  getEvolvesCount(evolveCost, { candy, count }) {
+  getEvolvesCount(evolveCost, candy, count) {
     let evolves = Math.floor(candy / evolveCost)
 
     if ((evolves === Infinity || isNaN(evolves))) {