Social link bug fix

platforms/browser/www/index.html

                         //If it's none of them then it will not display anything
                         //First Social Media
                         if(red1.includes("facebook")){
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("instagram")){
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("myspace")){
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
 
                         //Second Social Media
                         if(red2.includes("facebook")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("instagram")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("myspace")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
                         
                         //E-commerce 
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
                         //If it's none of them then it will not display anything
                         if(red1.includes("facebook")) {
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("instagram")){
                             
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("myspace")){
                             
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
 
 
                         if(red2.includes("facebook")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("instagram")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("myspace")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
 
 

platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/christian.xcuserdatad/xcschemes/xcschememanagement.plist

 		<key>Cordova.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

platforms/ios/www/index.html

                             //'title':'${Artesano.Nombre}','esp': '${info}'
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
                             //And puts this into the 'item' variable
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre.replace(/"/g, " ")}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}', tecnicas: '${Artesano["Tecnica"]}' } })" tappable>
+                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre.replace(/"/g, " ")}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["Email"]}', esp: '${Artesano.Especificacion}', red1: '${Artesano["Red Social 1"]}', red2: '${Artesano["Red Social 2"]}', ecom: '${Artesano["E-Commerce 1"]}', tecnicas: '${Artesano["Tecnica"]}' } })" tappable>
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
                              });*/
 
                              for(var i=0; i<results.length; i++) {
-
+                                
                                  //if(Esp[num] in artesanos_json.) {}
                                  //results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
                                  ANombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
                                  Artesanos+=`${ANombre}|`
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}|${results[i]["Tecnica"]}&&`
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}|${results[i]["E-Commerce 1"]}|${results[i]["Red Social 1"]}|${results[i]["Red Social 2"]}|${results[i]["Tecnica"]}&&`
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
-                             }
+                                }
 
                              return {
                                  name: Esp[num],
                                      tel = lot[1],
                                      email = lot[2],
                                      esp = lot[3],
-                                     redes = lot[4],
-                                     tecnicas = lot[5];
+                                     ecom = lot[4],
+                                     red1 = lot[5];
+                                     red2 = lot[6];
+                                     tecnicas = lot[7]
+                                     console.log(lot)
 
-                                 listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}', tecnicas: '${tecnicas}' }} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
+                                 listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i].replace(/"/g, " ")}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', red1: '${red1}', red2: '${red2}', ecom: '${ecom}', tecnicas: '${tecnicas}' }} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
                              }
 
                              if (Artesania.name == "Figuras y simbolos indigenas") {
                                  Artesania.name = "Figuras y símbolos indígenas";
                              } 
 
-                             console.log(Artesania.name);
+        
 
                              return ons.createElement(`
               <ons-list-item expandable tappable>
                     for (i = 0; i < all_artesanos.length;i++){
                         all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-                        onclick="SNavigator.pushPage('artesano_s.html', { data: {title: '${all_artesanos[i].Nombre.replace(/"/g, " ")}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica"]}' } })" tappable>
+                        onclick="SNavigator.pushPage('artesano_s.html', { data: {title: '${all_artesanos[i].Nombre.replace(/"/g, " ")}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["Email"]}', esp: '${all_artesanos[i].Especificacion}', red1: '${all_artesanos[i]["Red Social 1"]}', red2: '${all_artesanos[i]["Red Social 2"]}', ecom: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica"]}' } })" tappable>
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         document.getElementById('results').appendChild(artesano);
                             tel = this.data.tel,
                             em = this.data.email,
                             esp = this.data.esp,
-                            redes = this.data.redes,
+                            red1 = this.data.red1,
+                            red2 = this.data.red2,
+                            ecom = this.data.ecom,
                             tecnicas = this.data.tecnicas;
 
+                            
+
                         //here the email is the string made from the start to where the '#' is.
                         
 
                             data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
                         }
 
-                        console.log("Redes: "+redes);
+                        
 
                         //Here it has to decide what to do depending on the links they give to their social media pages
                         //if the link is to a facebook, instagram or myspace account then it will show the picture of the social media site, and when you click the picture then the app redirects you to their social media.
-                        //The alt attribute is required for images, it's in case theres no internet connection, then it will display that tet instead, I think screen readers can also read that text
-                        //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
+                        
+                        
                         //If it's none of them then it will not display anything
-                        if(redes.includes("facebook")){
-
-                            console.log(redes.substring(1,redes.length-2));
-                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                        //First Social Media
+                        if(red1.includes("facebook")){
+                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if(redes.includes("instagram")){
-                            console.log(redes.substring(1,redes.length-2));
-                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                        else if(red1.includes("instagram")){
+                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if(redes.includes("myspace")){
-                            console.log(redes.substring(1,redes.length-2));
-                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                        else if(red1.includes("myspace")){
+                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if((redes.includes(".org") || redes.includes(".com")) && !redes.includes("mailto")){
-                            redes = redes.substr(redes.indexOf("#")+1,redes.length);
-                            redes = redes.substr(0, redes.length-1);
-                            console.log(redes);
-                            data+='<br><a href="'+ redes + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
+
+                        //Second Social Media
+                        if(red2.includes("facebook")){
+                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(red2.includes("instagram")){
+                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if(redes.includes("#") || redes.includes("mailto")){
-                            console.log("tiene un disparate");
-                        } else {
-                            console.log("no tiene nada");
+                        else if(red2.includes("myspace")){
+                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
+                        
+                        //E-commerce 
+                        if ((ecom.includes(".org") || ecom.includes(".com")) && !ecom.includes("mailto")){
+                            ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
+                            ecom = ecom.substr(0, ecom.length-1);
+                            console.log(ecom);
+                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        
 
                         //This is the part that allows eveything (data) to be displayed
                         document.getElementById("all").innerHTML = `${data}`;
                             tel = this.data.tel,
                             em = this.data.email,
                             esp = this.data.esp,
-                            redes = this.data.redes,
+                            red1 = this.data.red1,
+                            red2 = this.data.red2,
+                            ecom = this.data.ecom,
                             tecnicas = this.data.tecnicas;
 
                         //here the email is the string made from the start to where the '#' is.
                             data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
                         }
 
-                        console.log("Redes: "+redes);
+                        
 
                         //Here it has to decide what to do depending on the links they give to their social media pages
                         //if the link is to a facebook, instagram or myspace account then it will show the picture of the social media site, and when you click the picture then the app redirects you to their social media.
                         //The alt attribute is required for images, it's in case theres no internet connection, then it will display that tet instead, I think screen readers can also read that text
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
                         //If it's none of them then it will not display anything
-                        if(redes.includes("facebook")){
-
-                            console.log(redes.substring(1,redes.length-2));
-                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                        if(red1.includes("facebook")) {
+                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(red1.includes("instagram")){
+                            
+                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                        }
+                        else if(red1.includes("myspace")){
+                            
+                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if(redes.includes("instagram")){
-                            console.log(redes.substring(1,redes.length-2));
-                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+
+
+                        if(red2.includes("facebook")){
+                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if(redes.includes("myspace")){
-                            console.log(redes.substring(1,redes.length-2));
-                            data+='<br><a href="'+ redes.substring(1,redes.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                        else if(red2.includes("instagram")){
+                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if((redes.includes(".org") || redes.includes(".com")) && !redes.includes("mailto")){
-                            redes = redes.substr(redes.indexOf("#")+1,redes.length);
-                            redes = redes.substr(0, redes.length-1);
-                            console.log(redes);
-                            data+='<br><a href="'+ redes + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
+                        else if(red2.includes("myspace")){
+                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
-                        else if(redes.includes("#") || redes.includes("mailto")){
-                            console.log("tiene un disparate");
-                        } else {
-                            console.log("no tiene nada");
+
+
+                        if((ecom.includes(".org") || ecom.includes(".com")) && !ecom.includes("mailto")){
+                            ecom = ecom.substr(ecom.indexOf("#")+1,ecom.length);
+                            ecom = ecom.substr(0, ecom.length-1);
+
+                            data+='<br><a href="'+ ecom + '"><img src="img/internet.jpg" style="width:35px;height:35px;border:0;"><br>';
                         }
+                        
 
                         //This is the part that allows eveything (data) to be displayed
                         document.getElementById("all2").innerHTML = `${data}`;

www/index.html

                         //If it's none of them then it will not display anything
                         //First Social Media
                         if(red1.includes("facebook")){
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("instagram")){
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("myspace")){
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
 
                         //Second Social Media
                         if(red2.includes("facebook")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("instagram")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("myspace")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
                         
                         //E-commerce 
                         //If the link is to another website (but isn't a mailto link) then it will display a default picture we chose to display a default web browser, like the other ones clikcing on it will take you to the link.
                         //If it's none of them then it will not display anything
                         if(red1.includes("facebook")) {
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("instagram")){
                             
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red1.includes("myspace")){
                             
-                            data+='<br><a href="'+ red1.substring(1,red1.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red1 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }
 
 
                         if(red2.includes("facebook")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/facebook.png" alt="Facebook"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("instagram")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/instagram.png" alt="Instagram"style="width:35px;height:35px;border:0;"><br>';
                         }
                         else if(red2.includes("myspace")){
-                            data+='<br><a href="'+ red2.substring(1,red2.length-2) + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
+                            data+='<br><a href="'+ red2 + '"><img src="img/MySpace.png" alt="MySpace"style="width:35px;height:35px;border:0;"><br>';
                         }