CCOM4030
/
artesanias
Tarkkaile 5
Äänestä 0
Fork 0

2 Commitit
37c3d6cd46 ... eb34a8a2cb

Tekijä SHA1 Viesti Päivämäärä
  Christian Matos eb34a8a2cb fixes and conflicts 3 vuotta sitten
  Christian Matos b8ce011dc7 Cambios en nombres 3 vuotta sitten
26 muutettua tiedostoa jossa 226 lisäystä ja 27 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. BIN
      platforms/android/app/src/main/assets/www/img/BARRO.jpg
  2. BIN
      platforms/android/app/src/main/assets/www/img/CRISTAL.jpg
  3. BIN
      platforms/android/app/src/main/assets/www/img/CUERO.jpg
  4. BIN
      platforms/android/app/src/main/assets/www/img/FIBRAS.jpg
  5. BIN
      platforms/android/app/src/main/assets/www/img/INSTRUMENTOS TÍPICOS.jpg
  6. BIN
      platforms/android/app/src/main/assets/www/img/JUGUETES TRADICIONALES.jpg
  7. BIN
      platforms/android/app/src/main/assets/www/img/LABORES EN AGUJA.jpg
  8. BIN
      platforms/android/app/src/main/assets/www/img/METAL.jpg
  9. BIN
      platforms/android/app/src/main/assets/www/img/MÁSCARAS.jpg
  10. BIN
      platforms/android/app/src/main/assets/www/img/TABACOS.jpg
  11. 92
    3
      platforms/android/app/src/main/assets/www/index.html
  12. 4
    0
      platforms/android/app/src/main/assets/www/js/azar.js
  13. 4
    0
      platforms/android/app/src/main/assets/www/js/renglones.js
  14. 2
    0
      platforms/android/app/src/main/assets/www/js/saveLocal.js
  15. 68
    8
      platforms/browser/www/index.html
  16. 4
    0
      platforms/browser/www/js/renglones.js
  17. 2
    0
      platforms/browser/www/js/saveLocal.js
  18. BIN
      platforms/ios/ArtesaníasICP.xcworkspace/xcuserdata/christian.xcuserdatad/UserInterfaceState.xcuserstate
  19. 2
    2
      platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/christian.xcuserdatad/xcschemes/xcschememanagement.plist
  20. 1
    1
      platforms/ios/www/css/index.css
  21. 10
    5
      platforms/ios/www/index.html
  22. 4
    0
      platforms/ios/www/js/renglones.js
  23. 2
    0
      platforms/ios/www/js/saveLocal.js
  24. 25
    8
      www/index.html
  25. 4
    0
      www/js/renglones.js
  26. 2
    0
      www/js/saveLocal.js

BIN
platforms/android/app/src/main/assets/www/img/BARRO.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/CRISTAL.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/CUERO.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/FIBRAS.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/INSTRUMENTOS TÍPICOS.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/JUGUETES TRADICIONALES.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/LABORES EN AGUJA.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/METAL.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/MÁSCARAS.jpg Näytä tiedosto


BIN
platforms/android/app/src/main/assets/www/img/TABACOS.jpg Näytä tiedosto


+ 92
- 3
platforms/android/app/src/main/assets/www/index.html Näytä tiedosto

41 
         <meta name="format-detection" content="telephone=no">
 41 
         <meta name="format-detection" content="telephone=no">
42 
         <meta name="msapplication-tap-highlight" content="no">
 42 
         <meta name="msapplication-tap-highlight" content="no">
43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
 43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44 
+        <meta charset="UTF-8">
44 
         <link rel="stylesheet" type="text/css" href="css/index.css">
 45 
         <link rel="stylesheet" type="text/css" href="css/index.css">
45 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
 46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
 47 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52 
     </head>
 53 
     </head>
53 
     <body>
 54 
     <body>
54
55
55 
-
56 
+        <script>
57 
+
58 
+
59 
+
60 
+        </script>
56
61
57 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
 62 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58 
            <ons-page>
 63 
            <ons-page>
219 
                 <div class="center" >${Artesano.Nombre}</div>
 224 
                 <div class="center" >${Artesano.Nombre}</div>
220 
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
 225 
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
221 
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
 226 
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
222 
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
227 
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
223 
                                                  </div>
 228 
                                                  </div>
224 
               </ons-list-item>`
 229 
               </ons-list-item>`
225 
                                                     );
 230 
                                                     );
242 
                             if (Artesano["Telefono 1"].trim().length != 0) {
 247 
                             if (Artesano["Telefono 1"].trim().length != 0) {
243 
                                 cont ++;
 248 
                                 cont ++;
244 
                             }
 249 
                             }
245 
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
250 
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
246 
                                 cont ++;
 251 
                                 cont ++;
