Added thee search bars (Any,Artesanias,Municipios)

.idea/workspace.xml

@@ -2,27 +2,26 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="eb079ee0-6a1e-46bc-8208-93306bafc623" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/calendar_files/css/theme1.css" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/calendar_files/css/theme1.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/css/index.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/artesano.html" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/artesano.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Barro.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Cristal.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Cuero.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Fibras.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Higüera.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Instrumento musical.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Juguetes tradicional.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Labores en aguja.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Madera.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Metal.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Tabacos.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/img/Textiles.jpg" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/js/load.js" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/js/load.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/js/renglones.js" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/js/renglones.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/js/saveLocal.js" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/js/saveLocal.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/lib/OnsenUI/css/onsenui.css" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/android/app/src/main/assets/www/lib/OnsenUI/css/onsenui.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/browser/www/calendar_files/css/theme1.css" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/browser/www/calendar_files/css/theme1.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/browser/www/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/browser/www/css/index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/browser/www/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/browser/www/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/browser/www/js/renglones.js" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/browser/www/js/renglones.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/browser/www/js/saveLocal.js" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/browser/www/js/saveLocal.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platforms/browser/www/lib/OnsenUI/css/onsenui.css" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/browser/www/lib/OnsenUI/css/onsenui.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/www/calendar_files/css/theme1.css" beforeDir="false" afterPath="$PROJECT_DIR$/www/calendar_files/css/theme1.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/www/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/www/css/index.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/www/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/www/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/www/js/azar.js" beforeDir="false" afterPath="$PROJECT_DIR$/www/js/azar.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/www/js/saveLocal.js" beforeDir="false" afterPath="$PROJECT_DIR$/www/js/saveLocal.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/www/lib/OnsenUI/css/onsenui.css" beforeDir="false" afterPath="$PROJECT_DIR$/www/lib/OnsenUI/css/onsenui.css" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -32,23 +31,9 @@
     <option name="testRunner" value="GRADLE" />
     <option name="delegatedBuild" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_API_29" />
   <component name="FavoritesManager">
     <favorites_list name="artesanias" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/www/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-730">
-              <caret line="428" column="34" selection-start-line="428" selection-start-column="34" selection-end-line="428" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -62,60 +47,17 @@
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="70" />
-    <option name="y" value="-20" />
-    <option name="width" value="1940" />
-    <option name="height" value="1050" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="artesanias" type="b2602c69:ProjectViewProjectNode" />
-              <item name="artesanias" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="artesanias" type="b2602c69:ProjectViewProjectNode" />
-              <item name="artesanias" type="462c0819:PsiDirectoryNode" />
-              <item name="platforms" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="artesanias" type="b2602c69:ProjectViewProjectNode" />
-              <item name="artesanias" type="462c0819:PsiDirectoryNode" />
-              <item name="platforms" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
-    </panes>
+  <component name="ProjectId" id="1hkacnpBNwnsGBZKJXzugbTopNv" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
     <property name="android.sdk.path" value="$USER_HOME$/SDK" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager">
     <configuration name="C:/Users/Chuch/Documents/Cordova/artesanias/platforms/android/build.gradle" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
@@ -153,36 +95,14 @@
     </task>
     <servers />
   </component>
-  <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
-    <layout>
-      <window_info id="Captures" order="0" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.4978903" visible="true" weight="0.3295302" />
-      <window_info id="Structure" order="2" side_tool="true" />
-      <window_info id="Image Layers" order="3" />
-      <window_info id="Designer" order="4" />
-      <window_info id="Resources Explorer" order="5" />
-      <window_info id="Capture Tool" order="6" />
-      <window_info id="Favorites" order="7" sideWeight="0.5021097" side_tool="true" weight="0.32980832" />
-      <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49966952" visible="true" weight="0.3286119" />
-      <window_info anchor="bottom" id="TODO" order="1" />
-      <window_info anchor="bottom" id="Debug" order="2" />
-      <window_info anchor="bottom" id="Terminal" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="4" sideWeight="0.50033045" side_tool="true" visible="true" weight="0.3286119" />
-      <window_info anchor="bottom" id="Version Control" order="5" />
-      <window_info anchor="right" id="Assistant" weight="0.33489934" />
-      <window_info anchor="right" id="Capture Analysis" order="0" />
-      <window_info anchor="right" id="Theme Preview" order="1" />
-      <window_info anchor="right" id="Palette&#9;" order="2" />
-    </layout>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/www/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-730">
-          <caret line="428" column="34" selection-start-line="428" selection-start-column="34" selection-end-line="428" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
+  <component name="WindowStateProjectService">
+    <state x="1060" y="100" width="721" height="853" key="com.android.tools.idea.avdmanager.AvdListDialog" timestamp="1600557814931">
+      <screen x="0" y="0" width="1920" height="1053" />
+    </state>
+    <state x="1060" y="100" width="721" height="853" key="com.android.tools.idea.avdmanager.AvdListDialog/0.0.1920.1053@0.0.1920.1053" timestamp="1600557814931" />
+    <state x="1103" y="354" key="com.intellij.ide.util.TipDialog" timestamp="1600557633060">
+      <screen x="0" y="0" width="1920" height="1053" />
+    </state>
+    <state x="1103" y="354" key="com.intellij.ide.util.TipDialog/0.0.1920.1053@0.0.1920.1053" timestamp="1600557633060" />
   </component>
 </project>

platforms/android/android/.json

@@ -0,0 +1,11 @@
+{
+  "prepare_queue": {
+    "installed": [],
+    "uninstalled": []
+  },
+  "config_munge": {
+    "files": {}
+  },
+  "installed_plugins": {},
+  "dependent_plugins": {}
+}

platforms/android/app/src/main/assets/www/artesano.html

@@ -1,72 +1,68 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>Artesanos</title>
+    <title>Artesanos</title>
 
-	<script src="jquery/dist/jquery.min.js">
-	</script>
+    <script src="jquery/dist/jquery.min.js">
+    </script>
 
 
 </head>
 <body>
 
