Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit fa2b0e32 authored by Ulises Morales Ramírez's avatar Ulises Morales Ramírez
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	reports/static/reports/js/minimap.js
#	reports/templates/aside.html
parents 130abd45 d7028d38
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 23 deletions
reports/static/reports/js/minimap.js
View file @ fa2b0e32
......@@ -175,7 +175,26 @@ function compare(labels) {
$(".showChart").show();
$(".hideChart").hide();
//desactiva el botón de mostrar la gráfica
$('#showGraph').attr('disabled', true);
$('#showGraph').attr('disabled',true);
$('#chartType').attr('disabled',true);
//quita todas las capas SCL y deja sólo TCI
removeLayer();
changeLayers('TCI');
$("#tcicheck").prop("checked", true);
$("#check-no-data").prop("checked", false);
$("#check-saturated").prop("checked", false);
$("#check-shadows").prop("checked", false);
$("#check-cloud-shadows").prop("checked", false);
$("#check-vegetation").prop("checked", false);
$("#check-not-vegetated").prop("checked", false);
$("#check-water").prop("checked", false);
$("#check-unclassified").prop("checked", false);
$("#check-clouds").prop("checked", false);
$("#check-snow").prop("checked", false);
map.getControls().forEach(function (control) { //checa si ya se añadio el control de comparacion (swipe), si no lo tiene, lo agrega
if (control instanceof ol.control.Swipe) { //si ya tiene el control agregado
......@@ -232,7 +251,8 @@ function exitCompare() {
document.getElementById("timeLine").style.display = "block";
//activa el boton de la grafica
$('#showGraph').attr('disabled', false);
$('#showGraph').attr('disabled',false);
$('#chartType').attr('disabled',false);
}
......
reports/templates/aside.html
View file @ fa2b0e32
......@@ -80,7 +80,7 @@
</li>
{% endif %}
<li class="treeview">
<a href="#">
<a href="#" id="chartType">
<i class="fa fa-area-chart"></i>
<span>Chart Type</span>
<span class="pull-right-container">
......@@ -89,7 +89,7 @@
</a>
<ul class="treeview-menu sidebar-form">
<li>
<a class="treeview submenu" href="#" onclick="change('line');showGraph(true)">
<a class="treeview submenu" href="#" onclick="change('line')">
<i class="fa fa-bar-chart"></i>
<span>Line Chart</span>
<span class="pull-right-container">
......@@ -98,7 +98,7 @@
</a>
</li>
<li>
<a class="treeview submenu" href="#" onclick="change('bar');showGraph(true)">
<a class="treeview submenu" href="#" onclick="change('bar')">
<i class="fa fa-bar-chart"></i>
<span>Bar Chart</span>
<span class="pull-right-container">
......@@ -107,7 +107,7 @@
</a>
</li>
<li>
<a class="treeview submenu" href="#" onclick="change('stackedBar');showGraph(true)">
<a class="treeview submenu" href="#" onclick="change('stackedBar')">
<i class="fa fa-bar-chart"></i>
<span>Stacked Bar Chart</span>
<span class="pull-right-container">
......@@ -116,7 +116,7 @@
</a>
</li>
<li>
<a class="treeview submenu" href="#" onclick="change('polarArea');showGraph(true)">
<a class="treeview submenu" href="#" onclick="change('polarArea')">
<i class="fa fa-bar-chart"></i>
<span>Polar Area Chart</span>
<span class="pull-right-container">
......@@ -125,7 +125,7 @@
</a>
</li>
<li>
<a class="treeview submenu" href="#" onclick="change('doughnut');showGraph(true)">
<a class="treeview submenu" href="#" onclick="change('doughnut')">
<i class="fa fa-bar-chart"></i>
<span>Doughnut Chart</span>
<span class="pull-right-container">
......@@ -134,7 +134,7 @@
</a>
</li>
<li>
<a class="treeview submenu" href="#" onclick="change('pie');showGraph(true)">
<a class="treeview submenu" href="#" onclick="change('pie')">
<i class="fa fa-bar-chart"></i>
<span>Pie Chart</span>
<span class="pull-right-container">
......@@ -143,7 +143,7 @@
</a>
</li>
<li>
<a class="treeview submenu" href="#" onclick="change('radar');showGraph(true)">
<a class="treeview submenu" href="#" onclick="change('radar')">
<i class="fa fa-bar-chart"></i>
<span>Radar Chart</span>
<span class="pull-right-container">
......@@ -219,70 +219,70 @@
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-no-data">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_0" value="SCL_0">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_0" id="check-no-data">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #383838"></i>
&nbspSCL No Data
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-saturated">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_1" value="SCL_1">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_1" id="check-saturated">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #de3d3d"></i>
&nbspSCL Saturated
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-shadows">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_2" value="SCL_2">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_2" id="check-shadows">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #696767"></i>
&nbspSCL Shadows
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-cloud-shadows">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_3" value="SCL_3">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_3" id="check-cloud-shadows">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #98775b"></i>
&nbspSCL Cloud Shadows
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-vegetation">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_4" value="SCL_4">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_4" id="check-vegetation">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #44ba5d"></i>
&nbspSCL Vegetation
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-not-vegetated">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_5" value="SCL_5">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_5" id="check-not-vegetated">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #fff98b"></i>
&nbspSCL Not-Vegetated
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-water">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_6" value="SCL_6">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_6" id="check-water">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #659acc"></i>
&nbspSCL Water
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-unclassified">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_7" value="SCL_7">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_7" id="check-unclassified">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #ababab"></i>
&nbspSCL Unclassified
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-clouds">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_8" value="SCL_8">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_8" id="check-clouds">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #dddddd"></i>
&nbspSCL Clouds
</label>
</div>
<div class="form-check submenu" style="display:none" id="sclcheck-snow">
<input class="form-check-input" type="checkbox" name="layer_type" id="SCL_9" value="SCL_9">
<input class="form-check-input" type="checkbox" name="layer_type" value="SCL_9" id="check-snow">
<label class="form-check-label">
<i class="fa fa-circle" aria-hidden="true" style="color: #ff8afa"></i>
&nbspSCL Snow
......@@ -309,7 +309,7 @@
<ul class="treeview-menu sidebar-form text-center">
<span>
<div class="form-check submenu" onclick="changeMap('light')">
<input id="light" type="radio" name="layerOption">
<input id="light" type="radio" name="layerOption" checked>
<span>Noon</span>
</div>
<div class="form-check submenu" onclick="changeMap('streets')">
......@@ -317,7 +317,7 @@
<span>Streets</span>
</div>
<div class="form-check submenu" onclick="changeMap('night')">
<input id="night" type="radio" name="layerOption" checked>
<input id="night" type="radio" name="layerOption" checked="">
<span>Night</span>
</div>
<div class="form-check submenu" onclick="changeMap('cycle')">
......
reports/templates/sclData.html
View file @ fa2b0e32
......@@ -120,6 +120,7 @@
{% block content %}
<!-- Content Wrapper. Contains page content -->
<!-- Main content -->
{% if labels|length > 1 %}
<div id="timeLine" class="container col-md-12 floating-panel slidecontainer"
style="position:absolute; display:block; bottom: 40px; width: 500px; z-index: 1000">
<div id="set_Range_date" class="col-md-4 pull-left"
......@@ -138,6 +139,7 @@
</div>
</div>
{% endif %}
<div id="selectLeft" class="container col-md-12 floating-panel"
style="position:absolute; display:none; bottom: 50px; left: 30%; width: 300px; z-index: 1000">
......@@ -229,7 +231,11 @@
<div class="row col-lg-11 title">
<div class="box box-success box-solid info">
<div class="box-header with-border">
<h3>{{ searchInfo.title }}, {{ searchInfo.startDate }} to {{ searchInfo.endDate }}</h3>
{% if labels|length > 1 %}
<h3>{{ searchInfo.title }}, {{ labels|first|slice:"6:8" }}-{{ labels|first|slice:"4:6" }}-{{ labels|first|slice:"0:4" }} to {{ labels|last|slice:"6:8" }}-{{ labels|last|slice:"4:6" }}-{{ labels|last|slice:"0:4" }}</h3>
{% else %}
<h3>{{ searchInfo.title }}, {{ labels|first|slice:"6:8" }}-{{ labels|first|slice:"4:6" }}-{{ labels|first|slice:"0:4" }}</h3>
{% endif %}
<h6>{{ searchInfo.report_name }}</h6>
<!-- /.box-tools -->
</div>
......
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