247 
                             }
 252 
                             }
248 
                             if (Artesano.Especificacion.trim().length != 0) {
 253 
                             if (Artesano.Especificacion.trim().length != 0) {
254 
                             //'title':'${Artesano.Nombre}','esp': '${info}'
 259 
                             //'title':'${Artesano.Nombre}','esp': '${info}'
255 
                             //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)
 260 
                             //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)
256 
                             //And puts this into the 'item' variable
 261 
                             //And puts this into the 'item' variable
262 
+<<<<<<< HEAD
263 
+                            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["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
264 
+=======
257 
                             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"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}', tecnicas: '${Artesano["Tecnica 1"]}' } })" tappable>
 265 
                             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"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}', tecnicas: '${Artesano["Tecnica 1"]}' } })" tappable>
266 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
258 
                         <div class="title">${Artesano.Nombre}</div>
 267 
                         <div class="title">${Artesano.Nombre}</div>
259 
                     </ons-list-item>`);
 268 
                     </ons-list-item>`);
260
269
362
371
363 
                                  //if(Esp[num] in artesanos_json.) {}
 372 
                                  //if(Esp[num] in artesanos_json.) {}
364 
                                  Artesanos+=`${results[i].Nombre}|`
 373 
                                  Artesanos+=`${results[i].Nombre}|`
374 
+<<<<<<< HEAD
375 
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
376 
+=======
365 
                                  ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
 377 
                                  ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
378 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
366 
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
 379 
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
367 
                              }
 380 
                              }
368
381
399 
                                  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>`;
 412 
                                  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>`;
400 
                              }
 413 
                              }
401
414
415 
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
416 
+                                 Artesania.name = "Figuras y símbolos indígenas";
417 
+                             }
418 
+
419 
+                             console.log(Artesania.name);
402
420
403 
                              return ons.createElement(`
 421 
                              return ons.createElement(`
404 
               <ons-list-item expandable tappable>
 422 
               <ons-list-item expandable tappable>
538 
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
 556 
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
539 
                     for (i = 0; i < all_artesanos.length;i++){
 557 
                     for (i = 0; i < all_artesanos.length;i++){
540 
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
 558 
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
559 
+<<<<<<< HEAD
560 
+                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', 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"]}' } })" tappable>
561 
+=======
541 
                         onclick="SNavigator.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"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
 562 
                         onclick="SNavigator.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"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
563 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
542 
                         <div>${all_artesanos[i].Nombre}</div>
 564 
                         <div>${all_artesanos[i].Nombre}</div>
543 
                     </ons-list-item>`);
 565 
                     </ons-list-item>`);
544 
                         document.getElementById('results').appendChild(artesano);
 566 
                         document.getElementById('results').appendChild(artesano);
719 
                     <script type="text/javascript" src="calendar_files/js/events.js"></script>
 741 
                     <script type="text/javascript" src="calendar_files/js/events.js"></script>
720 
                 </div>
 742 
                 </div>
721
743
744 
+<<<<<<< HEAD
745 
+                </ons-card>-->
746 
+                <br><br><br>
747 
+                <button onclick="redirect()">Pasar a la pagina de eventos</button>
748 
+=======
722 
                 </ons-card>--
 749 
                 </ons-card>--
723 
                 <br><br><br>-->
 750 
                 <br><br><br>-->
724 
                 <ons-card>
 751 
                 <ons-card>
734 
                     El Instituto de Cultura Puertorriqueña, el Gobierno de Puerto Rico, los Colaboradores de esta aplicación, así como los funcionarios, empleados y contratistas de los anteriores, no se hacen responsables de los mensajes, imágenes, opiniones, servicios, declaraciones, representaciones o cualquier forma de contenido incluido en cualquiera de los enlaces accesibles, vinculados o referidos a través de ArtesaníasICP.
 761 
                     El Instituto de Cultura Puertorriqueña, el Gobierno de Puerto Rico, los Colaboradores de esta aplicación, así como los funcionarios, empleados y contratistas de los anteriores, no se hacen responsables de los mensajes, imágenes, opiniones, servicios, declaraciones, representaciones o cualquier forma de contenido incluido en cualquiera de los enlaces accesibles, vinculados o referidos a través de ArtesaníasICP.
735 
                 </div>
 762 
                 </div>
736 
                 </ons-card>
 763 
                 </ons-card>
764 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
737
765
738 
               <script>
 766 
               <script>
