Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit cfb3df0a authored by Renán Sosa Guillen's avatar Renán Sosa Guillen
Browse files
Options

product list and product cart list

parent 363b6b67
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 321 deletions
catalog/forms.py
View file @ cfb3df0a
...@@ -12,7 +12,7 @@ platforms = [ ...@@ -12,7 +12,7 @@ platforms = [
class ASFSearchForm(forms.Form): class ASFSearchForm(forms.Form):
polygon = forms.CharField(widget=forms.TextInput(attrs={'class':"form-control"})) polygon = forms.CharField(widget=forms.TextInput(attrs={'class':"form-control"}))
platform = forms.ChoiceField(choices=platforms, widget=forms.Select(attrs={'class':"form-control"})) platform = forms.ChoiceField(choices=platforms, widget=forms.Select(attrs={'class':"form-control"}))
start = forms.DateField(widget=forms.DateTimeInput(attrs={'type':'datetime-local'}), required=False) start = forms.DateField(widget=forms.DateTimeInput(attrs={'type':'datetime-local'}), required=True)
end = forms.DateField(widget=forms.DateTimeInput(attrs={'type':'datetime-local'}), required=False) end = forms.DateField(widget=forms.DateTimeInput(attrs={'type':'datetime-local'}), required=True)
maxResults = forms.IntegerField() maxResults = forms.IntegerField()
catalog/static/css/body.css
View file @ cfb3df0a
...@@ -148,6 +148,19 @@ div .item-info-view { ...@@ -148,6 +148,19 @@ div .item-info-view {
background-color: #dc7828; background-color: #dc7828;
} }
div .item-info-cart-view {
position: absolute;
background: white;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
top: -106px;
left: -417px;
width: 400px;
height: 360px;
background-color: #dc7828;
}
ul.control-sidebar-menu li div.item-info-view { ul.control-sidebar-menu li div.item-info-view {
display: none; display: none;
} }
...@@ -161,6 +174,10 @@ div .cropped-preview { ...@@ -161,6 +174,10 @@ div .cropped-preview {
overflow: hidden; overflow: hidden;
} }
div .cropped-preview img {
width: 50px;
}
div .cropped-preview img { div .cropped-preview img {
width: 100%; width: 100%;
border-top-left-radius: 10px; border-top-left-radius: 10px;
...@@ -197,12 +214,32 @@ div .item-info-view .button-add-del { ...@@ -197,12 +214,32 @@ div .item-info-view .button-add-del {
padding-left: 58%; padding-left: 58%;
} }
div #product-list-globe { div #product-list-globe,
div #product-list-cart-items {
max-height: 500px; max-height: 500px;
overflow: auto; overflow: auto;
} }
div #product-list-cart-items {
max-height: 167px;
overflow: auto;
}
div .sidebar-title h3 {
float: left;
}
div .sidebar-button button {
margin-top: 17px;
margin-left: 10px;
}
/*----------product list clases----------*/ /*----------product list clases----------*/
div .draw-button {
float: left;
margin-left: 20px;
}
div .sidebar-input { div .sidebar-input {
border-radius: 3px; border-radius: 3px;
border: 1px solid #374850; border: 1px solid #374850;
......
catalog/static/js/dataRetrieval.js
View file @ cfb3df0a
// // Get the <datalist> and <input> elements.
// var input = document.getElementById('ajax-input');
// var value = input.value;
// var dataList = document.getElementById('polygon-list');
// console.log("VALUE:", value);
// // Create a new XMLHttpRequest.
// var request = new XMLHttpRequest();
//
// // Handle state changes for the request.
// request.onreadystatechange = function(response) {
// if (request.readyState === 4) {
// if (request.status === 200) {
// // Parse the JSON
// var jsonOptions = JSON.parse(request.responseText);
//
// // Loop over the JSON array.
// jsonOptions.forEach(function(item) {
// // Create a new <option> element.
// var option = document.createElement('option');
// // Set the value using the item in the JSON array.
// option.value = item;
// // Add the <option> element to the <datalist>.
// dataList.appendChild(option);
// });
//
// // Update the placeholder text.
// input.placeholder = "Search...";
// } else {
// // An error occured :(
// input.placeholder = "Couldn't load datalist options :(";
// }
// }
// };
//
// // Update the placeholder text.
// input.placeholder = "Loading options...";
//
// // Set up and make the request.
// request.open('POST', 'http://localhost:8080/catalog/searchsubmit/', true);
// request.send({
// value: value
// });
var OPT_LIST_IS_HIDDEN = true; var OPT_LIST_IS_HIDDEN = true;
var INPUT_ON_FOCUS = false; var INPUT_ON_FOCUS = false;
var polygonList; var polygonList;
var product_list = [] var product_list = [];
var makeRequest = function (value) { var makeRequest = function (value) {
var pol_element = document.getElementById('polygon-list'); var pol_element = document.getElementById('polygon-list');
...@@ -119,6 +77,10 @@ function drawPolygon(element) { ...@@ -119,6 +77,10 @@ function drawPolygon(element) {
}) })
} }
function erase_input() {
$('#ajax-input').val('');
}
var prevfeature = null; var prevfeature = null;
function drawApiResponse(element) { function drawApiResponse(element) {
product_list.catalog.forEach(function (data) { product_list.catalog.forEach(function (data) {
...@@ -170,6 +132,10 @@ $(document).ready(function () { ...@@ -170,6 +132,10 @@ $(document).ready(function () {
var typingTimer; var typingTimer;
var typingInterval = 800; //milliseconds var typingInterval = 800; //milliseconds
var productListPrev = [];
var productListGlobe = [];
var productListCart = {}; // this array represent DB where products will be stored
// On keyup, start the contdown // On keyup, start the contdown
$('#ajax-input').on('input', function () { $('#ajax-input').on('input', function () {
var value = $('#ajax-input').val(); var value = $('#ajax-input').val();
...@@ -190,7 +156,6 @@ $(document).ready(function () { ...@@ -190,7 +156,6 @@ $(document).ready(function () {
} }
}); });
var productListGlobe = []; // this array represent DB where products will be stored
var PRODUCT_IN_LIST = false; var PRODUCT_IN_LIST = false;
// function for making POST request to productList in view.py // function for making POST request to productList in view.py
...@@ -203,14 +168,19 @@ $(document).ready(function () { ...@@ -203,14 +168,19 @@ $(document).ready(function () {
data: submit_data, data: submit_data,
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
PRODUCT_IN_LIST = false;
productListGlobe = [];
productListPrev = [];
console.log("DATA: ", data); console.log("DATA: ", data);
product_list = data; product_list = data;
productListGlobe = data.catalog;
console.log('GLOBEEE: ', productListGlobe);
if (productListGlobe.length > 0) { if (productListPrev.length > 0) {
PRODUCT_IN_LIST = false; PRODUCT_IN_LIST = false;
for (var i = 0; i < productListGlobe.length; i++) { for (var i = 0; i < productListPrev.length; i++) {
if (productListGlobe[i].id === data.id) { if (productListPrev[i].id === data.id) {
i = productListGlobe.length; i = productListPrev.length;
PRODUCT_IN_LIST = true; PRODUCT_IN_LIST = true;
} }
} }
...@@ -218,7 +188,7 @@ $(document).ready(function () { ...@@ -218,7 +188,7 @@ $(document).ready(function () {
if (!PRODUCT_IN_LIST) { if (!PRODUCT_IN_LIST) {
console.log("DEFS: ahora crea producto"); console.log("DEFS: ahora crea producto");
productListGlobe.push(data); productListPrev.push(data);
data.catalog.forEach(function (data) { data.catalog.forEach(function (data) {
console.log("DD: ", data); console.log("DD: ", data);
...@@ -231,9 +201,8 @@ $(document).ready(function () { ...@@ -231,9 +201,8 @@ $(document).ready(function () {
}, },
dataType: 'text', dataType: 'text',
success: function (response) { success: function (response) {
var raw_img = response.toString("base64"); console.log("from img response: ", response);
console.log("from img response: ", raw_img); var product_html = '<li id="' + data.id + '" onclick="drawApiResponse(this)" class="hover-me">'+
var product_html = '<li id="' + data.id + ' class="hover-me">'+
'<a href="javascript:void(0)">'+ '<a href="javascript:void(0)">'+
'<i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>'+ '<i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>'+
'<div class="menu-info">'+ '<div class="menu-info">'+
...@@ -241,59 +210,10 @@ $(document).ready(function () { ...@@ -241,59 +210,10 @@ $(document).ready(function () {
'<p>' + data.product.beginposition + '</p>'+ '<p>' + data.product.beginposition + '</p>'+
'</div>'+ '</div>'+
'</a>'+ '</a>'+
// '</li>'+
// '<div id="' + data.id + '-hover" class="row">'+
// '<div class="col-12">'+
'<div id="' + data.id + '-hover" class="item-info-view">'+
'<div class="cropped-preview">'+
// '<img src="' + data.img + '">'+
'<img src="data:image/jpeg;base64, ' + raw_img + '">'+
'</div>'+
'<div class="polygon-item-data">'+
'<div class="city">' + data.product.identifier + '</div>'+
'<p class="info">'+
'<i class="fa fa-sync-alt"></i>'+
'<span class="type">Size:</span><br>'+
'<span class="data-info">' + data.product.size + '</span>'+
'</p>'+
'<p class="info">'+
'<i class="fa fa-calendar-gear"></i>'+
'<span class="type">Instrument:</span><br>'+
'<span class="data-info">' + data.product.instrumentname + '</span>'+
'</p>'+
// '<p class="info">'+
// '<i class="fa fa-cloud"></i>'+
// '<span class="type">Cloud percentage:</span><br>'+
// '<span class="data-info">' + data.product.cloudcoverpercentage + ' %</span>'+
// '</p>'+
'</div>'+
// '<div class="button-add-del">'+
// '<button type="button" class="btn btn-success">Add to cart</button> '+
// '<button type="button" class="btn btn-danger">Remove</button>'+
// '</div>'+
'</div>'+
// '</div>'+
// '</div>'+
'</li>';
$('#product-list-globe').append(product_html);
}
});
var product_html = '<li id="' + data.id + '" onclick="drawApiResponse(this)" class="hover-me">'+
'<a href="javascript:void(0)">'+
'<i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>'+
'<div class="menu-info">'+
'<h4 class="control-sidebar-subheading">' + data.product.producttype + '_' + data.product.tileid + '</h4>'+
'<p>' + data.product.beginposition + '</p>'+
'</div>'+
'</a>'+
// '</li>'+
// '<div id="' + data.id + '-hover" class="row">'+
// '<div class="col-12">'+
'<div id="' + data.id + '-hover" class="item-info-view">'+ '<div id="' + data.id + '-hover" class="item-info-view">'+
'<div class="cropped-preview">'+ '<div class="cropped-preview">'+
'<img src="' + data.img + '">'+ '<img src="' + data.img + '">'+
// '<img src="data:image/jpeg;base64, ' + raw_img + '">'+
'</div>'+ '</div>'+
'<div class="polygon-item-data">'+ '<div class="polygon-item-data">'+
'<div class="city">' + data.product.identifier + '</div>'+ '<div class="city">' + data.product.identifier + '</div>'+
...@@ -303,26 +223,17 @@ $(document).ready(function () { ...@@ -303,26 +223,17 @@ $(document).ready(function () {
'<span class="data-info">' + data.product.size + '</span>'+ '<span class="data-info">' + data.product.size + '</span>'+
'</p>'+ '</p>'+
'<p class="info">'+ '<p class="info">'+
'<i class="fa fa-calendar-gear"></i>'+ '<i class="fa fa-gear"></i>'+
'<span class="type">Instrument:</span><br>'+ '<span class="type">Instrument:</span><br>'+
'<span class="data-info">' + data.product.instrumentname + '</span>'+ '<span class="data-info">' + data.product.instrumentname + '</span>'+
'</p>'+ '</p>'+
// '<p class="info">'+
// '<i class="fa fa-cloud"></i>'+
// '<span class="type">Cloud percentage:</span><br>'+
// '<span class="data-info">' + data.product.cloudcoverpercentage + ' %</span>'+
// '</p>'+
'</div>'+ '</div>'+
// '<div class="button-add-del">'+
// '<button type="button" class="btn btn-success">Add to cart</button> '+
// '<button type="button" class="btn btn-danger">Remove</button>'+
// '</div>'+
'</div>'+ '</div>'+
// '</div>'+ '</li>';
// '</div>'+
'</li>';
$('#product-list-globe').append(product_html); $('#product-list-globe').append(product_html);
}
});
}); });
} }
} }
...@@ -331,51 +242,70 @@ $(document).ready(function () { ...@@ -331,51 +242,70 @@ $(document).ready(function () {
event.preventDefault(); event.preventDefault();
}); });
$('#add-cart').click(function () { $('#add-cart').click(function () {
product_list.catalog.forEach(function (data) { var product_id = productListGlobe[0].id;
var product_html = '<li id="' + data.id + ' class="hover-me">'+ productListCart[product_id] = productListGlobe;
'<a href="javascript:void(0)">'+ console.log("CAAART: ", productListCart);
'<i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>'+
'<div class="menu-info">'+ var globe_element = document.getElementById('product-list-globe');
'<h4 class="control-sidebar-subheading">' + data.product.producttype + '_' + data.product.tileid + '</h4>'+ while (globe_element.firstChild) {
'<p>' + data.product.beginposition + '</p>'+ globe_element.removeChild(globe_element.firstChild);
'</div>'+ }
'</a>'+
// '</li>'+
// '<div id="' + data.id + '-hover" class="row">'+ var product_html = '<li class="treeview">'+
// '<div class="col-12">'+ '<a href="#">'+
'<div id="' + data.id + '-hover" class="item-info-view">'+ '<i class="fa fa-cubes"></i>'+
'<div class="cropped-preview">'+ '<span>Product Name</span>'+
'<img src="' + data.img + '">'+ '<span class="pull-right-container">'+
'</div>'+ '<span class="label label-primary pull-right"></span>'+
'<div class="polygon-item-data">'+ '</span>'+
'<div class="city">' + data.product.identifier + '</div>'+ '</a>'+
'<p class="info">'+ '<ul class="treeview-menu sidebar-form">'+
'<i class="fa fa-sync-alt"></i>'+ '<li>'+
'<span class="type">Size:</span><br>'+ '<ul id="product-list-cart-items" class="control-sidebar-menu">';
'<span class="data-info">' + data.product.size + '</span>'+
'</p>'+ var product_html_li = '';
'<p class="info">'+ console.log("djdj: ", productListGlobe);
'<i class="fa fa-calendar-gear"></i>'+ productListGlobe.forEach(function (data) {
'<span class="type">Instrument:</span><br>'+ console.log("SS: ", data.product.size);
'<span class="data-info">' + data.product.instrumentname + '</span>'+ product_html_li += '<li id="' + data.id + ' class="hover-me">'+
'</p>'+ '<a href="javascript:void(0)">'+
// '<p class="info">'+ '<i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>'+
// '<i class="fa fa-cloud"></i>'+ '<div class="menu-info">'+
// '<span class="type">Cloud percentage:</span><br>'+ '<h4 class="control-sidebar-subheading">' + data.product.producttype + '_' + data.product.tileid + '</h4>'+
// '<span class="data-info">' + data.product.cloudcoverpercentage + ' %</span>'+ '<p>' + data.product.beginposition + '</p>'+
// '</p>'+
'</div>'+
// '<div class="button-add-del">'+
// '<button type="button" class="btn btn-success">Add to cart</button> '+
// '<button type="button" class="btn btn-danger">Remove</button>'+
// '</div>'+
'</div>'+ '</div>'+
// '</div>'+ '</a>'+
// '</div>'+ '<div id="' + data.id + '-hover" class="item-info-cart-view">'+
'</li>'; '<div class="cropped-preview">'+
'<img src="' + data.img + '">'+
'</div>'+
'<div class="polygon-item-data">'+
'<div class="city">' + data.product.identifier + '</div>'+
'<p class="info">'+
'<i class="fa fa-sync-alt"></i>'+
'<span class="type">Size:</span><br>'+
'<span class="data-info">' + data.product.size + '</span>'+
'</p>'+
'<p class="info">'+
'<i class="fa fa-calendar-gear"></i>'+
'<span class="type">Instrument:</span><br>'+
'<span class="data-info">' + data.product.instrumentname + '</span>'+
'</p>'+
'</div>'+
'</div>'+
'</li>';
});
product_html_li += '</ul>'+
'</li>'+
'</ul>'+
'</li>';
$('#product-list-globe').append(product_html); $('#product-list-cart').append(product_html + product_html_li);
}); // product_html = '';
}); });
}); });
catalog/templates/base_top.html
View file @ cfb3df0a
...@@ -104,127 +104,18 @@ ...@@ -104,127 +104,18 @@
<div class="tab-content"> <div class="tab-content">
<!-- Home tab content --> <!-- Home tab content -->
<div class="tab-pane" id="control-sidebar-home-tab"> <div class="tab-pane" id="control-sidebar-home-tab">
<h3 class="control-sidebar-heading"><b>Products</b></h3> <div class="container">
<button type="button" name="search" id="add-cart" class="btn btn-primary"> <div class="sidebar-title">
Add to cart <h3><b>Products</b></h3>
</button>
<ul id="product-list-globe" class="control-sidebar-menu"></ul>
<!-- <li id="me-id">
<a href="javascript:void(0)">
<i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i>
<div class="menu-info">
<h4 class="control-sidebar-subheading">Mérida, Yucatán</h4>
<p>May 26th 2018</p>
</div>
</a>
</li>
<div id="me-id-hover" class="row">
<div class="col-12">
<div id="polygon id" class="item-info-view">
<div class="cropped-preview">
<img src="{% static 'images/sat_preview/sat_test.jpg' %}">
</div>
<div class="polygon-item-data">
<div class="city">Mérida, Yucatán</div>
<p class="info">
<span class="type">Process:</span><br>
Vegetation index
</p>
<p class="info">
<span class="type">Date range:</span><br>
2018-05-19 to 2018-05-26
</p>
<p class="info">
<span class="type">Polygon:</span><br>
WKT format
</p>
<p class="info">
<span class="type">Cloud percentage:</span><br>
25%
</p>
</div>
<div class="button-add-del">
<button type="button" class="btn btn-success">Add to cart</button>
<button type="button" class="btn btn-danger">Delete</button>
</div>
</div>
</div>
</div> </div>
<li id="va-id"> <div class="sidebar-button">
<a href="javascript:void(0)"> <button type="button" name="search" id="add-cart" class="btn btn-primary">
<i class="menu-icon glyphicon glyphicon-bookmark bg-red"></i> Add to cart
</button>
<div class="menu-info"> </div>
<h4 class="control-sidebar-subheading">Valladolid, Yucatán</h4> </div>
<p>May 26th 2018</p> <!-- this ul element is filled with data -->
</div> <ul id="product-list-globe" class="control-sidebar-menu"></ul>
</a>
</li>
<div id="va-id-hover" class="row">
<div class="col-12">
<div id="polygon id" class="item-info-view">
<div class="cropped-preview">
<img src="{% static 'images/sat_preview/sat_test.jpg' %}">
</div>
<div class="polygon-item-data">
<div class="city">Valladolid, Yucatán</div>
<p class="info">
<span class="type">Process:</span><br>
Water bodies
</p>
<p class="info">
<span class="type">Date range:</span><br>
2018-05-19 to 2018-05-26
</p>
<p class="info">
<span class="type">Polygon:</span><br>
WKT format
</p>
<p class="info">
<span class="type">Cloud percentage:</span><br>
40%
</p>
</div>
<div class="button-add-del">
<button type="button" class="btn btn-success">Add to cart</button>
<button type="button" class="btn btn-danger">Delete</button>
</div>
</div>
</div>
</div> -->
<!-- <h3 class="control-sidebar-heading">Recent Activity</h3>
<ul class="control-sidebar-menu">
<li>
<a href="javascript:void(0)">
<i class="menu-icon fa fa-birthday-cake bg-red"></i>
<div class="menu-info">
<h4 class="control-sidebar-subheading">Langdon's Birthday</h4>
<p>Will be 23 on April 24th</p>
</div>
</a>
</li>
</ul> -->
<!-- /.control-sidebar-menu -->
<!-- <h3 class="control-sidebar-heading">Tasks Progress</h3>
<ul class="control-sidebar-menu">
<li>
<a href="javascript:void(0)">
<h4 class="control-sidebar-subheading">
Custom Template Design
<span class="label label-danger pull-right">70%</span>
</h4>
<div class="progress progress-xxs">
<div class="progress-bar progress-bar-danger" style="width: 70%"></div>
</div>
</a>
</li>
</ul> -->
<!-- /.control-sidebar-menu --> <!-- /.control-sidebar-menu -->
</div> </div>
<!-- /.tab-pane --> <!-- /.tab-pane -->
...@@ -233,33 +124,18 @@ ...@@ -233,33 +124,18 @@
<!-- /.tab-pane --> <!-- /.tab-pane -->
<!-- Settings tab content --> <!-- Settings tab content -->
<div class="tab-pane" id="control-sidebar-settings-tab"> <div class="tab-pane" id="control-sidebar-settings-tab">
<form method="post"> <div class="container">
<h3 class="control-sidebar-heading">General Settings</h3> <div class="sidebar-title">
<h3><b>My cart</b></h3>
<div class="form-group"> </div>
<label class="control-sidebar-subheading"> <div class="sidebar-button">
Report panel usage <button type="button" name="search" id="add-cart" class="btn btn-primary">
<input type="checkbox" class="pull-right" checked> Buy products
</label> </button>
</div>
<p>
Some information about this general settings option
</p>
</div>
<!-- /.form-group -->
<h3 class="control-sidebar-heading">Chat Settings</h3>
<div class="form-group">
<label class="control-sidebar-subheading">
Show me as online
<input type="checkbox" class="pull-right" checked>
</label>
</div> </div>
<!-- /.form-group --> <!-- this ul element is filled with data -->
</form> <ul id="product-list-cart" class="sidebar-menu" data-widget="tree"></ul>
</div> </div>
<!-- /.tab-pane --> <!-- /.tab-pane -->
</div> </div>
......
catalog/templates/map.html
View file @ cfb3df0a
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<div class="input-group"> <div class="input-group">
<input type="text" id="ajax-input" name="value" class="form-control" placeholder="Search region..."> <input type="text" id="ajax-input" name="value" class="form-control" placeholder="Search region...">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" name="search" id="search-btn" class="btn btn-flat"> <button type="button" name="search" id="search-btn" class="btn btn-flat" onclick="erase_input()">
<i class="fa fa-eraser"></i> <i class="fa fa-eraser"></i>
</button> </button>
</span> </span>
...@@ -139,11 +139,6 @@ ...@@ -139,11 +139,6 @@
<!-- <form role="form" target="catalogFrame" action="{% url 'productList' %}" method="post"> --> <!-- <form role="form" target="catalogFrame" action="{% url 'productList' %}" method="post"> -->
<form id='product-form' role="form" method="post"> <form id='product-form' role="form" method="post">
{% csrf_token %} {% csrf_token %}
<div class="row" id="option-list">
<div class="col-12">
<ul id="polygon-list" class="no-bullet"></ul>
</div>
</div>
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -212,7 +207,7 @@ ...@@ -212,7 +207,7 @@
</form> </form>
</div> </div>
<div id="div-draw-btn"> <div id="div-draw-btn" class="draw-button">
<button type="submit" name="draw" id="draw-btn" class="btn btn-primary" onclick="osmap.draw()"><i class="fa fa-object-ungroup"></i> Dibujar</button> <button type="submit" name="draw" id="draw-btn" class="btn btn-primary" onclick="osmap.draw()"><i class="fa fa-object-ungroup"></i> Dibujar</button>
</div> </div>
<!-- form-group--> <!-- form-group-->
......
catalog/views.py
View file @ cfb3df0a
...@@ -9,8 +9,7 @@ from django.urls import reverse ...@@ -9,8 +9,7 @@ from django.urls import reverse
from django.views.generic.base import View from django.views.generic.base import View
from django.template import loader from django.template import loader
from urllib import urlencode from urllib import urlencode
import requests, json, unicodedata import requests, json, unicodedata, sys
import random, sys, imp
sys.path.append('../') sys.path.append('../')
from geosentinel import APISentinel from geosentinel import APISentinel
...@@ -43,11 +42,11 @@ def requestToImage(request): ...@@ -43,11 +42,11 @@ def requestToImage(request):
img_link = request.GET['value'] img_link = request.GET['value']
# img_link = img_link[:img_link.find("/") + 2] + "emmhp:geoemm29@" + img_link[img_link.find("/") + 2:] # img_link = img_link[:img_link.find("/") + 2] + "emmhp:geoemm29@" + img_link[img_link.find("/") + 2:]
r = requests.get(img_link, auth=("emmhp", "geoemm29"), stream=True) # r = requests.get(img_link, auth=("emmhp", "geoemm29"), stream=True)
# print("RAAAW: ", r.raw.read()) # print("RAAAW: ", r.raw.read())
# return JsonResponse({'img': "hello"}) return JsonResponse({'img': "reqToIMG"})
return HttpResponse(r.raw.read(), content_type="image/jpeg") # return HttpResponse(r.raw.read(), content_type="image/jpeg")
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
def productList(request): def productList(request):
...@@ -93,7 +92,7 @@ def productList(request): ...@@ -93,7 +92,7 @@ def productList(request):
'cloud_percentage': cloud_percentage, 'cloud_percentage': cloud_percentage,
'product' : products[p], 'product' : products[p],
'id' : products[p]['uuid'], 'id' : products[p]['uuid'],
'img' : img_link 'img' : img_preview
}) })
return JsonResponse({'catalog':catalog}); return JsonResponse({'catalog':catalog});
......
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