-	<ons-toolbar>
-  		<div class="left">
-    		<ons-back-button>Back</ons-back-button>
-  		</div>
-	</ons-toolbar>
+    <ons-toolbar>
+        <div class="left">
+            <ons-back-button>Back</ons-back-button>
+        </div>
+    </ons-toolbar>
 
 
 
-	<script type="text/javascript">
-	function getUrlVars() {
-    	var vars = [], hash;
-    	var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-    	for(var i = 0; i < hashes.length; i++)
-    	{
-        	hash = hashes[i].split('=');
-        	vars.push(hash[0]);
-        	vars[hash[0]] = hash[1];
-    	}
-    	return vars;
-	}
+    <script type="text/javascript">
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for(var i = 0; i < hashes.length; i++)
+        {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    }
 
-	nombre = decodeURIComponent(getUrlVars()["nombre"]);
-	renglon = "json/MADERA.json";
-	
+    nombre = decodeURIComponent(getUrlVars()["nombre"]);
+    renglon = "json/MADERA.json";
+    
 
-	$.getJSON(renglon, function(json) {
-    	for (i = 0; i < json.length; i++) {
-    		if (json[i].Nombre == nombre) {
-    			break;
-    		}
-    	}
+    $.getJSON(renglon, function(json) {
+        for (i = 0; i < json.length; i++) {
+            if (json[i].Nombre == nombre) {
+                break;
+            }
+        }
 
-    	var telefono = "Teléfono 1";
-    	var clickTel = (((json[i]["Teléfono 1"].replace('(', "")).replace(')', "")).replace('-', "")).replace(' ', "");
+        console.log("entre a artesano.html...???");
 
-    	var email = "E-mail";
+        document.write("<h1 align='center'>" + json[i].Nombre + "</h1>");
 
+        document.write("<h2 align='center'>" + json[i].Municipio + "</h1>");
 
-    	document.write("<h1 align='center'>" + json[i].Nombre + "</h1>");
+        document.write("<h2 align='center'>" + json[i].Especificaciones + "</h2>");
 
-    	document.write("<h2 align='center'>" + json[i].Municipio + "</h1>");
+        document.write("<a class='button' href='tel://" + json[i]["Teléfono 1"] + "'>" + "<h2 align='center'>" + json[i]["Teléfono 1"] + "</h2>" + "</a>");
 
-    	document.write("<h2 align='center'>" + json[i].Especificaciones + "</h2>");
+        document.write("<a href='mailto:" + json[i]["E-mail"] + "'>" + "<h2 align='center'>" + json[i]["E-mail"] + "</h2>" + "</a>");
 
-    	document.write("<a class='button' href='tel://" + clickTel + "'>" + "<h2 align='center'>" + json[i][telefono] + "</h2>" + "</a>");
 
-    	document.write("<a href='mailto:" + json[i][email] + "'>" + "<h2 align='center'>" + json[i][email] + "</h2>" + "</a>");
 
+    });
 
 
-	});
 
 
-
-
-	
-	</script>
+    
+    </script>
 
 </body>
 </html>

platforms/android/app/src/main/assets/www/index.html

@@ -53,7 +53,7 @@
 
       <script type="text/javascript" src="js/saveLocal.js"></script>
 
-
+      <script> console.log(window.localStorage.getItem("MADERA")); </script>
 
 
         <ons-navigator swipeable animation="slide" id="myNavigator">
