Skip to content

F
front
Commit fda22a2e by Esteban Ramirez Mora
Options

Actualizaciones_6_junio

parent d3a2030f
Showing with 22 additions and 114 deletions
geoportal_v0.1.html
......@@ -366,12 +366,12 @@
<div class="col-md-6 col-sm-6 col-xs-6">
Inicio:
<input id="date_timepicker_start" type="text" value="" style="width: 100px;">
<input id="yearPicker_start" type="text" value="" style="width: 100px;">
</div>
<div class="col-md-6 col-sm-6 col-xs-6">
Fin:
<input id="date_timepicker_end" type="text" value="" style="width: 100px;">
<input id="yearPicker_end" type="text" value="" style="width: 100px;">
</div>
</div>
......
javascripts/map_module.js
......@@ -2221,7 +2221,15 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) {
let nodo = _AGENT_SELECTED.toLowerCase()
let query = 'query{occurrences_by_taxon_' + nodo + '(query: "nombreenfermedad = \''+ _DISEASE_SELECTED + '\' AND '+ _PARENT_FIELD.toLowerCase() +' = \'' + _LABEL_VALUE +'\' "){individuosinfectados gridid_'+ _grid_res + '}}'
let fecha_ini = document.getElementById("yearPicker_start").value.trim()
let fecha_fin = document.getElementById("yearPicker_end").value.trim()
if ( fecha_ini.length < 3)
var query = 'query{occurrences_by_taxon_' + nodo + '(query: "nombreenfermedad = \''+ _DISEASE_SELECTED + '\' AND '+ _PARENT_FIELD.toLowerCase() +' = \'' + _LABEL_VALUE +'\' "){individuosinfectados gridid_'+ _grid_res + '}}'
else
var query = 'query{occurrences_by_taxon_' + nodo + '(query: "nombreenfermedad = \''+ _DISEASE_SELECTED + '\' AND '+ _PARENT_FIELD.toLowerCase() +' = \'' + _LABEL_VALUE +'\' AND aniocolecta >= \''+ fecha_ini + ' \' AND aniocolecta <= \'' + fecha_fin + ' \'"){individuosinfectados gridid_'+ _grid_res + '}}'
console.log(query)
$.ajax({
......
javascripts/res_display_module.js
......@@ -2834,9 +2834,12 @@ var res_display_module = (function (verbose, url_zacatuche) {
var _url = "http://10.90.0.42:4008/graphql/vectores/"
let nodo = _AGENT_SELECTED.toLowerCase()
let query = 'query{occurrences_by_taxon_' + nodo + '(query: "nombreenfermedad = \''+ _DISEASE_SELECTED + '\' AND '+ _PARENT_FIELD.toLowerCase() +' = \'' + _LABEL_VALUE +'\' AND longituddecimal ='+ long +' AND latituddecimal = ' + lat + '"){epitetoespecifico reino aniocolecta genero localidad sexo individuosinfectados gridid_'+ grid_res + '}}'
console.log(query)
$.ajax({
method: "POST",
url: _url,
......
javascripts/variable_module.js
......@@ -107,7 +107,7 @@ var variable_module = (function (verbose, url_zacatuche) {
// se comentan variables topograficas por expansión de terreno
var tags = abio_tab ? ['a_taxon', 'a_raster'] : ['a_taxon'];
var tags = abio_tab ? ['a_taxon', 'a_raster', 'a_socio'] : ['a_taxon'];
var sp_items = ['a_item_reino', 'a_item_phylum', 'a_item_clase', 'a_item_orden', 'a_item_familia', 'a_item_genero','a_item_especie'];
......@@ -1033,115 +1033,6 @@ var variable_module = (function (verbose, url_zacatuche) {
}
$("#disease_selected").change(function () {
_VERBOSE ? console.log("self.loadNodes0") : _VERBOSE;
// se incrementa level para asignar el nivel adecuado a los hijos de la raiz
// la funcion es llamda dos veces, por tantro se decidio utilizar el arreglo + 1, en lufar de utilzar la variable global "level_vartree"
self.level_vartree = 5;
_VERBOSE ? console.log("level_vartree: " + self.level_vartree) : _VERBOSE;
console.log(self.varfilter_selected);
var field_r = 'orden';
var parentfield_r = self.parent_field_vartree;
if(parseInt(self.level_vartree) > 8){
field_r = 'especievalidabusqueda';
parentfield_r = '';
}
_VERBOSE ? console.log(self.field_vartree) : _VERBOSE;
_VERBOSE ? console.log(self.value_vartree) : _VERBOSE;
_REGION_SELECTED = ($("#footprint_region_select").val() !== null && $("#footprint_region_select").val() !== undefined) ? parseInt($("#footprint_region_select").val()) : _REGION_SELECTED;
_GRID_RES = $("#grid_resolution").val();
_AGENT_SELECTED = $("#agent_selected").val();
_DISEASE_SELECTED = $("#disease_selected").val()
console.log("REGION_SELECTED: " + _REGION_SELECTED);
console.log("_GRID_RES: " + _GRID_RES);
console.log("_AGENT_SELECTED" + _AGENT_SELECTED);
if (_AGENT_SELECTED == 'Hospederos')
var _url = 'http://10.90.0.42:4006/graphql/hospederos/'
else if (_AGENT_SELECTED == 'Patogenos')
var _url = "http://10.90.0.42:4007/graphql/patogenos/"
else
var _url = "http://10.90.0.42:4008/graphql/vectores/"
let nodo = _AGENT_SELECTED.toLowerCase()
let query = 'query{occurrences_by_taxon_' + nodo + '(query: "nombreenfermedad = \''+ _DISEASE_SELECTED + '\' "){clase}}'
console.log(query)
$.ajax({
method: "POST",
url: _url,
contentType: "application/json",
data: JSON.stringify({query: query}),
success: function (resp, event, ui) {
console.log(resp)
let data2 = resp.data["occurrences_by_taxon_" + nodo]
console.log(data2)
let uniqueObjArray = [
...new Map(data2.map((item) => [item["name"], item])).values(),
];
console.log(uniqueObjArray)
let data = uniqueObjArray
console.log(ui);
$('#jstree_variables_species_' + id).jstree("destroy").empty();
$('#jstree_variables_species_' + id).on('open_node.jstree', self.getTreeVar);
$("#jstree_variables_species_" + id).on('changed.jstree', self.getChangeTreeVar);
$("#jstree_variables_species_" + id).on('loaded.jstree', self.loadNodes);
self.value_vartree = ui.item.id;
self.field_vartree = self.varfilter_selected[0];
self.parent_field_vartree = self.varfilter_selected[1];
self.level_vartree = self.varfilter_selected[2];
// _VERBOSE ? console.log("nivel") : _VERBOSE;
_VERBOSE ? console.log(self.level_vartree) : _VERBOSE;
var icon = parseInt(self.level_vartree) === 8 ? "plugins/jstree/images/dna.png" : "plugins/jstree/dist/themes/default/throbber.gif"
// _VERBOSE ? console.log(self.level_vartree) : _VERBOSE;
var tree_reinos = [{
"text": self.value_vartree,
"id": "root",
"attr": {"nivel": self.level_vartree, "type": _TYPE_TAXON},
'state': {'opened': true},
"icon": icon
}];
$('#jstree_variables_species_' + id).jstree({
'plugins': ["wholerow", "checkbox"],
'core': {
'data': tree_reinos,
'themes': {
'name': 'proton',
'responsive': true
},
'check_callback': true
}
});
}
})
})
// Evento generado cuando se realiza la acción de abrir una rama del árbol de selección, realiza la carga de los elementos que componen la rama a la cual se desea tener acceso.
......
plugins/datetimepicker/jquery.datetimepicker.full.js
......@@ -2908,4 +2908,9 @@ var datetimepickerFactory = function ($) {
return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
}
$('#yearPicker').datetimepicker({
format : "YYYY",
viewMode : "years",
});
}));
plugins/i18n/in/nicho.properties
......@@ -21,7 +21,7 @@ a_taxon = Taxonomic
a_clima = Climatic
a_topo = Others
a_raster = Raster
a_socio = Socioeconómicas
a_socio = Socioeconomics
lb_occ = Species occurrences
lb_occ_celda = Cells with species occurrences
btn_variable = Taxon
......
plugins/i18n/in/nicho_es.properties
......@@ -21,6 +21,7 @@ a_taxon = Taxonómicas
a_clima = Climáticas
a_topo = Topográficas
a_raster = Raster
a_socio = Socioeconómicas
lb_occ = Ocurrencias especie
lb_occ_celda = Celdas con ocurrencias de la especie (ni)
btn_variable = Taxon
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment