Merge pull request #183 from sketchysocks/search-by-type

Search Pokemon Filter by Type
WatWowMap · Sep 13, 2020 · 276f7be · 276f7be
2 parents e1bca0d + 33680da
commit 276f7be
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/routes/api.js b/src/routes/api.js
@@ -265,7 +265,8 @@ const getData = async (perms, filter) => {
                     'image': `IV-${andOrString}`,
                     'filter': filter,
                     'size': size,
-                    'type': globalFiltersString
+                    'type': globalFiltersString,
+                    'types': null
                 });
             }
         }
@@ -294,7 +295,8 @@ const getData = async (perms, filter) => {
                     'image': `PVP-${andOrString}`,
                     'filter': filter,
                     'size': size,
-                    'type': globalFiltersString
+                    'type': globalFiltersString,
+                    'types': null
                 });
             }
         }
@@ -318,7 +320,8 @@ const getData = async (perms, filter) => {
                 },
                 'filter': filter,
                 'size': size,
-                'type': globalFiltersString
+                'type': globalFiltersString,
+                'types': null
             });
         }
 
@@ -328,6 +331,7 @@ const getData = async (perms, filter) => {
             const forms = Object.keys(pkmn.forms);
             for (let j = 0; j < forms.length; j++) {
                 const formId = forms[j];
+                const types = JSON.stringify(pkmn.types);
                 //const form = pkmn.forms[formId];
                 let formName = pkmn.forms[formId].name;//i18n.__('form_' + formId);
                 if (skipForms.includes(formName.toLowerCase())) {
@@ -361,7 +365,8 @@ const getData = async (perms, filter) => {
                     },
                     'filter': filter,
                     'size': size,
-                    'type': pokemonTypeString
+                    'type': pokemonTypeString,
+                    'types': types
                 });
             }
         }

diff --git a/static/js/index.js b/static/js/index.js
@@ -5591,7 +5591,9 @@ function loadPokemonFilter () {
                 width: '5%'
             },
             { data: 'filter' },
-            { data: 'size' }
+            { data: 'size' },
+            { data: 'types',
+                visible: false}
         ],
         ajax: {
             url: '/api/get_data?show_pokemon_filter=true',
@@ -5602,7 +5604,7 @@ function loadPokemonFilter () {
         order: [[2, 'asc']],
         'search.caseInsensitive': true,
         columnDefs: [{
-            targets: [0, 3, 4],
+            targets: [0, 3, 4, 5],
             orderable: false
         }, {
             type: 'num',