@@ -117,12 +117,12 @@
                     ons.getScriptPage().onInit = function () {
                         this.querySelector('ons-toolbar div.center').textContent = this.data.title;
 
-                        console.log("test");
 
                         //var File = this.data.title.toUpperCase() + '.json' ;
-                        var Esp = this.data.esp.split(';');
+                        var Esp = this.data.esp.split(', ');
                         var artesanos_json = this.data.json;
 
+
                         //Convertir en mayuscula primera letra del string.
                         for(var i=0; i<Esp.length; i++) {
                             Esp[i] = Esp[i].charAt(0).toUpperCase() + Esp[i].slice(1);
@@ -160,7 +160,7 @@
                             var searchVal = "my Name";
                             for (var i=0 ; i < artesanos_json.length ; i++)
                             {
-                                if (artesanos_json[i].Especificaciones1.includes(Esp[num])) {
+                                if (artesanos_json[i].Especificaciones.includes(Esp[num])) {
                                     results.push(artesanos_json[i]);
                                 }
                             }
@@ -198,8 +198,8 @@
               <ons-list-item expandable tappable>
                 <div class="center" >${Artesano.Nombre}</div>
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
-                                                 Tel\u00e9fono: ${Artesano["Telefono1"]}<br>
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail1"]}<br>
+                                                 Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
+                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
                                                  </div>
               </ons-list-item>`
                                                     );
@@ -217,20 +217,20 @@
                             if (Artesano.Municipio.trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano["Telefono1"].trim().length != 0) {
+                            if (Artesano["Telefono 1"].trim().length != 0) {
                                 cont ++;
                             }
-                            if (Artesano["E-mail1"].trim().length != 0) {
+                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
                                 cont ++;
                             }
-                            if (Artesano.Especificaciones1.trim().length != 0) {
+                            if (Artesano.Especificacion.trim().length != 0) {
                                 cont ++;
                             }
 
 
                             //info a pasar
                             //'title':'${Artesano.Nombre}','esp': '${info}'
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono1"]}', email: '${Artesano["E-mail1"]}', esp: '${Artesano.Especificaciones1}' } })" tappable>
+                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', redes: '${Artesano["E-Commerce1"]}', esp: '${Artesano.Especificacion}' } })" tappable>
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
@@ -324,7 +324,7 @@
                              var searchVal = "my Name";
                              for (var i=0 ; i < artesanos_json.length ; i++)
                              {
-                                 if (artesanos_json[i].Especificaciones.includes(Esp[num])) {
+                                 if (artesanos_json[i].Especificacion.includes(Esp[num])) {
                                      results.push(artesanos_json[i]);
                                  }
                              }
@@ -337,7 +337,7 @@
 
                                  //if(Esp[num] in artesanos_json.) {}
                                  Artesanos+=`${results[i].Nombre}|`
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Tel\u00e9fono 1"]}|${results[i]["E-mail"]}|${results[i].Especificaciones}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
@@ -410,139 +410,93 @@
         </template>
 
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
-
-        <template id="artesano.html">
-            <ons-page id="artesano">
-                <ons-toolbar>
-                    <div class="left"><ons-back-button>Atras</ons-back-button></div>
-                    <div class="center"></div>
-                </ons-toolbar>
-                <body>
-                    <ons-card id="all"></ons-card>
-                </body>
-                <script>
-                    ons.getScriptPage().onInit = function () {
-                        this.querySelector('ons-toolbar div.center').textContent = this.data.title;
-
-                        var info = ``,
-                            mun = this.data.mun,
-                            tel = this.data.tel,
-                            email = this.data.email,
-                            esp = this.data.esp;
-
-                        if(mun.trim() != '') {
-                            info = info + `Municipio: ` + mun + `<br>`;
-                        }
-                        if(tel.trim() != '') {
-                            info = info + `Tel\u00e9fono: <a href="tel:+1` + tel + `">` + tel + `</a><br>`;
-                        }
-                        if(email.trim() != '') {
-                            info = info + `Correo Electr\u00f3nico: ` + email + `<br>`;
-                        }
-                        if(esp.trim() != '') {
-                            info = info + `Trabaja con: ` + esp + `<br>`;
-                        }
-
-                        document.getElementById("all").innerHTML = `${info}`;
-
-                    }
-                </script>
-
-            </ons-page>
-        </template>
-
-<!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
-
+<!----------------------------------------------------------------------------------->
+        <script src = "js/searchfunctions.js"></script>
         <script>
-            var Madera = JSON.parse(window.localStorage.getItem("TODOS"));
+            //JSON file that has all the artesanos 
+            var all_artesanos = JSON.parse(window.localStorage.getItem("TODOS"));
             function filter(){
-
-
-                // var request = new XMLHttpRequest()
-                // request.open('GET','json/MADERA.json',true)
-                // request.onload = function(){
-                //   var Madera = JSON.parse(this.response)
-                // }
-                // request.send()
-                // var input = document.getElementById('searchbar').value
-                // var firstwood = Madera[0].Nombre
-                // ons.notification.alert('Searched for: ' + firstwood)
-                var input = document.getElementById('searchbar').value
+                var input = document.getElementById('searchbar').value;
+                var inputarte = document.getElementById('searchartesania').value;
+                var inputmuni = document.getElementById('searchbarmunicipio').value;
                 var x = document.getElementsByClassName('artists');
+                //making sure they're all in the same format
                 input = input.trim().toLowerCase();
-                if (input.length == 0){
-                    for (i = 0; Madera.length; i++){
+                inputarte = inputarte.trim().toLowerCase();
+                inputmuni = inputmuni.trim().toLowerCase();
+                input = acento_replace(input);
+                inputarte = acento_replace(inputarte);
+                inputmuni = acento_replace(inputmuni);
+                //default case is where evey one of them has nothing or less than 3 characters (displays every artist)
+                if (input.length <= 3 && inputarte.length <= 3 && inputmuni.length <= 3){
+                    for (var i = 0; all_artesanos.length; i++){
                         x[i].style.display = "list-item";
                     }
                 }
                 else{
-                    var foundesp = 0;
-                    for (i = 0; i < Madera.length; i++){
-                        console.log("damn")
-                        //try checking the especificacion first
-                        var especificaciones = Madera[i].Especificaciones1;
-                        especificaciones = especificaciones.split(';');
-                        for (var j = 0; j < especificaciones.length; j++){
-                            var especificacion = especificaciones[j];
-                            especificacion = especificacion.trim().toLowerCase();
-                            if (input == especificacion){
-                                x[i].style.display = "list-item";
-                                foundesp = 1;
-                                break;
-                            }
-                            else{
-                                x[i].style.display = "none";
-                            }
-                        }
+                    var cases = 0;
+                    cases = getcasenum(input,inputarte,inputmuni);
+                    //take every one of them out first (dont display any)
+                    for (var i = 0; i < all_artesanos.length; i++){
+                        x[i].style.display = "none";
                     }
-                    if (foundesp != 1){
-                        input = input.trim().toLowerCase().split(' ')
-                        //changing the input into something that can be searched
-                        for (var i = 0; i < input.length; i++){
-                            input[i] = input[i].charAt(0).toUpperCase() + input[i].slice(1);
-                        }
-                        console.log(input);
-                        for(var i = 0; i < Madera.length; i++){
-                            count = 0;
-                            artist = Madera[i].Nombre.trim().split(' ');
-                            for (k = 0; k < input.length; k++){
-                                for (var l = 0; l < artist.length; l++){
-                                    if(artist[l] == input[k]){
-                                        x[i].style.display = "list-item";
-                                        break;
-                                    }
-                                    else{
-                                        x[i].style.display = "none";
-                                    }
-                                }
-                            }
-                        }
+                    switch(cases){
+                        //cases == 1 when only inputmuni has been writen on
+                        case 1:
+                            filter_municipios(inputmuni);
+                            break;
+                        //cases == 2 when only inputarte has been written on
+                        case 2:
+                            filter_artesanias(inputarte);
+                            break;
+                        //cases == 3 when inputarte and inputmuni has been written on
+                        case 3:
+                            search_art_mun(inputarte,inputmuni);
+                            break;
+                        //cases == 4 when input has been writen on
+                        case 4:
+                            filter_any(input);
+                            break;
+                        //cases == 5 when input and inputmuni has been written on
+                        case 5:
+                            search_any_mun(input,inputmuni);
+                            break;
+                        //cases == 6 when input and inputart has been written on
+                        case 6:
+                            search_any_art(input,inputarte);
+                            break;
+                        //cases == 7 when input, inputart and inputmuni has been writen on
+                        case 7:
+                            search_any_art_mun(input,inputarte,inputmuni);
+                            break;
                     }
                 }
-            }
+            }            
         </script>
 
         <template id="search.html">
             <ons-page id="Buscar">
-
                 <p style="text-align: center; margin-top: 10px;">
-                    <ons-search-input placeholder="Search" id = "searchbar"
-                                      onchange = "filter()"
-                                      ></ons-search-input>
+                    <ons-search-input placeholder="Search anything" id = "searchbar"
+                        onkeyup = "filter()"></ons-search-input>
+                    <ons-search-input placeholder="Tipo de artesania" id = "searchartesania" 
+                        onkeyup = "filter()"></ons-search-input>
+                    <ons-search-input placeholder = "Municipio" id = "searchbarmunicipio"
+                        onkeyup = "filter()"></ons-search-input>
                 </p>
 
                 <ons-list id="results" src="">
                 </ons-list>
 
                 <script>
-                    for (i = 0; i < Madera.length;i++){
+                    for (i = 0; i < all_artesanos.length;i++){
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-                        onclick="myNavigator.pushPage('artesano.html', { data: {title: '${Madera[i].Nombre}', mun: '${Madera[i].Municipio}', tel: '${Madera[i]["Telefono1"]}', email: '${Madera[i]["E-mail1"]}', esp: '${Madera[i].Especificaciones1}' } })" tappable>
-                        <div>${Madera[i].Nombre}</div>
+                        onclick="myNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', redes: '${all_artesanos[i]["E-Commerce"]}', esp: '${all_artesanos[i].Especificacion}' } })" tappable>
+                        <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         // var artesano = ons.createElement(`
                         //   <ons-list-item class = "artists">
-                        //     <div class="center" >${Madera[i].Nombre}</div>
+                        //     <div class="center" >${all_artesanos[i].Nombre}</div>
                         //   </ons-list-item>`
                         // );
                         document.getElementById('results').appendChild(artesano);
@@ -567,26 +521,41 @@
                     ons.getScriptPage().onInit = function () {
                         this.querySelector('ons-toolbar div.center').textContent = this.data.title;
 
-                        var info = ``,
+                        var data = '',
                             mun = this.data.mun,
                             tel = this.data.tel,
-                            email = this.data.email,
+                            em = this.data.email,
                             esp = this.data.esp;
 
-                        if(mun.trim() != '') {
-                            info = info + `Municipio: ` + mun + `<br>`;
+                        email = em.slice(0, em.search("#"));
+                        if(esp.trim() != ""){
+                            if(esp.includes(";", 0)){
+                                esp=esp.replace(/;/g,", ");
+                                data+='Tipos de artesanias: '+esp+'<br>';
+                            }
+                            else {
+                                data+='Tipo de artesania: '+esp+'<br>';
+                            }
                         }
-                        if(tel.trim() != '') {
-                            info = info + `Tel\u00e9fono: <a href="tel:+1` + tel + `">` + tel + `</a><br>`;
+
+                        //console.log("Las redes son..."+this.data.redes);
+
+                        if(mun.trim() != ""){
+                            data+='Municipio: '+ mun +'<br>';
                         }
-                        if(email.trim() != '') {
-                            info = info + `Correo Electr\u00f3nico: ` + email + `<br>`;
+                        
+                        if(email.trim() != "" & email.toUpperCase().trim() != "NO TIENE"){
+                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+email+'"><u>'+email+'</u></a><br>';
                         }
-                        if(esp.trim() != '') {
-                            info = info + `Trabaja con: ` + esp + `<br>`;
+
+                        //Underlined <u></u>
+                        //Color blue <p style="color:blue"></p>
+
+                        if(tel.trim() != "" ){
+                            data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
                         }
 
-                        document.getElementById("all").innerHTML = `${info}`;
+                        document.getElementById("all").innerHTML = `${data}`;
 
                     }
                 </script>
@@ -710,4 +679,4 @@
         <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
     </body>
-</html>
+</html>

platforms/android/app/src/main/assets/www/js/load.js

@@ -15,12 +15,12 @@ window.fn.loadLink = function (url) {
 
 window.fn.pushPage = function (page, anim) {
 
-	//Open and send json file that is equivalent with the especification.
-	var artesanos = JSON.parse(window.localStorage.getItem(page.title.toUpperCase()));
+  //Open and send json file that is equivalent with the especification.
+  var artesanos = JSON.parse(window.localStorage.getItem(page.title.toUpperCase()));
 
   if (anim) {
     document.getElementById('myNavigator').pushPage(page.id, { data: { title: page.title, esp: page.esp, json: artesanos } , animation: anim });
   } else {
     document.getElementById('myNavigator').pushPage(page.id, { data: { title: page.title, esp: page.esp, json: artesanos } });
   }
-};
+};

platforms/android/app/src/main/assets/www/js/renglones.js

@@ -1,9 +1,12 @@
 var info = JSON.parse(window.localStorage.getItem("RENGLONES"));
-console.log("TEST!!!");
+
+
+
 var list = document.getElementById("list");
 
-console.log(info.length);
-  for (var i = 0; i < info.length(); i++) {
+  for (var i = 0; i < info.length; i++) {
+
+          
 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
                       <div class="center">${info[i].Renglones}</div>
@@ -21,4 +24,4 @@ console.log(info.length);
   /*`<ons-card onclick="fn.pushPage({'id':'artesanias.html','title':'${info[i].Renglones}','esp': '${info[i].Especificaciones}'})">
                         <div class="title">${info[i].Renglones}</div>
                         <div class="content"><img class="list-item__thumbnail" src="img/${info[i].Renglones}.png"></div>
-                    </ons-card>`*/
+                    </ons-card>`*/

platforms/android/app/src/main/assets/www/js/saveLocal.js

@@ -38,4 +38,4 @@ try {
   }
   } catch {
     console.log("error");
-  }
+  }

platforms/android/app/src/main/assets/www/js/searchfunctions.js

@@ -0,0 +1,260 @@
+//Basic shit to understand
+//all_artesanos is the json that has the file that contains all the artesanos, this includes the studd they do,municipio,telefono,email and name
+//x is going to be what is displayed in the app, it basically has the same infromation as all_artesanos
+//THe basic mechanic is to display each artist in the search tab whenever something of them is found
+//You need at least 3 characters in one of the searchbars for it to display something
+//If nothing is written then it will display every artists
+//Some of these functions also try to make sure that the inputs are the same format as the thing they're looking up so that they dont have to follow a specific syntax to look for stuff
+
+//Tries to filter by the type of work that the artists do, if what they wrote in inputarte is included in one of them then the artists is displayed in the search bar
+function filter_artesanias(inputarte){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        var especificaciones = all_artesanos[i].Especificacion;
+        especificaciones = especificaciones.trim().toLowerCase();
+        especificaciones = acento_replace(especificaciones);
+        if (especificaciones.search(inputarte) != -1){
+            x[i].style.display = "list-item";
+        }
+        //before it did this down here but im keeping it just in case...
+        //especificaciones = especificaciones.split(',');
+        //for (var j = 0; j < especificaciones.length; j++){
+            //var especificacion = especificaciones[j];
+            //especificacion = especificacion.trim().toLowerCase();
+            //especificacion = acento_replace(especificacion);
+            //if (especificacion.search(inputarte) != -1){
+                //x[i].style.display = "list-item";
+                //break;
+            //}
+
+        }
+    return;
+}
+
+//Tries to filter by the municipio that they reside in or work in (not sure which one of the two it is)
+function filter_municipios(inputmuni){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        var municipio = all_artesanos[i].Municipio;
+        municipio = municipio.trim().toLowerCase();
+        municipio = acento_replace(municipio);
+        if (municipio.search(inputmuni)!= -1){
+            x[i].style.display = "list-item";
+        }
+    }
+    return;
+}
+
+//Tries to filter by any kind of information provided (name,artesania,municipio,telefono,email)
+function filter_any(input){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        if (find_name(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_artesania(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_municipio(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_telefono(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_email(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+    }
+    return;
+}
+
+//Te trata de buscar si cualquiera de ellos tienen el input que se dio aplica a ese artista especifico (i)
+function find_any(i,input){
+    //if you find any of these in that space then return 1 if you didnt find that anything matched with the input then return 0
+    if (find_name(i,input) || find_telefono(i,input) || find_email(i,input) || find_artesania(i,input) || find_municipio(i,input)){
+        return 1;
+    }
+    else{
+        return 0;
+    }
+}
+
+//Trata de ver si el input es parte del nombre del artista i
+//Mayuscula y acento proof
+function find_name(i,input){
+    var name = all_artesanos[i].Nombre;
+    name = name.trim().toLowerCase();
+    name = acento_replace(name);
+    if(name.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//trata de ver si el input es parte de alguna artesania que trabaja el artista i
+//Mayuscula y acento proof
+function find_artesania(i,input){
+    var artesanias = all_artesanos[i].Especificacion;
+    artesanias = artesanias.trim().toLowerCase();
+    artesanias = acento_replace(artesanias);
+    if(artesanias.search(input) != -1){
+        return 1;
+    }
+    //artesanias = artesanias.split(',');
+    //for (var j = 0; j < artesanias.length; j++){
+        //var artesania = artesanias[j];
+        //artesania = artesania.trim().toLowerCase();
+        //artesania = acento_replace(artesania);
+        //if (artesania.search(input) != -1){
+            //return 1;
+        //}
+    //}
+    return 0;
+}
+
+//trata de ver si el input es parte del municipio del artista i
+//Mayuscula y acento proof
+function find_municipio(i,input){
+    var mun = all_artesanos[i].Municipio;
+    mun = mun.trim().toLowerCase();
+    mun = acento_replace(mun);
+    if(mun.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//trata de ver si el input es parte del telefono del artista i
+//'(',')','-' and ' ' proof
+function find_telefono(i,input){
+    var tel = all_artesanos[i]["Telefono 1"];
+    tel = tel.trim();
+    //To make sure they're both the same im taking out spaces,'(',')' and '-' to make sure they're both the same format
+    tel = tel.replace(/\s/g,'').replace(/\u0028/g,'').replace(/\u0029/g,'').replace(/\u002D/g,'');
+    input = input.replace(/\s/g,'').replace(/\u0028/g,'').replace(/\u0029/g,'').replace(/\u002D/g,'');
+    if(tel.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//trata de ver si el input es parte del email del artista i
+//Mayuscula and acento proof
+function find_email(i,input){
+    var email = all_artesanos[i]["E-mail"];
+    email = email.trim().toLowerCase();
+    email = acento_replace(email);
+    if(email.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//Esta funcion trata de coger el numero de caso que se esta buscando, esto es para saber que 
+//caso del switch para considerar
+//LOs casos dependen de lo que esta escrito en cada search bar, cada vez que se escribe en uno nuevo o cuando se borra completamente uno entonces es un caso nuevo
+function getcasenum(input,inputarte,inputmuni){
+    //this will get the case number
+    //think of this as 3 binary numbers where 001 would mean that only its input muni
+    //010 is only inputarte and 100 is only input
+    //max number is 7
+    var casenum = 0;
+    if (input.length != 0){
+        casenum += 4;
+    }
+    if (inputarte.length != 0){
+        casenum += 2;
+    }
+    if (inputmuni.length != 0){
+        casenum += 1;
+    }
+    return casenum;
+}
+
+//case 3: artesania y municipio
+//Busca todos los artistas que trabajan con esa artesania y en ese municipio
+function search_art_mun(inputarte,inputmuni){
+    var x = document.getElementsByClassName('artists');
+        for (var i = 0; i < all_artesanos.length; i++){
+            if (find_artesania(i,inputarte) && find_municipio(i,inputmuni)){
+                x[i].style.display = "list-item";
+            }
+        }
+}
+
+//Busca todos los artistas que salen con el primer input y trabajan en ese municipio
+function search_any_mun(input,inputmuni){
+    var x = document.getElementsByClassName('artists');
+        for (var i = 0; i < all_artesanos.length; i++){
+            if(find_any(i,input) && find_municipio(i,inputmuni)){
+                x[i].style.display = "list-item";
+            }
+        }
+}
+
+//Busca todos los artistas que salen con el primer input y trabajan con esa artesania
+function search_any_art(input,inputarte){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        if(find_any(i,input) && find_artesania(i,inputarte)){
+            x[i].style.display = "list-item";
+        }
+    }
+}
+
+//Busca todos los artistas que salen con el primer input, trabajan con esa artesania y trabajan en ese municipio
+function search_any_art_mun(input,inputarte,inputmuni){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        if(find_any(i,input) && find_artesania(i,inputarte) && find_municipio(i,inputmuni)){
+            x[i].style.display = "list-item";
+        }
+    }
+}
+
+//Replacing special characters with non special characters in case input doesnt include it
+function acento_replace(string){
+    var precstring = "";
+    var poststring = "";
+    for( i = 0; i < string.length ; i++){
+        if (string.charAt(i) == 'á' || string.charAt(i) == 'é' || string.charAt(i) == 'í'|| string.charAt(i) == 'ó' || string.charAt(i) == 'ú' || string.charAt(i) == 'ü' || string.charAt(i) == 'ñ' || string.charAt(i) == 'ö'){
+            precstring = string.slice(0,i);
+            postcstring = "";
+            if(i != string.length-1){
+              postcstring = string.slice(i+1,string.length);
+            }
+            switch(string.charAt(i)){
+                case 'á':
+                    string = precstring.concat('a',postcstring);
+                    break;
+                case 'é':
+                    string = precstring.concat('e',postcstring);
+                    break;
+                case 'í':
+                    string = precstring.concat('i',postcstring);
+                    break;
+                case 'ó':
+                    string = precstring.concat('o',postcstring);
+                    break;
+                case 'ú':
+                    string = precstring.concat('u',postcstring);
+                    break;
+                case 'ü':
+                    string = precstring.concat('u',postcstring);
+                    break;
+                case 'ñ':
+                    string = precstring.concat('n',postcstring);
+                    break;
+                case 'ö':
+                    string = precstring.concat('o',postcstring);
+                    break;
+            }
+        }
+    }
+    return string;
+}

www/index.html

@@ -410,97 +410,93 @@
         </template>
 
 <!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
-
+<!----------------------------------------------------------------------------------->
+        <script src = "js/searchfunctions.js"></script>
         <script>
-            var Madera = JSON.parse(window.localStorage.getItem("TODOS"));
+            //JSON file that has all the artesanos 
+            var all_artesanos = JSON.parse(window.localStorage.getItem("TODOS"));
             function filter(){
-
-
-                // var request = new XMLHttpRequest()
-                // request.open('GET','json/MADERA.json',true)
-                // request.onload = function(){
-                //   var Madera = JSON.parse(this.response)
-                // }
-                // request.send()
-                // var input = document.getElementById('searchbar').value
-                // var firstwood = Madera[0].Nombre
-                // ons.notification.alert('Searched for: ' + firstwood)
-                var input = document.getElementById('searchbar').value
+                var input = document.getElementById('searchbar').value;
+                var inputarte = document.getElementById('searchartesania').value;
+                var inputmuni = document.getElementById('searchbarmunicipio').value;
                 var x = document.getElementsByClassName('artists');
+                //making sure they're all in the same format
                 input = input.trim().toLowerCase();
-                if (input.length == 0){
-                    for (i = 0; Madera.length; i++){
+                inputarte = inputarte.trim().toLowerCase();
+                inputmuni = inputmuni.trim().toLowerCase();
+                input = acento_replace(input);
+                inputarte = acento_replace(inputarte);
+                inputmuni = acento_replace(inputmuni);
+                //default case is where evey one of them has nothing or less than 3 characters (displays every artist)
+                if (input.length <= 3 && inputarte.length <= 3 && inputmuni.length <= 3){
+                    for (var i = 0; all_artesanos.length; i++){
                         x[i].style.display = "list-item";
                     }
                 }
                 else{
-                    var foundesp = 0;
-                    for (i = 0; i < Madera.length; i++){
-                        console.log("damn")
-                        //try checking the especificacion first
-                        var especificaciones = Madera[i].Especificaciones1;
-                        especificaciones = especificaciones.split(';');
-                        for (var j = 0; j < especificaciones.length; j++){
-                            var especificacion = especificaciones[j];
-                            especificacion = especificacion.trim().toLowerCase();
-                            if (input == especificacion){
-                                x[i].style.display = "list-item";
-                                foundesp = 1;
-                                break;
-                            }
-                            else{
-                                x[i].style.display = "none";
-                            }
-                        }
+                    var cases = 0;
+                    cases = getcasenum(input,inputarte,inputmuni);
+                    //take every one of them out first (dont display any)
+                    for (var i = 0; i < all_artesanos.length; i++){
+                        x[i].style.display = "none";
                     }
-                    if (foundesp != 1){
-                        input = input.trim().toLowerCase().split(' ')
-                        //changing the input into something that can be searched
-                        for (var i = 0; i < input.length; i++){
-                            input[i] = input[i].charAt(0).toUpperCase() + input[i].slice(1);
-                        }
-                        console.log(input);
-                        for(var i = 0; i < Madera.length; i++){
-                            count = 0;
-                            artist = Madera[i].Nombre.trim().split(' ');
-                            for (k = 0; k < input.length; k++){
-                                for (var l = 0; l < artist.length; l++){
-                                    if(artist[l] == input[k]){
-                                        x[i].style.display = "list-item";
-                                        break;
-                                    }
-                                    else{
-                                        x[i].style.display = "none";
-                                    }
-                                }
-                            }
-                        }
+                    switch(cases){
+                        //cases == 1 when only inputmuni has been writen on
+                        case 1:
+                            filter_municipios(inputmuni);
+                            break;
+                        //cases == 2 when only inputarte has been written on
+                        case 2:
+                            filter_artesanias(inputarte);
+                            break;
+                        //cases == 3 when inputarte and inputmuni has been written on
+                        case 3:
+                            search_art_mun(inputarte,inputmuni);
+                            break;
+                        //cases == 4 when input has been writen on
+                        case 4:
+                            filter_any(input);
+                            break;
+                        //cases == 5 when input and inputmuni has been written on
+                        case 5:
+                            search_any_mun(input,inputmuni);
+                            break;
+                        //cases == 6 when input and inputart has been written on
+                        case 6:
+                            search_any_art(input,inputarte);
+                            break;
+                        //cases == 7 when input, inputart and inputmuni has been writen on
+                        case 7:
+                            search_any_art_mun(input,inputarte,inputmuni);
+                            break;
                     }
                 }
-            }
+            }            
         </script>
 
         <template id="search.html">
             <ons-page id="Buscar">
-
                 <p style="text-align: center; margin-top: 10px;">
-                    <ons-search-input placeholder="Search" id = "searchbar"
-                                      onchange = "filter()"
-                                      ></ons-search-input>
+                    <ons-search-input placeholder="Search anything" id = "searchbar"
+                        onkeyup = "filter()"></ons-search-input>
+                    <ons-search-input placeholder="Tipo de artesania" id = "searchartesania" 
+                        onkeyup = "filter()"></ons-search-input>
+                    <ons-search-input placeholder = "Municipio" id = "searchbarmunicipio"
+                        onkeyup = "filter()"></ons-search-input>
                 </p>
 
                 <ons-list id="results" src="">
                 </ons-list>
 
                 <script>
-                    for (i = 0; i < Madera.length;i++){
+                    for (i = 0; i < all_artesanos.length;i++){
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-                        onclick="myNavigator.pushPage('artesano.html', { data: {title: '${Madera[i].Nombre}', mun: '${Madera[i].Municipio}', tel: '${Madera[i]["Telefono1"]}', email: '${Madera[i]["E-mail1"]}', redes: '${Madera[i]["E-Commerce1"]}', esp: '${Madera[i].Especificaciones1}' } })" tappable>
-                        <div>${Madera[i].Nombre}</div>
+                        onclick="myNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', redes: '${all_artesanos[i]["E-Commerce"]}', esp: '${all_artesanos[i].Especificacion}' } })" tappable>
+                        <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         // var artesano = ons.createElement(`
                         //   <ons-list-item class = "artists">
-                        //     <div class="center" >${Madera[i].Nombre}</div>
+                        //     <div class="center" >${all_artesanos[i].Nombre}</div>
                         //   </ons-list-item>`
                         // );
                         document.getElementById('results').appendChild(artesano);

www/js/searchfunctions.js

@@ -0,0 +1,260 @@
+//Basic shit to understand
+//all_artesanos is the json that has the file that contains all the artesanos, this includes the studd they do,municipio,telefono,email and name
+//x is going to be what is displayed in the app, it basically has the same infromation as all_artesanos
+//THe basic mechanic is to display each artist in the search tab whenever something of them is found
+//You need at least 3 characters in one of the searchbars for it to display something
+//If nothing is written then it will display every artists
+//Some of these functions also try to make sure that the inputs are the same format as the thing they're looking up so that they dont have to follow a specific syntax to look for stuff
+
+//Tries to filter by the type of work that the artists do, if what they wrote in inputarte is included in one of them then the artists is displayed in the search bar
+function filter_artesanias(inputarte){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        var especificaciones = all_artesanos[i].Especificacion;
+        especificaciones = especificaciones.trim().toLowerCase();
+        especificaciones = acento_replace(especificaciones);
+        if (especificaciones.search(inputarte) != -1){
+            x[i].style.display = "list-item";
+        }
+        //before it did this down here but im keeping it just in case...
+        //especificaciones = especificaciones.split(',');
+        //for (var j = 0; j < especificaciones.length; j++){
+            //var especificacion = especificaciones[j];
+            //especificacion = especificacion.trim().toLowerCase();
+            //especificacion = acento_replace(especificacion);
+            //if (especificacion.search(inputarte) != -1){
+                //x[i].style.display = "list-item";
+                //break;
+            //}
+
+        }
+    return;
+}
+
+//Tries to filter by the municipio that they reside in or work in (not sure which one of the two it is)
+function filter_municipios(inputmuni){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        var municipio = all_artesanos[i].Municipio;
+        municipio = municipio.trim().toLowerCase();
+        municipio = acento_replace(municipio);
+        if (municipio.search(inputmuni)!= -1){
+            x[i].style.display = "list-item";
+        }
+    }
+    return;
+}
+
+//Tries to filter by any kind of information provided (name,artesania,municipio,telefono,email)
+function filter_any(input){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        if (find_name(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_artesania(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_municipio(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_telefono(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+        else if (find_email(i,input)){
+            x[i].style.display = "list-item";
+            continue;
+        }
+    }
+    return;
+}
+
+//Te trata de buscar si cualquiera de ellos tienen el input que se dio aplica a ese artista especifico (i)
+function find_any(i,input){
+    //if you find any of these in that space then return 1 if you didnt find that anything matched with the input then return 0
+    if (find_name(i,input) || find_telefono(i,input) || find_email(i,input) || find_artesania(i,input) || find_municipio(i,input)){
+        return 1;
+    }
+    else{
+        return 0;
+    }
+}
+
+//Trata de ver si el input es parte del nombre del artista i
+//Mayuscula y acento proof
+function find_name(i,input){
+    var name = all_artesanos[i].Nombre;
+    name = name.trim().toLowerCase();
+    name = acento_replace(name);
+    if(name.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//trata de ver si el input es parte de alguna artesania que trabaja el artista i
+//Mayuscula y acento proof
+function find_artesania(i,input){
+    var artesanias = all_artesanos[i].Especificacion;
+    artesanias = artesanias.trim().toLowerCase();
+    artesanias = acento_replace(artesanias);
+    if(artesanias.search(input) != -1){
+        return 1;
+    }
+    //artesanias = artesanias.split(',');
+    //for (var j = 0; j < artesanias.length; j++){
+        //var artesania = artesanias[j];
+        //artesania = artesania.trim().toLowerCase();
+        //artesania = acento_replace(artesania);
+        //if (artesania.search(input) != -1){
+            //return 1;
+        //}
+    //}
+    return 0;
+}
+
+//trata de ver si el input es parte del municipio del artista i
+//Mayuscula y acento proof
+function find_municipio(i,input){
+    var mun = all_artesanos[i].Municipio;
+    mun = mun.trim().toLowerCase();
+    mun = acento_replace(mun);
+    if(mun.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//trata de ver si el input es parte del telefono del artista i
+//'(',')','-' and ' ' proof
+function find_telefono(i,input){
+    var tel = all_artesanos[i]["Telefono 1"];
+    tel = tel.trim();
+    //To make sure they're both the same im taking out spaces,'(',')' and '-' to make sure they're both the same format
+    tel = tel.replace(/\s/g,'').replace(/\u0028/g,'').replace(/\u0029/g,'').replace(/\u002D/g,'');
+    input = input.replace(/\s/g,'').replace(/\u0028/g,'').replace(/\u0029/g,'').replace(/\u002D/g,'');
+    if(tel.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//trata de ver si el input es parte del email del artista i
+//Mayuscula and acento proof
+function find_email(i,input){
+    var email = all_artesanos[i]["E-mail"];
+    email = email.trim().toLowerCase();
+    email = acento_replace(email);
+    if(email.search(input) != -1){
+        return 1;
+    }
+    return 0;
+}
+
+//Esta funcion trata de coger el numero de caso que se esta buscando, esto es para saber que 
+//caso del switch para considerar
+//LOs casos dependen de lo que esta escrito en cada search bar, cada vez que se escribe en uno nuevo o cuando se borra completamente uno entonces es un caso nuevo
+function getcasenum(input,inputarte,inputmuni){
+    //this will get the case number
+    //think of this as 3 binary numbers where 001 would mean that only its input muni
+    //010 is only inputarte and 100 is only input
+    //max number is 7
+    var casenum = 0;
+    if (input.length != 0){
+        casenum += 4;
+    }
+    if (inputarte.length != 0){
+        casenum += 2;
+    }
+    if (inputmuni.length != 0){
+        casenum += 1;
+    }
+    return casenum;
+}
+
+//case 3: artesania y municipio
+//Busca todos los artistas que trabajan con esa artesania y en ese municipio
+function search_art_mun(inputarte,inputmuni){
+    var x = document.getElementsByClassName('artists');
+        for (var i = 0; i < all_artesanos.length; i++){
+            if (find_artesania(i,inputarte) && find_municipio(i,inputmuni)){
+                x[i].style.display = "list-item";
+            }
+        }
+}
+
+//Busca todos los artistas que salen con el primer input y trabajan en ese municipio
+function search_any_mun(input,inputmuni){
+    var x = document.getElementsByClassName('artists');
+        for (var i = 0; i < all_artesanos.length; i++){
+            if(find_any(i,input) && find_municipio(i,inputmuni)){
+                x[i].style.display = "list-item";
+            }
+        }
+}
+
+//Busca todos los artistas que salen con el primer input y trabajan con esa artesania
+function search_any_art(input,inputarte){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        if(find_any(i,input) && find_artesania(i,inputarte)){
+            x[i].style.display = "list-item";
+        }
+    }
+}
+
+//Busca todos los artistas que salen con el primer input, trabajan con esa artesania y trabajan en ese municipio
+function search_any_art_mun(input,inputarte,inputmuni){
+    var x = document.getElementsByClassName('artists');
+    for (var i = 0; i < all_artesanos.length; i++){
+        if(find_any(i,input) && find_artesania(i,inputarte) && find_municipio(i,inputmuni)){
+            x[i].style.display = "list-item";
+        }
+    }
+}
+
+//Replacing special characters with non special characters in case input doesnt include it
+function acento_replace(string){
+    var precstring = "";
+    var poststring = "";
+    for( i = 0; i < string.length ; i++){
+        if (string.charAt(i) == 'á' || string.charAt(i) == 'é' || string.charAt(i) == 'í'|| string.charAt(i) == 'ó' || string.charAt(i) == 'ú' || string.charAt(i) == 'ü' || string.charAt(i) == 'ñ' || string.charAt(i) == 'ö'){
+            precstring = string.slice(0,i);
+            postcstring = "";
+            if(i != string.length-1){
+              postcstring = string.slice(i+1,string.length);
+            }
+            switch(string.charAt(i)){
+                case 'á':
+                    string = precstring.concat('a',postcstring);
+                    break;
+                case 'é':
+                    string = precstring.concat('e',postcstring);
+                    break;
+                case 'í':
+                    string = precstring.concat('i',postcstring);
+                    break;
+                case 'ó':
+                    string = precstring.concat('o',postcstring);
+                    break;
+                case 'ú':
+                    string = precstring.concat('u',postcstring);
+                    break;
+                case 'ü':
+                    string = precstring.concat('u',postcstring);
+                    break;
+                case 'ñ':
+                    string = precstring.concat('n',postcstring);
+                    break;
+                case 'ö':
+                    string = precstring.concat('o',postcstring);
+                    break;
+            }
+        }
+    }
+    return string;
+}