Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 1573aaa5 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 fc8ac856 8398c0b8
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 105 deletions
catalog/middleware.py
View file @ 1573aaa5
...@@ -16,9 +16,17 @@ class AuthRequiredMiddleware(object): ...@@ -16,9 +16,17 @@ class AuthRequiredMiddleware(object):
# if request.path_info == reverse('ws-news-list2'): # if request.path_info == reverse('ws-news-list2'):
# return response # return response
if not request.user.is_authenticated and request.path_info != reverse('login') and not request.user.is_active: if request.path_info ==reverse('ipn'):
print(request.path_info)
elif not request.user.is_authenticated and request.path_info != reverse('login') and not request.user.is_active:
return HttpResponseRedirect(reverse('login')) return HttpResponseRedirect(reverse('login'))
#if not request.user.is_authenticated and request.path_info != reverse('login') and not request.user.is_active:
#if not request.user.is_authenticated or not request.user.is_active:
# return HttpResponseRedirect(reverse('login'))
# Code to be executed for each request/response after # Code to be executed for each request/response after
# the view is called. # the view is called.
......
catalog/templates/show_cart.html
View file @ 1573aaa5
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
value='../reports'> value='../reports'>
<input type='hidden' name='return' <input type='hidden' name='return'
value='../catalog/cart'> value='../catalog/cart'>
<input type="hidden" name="notify_url" value="../catalog/ipn"> <input type="hidden" name="notify_url" value="http://repsat.geoint.mx/catalog/ipn/">
<input type="image" <input type="image"
src="https://www.sandbox.paypal.com/es_XC/MX/i/btn/btn_buynowCC_LG.gif" src="https://www.sandbox.paypal.com/es_XC/MX/i/btn/btn_buynowCC_LG.gif"
border="0" name="submit" border="0" name="submit"
...@@ -236,6 +236,18 @@ ...@@ -236,6 +236,18 @@
src="https://www.sandbox.paypal.com/es_XC/i/scr/pixel.gif" width="1" src="https://www.sandbox.paypal.com/es_XC/i/scr/pixel.gif" width="1"
height="1"> height="1">
</form> </form>
<form method="post" action="http://repsat.geoint.mx/catalog/ipn/">
<input type="text" name="nombre" value="">
<input type="submit">
</form>
<form method="post" action="../ipn/">
<input type="text" name="nombre" value="">
<input type="submit">
</form>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
......
catalog/views.py
View file @ 1573aaa5
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.shortcuts import render, redirect from django.shortcuts import render, redirect
from django.views.decorators.csrf import csrf_exempt
from GeoInt_SIDT.settings import BASE_URL from GeoInt_SIDT.settings import BASE_URL
from catalog.forms import ASFSearchForm from catalog.forms import ASFSearchForm
...@@ -581,14 +582,22 @@ def Pay(request): ...@@ -581,14 +582,22 @@ def Pay(request):
# ----------------------------------------------------------------- # -----------------------------------------------------------------
@csrf_exempt
def IPN(request): def IPN(request):
print("content-type: text/html\r\n\r\n") PATH_USERS = config['PATHS']['PATH_USERS']
print()
if request.POST['payment_status'] == 'Completed': f = open(PATH_USERS+"myfile.txt", "w")
Purchase.objects.filter(user_id=request.user.id, purchased=0).update(purchased=True) x = request.POST.dict()
return redirect('../../reports') for key, value in x.items():
else: f.write(key+": "+value+'\n')
return redirect('../cart') return redirect('../../')
#print("content-type: text/html\r\n\r\n")
#if request.POST.get['payment_status'] == 'Completed':
# Purchase.objects.filter(user_id=request.user.id, purchased=0).update(purchased=True)
# return redirect('../../reports')
#else:
# return redirect('../cart')
# f.write(request.GET) # f.write(request.GET)
# f.close() # f.close()
......
reports/static/reports/css/scldata.css
View file @ 1573aaa5
body body {
{ background-color: White;
background-color:White;
} }
.next{ .next {
padding: 0px; padding: 0px;
padding-top: 50%; padding-top: 50%;
cursor: pointer; cursor: pointer;
font-size: 20px; font-size: 20px;
} }
.prev{ .prev {
padding-left: 20px; padding-left: 20px;
padding-top: 50%; padding-top: 50%;
cursor: pointer; cursor: pointer;
font-size: 20px; font-size: 20px;
} }
.submenu{ .submenu {
padding-right: 140px !important; padding-right: 140px !important;
} }
.img-comp-container { .img-comp-container {
position: relative; position: relative;
height: 550px; /*should be the same height as the images*/ height: 550px; /*should be the same height as the images*/
} }
.listImg{ .listImg {
z-index: 4; z-index: 4;
} }
.listImg ul{ .listImg ul {
list-style: none; list-style: none;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
cursor: pointer; cursor: pointer;
} }
.listImg ul li:hover{ .listImg ul li:hover {
background: #87CEFA; background: #87CEFA;
} }
.listImg ul .active{ .listImg ul .active {
color:red color: red
} }
.list { .list {
max-height: 220px; max-height: 220px;
overflow: auto; overflow: auto;
} }
.img-comp-img { .img-comp-img {
position: absolute; position: absolute;
width: auto; width: auto;
height: auto; height: auto;
overflow:hidden; overflow: hidden;
z-index: 2; z-index: 2;
} }
.img-comp-img img { .img-comp-img img {
display: block; display: block;
vertical-align: middle; vertical-align: middle;
} }
.img-comp-slider { .img-comp-slider {
position: absolute; position: absolute;
z-index:9; z-index: 9;
cursor: ew-resize; cursor: ew-resize;
/*set the appearance of the slider:*/ /*set the appearance of the slider:*/
width: 40px; width: 40px;
height: 40px; height: 40px;
background-color: #2196F3; background-color: #2196F3;
opacity: 0.7; opacity: 0.7;
border-radius: 50%; border-radius: 50%;
} }
.draggable { .draggable {
padding: 0px; padding: 0px;
position: absolute; position: absolute;
z-index: -1; z-index: -1;
text-align: center; text-align: center;
/* border: 1px solid #d3d3d3; */ /* border: 1px solid #d3d3d3; */
opacity: .5; opacity: .5;
} }
.draggable:hover { .draggable:hover {
opacity: 1; opacity: 1;
} }
.title{ .title {
/*position: absolute; */ /*position: absolute; */
top: 2%; top: 2%;
left: 6%; left: 6%;
/*width:100%; /*width:100%;
height: 100%; */ height: 100%; */
} }
.title .info { .title .info {
opacity: 0.5; opacity: 0.5;
} }
.title .info:hover{
opacity: 1; .title .info:hover {
opacity: 1;
}
#minimap {
width: 100%;
height: 100%;
margin: 0;
padding: 0;
position: fixed;
}
#reportPage {
height: 940px !important;
}
#rangecontrol:hover > #slidertitle {
display: block;
}
.range-control {
position: relative;
} }
#minimap{ input[type=range] {
width:100%; display: block;
height:100%; width: 100%;
margin:0; margin: 0;
padding:0; -webkit-appearance: none;
position:fixed; outline: none;
} }
#reportPage{ input[type=range]::-webkit-slider-runnable-track {
height: 940px !important; position: relative;
height: 12px;
border: 1px solid #b2b2b2;
border-radius: 5px;
background-color: #e2e2e2;
box-shadow: inset 0 1px 2px 0 rgba(0, 0, 0, 0.1);
} }
input[type=range]::-webkit-slider-thumb {
position: relative;
top: 0px;
width: 10px;
height: 10px;
border: 1px solid #999;
-webkit-appearance: none;
background-color: green;
box-shadow: inset 0 -1px 2px 0 rgba(0, 0, 0, 0.25);
border-radius: 100%;
cursor: pointer;
}
\ No newline at end of file
reports/static/reports/js/draggable.js
View file @ 1573aaa5
...@@ -64,4 +64,4 @@ function showComparisons() { ...@@ -64,4 +64,4 @@ function showComparisons() {
} }
dragElement(document.getElementById("draggableChart")); dragElement(document.getElementById("draggableChart"));
dragElement(document.getElementById("draggableImage")); //dragElement(document.getElementById("draggableImage"));
\ No newline at end of file \ No newline at end of file
reports/templates/sclData.html
View file @ 1573aaa5
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<link rel="stylesheet" href="{% static 'catalog/css/body.css' %}" type="text/css"> <link rel="stylesheet" href="{% static 'catalog/css/body.css' %}" type="text/css">
<link rel="stylesheet" href="{% static 'reports/css/scldata.css' %}" type="text/css"> <link rel="stylesheet" href="{% static 'reports/css/scldata.css' %}" type="text/css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/css/ol.css" type="text/css"> <link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/css/ol.css"
type="text/css">
<script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/build/ol.js"></script> <script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/build/ol.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css"/> <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css"/>
<script type="text/javascript" src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script> <script type="text/javascript" src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script>
...@@ -116,7 +117,29 @@ ...@@ -116,7 +117,29 @@
<!-- Content Wrapper. Contains page content --> <!-- Content Wrapper. Contains page content -->
<!-- Main content --> <!-- Main content -->
<div id="reportPage" class="wrapper" style="background-color: #ecf0f5"> <div id="reportPage" class="wrapper" style="background-color: #ecf0f5">
<div id="minimap"></div>
<div class="container floating-panel"
style="position:absolute;bottom: 40px;width: 500px;z-index: 1000">
<div class="range-control" id="rangecontrol">
<span id="tooltiptext">No Data</span>
<input id="inputRange" type="range" min="0" max="{{ labels|length }}"
step="1" value="0"
data-thumbwidth="20">
<datalist class="range__list" id="number">
<option>No Data</option>
{% for label in labels %}
<option class="range__opt"
value="{{ label }}">{{ label|slice:"6:8" }}/{{ label|slice:"4:6" }}/{{ label|slice:"0:4" }}</option>
{% endfor %}
</datalist>
</div>
</div>
<div id="minimap"></div>
<section class="content"> <section class="content">
<div class="row col-lg-11 title"> <div class="row col-lg-11 title">
...@@ -261,6 +284,52 @@ ...@@ -261,6 +284,52 @@
<!-- /.content --> <!-- /.content -->
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script id="rendered-js">
$('input[type="range"]').on('input', function () {
var control = $(this),
controlMin = control.attr('min'),
controlMax = control.attr('max'),
controlVal = control.val(),
controlThumbWidth = control.data('thumbwidth');
var range = controlMax - controlMin;
var position = (controlVal - controlMin) / range * 100;
var positionOffset = Math.round(controlThumbWidth * position / 100) - controlThumbWidth / 2;
var fecha = $("option:eq(" + controlVal + ")").text();
var valor = $("option:eq(" + controlVal + ")").val();
addImageLayer(valor);
$("#maptitle").empty();
$("#maptitle").append("Map Date: " + fecha);
$("#tooltiptext").empty();
$("#tooltiptext").append(fecha);
});
var slider2 = document.getElementById("inputRange");
var sliderOffsetX = slider2.getBoundingClientRect().left - document.documentElement.getBoundingClientRect().left;
var sliderOffsetY = slider2.getBoundingClientRect().top - document.documentElement.getBoundingClientRect().top;
var sliderWidth = slider2.offsetWidth - 1;
slider2.addEventListener('mousemove', function (event) {
var currentMouseXPos = (event.clientX + window.pageXOffset) - sliderOffsetX;
var sliderValAtPos = Math.round(currentMouseXPos / sliderWidth * {{ labels|length }}+1);
value = sliderValAtPos - 1;
var fecha = $("option:eq(" + value + ")").text();
var valor = $("option:eq(" + value + ")").val();
$("#tooltiptext").empty();
$("#tooltiptext").css({"margin-left": currentMouseXPos + 'px', "margin-top": sliderOffsetY + 'px'});
$("#tooltiptext").append(fecha);
});
</script>
<!-- page script --> <!-- page script -->
<script> <script>
var defaultLegendClickHandler = Chart.defaults.global.legend.onClick; var defaultLegendClickHandler = Chart.defaults.global.legend.onClick;
...@@ -275,31 +344,29 @@ ...@@ -275,31 +344,29 @@
console.log(meta.hidden) console.log(meta.hidden)
var layer = legendItem.text.toLowerCase(); var layer = legendItem.text.toLowerCase();
//layer = layer.replace(" ", "_"); //layer = layer.replace(" ", "_");
layer = layer.replace(/\s/g,'_'); //reeemplaza los espacios con guion bajo layer = layer.replace(/\s/g, '_'); //reeemplaza los espacios con guion bajo
console.log(layer) console.log(layer)
var activePoint = ch.getElementAtEvent(e); var activePoint = ch.getElementAtEvent(e);
console.log(document.getElementById("titleMap").textContent) //console.log(document.getElementById("titleMap").textContent)
var label = document.getElementById("titleMap").textContent; //obtiene la fecha que se está viendo // var label = document.getElementById("titleMap").textContent; //obtiene la fecha que se está viendo
label = label.replace(/\//g,''); // reemplaza los diagonales por nada // label = label.replace(/\//g,''); // reemplaza los diagonales por nada
console.log(label) // console.log(label)
// if(meta.hidden){
// console.log("Mostrar!!!")
if(meta.hidden){ // SCLlayers.push(layer)
console.log("Mostrar!!!") // document.getElementById("scl_"+layer).src = "../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}"+label+"_SCL_60m_"+layer+".png"
SCLlayers.push(layer) // }
document.getElementById("scl_"+layer).src = "../../static/reports/tmpImages/repsat_test_dev/{{ SCL_PATH }}"+label+"_SCL_60m_"+layer+".png" // else{
} // console.log("Ocultar!!")
else{ // SCLlayers.splice(SCLlayers.indexOf(layer), 1);
console.log("Ocultar!!") // document.getElementById("scl_"+layer).src = ""
SCLlayers.splice(SCLlayers.indexOf(layer), 1); // }
document.getElementById("scl_"+layer).src = ""
}
//if (index > 1) { //if (index > 1) {
// Do the original logic // Do the original logic
//console.log("wooooo") //console.log("wooooo")
//defaultLegendClickHandler(e, legendItem); //defaultLegendClickHandler(e, legendItem);
defaultLegendClickHandler.call(this, e, legendItem); defaultLegendClickHandler.call(this, e, legendItem);
//} else { //} else {
// console.log("holaaaa") // console.log("holaaaa")
//} //}
...@@ -316,7 +383,7 @@ ...@@ -316,7 +383,7 @@
let productLevel = "{{ productLevel }}"; let productLevel = "{{ productLevel }}";
let startDate = "{{ startDate }}"; let startDate = "{{ startDate }}";
let endDate = "{{ endDate }}"; let endDate = "{{ endDate }}";
let clouds= "{{ clouds }}"; let clouds = "{{ clouds }}";
let oldLabel = "{{defaultDataSet}}"; let oldLabel = "{{defaultDataSet}}";
let labels = {{labels}}; let labels = {{labels}};
var config = {{graphData}}; var config = {{graphData}};
...@@ -326,7 +393,7 @@ ...@@ -326,7 +393,7 @@
maintainAspectRatio: false, maintainAspectRatio: false,
// scales: { xAxes: [{ stacked: true }], yAxes: [{ stacked: true }] }, // scales: { xAxes: [{ stacked: true }], yAxes: [{ stacked: true }] },
legend: { legend: {
display:true, display: true,
onClick: newLegendClickHandler, onClick: newLegendClickHandler,
} }
}; };
......
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