739 
               function redirect() {
 767 
               function redirect() {
766 
                         <br><br>
 794 
                         <br><br>
767 
                         En esta plataforma agrupamos herramientas que permitirán que tu organización adquiera mayor visibilidad, recursos, conexiones, capacidad para una operación más eficiente y efectiva.
 795 
                         En esta plataforma agrupamos herramientas que permitirán que tu organización adquiera mayor visibilidad, recursos, conexiones, capacidad para una operación más eficiente y efectiva.
768 
                         <br><br>
 796 
                         <br><br>
797 
+<<<<<<< HEAD
798 
+                    </body>
799 
+
800 
+
801 
+
802 
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br>
803 
+                    <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
804 
+                    </a>
805 
+                    <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
806 
+=======
769 
                         Saludos Cordiales,
 807 
                         Saludos Cordiales,
770 
                                 Aziria
 808 
                                 Aziria
771 
                     </div>
809 
                     </div>
777 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
 815 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
778 
                     </a>
 816 
                     </a>
779 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
 817 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
818 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
819 
+                    </a>
820 
+                    <a href="https://www.linkedin.com/company/sinfinespr/"><img src="img/linkedin.png" alt="Linkedin" style="width:35px;height:35px;border:0;">
821 
+                    </a>
822 
+                    <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
823 
+                    </a>
824 
+<<<<<<< HEAD
825 
+
826 
+                    <br><br><br>
827 
+                    <button onclick="redirect()">Pasar a la pagina de eventos</button>
828 
+
829 
+                    <script>
830 
+                        function redirect() {
831 
+                            location.replace("https://facebook.com/icppr")
832 
+                        }
833 
+                    </script>
834 
+
835 
+                    <br><br>
836 
+                    <style>
837 
+                        .column {
838 
+                            float: left;
839 
+                            width: 50%;
840 
+                        }
841 
+                        .row {
842 
+                            width: 100%;
843 
+                        }
844 
+                    </style>
845 
+                    <h2>SINFINESPR</h2>
846 
+                    <div class = "column">
847 
+                        SINFINESPR es un programa de Titín Foundation que responde a nuestro interés y compromiso con el fortalecimiento del tercer sector.
848 
+                        <br><br>
849 
+                        En esta plataforma agrupamos herramientas que permitirán que tu organización adquiera mayor visibilidad, recursos, conexiones, capacidad para una operación más eficiente y efectiva.
850 
+                        <br><br>
851 
+                        Saludos Cordiales,
852 
+                                Aziria
853 
+                    </div>
854 
+                    <div class = "column">
855 
+                        <img src="img/sfpr.svg" style="width:150px;height:100px">
856 
+                    </div>
857 
+                    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
858 
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
859 
+                    <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
860 
+                    </a>
861 
+                    <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
780 
                     </a>
 862 
                     </a>
781 
                     <a href="https://www.linkedin.com/company/sinfinespr/"><img src="img/linkedin.png" alt="Linkedin" style="width:35px;height:35px;border:0;">
 863 
                     <a href="https://www.linkedin.com/company/sinfinespr/"><img src="img/linkedin.png" alt="Linkedin" style="width:35px;height:35px;border:0;">
782 
                     </a>
 864 
                     </a>
783 
                     <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
 865 
                     <a href="https://www.instagram.com/sinfinespr/"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
784 
                     </a>
 866 
                     </a>
785 
                     <br><br>
 867 
                     <br><br>
868 
+                    <h2>Centro de Desarrollo y Consultoria Computacional</h2>
869 
+                    El Centro de Desarrollo y Consultoría Computacional está compuesto por profesores y estudiantes del departamento de Ciencia de Cómputos de la Universidad de Puerto Rico Recinto de Río Piedras. Nuestra meta es aportar al desarrollo computacional de la Universidad y de Puerto Rico al proveer servicios al día, de calidad y con precios accesibles, a la misma vez que se le ofrece experiencias prácticas a los estudiantes del departamento de Ciencia de Cómputos.
870 
+                    <br><br>
871 
+                    Si tiene alguna duda nos puede conactar por:
872 
+=======
873 
+                    <br><br>
786 
                     <h2>Centro de Desarrollo y Consultoría Computacional</h2>
 874 
                     <h2>Centro de Desarrollo y Consultoría Computacional</h2>
787 
                     El Centro de Desarrollo y Consultoría Computacional está compuesto por profesores y estudiantes del departamento de Ciencia de Cómputos de la Universidad de Puerto Rico Recinto de Río Piedras. Nuestra meta es aportar al desarrollo computacional de la Universidad y de Puerto Rico al proveer servicios al día, de calidad y con precios accesibles, a la misma vez que se le ofrece experiencias prácticas a los estudiantes del departamento de Ciencia de Cómputos.
 875 
                     El Centro de Desarrollo y Consultoría Computacional está compuesto por profesores y estudiantes del departamento de Ciencia de Cómputos de la Universidad de Puerto Rico Recinto de Río Piedras. Nuestra meta es aportar al desarrollo computacional de la Universidad y de Puerto Rico al proveer servicios al día, de calidad y con precios accesibles, a la misma vez que se le ofrece experiencias prácticas a los estudiantes del departamento de Ciencia de Cómputos.
788 
                     <br><br>
 876 
                     <br><br>
791
879
792 
                     <br><br>
 880 
                     <br><br>
793 
                     Si tiene alguna duda nos puede contactar por:
 881 
                     Si tiene alguna duda nos puede contactar por:
882 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
794 
                     <br>
 883 
                     <br>
795 
                     Teléfono: 787-764-0000 Ext. 88341, 88349
 884 
                     Teléfono: 787-764-0000 Ext. 88341, 88349
796 
                     <br>
 885 
                     <br>

+ 4
- 0
platforms/android/app/src/main/assets/www/js/azar.js Näytä tiedosto

6 
 var page = document.getElementById("home");
 6 
 var page = document.getElementById("home");
7
7
8 
 var aleatorio = Math.floor(Math.random()*52);
 8 
 var aleatorio = Math.floor(Math.random()*52);
9 
+<<<<<<< HEAD
10 
+document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="300">`;
11 
+=======
9 
 document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="auto">`;
 12 
 document.getElementById("image").innerHTML = `<img src="img/${aleatorio}.jpg" width="100%" height="auto">`;
13 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
10 
 document.getElementById("Content").innerHTML = "<h4>" + data[aleatorio].titulo + "</h4>" + data[aleatorio].texto;
14 
 document.getElementById("Content").innerHTML = "<h4>" + data[aleatorio].titulo + "</h4>" + data[aleatorio].texto;
11
15
12 
 page.addEventListener("show", function(event){
 16 
 page.addEventListener("show", function(event){

+ 4
- 0
platforms/android/app/src/main/assets/www/js/renglones.js Näytä tiedosto

7 
           var renglonLower = info[i].Renglones.toLowerCase()
 7 
           var renglonLower = info[i].Renglones.toLowerCase()
8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
9
10 
+          if (renglonCap == "Metal") {
11 
+                  renglonCap = "Joyería y orfebrería"
12 
+          }
13 
+
10
14
11
15
12 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
 16 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
platforms/android/app/src/main/assets/www/js/saveLocal.js Näytä tiedosto

41 
   } catch {
 41 
   } catch {
42 
     console.log("error");
 42 
     console.log("error");
43 
   }
 43 
   }
44 
+
45 
+

+ 68
- 8
platforms/browser/www/index.html Näytä tiedosto

41 
         <meta name="format-detection" content="telephone=no">
 41 
         <meta name="format-detection" content="telephone=no">
42 
         <meta name="msapplication-tap-highlight" content="no">
 42 
         <meta name="msapplication-tap-highlight" content="no">
43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
 43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44 
+        <meta charset="UTF-8">
44 
         <link rel="stylesheet" type="text/css" href="css/index.css">
 45 
         <link rel="stylesheet" type="text/css" href="css/index.css">
45 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
 46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
 47 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52 
     </head>
 53 
     </head>
53 
     <body>
 54 
     <body>
54
55
55 
-
56 
+        <script>
57 
+
58 
+
59 
+
60 
+        </script>
56
61
57 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
 62 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58 
            <ons-page>
 63 
            <ons-page>
219 
                 <div class="center" >${Artesano.Nombre}</div>
 224 
                 <div class="center" >${Artesano.Nombre}</div>
220 
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
 225 
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
221 
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
 226 
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
222 
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
227 
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
223 
                                                  </div>
 228 
                                                  </div>
224 
               </ons-list-item>`
 229 
               </ons-list-item>`
225 
                                                     );
 230 
                                                     );
242 
                             if (Artesano["Telefono 1"].trim().length != 0) {
 247 
                             if (Artesano["Telefono 1"].trim().length != 0) {
243 
                                 cont ++;
 248 
                                 cont ++;
244 
                             }
 249 
                             }
245 
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
250 
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
246 
                                 cont ++;
 251 
                                 cont ++;
247 
                             }
 252 
                             }
