From 37ca0268790501cee2f47912b7c7b986dc41302a Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Tue, 7 Apr 2020 07:02:02 -0500
Subject: [PATCH] Mejopras en categorizacion

---
 iconoclasta/index.php | 19 +++++--------
 labmapero.php         | 11 ++++----
 mapero.php            | 65 +++++++++++++++++++++++++++++++++++--------
 3 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/iconoclasta/index.php b/iconoclasta/index.php
index 358c512..ffbf986 100644
--- a/iconoclasta/index.php
+++ b/iconoclasta/index.php
@@ -9,7 +9,7 @@ require ('funciones/funciones.php');
 require ('../milfs/funciones/funciones.php');
 require ("../milfs/funciones/conex.php");
 
-$xajax->processRequests(); 
+$xajax->processRequests();
 $color_frente= random_color();
 $color_fondo= random_color();
 
@@ -22,20 +22,15 @@ $color_fondo= random_color();
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
-    
-     <?php 
-     $xajax->printJavascript("../milfs/xajax/"); 
+
+     <?php
+     $xajax->printJavascript("../milfs/xajax/");
      //	$xajax->debugOn();
 		//$xajax->statusMessagesOn();
       ?>
 	<link rel="shortcut icon" href="favicon-152.png">
 	<link rel="apple-touch-icon-precomposed" href="favicon-152.png">
