h4ckypurpl3/tupali_fork
1
0
Fork 0
forked from qwerty/tupali
Code Releases Wiki Activity

Mejoras en paginacion de api simple

Browse Source
This commit is contained in:
fredyrivera 2017-10-18 16:16:07 -05:00
parent 94a25e23db
commit 30fcb4e6a9
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -776,7 +776,7 @@ $eventos= "
header: {
left: 'prev,next today',
center: 'title',
right: 'listMonth,month,agendaWeek,agendaDay,listYear'
right: 'listMonth,month,agendaWeek,agendaDay,listYear,timeLineYear'
},
//defaultDate: '2017-10-12',
defaultView: 'listMonth',

2
milfs/api.php
View File

@ -12,7 +12,9 @@ $datos['id']=$_REQUEST['id'];
$datos['identificador']=$_REQUEST['identificador'];
$datos['dato']=$_REQUEST['dato'];
$datos['inicio']=$_REQUEST['inicio'];
$datos['start']=$_REQUEST['start'];
$datos['fin']=$_REQUEST['fin'];
$datos['end']=$_REQUEST['end'];
$datos['tipo']=$_REQUEST['tipo'];
if(isset($_REQUEST['debug'])) {ini_set('display_errors', 'On');
}

25
milfs/funciones/funciones.php
View File

@ -8694,7 +8694,17 @@ function formulario_embebido_campos($id,$opcion){
}
function json($datos){
//print_r($datos); return;
if(isset($datos['start']) AND isset($datos['end'])) {
$campo = buscar_campo_tipo($datos['id'],"32");
if($campo[0] =="") {
$campo = buscar_campo_tipo($datos['id'],"11");
}
$w_rango ="( form_datos.id_campo = $campo[0] ) AND ( DATE(contenido) BETWEEN DATE('$datos[start]') AND DATE('$datos[end]') ) AND ";
}
if(!isset ($datos["tipo"] )) { $datos["tipo"]="";}
if ( !isset ( $_SESSION['id_empresa'] ) ) { $publico = "AND form_id.publico = '1' "; $w_publico = "WHERE form_id.publico = '1' "; }
else {
@ -8705,22 +8715,27 @@ function json($datos){
$link=Conectarse();
mysqli_set_charset($link, "utf8");
if($datos["id"] !=''){
//$id_campo = remplacetas('form_datos','id',$row["id"],'id_campo',"") ;
//$campo_tipo = remplacetas("form_campos","id",$row["id_campo"],"campo_tipo","");
if($datos["tipo"] =='simple') {
$campos ="control " ;
$consulta = "SELECT $campos, form_id.id as form_id ,form_datos.id as id_dato
FROM `form_datos` , `form_campos` ,form_id
WHERE form_datos.id_campo = `form_campos`.id
WHERE $w_rango form_datos.id_campo = `form_campos`.id
AND form_datos.form_id = `form_id`.id
AND (form_id = '$datos[id]' )
$publico
GROUP BY form_datos.control
ORDER BY form_datos.timestamp DESC";
$sql = mysqli_query($link,$consulta) or die("Error al ejecutar consulta 03 ");
$sql = mysqli_query($link,$consulta) or die("Error al ejecutar consulta 03 ");
// $features['consulta'] = $consulta;
if (mysqli_num_rows($sql)!='0'){
$i = 1;
$features = array();
// $features[] = $consulta;
while($row = mysqli_fetch_array( $sql ))
{
@ -8735,7 +8750,7 @@ mysqli_set_charset($link, "utf8");
$nuevos_datos["identificador"]="$row[control]";
$nuevos_datos["tipo"]="array";
$features[] = datos_array($row["control"],"$datos[id]","") ;
//$features['consulta'] = $consulta;
}
else {
// $features[] = $row;