248 
                             if (Artesano.Especificacion.trim().length != 0) {
 253 
                             if (Artesano.Especificacion.trim().length != 0) {
249 
                                 cont ++;
 254 
                                 cont ++;
250 
                             }
 255 
                             }
251 
-
256 
+
257 
+                            Artesano.Nombre = Artesano.Nombre + " " + Artesano["Apellido Paterno"] + " " + Artesano["Apellido Materno"];
252
258
253 
                             //info a pasar
 259 
                             //info a pasar
254 
                             //'title':'${Artesano.Nombre}','esp': '${info}'
 260 
                             //'title':'${Artesano.Nombre}','esp': '${info}'
255 
                             //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)
 261 
                             //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)
256 
                             //And puts this into the 'item' variable
 262 
                             //And puts this into the 'item' variable
263 
+<<<<<<< HEAD
264 
+                            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["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
265 
+=======
257 
                             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"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}', tecnicas: '${Artesano["Tecnica 1"]}' } })" tappable>
 266 
                             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"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}', tecnicas: '${Artesano["Tecnica 1"]}' } })" tappable>
267 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
258 
                         <div class="title">${Artesano.Nombre}</div>
 268 
                         <div class="title">${Artesano.Nombre}</div>
259 
                     </ons-list-item>`);
 269 
                     </ons-list-item>`);
