deliver #181 visualize level of a pokemon

vinnymac · Jan 14, 2017 · 5368ad8 · 5368ad8
1 parent d5724bf
commit 5368ad8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/app/screens/Settings/components/ModalBody.js b/app/screens/Settings/components/ModalBody.js
@@ -80,6 +80,7 @@ const specieSortByOptions = [
   'name',
   'nickname',
   'cp',
+  'level',
   'iv',
 ]
 

diff --git a/app/screens/Table/components/Pokemon.js b/app/screens/Table/components/Pokemon.js
@@ -12,6 +12,7 @@ import {
 
 import renderModal from '../../Detail'
 import Tooltip from '../../Tooltip'
+import utils from '../../../utils'
 
 const favoriteGlyph = 'fa fa-star favorite-yellow'
 const emptyFavoriteGlyph = 'fa fa-star-o'
@@ -106,6 +107,17 @@ const Pokemon = React.createClass({
                 >
                   CP
                 </th>
+                <th
+                  className={this.getSortDirectionClassName('level')}
+                  tabIndex="0"
+                  rowSpan="1"
+                  colSpan="1"
+                  aria-controls="pokemon-data"
+                  aria-label="Level: activate to sort column ascending"
+                  onClick={this.handleSortPokemon.bind(this, 'level')}
+                >
+                  Level
+                </th>
                 <th
                   className={this.getSortDirectionClassName('iv')}
                   tabIndex="0"
@@ -154,6 +166,7 @@ const Pokemon = React.createClass({
         {`Stamina: ${pokemon.stamina}`}
       </span>)
       const isChecked = pokemonState[String(pokemon.id)].check
+      const level = utils.getLevelFromCpMultiplier(pokemon.cp_multiplier + pokemon.additional_cp_multiplier)
 
       return (
         <tr key={pokemon.id}>
@@ -210,6 +223,9 @@ const Pokemon = React.createClass({
               {pokemon.cp}
             </Tooltip>
           </td>
+          <td>
+            {level}
+          </td>
           <td>
             <Tooltip
               placement="right"
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,7 @@ const specieSortByOptions = [ @@
       'name',
       'nickname',
       'cp',
+      'level',
       'iv',
     ]
@@ Expand Down @@