Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 7678218b authored by Emmanuel René Huchim Puc's avatar Emmanuel René Huchim Puc
Browse files
Options

Merge branch 'dev' of gitlab.geoint.mx:mario.chirinos/GeoInt_SIDT into dev

parents f1713129 09f9f798
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 44 deletions
reports/static/reports/css/scldata.css
View file @ 7678218b
......@@ -75,12 +75,14 @@ body {
}
.draggable {
padding: 0px;
position: absolute;
z-index: -1;
text-align: center;
/* border: 1px solid #d3d3d3; */
opacity: .5;
padding: 0px;
top: 120%;
left: 2%;
position: absolute;
z-index: -1;
text-align: center;
/* border: 1px solid #d3d3d3; */
opacity: .5;
}
.draggable:hover {
......@@ -103,16 +105,23 @@ body {
opacity: 1;
}
#minimap {
width: 100%;
height: 100%;
margin: 0;
padding: 0;
position: fixed;
.minimap{
width:100%;
height:100%;
margin:0;
padding:0;
position:fixed;
}
.minimaptabs{
width:100%;
height:100%;
margin:0;
padding:0;
}
#reportPage {
height: 940px !important;
#reportPage{
height: 940px !important;
}
#rangecontrol:hover > #slidertitle {
......
reports/static/reports/js/draggable.js
View file @ 7678218b
......@@ -39,8 +39,8 @@ function dragElement(elmnt) {
}
}
function showGraph(){
if ($('.showChart').is(':visible')){
function showGraph(type=false){
if ($('.showChart').is(':visible') || type==true){
$("#draggableChart").css('z-index', 10);
$(".showChart").hide();
$(".hideChart").show();
......
reports/static/reports/js/reportImg.js
View file @ 7678218b
......@@ -160,6 +160,7 @@ function change(newType) {
}
myChart = new Chart(ctx, temp);
showGraph(true)
};
let img, imgWidth=0, slider=false, clicked=0;
......
reports/templates/L2ASCL_data.html
View file @ 7678218b
......@@ -302,17 +302,9 @@
width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_unclassified.png"
style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_cloud_medium_probability"
width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_cloud_medium_probability.png"
style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_cloud_high_probability"
width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_cloud_high_probability.png"
style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_thin_cirrus"
width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_thin_cirrus.png"
<img onclick="window.open(this.src)" class="img-responsive" id="scl_clouds"
width="375"
height="400px" src="../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}{{ dafaultLabel }}_SCL_60m_clouds.png"
style="position: absolute; top: 0; z-index:1;">
<img onclick="window.open(this.src)" class="img-responsive" id="scl_snow"
width="375"
......@@ -332,7 +324,7 @@
<h3 class="box-title">Map</h3>
</div>
<div class="box-body" style="max-height: 550px;">
<div id="minimap" style="height: 550px"></div>
<div id="minimap" class="minimaptabs" style="height: 547px"></div>
</div>
<!-- /.box-body -->
</div>
......@@ -431,14 +423,8 @@
SCLlayers.splice(SCLlayers.indexOf(layer), 1);
document.getElementById("scl_"+layer).src = ""
}
//if (index > 1) {
// Do the original logic
//console.log("wooooo")
//defaultLegendClickHandler(e, legendItem);
defaultLegendClickHandler.call(this, e, legendItem);
//} else {
// console.log("holaaaa")
//}
defaultLegendClickHandler.call(this, e, legendItem);
};
var label;
......@@ -454,6 +440,7 @@
let endDate = "{{ endDate }}";
let clouds= "{{ clouds }}";
let oldLabel = "{{defaultDataSet}}";
let labels = {{ labels }};
var config = {{graphData}}
config.options = {
responsive: true,
......
reports/templates/sclData.html
View file @ 7678218b
......@@ -139,7 +139,7 @@
</div>
</div>
<div id="minimap"></div>
<div id="minimap" class="minimap"></div>
<section class="content">
<div class="row col-lg-11 title">
......@@ -152,10 +152,7 @@
<div class="box box-success">
<div class="box-body with-border">
<div class="row">
<div class="col-lg-2 text-center">
<h4>Zone: {{ zone }}</h4>
</div>
<div class="col-lg-2 text-center">
<div class="col-lg-2 text-center col-lg-offset-1">
<h4>Platform: {{ platform }}</h4>
</div>
<div class="col-lg-2 text-center">
......
reports/views.py
View file @ 7678218b
......@@ -63,6 +63,7 @@ def report_L2ASCL(request, report, purchase_id):
template = "L2ASCL_data.html"
reporteDir = report.replace('_sclData', '')
reporteDir += "/mask"
absolute_path = USERS_PATH + request.user.email + "/" + purchase_id + "/out"
folders = os.listdir(absolute_path)
......@@ -410,13 +411,12 @@ def ProcessChartData(path):
labelNames = [
"No Data", "Saturated", "Shadows", "Cloud Shadows", "Vegetation",
"Not-Vegetated", "Water", "Unclassified", "Cloud Medium Probability",
"Cloud High Probability", "Thin Cirrus", "Snow"
"Not-Vegetated", "Water", "Unclassified", "Clouds", "Snow"
]
colors = [
"#383838", "#de3d3d", "#696767", "#98775b", "#44ba5d", "#fff98b",
"#659acc", "#ababab", "#dddddd", "#d9f9ff", "#99d4d9", "#ff8afa"
"#659acc", "#ababab", "#dddddd", "#ff8afa"
]
for l in labels:
......
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