260
270
361 
                              for(var i=0; i<results.length; i++) {
 371 
                              for(var i=0; i<results.length; i++) {
362
372
363 
                                  //if(Esp[num] in artesanos_json.) {}
 373 
                                  //if(Esp[num] in artesanos_json.) {}
374 
+                                 results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
364 
                                  Artesanos+=`${results[i].Nombre}|`
 375 
                                  Artesanos+=`${results[i].Nombre}|`
376 
+<<<<<<< HEAD
377 
+                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
378 
+=======
365 
                                  ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
 379 
                                  ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
380 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
366 
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
 381 
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
367 
                              }
 382 
                              }
368
383
396 
                                      redes = lot[4],
 411 
                                      redes = lot[4],
397 
                                      tecnicas = lot[5];
 412 
                                      tecnicas = lot[5];
398
413
414 
+<<<<<<< HEAD
415 
+                                 listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
416 
+                                 console.log(listaArt)
417 
+=======
399 
                                  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>`;
 418 
                                  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>`;
419 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
400 
                              }
 420 
                              }
401
421
422 
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
423 
+                                 Artesania.name = "Figuras y símbolos indígenas";
424 
+                             }
425 
+
426 
+                             console.log(Artesania.name);
402
427
403 
                              return ons.createElement(`
 428 
                              return ons.createElement(`
404 
               <ons-list-item expandable tappable>
 429 
               <ons-list-item expandable tappable>
537 
                     //This is basically declaring what we refer to as informacion in the filter() function
 562 
                     //This is basically declaring what we refer to as informacion in the filter() function
538 
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
 563 
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
539 
                     for (i = 0; i < all_artesanos.length;i++){
 564 
                     for (i = 0; i < all_artesanos.length;i++){
565 
+                        all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
540 
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
 566 
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
567 
+<<<<<<< HEAD
568 
+                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', 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"]}' } })" tappable>
569 
+=======
541 
                         onclick="SNavigator.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"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
 570 
                         onclick="SNavigator.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"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
571 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
542 
                         <div>${all_artesanos[i].Nombre}</div>
 572 
                         <div>${all_artesanos[i].Nombre}</div>
543 
                     </ons-list-item>`);
 573 
                     </ons-list-item>`);
544 
                         document.getElementById('results').appendChild(artesano);
 574 
                         document.getElementById('results').appendChild(artesano);
572 
                             tel = this.data.tel,
 602 
                             tel = this.data.tel,
573 
                             em = this.data.email,
 603 
                             em = this.data.email,
574 
                             esp = this.data.esp,
 604 
                             esp = this.data.esp,
605 
+<<<<<<< HEAD
606 
+                            redes = this.data.redes;
607 
+
608 
+=======
575 
                             redes = this.data.redes,
 609 
                             redes = this.data.redes,
576 
                             tecnicas = this.data.tecnicas;
 610 
                             tecnicas = this.data.tecnicas;
611 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
577
612
578 
                         //here the email is the string made from the start to where the '#' is.
 613 
                         //here the email is the string made from the start to where the '#' is.
579 
-                        email = em.slice(0, em.search("#"));
614 
+
580
615
581 
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
 616 
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
582 
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
 617 
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
608
643
609 
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
 644 
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
610 
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
 645 
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
611 
-                        if(email.trim() != "" & email.toUpperCase().trim() != "NO TIENE"){
612 
-                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+email+'"><u>'+email+'</u></a><br>';
646 
+                        if(em.trim() != "" & em.toUpperCase().trim() != "NO TIENE"){
647 
+                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+em+'"><u>'+em+'</u></a><br>';
613 
                         }
 648 
                         }
614
649
615 
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
 650 
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
751
786
752 
                     <h1>Colaboradores</h1>
 787 
                     <h1>Colaboradores</h1>
753
788
789 
+<<<<<<< HEAD
790 
+
791 
+
792 
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br>
793 
+                    <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
794 
+                    </a>
795 
+                    <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
796 
+                    </a>
797 
+                    <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
798 
+                    </a>
799 
+                    <a href="https://instagram.com/icppr"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
800 
+                    </a>
801 
+
802 
+                    <br><br><br>
803 
+                    <button onclick="redirect()">Pasar a la pagina de eventos</button>
804 
+
805 
+                    <script>
806 
+                        function redirect() {
807 
+                            location.replace("https://facebook.com/icppr")
808 
+                        }
809 
+                    </script>
810 
+
811 
+                    <br><br>
812 
+=======
813 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
754 
                     <style>
 814 
                     <style>
755 
                         .column {
 815 
                         .column {
756 
                             float: left;
 816 
                             float: left;
773 
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
 833 
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
774 
                     </div>
 834 
                     </div>
775 
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 835 
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
776 
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
836 
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
777 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
 837 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
778 
                     </a>
 838 
                     </a>
779 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
 839 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

+ 4
- 0
platforms/browser/www/js/renglones.js Näytä tiedosto

7 
           var renglonLower = info[i].Renglones.toLowerCase()
 7 
           var renglonLower = info[i].Renglones.toLowerCase()
8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
9
10 
+          if (renglonCap == "Metal") {
11 
+                  renglonCap = "Joyería y orfebrería"
12 
+          }
13 
+
10
14
11
15
12 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
 16 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
platforms/browser/www/js/saveLocal.js Näytä tiedosto

41 
   } catch {
 41 
   } catch {
42 
     console.log("error");
 42 
     console.log("error");
43 
   }
 43 
   }
44 
+
45 
+

BIN
platforms/ios/ArtesaníasICP.xcworkspace/xcuserdata/christian.xcuserdatad/UserInterfaceState.xcuserstate Näytä tiedosto


+ 2
- 2
platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/christian.xcuserdatad/xcschemes/xcschememanagement.plist Näytä tiedosto

7 
 		<key>Cordova.xcscheme_^#shared#^_</key>
 7 
 		<key>Cordova.xcscheme_^#shared#^_</key>
8 
 		<dict>
 8 
 		<dict>
9 
 			<key>orderHint</key>
 9 
 			<key>orderHint</key>
10 
-			<integer>2</integer>
10 
+			<integer>1</integer>
11 
 		</dict>
 11 
 		</dict>
12 
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
 12 
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
13 
 		<dict>
 13 
 		<dict>
14 
 			<key>orderHint</key>
 14 
 			<key>orderHint</key>
15 
-			<integer>1</integer>
15 
+			<integer>2</integer>
16 
 		</dict>
 16 
 		</dict>
17 
 	</dict>
 17 
 	</dict>
18 
 </dict>
 18 
 </dict>

+ 1
- 1
platforms/ios/www/css/index.css Näytä tiedosto

32 
     margin:0px;
 32 
     margin:0px;
33 
     padding:0px;
 33 
     padding:0px;
34 
     /* Padding to avoid the "unsafe" areas behind notches in the screen */
 34 
     /* Padding to avoid the "unsafe" areas behind notches in the screen */
35 
-    padding: env(safe-area-inset-top, 0px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 0px) env(safe-area-inset-right, 0px);
35 
+    padding: env(safe-area-inset-top, 10px) env(safe-area-inset-right, 0px) env(safe-area-inset-bottom, 10px) env(safe-area-inset-right, 0px);
36 
     text-transform:none;
 36 
     text-transform:none;
37 
     width:100%;
 37 
     width:100%;
38 
 }
 38 
 }

+ 10
- 5
platforms/ios/www/index.html Näytä tiedosto

41 
         <meta name="format-detection" content="telephone=no">
 41 
         <meta name="format-detection" content="telephone=no">
42 
         <meta name="msapplication-tap-highlight" content="no">
 42 
         <meta name="msapplication-tap-highlight" content="no">
43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
 43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44 
+        <meta charset="UTF-8">
44 
         <link rel="stylesheet" type="text/css" href="css/index.css">
 45 
         <link rel="stylesheet" type="text/css" href="css/index.css">
45 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
 46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
 47 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52 
     </head>
 53 
     </head>
53 
     <body>
 54 
     <body>
54
55
55 
-
56 
+        <script>
57 
+
58 
+
59 
+
60 
+        </script>
56
61
57 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
 62 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58 
            <ons-page>
 63 
            <ons-page>
726 
             <ons-page id="colaboradores">
 731 
             <ons-page id="colaboradores">
727 
                 <ons-card>
 732 
                 <ons-card>
728
733
729 
-                    <h1>Colaboradoress</h1>
734 
+                    <h1>Colaboradores</h1>
730 
                     <h2>Instituto de Cultura Puertorriqueña</h2>
 735 
                     <h2>Instituto de Cultura Puertorriqueña</h2>