-
-
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" integrity="sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous" >
-
-
-
 <style>
 @font-face {
     font-family: 'AlfphabetIV';
@@ -69,7 +64,7 @@ if (elemento &&  elemento.getContext){
 
 <div class='form-group '>
 <div class='col-md-8'>
-	
+
 <label for='color_front' >Titulo</label>
 	<input class='form-control input-lg' id='frase'  name='frase' placeholder='Escribe una frase o palabra' onkeyup="xajax_iconifica(xajax.getFormValues('formulario_iconifica'))" />
 
@@ -77,7 +72,7 @@ if (elemento &&  elemento.getContext){
 	</div>
 	<div class='form-group'>
 	<div class='col-md-2'>
-	
+
 				<label for='color_front' >Frente</label>
 
 		<input onchange="xajax_iconifica(xajax.getFormValues('formulario_iconifica'))" class='form-control input-lg' id='color_front' name='color_front' type='color' value='#<?php echo $color_frente; ?>'/>
@@ -85,7 +80,7 @@ if (elemento &&  elemento.getContext){
 	</div>
 	<div class='form-group '>
 	<div class='col-md-2'>
-	
+
 			<label for='color_back' >Fondo</label>
 	<input  onchange="xajax_iconifica(xajax.getFormValues('formulario_iconifica'))"  class='form-control input-lg' id='color_back' name='color_back' type='color' value="#<?php echo $color_fondo; ?>" />
 	</div>
diff --git a/labmapero.php b/labmapero.php
index b3dbfda..ecaa41e 100644
--- a/labmapero.php
+++ b/labmapero.php
@@ -154,7 +154,7 @@ $css_adicional[0]
 </style>";
 }
 
-print $css_adicional;
+print $css_adicional[0];
  ?>
     <style>
         body {
@@ -215,13 +215,14 @@ print $css_adicional;
                 <hr>
                 <label id='formulario_descripcion_mapa'><?php echo $formulario_descripcion[0] ?></label>
                 <center>
-                <a href='/g<?php echo $_REQUEST[id]; ?>' target='_blank' class="btn btn-default btn-xs"><i class="fa fa-plus-circle" aria-hidden="true"></i> Agregar</a> <br>
-                <span class="label label-warning">Despues de agregar, recarga el mapa</span>
+
+                <span class="label label-warning">Click en el mapa para agregar datos.</span>
                 </center>
 
                 <hr>
-
+								<div id='div_categorias'>
 				<?php echo $categorias; ?>
+								</div>
              </div>
              <div class="leaflet-sidebar-pane" id="search">
 				 <label>Buscar en el Mapa</label>
@@ -232,7 +233,7 @@ print $css_adicional;
         </div>
     </div>
 
-    <div id="map"></div>
+    <div id="map" title='Click en el mapa para agregar datos.'></div>
 
 
     <script src="librerias/leaflet/leaflet.js" crossorigin=""></script>
diff --git a/mapero.php b/mapero.php
index dc35c35..ecaa41e 100644
--- a/mapero.php
+++ b/mapero.php
@@ -63,6 +63,7 @@ $buscador ="
 <!--     <meta name="viewport" content="width=device-width, initial-scale=1"> -->
     <meta name="description" content="">
     <meta NAME="Language" CONTENT="Spanish">
+
 <meta NAME="Revisit" CONTENT="1 days">
 <meta NAME="Distribution" CONTENT="Global">
 <meta NAME="Robots" CONTENT="All">
@@ -85,6 +86,7 @@ $buscador ="
     <link rel="shortcut icon" href="favicon-152.png">
 	<link rel="apple-touch-icon-precomposed" href="favicon-152.png">
 	<link rel="stylesheet" href="librerias/leaflet/leaflet.css" />
+	<script src="milfs/js/scripts.js"></script>
     <?php
 $otro_json = remplacetas('form_parametrizacion','campo',$_REQUEST[id],'descripcion'," tabla='form_id' and  opcion = 'json'","","") ;;
 //$obj = file_get_contents('https://www.kleper.net/wiki/RutaPazTerritorial.geojson');
@@ -103,6 +105,7 @@ $ids = json_decode($otro_json[0]);
 				     iconSize: [100, 100],
 				     iconAnchor: [13, 27],
 				     popupAnchor:  [1, -24],
+						 className: 'mapIcon',
 				    /*iconUrl: feature.properties.icon.iconUrl*/
 				     iconUrl: 'https://tupale.co/milfs/images/secure/?file=150/da6d16547658ebc06c5378b30d1ee4bf.png'
 
@@ -138,24 +141,50 @@ $ids = json_decode($otro_json[0]);
 	<link href="librerias/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="librerias/leaflet/css/leaflet-sidebar.css" />
     <link rel="stylesheet" href="librerias/bootstrap/css/bootstrap.min.css"  />
+<?php
+$hoja_css = remplacetas('form_parametrizacion','campo',"index",'descripcion'," tabla='hoja_css' and  opcion = 'hoja_css' and id_empresa = '$id_empresa[0]'") ;
+if ($hoja_css[0] ==""){ $hoja_estilo ="<link href='./milfs/css/style.css' rel='stylesheet'>";}
+else{ $hoja_estilo ="<link href='$hoja_css[0]' rel='stylesheet'>";}
+print $hoja_estilo;
+$css_adicional = remplacetas('form_parametrizacion','campo',"index",'descripcion'," tabla='css' and  opcion = 'adicional' and id_empresa = '$empresa[0]'") ;
+if($css_adicional[0] !="") {
+$css_adicional ="<style >
 
+$css_adicional[0]
+</style>";
+}
+
+print $css_adicional[0];
+ ?>
     <style>
         body {
             padding: 0;
             margin: 0;
         }
-
         html, body, #map {
             height: 100%;
-
         }
-
-
-
     </style>
 
 </head>
 <body onload="">
+	<!-- modal -->
+<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true' data-backdrop='static' data-keyboard='false'>
+	<div class='modal-dialog modal-MD' style='' >
+		<div class='modal-content'>
+			<div class='modal-header' >
+				<button type='button' class='close' data-dismiss='modal' aria-hidden='true'>&times;</button>
+				<h4 class='modal-title' id='myModalLabel_info'><div id='titulo_modal'></div></h4>
+			</div>
+			<div class='modal-body'>
+		<div id='muestra_form'></div>
+			</div>
+			<div class='modal-footer' id='pie_modal'>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- modal -->
 
     <!-- optionally define the sidebar content via HTML markup -->
     <div id="sidebar" class="leaflet-sidebar collapsed">
@@ -186,13 +215,14 @@ $ids = json_decode($otro_json[0]);
                 <hr>
                 <label id='formulario_descripcion_mapa'><?php echo $formulario_descripcion[0] ?></label>
                 <center>
-                <a href='/g<?php echo $_REQUEST[id]; ?>' target='_blank' class="btn btn-default btn-xs"><i class="fa fa-plus-circle" aria-hidden="true"></i> Agregar</a> <br>
-                <span class="label label-warning">Despues de agregar, recarga el mapa</span>
+
+                <span class="label label-warning">Click en el mapa para agregar datos.</span>
                 </center>
 
                 <hr>
-
+								<div id='div_categorias'>
 				<?php echo $categorias; ?>
+								</div>
              </div>
              <div class="leaflet-sidebar-pane" id="search">
 				 <label>Buscar en el Mapa</label>
@@ -203,7 +233,7 @@ $ids = json_decode($otro_json[0]);
         </div>
     </div>
 
-    <div id="map"></div>
+    <div id="map" title='Click en el mapa para agregar datos.'></div>
 
 
     <script src="librerias/leaflet/leaflet.js" crossorigin=""></script>
@@ -213,7 +243,10 @@ $ids = json_decode($otro_json[0]);
     <link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.css" />
 	<link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.Default.css" />
 	<script src="librerias/leaflet/dist/leaflet.markercluster-src.js"></script>
-	<script src="librerias/jquery/jquery-2.1.4.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.3.1.js" ></script>
+ <script src="./librerias/bootstrap/js/bootstrap.min.js" ></script>
+
+	<!-- <script src="librerias/jquery/jquery-2.1.4.min.js"></script> -->
 	<?php $cadena_busqueda = $_REQUEST['buscar']; ?>
 
 	<script type="text/javascript" src="milfs/geojson.js.php?id=<?php echo $_REQUEST['id'] ?>&buscar=<?php echo $cadena_busqueda ?>&item=<?php echo $_REQUEST['item'] ?>"></script>
@@ -237,10 +270,11 @@ $ids = json_decode($otro_json[0]);
 
 			pointToLayer: function(feature, latlng) {
                 var smallIcon = new L.Icon({
-				     iconSize: [50, 50],
+				     iconSize: [70, 70],
 				     iconAnchor: [13, 27],
 				     popupAnchor:  [1, -24],
 				     autoPanPadding: [30,30],
+						 className: 'mapIcon',
 
 				     iconUrl: feature.properties.icon.iconUrl
 
@@ -285,6 +319,15 @@ function openMarkerPopup(e){
     marker.openPopup();
 }
 
+function onMapClick(e) {
+	var coordenadas =""+e.latlng.lat+"|"+e.latlng.lng;
+	setCookie('ubicacion',coordenadas, 1);
+  // alert("You clicked the map at " + e.latlng);
+			sidebar.close();
+xajax_formulario_embebido_ajax("","<?php echo $_REQUEST[id]; ?>","","");
+}
+
+map.on('click', onMapClick);
         // add panels dynamically to the sidebar