Skip to content

F
front
Commit 9e43c5c1 by vida092
Options

cambios

parent a22ba1e2
Showing with 36 additions and 30 deletions
javascripts/histogram_module.js
...@@ -210,6 +210,9 @@ var histogram_module = (function (verbose) { ...@@ -210,6 +210,9 @@ var histogram_module = (function (verbose) {
*/ */
function createMultipleBarChart(json_decil, array_recall, idComponent, nameMap) { function createMultipleBarChart(json_decil, array_recall, idComponent, nameMap) {
console.log("----------json decil ---------------")
console.log(json_decil)
_VERBOSE ? console.log("createMultipleBarChart") : _VERBOSE; _VERBOSE ? console.log("createMultipleBarChart") : _VERBOSE;
// LIMPIA EL AREA DONDE SE ENCUENTRA EL HISTOGRAMA // LIMPIA EL AREA DONDE SE ENCUENTRA EL HISTOGRAMA
...@@ -323,7 +326,7 @@ var histogram_module = (function (verbose) { ...@@ -323,7 +326,7 @@ var histogram_module = (function (verbose) {
if(deciles.length == 0 || grupos == 0){ if(deciles.length == 0 || grupos == 0){
console.log("Sin grupos o deciles seleccionados") console.log("Sin grupos o deciles seleccionados")
_toast_module.showToast_BottomCenter(_iTrans.prop('no_decilgrupo'), "warning"); _toast_module.showToast_BottomCenter(_iTrans.prop('no_decilgrupo'), "warning");
return returnaddTooltipBarChart
} }
body.selected_decile = deciles body.selected_decile = deciles
console.log(body.selected_decile) console.log(body.selected_decile)
...@@ -1223,9 +1226,9 @@ var histogram_module = (function (verbose) { ...@@ -1223,9 +1226,9 @@ var histogram_module = (function (verbose) {
function createBarChart(idComponent, data, f_legend) { function createBarChart(idComponent, data, f_legend) {
_VERBOSE ? console.log("createBarChart") : _VERBOSE; _VERBOSE ? console.log("createBarChart") : _VERBOSE;
console.log("<--------------------------------data----------------------->")
console.log(data) console.log(data)
console.log("<----------------------------idComponent-------------------->")
console.log(idComponent) console.log(idComponent)
$("#" + idComponent.id).empty(); $("#" + idComponent.id).empty();
......
javascripts/map_module.js
...@@ -412,9 +412,9 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) { ...@@ -412,9 +412,9 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) {
}; };
// var milliseconds = new Date().getTime(); //var milliseconds = new Date().getTime();
// var url = _url_geoserver + "t=" + milliseconds; //var url = _url_geoserver + "t=" + milliseconds;
// var espacio_capa = _workspace + ":sp_grid_terrestre"; //var espacio_capa = _workspace + ":sp_grid_terrestre";
// normal osm map: http://{s}.tile.osm.org/{z}/{x}/{y}.png // normal osm map: http://{s}.tile.osm.org/{z}/{x}/{y}.png
...@@ -692,10 +692,7 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) { ...@@ -692,10 +692,7 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) {
_REGION_SELECTED = region_selected; _REGION_SELECTED = region_selected;
let query = 'query{get_mesh(grid_res: "' + _grid_res + '"){cve simplified_geom}}' let query = 'query{get_mesh(grid_res: "' + _grid_res + '"){cve simplified_geom}}'
console.log(query) console.log(query)
$.ajax({ $.ajax({
method: "POST", method: "POST",
url: "https://covid19.c3.unam.mx/gateway/api/nodes/", url: "https://covid19.c3.unam.mx/gateway/api/nodes/",
...@@ -703,10 +700,10 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) { ...@@ -703,10 +700,10 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) {
data: JSON.stringify({query: query}), data: JSON.stringify({query: query}),
success: function (resp) { success: function (resp) {
let data = resp["data"]; let data = resp["data"];
let obj = data["get_mesh"] let obj = data["get_mesh"] //lista con {cve, simplified_geom}
let json = {type: 'FeatureCollection',crs: {}, features: []} let json = {type: 'FeatureCollection',crs: {}, features: []}
//console.log(obj)
for (let i = 0; i < obj.length; i++) for (let i = 0; i < obj.length; i++)
...@@ -2257,7 +2254,7 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) { ...@@ -2257,7 +2254,7 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) {
console.log(label_target) console.log(label_target)
var subquery = _LABEL_MAP.map(taxon => `${label_target}= \'${taxon}\'`).join(" OR ") var subquery = _LABEL_MAP.map(taxon => `${label_target}= \'${taxon}\'`).join(" OR ") //cambiar label , aparece orden y no nombre científico
console.log(subquery) console.log(subquery)
...@@ -2933,7 +2930,7 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) { ...@@ -2933,7 +2930,7 @@ var map_module = (function (url_geoserver, workspace, verbose, url_zacatuche) {
} }
console.log("********values") console.log("********values******")
console.log(equal_range_values) console.log(equal_range_values)
console.log(equal_range_colors) console.log(equal_range_colors)
......
javascripts/res_display_module.js
...@@ -1157,16 +1157,18 @@ var res_display_module = (function (verbose, url_zacatuche) { ...@@ -1157,16 +1157,18 @@ var res_display_module = (function (verbose, url_zacatuche) {
// copies.forEach(function (item, index) { // copies.forEach(function (item, index) {
// _createScore_Decil(item); // _createScore_Decil(item);
// }); // });
///descomentar para realizar peticiones de covariables
_REQUESTS_MADE.forEach(function (item, index) { _REQUESTS_MADE.forEach(function (item, index) {
_createScore_Decil(item); console.log(item);
console.log(item)
}); });
// _REQUESTS_MADE.forEach(function (item, index) {
// _createScore_Decil(item);
// });
//// aquí hay que modificar el body por cada covariable //// aquí hay que modificar el body por cada covariable
for (let i = 0; i < copies.length; i++) {
_createScore_Decil(_REQUESTS_MADE[i], copies[i]);
}
} }
...@@ -1183,8 +1185,8 @@ var res_display_module = (function (verbose, url_zacatuche) { ...@@ -1183,8 +1185,8 @@ var res_display_module = (function (verbose, url_zacatuche) {
* @param {boolean} hasChildren - Bandera que indica si la configuración enviada es un conjunto de las variables seleccionadas o es una variable del grupo * @param {boolean} hasChildren - Bandera que indica si la configuración enviada es un conjunto de las variables seleccionadas o es una variable del grupo
* @param {boolean} isTotal - Bandera que indica si la configuración enviada es el total de los conjuntos de las variables seleccionadas * @param {boolean} isTotal - Bandera que indica si la configuración enviada es el total de los conjuntos de las variables seleccionadas
*/ */
function _createScore_Decil(decildata) { function _createScore_Decil(decildata, petition) {
console.log(decildata) //console.log(decildata)
_VERBOSE ? console.log("_createScore_Decil") : _VERBOSE; _VERBOSE ? console.log("_createScore_Decil") : _VERBOSE;
...@@ -1196,8 +1198,13 @@ var res_display_module = (function (verbose, url_zacatuche) { ...@@ -1196,8 +1198,13 @@ var res_display_module = (function (verbose, url_zacatuche) {
//var data_request = JSON.stringify(body) //var data_request = JSON.stringify(body)
data_request["decil_selected"] = [_default_decil] data_request["decil_selected"] = [_default_decil]
console.log("<============================================>1") console.log("<====================================================>1")
console.log(data_request) console.log(data_request)
// _TREE_GENERATED.groups = _TREE_GENERATED.groups.filter(function(obj) {
// return !obj.name.includes("Emisiones");
// });
console.log(_TREE_GENERATED) console.log(_TREE_GENERATED)
...@@ -1206,15 +1213,15 @@ var res_display_module = (function (verbose, url_zacatuche) { ...@@ -1206,15 +1213,15 @@ var res_display_module = (function (verbose, url_zacatuche) {
// decildata["with_data_freq_cell"] = false; // decildata["with_data_freq_cell"] = false;
// decildata["with_data_score_decil"] = false; // decildata["with_data_score_decil"] = false;
///tal vez quitar
var verbo = _val_process_temp ? "countsTaxonsGroupTimeValidation" : "countsTaxonsGroup" var verbo = _val_process_temp ? "countsTaxonsGroupTimeValidation" : "countsTaxonsGroup"
// Por el momento dejemos el body, deberá de cambiar por decil data arreglando las peticiones
// Si se esta haciendo bien la peticion al servidor de epi-puma 2.0 // Si se esta haciendo bien la peticion al servidor de epi-puma 2.0
fetch("https://covid19.c3.unam.mx/gateway/api/analysis/cells/",{ fetch("https://covid19.c3.unam.mx/gateway/api/analysis/cells/",{
method:"POST", method:"POST",
//body: JSON.stringify(data_request), //body: JSON.stringify(data_request),
body: JSON.stringify(body), body: JSON.stringify(petition),
headers:{ headers:{
"Content-Type": "application/json" "Content-Type": "application/json"
} }
...@@ -1251,10 +1258,10 @@ var res_display_module = (function (verbose, url_zacatuche) { ...@@ -1251,10 +1258,10 @@ var res_display_module = (function (verbose, url_zacatuche) {
processSingleResponse(data_response, data_request, validation_data); processSingleResponse(data_response, data_request, validation_data);
console.log("<-------- _REQUEST_DONE BEFORE PUSH RESPONSE ------->")
console.log(_REQUESTS_DONE) console.log(_REQUESTS_DONE)
_REQUESTS_DONE.push(respuesta); _REQUESTS_DONE.push(respuesta);
console.log("<-------- _REQUEST_DONE AFTER RESPONSE ------->")
console.log(_REQUESTS_DONE) console.log(_REQUESTS_DONE)
_REQUESTS_DONE=_REQUESTS_DONE.slice(0,1) _REQUESTS_DONE=_REQUESTS_DONE.slice(0,1)
console.log("<-------- _REQUEST_DONE AFTER SLICE ------->") console.log("<-------- _REQUEST_DONE AFTER SLICE ------->")
......
javascripts/utils_module.js
...@@ -187,7 +187,6 @@ var utils_module = (function (verbose) { ...@@ -187,7 +187,6 @@ var utils_module = (function (verbose) {
function reduceScoreCell(data, val_apriori = 0, numr = 1) { function reduceScoreCell(data, val_apriori = 0, numr = 1) {
var cross_cells = crossfilter(data) var cross_cells = crossfilter(data)
console.log("<---------0--------->")
console.log(data) console.log(data)
cross_cells.groupAll(); cross_cells.groupAll();
......
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