731 
                     <h3>Ven, descubre lo que nuestra riqueza cultural puertorriqueña tiene para tí.<br> Disfrútala, es tu identidad.
 736 
                     <h3>Ven, descubre lo que nuestra riqueza cultural puertorriqueña tiene para tí.<br> Disfrútala, es tu identidad.
732 
                     </h3>
 737 
                     </h3>
747
752
748
753
749
754
750 
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br>
755 
+                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br>
751 
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
 756 
                     <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
752 
-                    </a>
757 
+                    </a>
753 
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
 758 
                     <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
754 
                     </a>
 759 
                     </a>
755 
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
 760 
                     <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
789 
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
 794 
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
790 
                     </div>
 795 
                     </div>
791 
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 796 
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
792 
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
797 
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
793 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
 798 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
794 
                     </a>
 799 
                     </a>
795 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
 800 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

+ 4
- 0
platforms/ios/www/js/renglones.js Näytä tiedosto

7 
           var renglonLower = info[i].Renglones.toLowerCase()
 7 
           var renglonLower = info[i].Renglones.toLowerCase()
8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
9
10 
+          if (renglonCap == "Metal") {
11 
+                  renglonCap = "Joyería y orfebrería"
12 
+          }
13 
+
10
14
11
15
12 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
 16 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
platforms/ios/www/js/saveLocal.js Näytä tiedosto

41 
   } catch {
 41 
   } catch {
42 
     console.log("error");
 42 
     console.log("error");
43 
   }
 43 
   }
44 
+
45 
+

+ 25
- 8
www/index.html Näytä tiedosto

41 
         <meta name="format-detection" content="telephone=no">
 41 
         <meta name="format-detection" content="telephone=no">
42 
         <meta name="msapplication-tap-highlight" content="no">
 42 
         <meta name="msapplication-tap-highlight" content="no">
43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
 43 
         <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover">
44 
+        <meta charset="UTF-8">
44 
         <link rel="stylesheet" type="text/css" href="css/index.css">
 45 
         <link rel="stylesheet" type="text/css" href="css/index.css">
45 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
 46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsenui.css">
46 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
 47 
         <link rel="stylesheet" href="lib/OnsenUI/css/onsen-css-components.min.css">
52 
     </head>
 53 
     </head>
53 
     <body>
 54 
     <body>
54
55
55 
-
56 
+        <script>
57 
+
58 
+
59 
+
60 
+        </script>
56
61
57 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
 62 
             <!--the toolbar is where it will have the main name of the app and the ICP logo (top center)-->
58 
            <ons-page>
 63 
            <ons-page>
219 
                 <div class="center" >${Artesano.Nombre}</div>
 224 
                 <div class="center" >${Artesano.Nombre}</div>
220 
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
 225 
                 <div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
221 
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
 226 
                                                  Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
222 
-                                                 Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
227 
+                                                 Correo Electr\u00f3nico: ${Artesano["Email"]}<br>
223 
                                                  </div>
 228 
                                                  </div>
224 
               </ons-list-item>`
 229 
               </ons-list-item>`
225 
                                                     );
 230 
                                                     );
242 
                             if (Artesano["Telefono 1"].trim().length != 0) {
 247 
                             if (Artesano["Telefono 1"].trim().length != 0) {
243 
                                 cont ++;
 248 
                                 cont ++;
244 
                             }
 249 
                             }
245 
-                            if (Artesano["E-mail"].trim().length != 0 & Artesano["E-mail"].toUpperCase().trim() != "NO TIENE") {
250 
+                            if (Artesano["Email"].trim().length != 0 & Artesano["Email"].toUpperCase().trim() != "NO TIENE") {
246 
                                 cont ++;
 251 
                                 cont ++;
247 
                             }
 252 
                             }
248 
                             if (Artesano.Especificacion.trim().length != 0) {
 253 
                             if (Artesano.Especificacion.trim().length != 0) {
249 
                                 cont ++;
 254 
                                 cont ++;
250 
                             }
 255 
                             }
251 
-
256 
+
257 
+                            Artesano.Nombre = Artesano.Nombre + " " + Artesano["Apellido Paterno"] + " " + Artesano["Apellido Materno"];
252
258
253 
                             //info a pasar
 259 
                             //info a pasar
254 
                             //'title':'${Artesano.Nombre}','esp': '${info}'
 260 
                             //'title':'${Artesano.Nombre}','esp': '${info}'
361 
                              for(var i=0; i<results.length; i++) {
 367 
                              for(var i=0; i<results.length; i++) {
362
368
363 
                                  //if(Esp[num] in artesanos_json.) {}
 369 
                                  //if(Esp[num] in artesanos_json.) {}
370 
+                                 results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
364 
                                  Artesanos+=`${results[i].Nombre}|`
 371 
                                  Artesanos+=`${results[i].Nombre}|`
365 
                                  ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
 372 
                                  ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
366 
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
 373 
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
399 
                                  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>`;
 406 
                                  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>`;
400 
                              }
 407 
                              }
401
408
409 
+                             if (Artesania.name == "Figuras y simbolos indigenas") {
410 
+                                 Artesania.name = "Figuras y símbolos indígenas";
411 
+                             }
412 
+
413 
+                             console.log(Artesania.name);
402
414
403 
                              return ons.createElement(`
 415 
                              return ons.createElement(`
404 
               <ons-list-item expandable tappable>
 416 
               <ons-list-item expandable tappable>
537 
                     //This is basically declaring what we refer to as informacion in the filter() function
 549 
                     //This is basically declaring what we refer to as informacion in the filter() function
538 
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
 550 
                     //It iterates though each artists in the all_artesanos json file from before, it displays their name in the "Buscar" page, and it gets prepared so that when its clicked it redirects to the "artesano.html" page with the other aditional information that we have other than the name.
539 
                     for (i = 0; i < all_artesanos.length;i++){
 551 
                     for (i = 0; i < all_artesanos.length;i++){
552 
+                        all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
540 
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
 553 
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
554 
+<<<<<<< HEAD
555 
+                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', 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"]}' } })" tappable>
556 
+=======
541 
                         onclick="SNavigator.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"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
 557 
                         onclick="SNavigator.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"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
558 
+>>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
542 
                         <div>${all_artesanos[i].Nombre}</div>
 559 
                         <div>${all_artesanos[i].Nombre}</div>
543 
                     </ons-list-item>`);
 560 
                     </ons-list-item>`);
544 
                         document.getElementById('results').appendChild(artesano);
 561 
                         document.getElementById('results').appendChild(artesano);
576 
                             tecnicas = this.data.tecnicas;
 593 
                             tecnicas = this.data.tecnicas;
577
594
578 
                         //here the email is the string made from the start to where the '#' is.
 595 
                         //here the email is the string made from the start to where the '#' is.
579 
-                        email = em.slice(0, em.search("#"));
596 
+
580
597
581 
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
 598 
                         //Here it's dividing all the especificaciones and writing them into the page (data) and then goes to the next line
582 
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
 599 
                         //if it has many especificaciones then it will replace all the ';' in it with ',' and writes it into the page
608
625
609 
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
 626 
                         //Here it's writing their email, in blue color and its used as a link to send one when it's clicked, then it goes to the next line
610 
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
 627 
                         //Whenever the variable is empty or if it has "NO TIENE" then it doesnt write anything
611 
-                        if(email.trim() != "" & email.toUpperCase().trim() != "NO TIENE"){
612 
-                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+email+'"><u>'+email+'</u></a><br>';
628 
+                        if(em.trim() != "" & em.toUpperCase().trim() != "NO TIENE"){
629 
+                            data+='Correo Electr\u00f3nico: <a style="color:blue" href="mailto: '+em+'"><u>'+em+'</u></a><br>';
613 
                         }
 630 
                         }
614
631
615 
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
 632 
                         //Here it's writing their phone number into the page,its in blue and whenever its clicked the app will redirect the user to call them, then it goes to the next line
773 
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
 790 
                         <img src="img/sfpr.svg" style="width:150px;height:100px">
774 
                     </div>
 791 
                     </div>
775 
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 792 
                     <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
776 
-                    Visita nuesta Página Web o siguenos en nuestras redes sociales<br>
793 
+                    Visita nuesta Página Web o siguenos en nuestras redes sociales <br> <br>
777 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
 794 
                     <a href="https://twitter.com/SINFINESPR"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
778 
                     </a>
 795 
                     </a>
779 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
 796 
                     <a href="https://www.facebook.com/sinfinespr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">

+ 4
- 0
www/js/renglones.js Näytä tiedosto

7 
           var renglonLower = info[i].Renglones.toLowerCase()
 7 
           var renglonLower = info[i].Renglones.toLowerCase()
8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
 8 
           var renglonCap = renglonLower.charAt(0).toUpperCase() + renglonLower.slice(1)
9
9
10 
+          if (renglonCap == "Metal") {
11 
+                  renglonCap = "Joyería y orfebrería"
12 
+          }
13 
+
10
14
11
15
12 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">
 16 
           var item = ons.createElement(`<ons-list-item expandable onclick="hideAll()">

+ 2
- 0
www/js/saveLocal.js Näytä tiedosto

41 
   } catch {
 41 
   } catch {
42 
     console.log("error");
 42 
     console.log("error");
43 
   }
 43 
   }
44 
+
45 
+