Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 21cd2d18 authored by Sergio Adrian Gongora Euan's avatar Sergio Adrian Gongora Euan
Browse files
Options

merged fixed

parents 9172ae7e c9eec930
Show whitespace changes
Inline Side-by-side
Showing with 314 additions and 166 deletions
administration/templates/dashboard.html
View file @ 21cd2d18
...@@ -251,7 +251,8 @@ ...@@ -251,7 +251,8 @@
<div class="chart "> <div class="chart ">
<!-- Sales Chart Canvas --> <!-- Sales Chart Canvas -->
<canvas id="salesChart" style="height: 142px; width: 814px;" width="814" height="170"></canvas> <canvas id="salesChart" style="height: 142px; width: 814px;" width="814"
height="170"></canvas>
</div> </div>
<!-- /.chart-responsive --> <!-- /.chart-responsive -->
</div> </div>
...@@ -330,8 +331,11 @@ ...@@ -330,8 +331,11 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="box box-success"> <div class="box box-success">
<div class="box-header with-border"> <div class="box-header with-border">
{% if request.user.username == "demo" %}
<h3 class="box-title" id="purchases_in">Reports Per Month</h3>
{% else %}
<h3 class="box-title" id="purchases_in">Purchases Per Month</h3> <h3 class="box-title" id="purchases_in">Purchases Per Month</h3>
{% endif %}
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i <button type="button" class="btn btn-box-tool" data-widget="collapse"><i
class="fa fa-minus"></i> class="fa fa-minus"></i>
...@@ -505,7 +509,11 @@ ...@@ -505,7 +509,11 @@
var label = myChart.data.labels[firstPoint._index]; var label = myChart.data.labels[firstPoint._index];
//if (!firstPoint) return; //if (!firstPoint) return;
$('#purchases_in').empty(); $('#purchases_in').empty();
$('#purchases_in').append("Purchases in " + label); {% if request.user.username == "demo" %}
$('#purchases_in').append("Reports in " + label);
{% else %}
$('#purchases_in').append("Reports in " + label);
{% endif %}
$.ajax({ $.ajax({
...@@ -523,7 +531,7 @@ ...@@ -523,7 +531,7 @@
"<th class=\"text-center\">User ID</th>" + "<th class=\"text-center\">User ID</th>" +
"<th class=\"text-center\">User</th>" + "<th class=\"text-center\">User</th>" +
"<th class=\"text-center\">E-Mail</th>" + "<th class=\"text-center\">E-Mail</th>" +
"<th class=\"text-center\">Purchases</th>" + "<th class=\"text-center\">Concluded</th>" +
//"<th class=\"text-center\">Storage</th>" + //"<th class=\"text-center\">Storage</th>" +
"<th class=\"text-center\">Downloads in process</th>" + "<th class=\"text-center\">Downloads in process</th>" +
"</tr>" + "</tr>" +
......
catalog/admin.py
View file @ 21cd2d18
...@@ -13,7 +13,7 @@ from catalog.models import Platform ...@@ -13,7 +13,7 @@ from catalog.models import Platform
#admin.site.register(Publisher) #admin.site.register(Publisher)
class ProcessAdmin(admin.ModelAdmin): class ProcessAdmin(admin.ModelAdmin):
list_display = ('name', 'platform', 'productLevel') list_display = ('name', 'platform', 'productLevel','description','command')
admin.site.register(Process, ProcessAdmin) admin.site.register(Process, ProcessAdmin)
......
catalog/forms.py
View file @ 21cd2d18
...@@ -15,7 +15,7 @@ all_process = Process.objects.filter(status=True) ...@@ -15,7 +15,7 @@ all_process = Process.objects.filter(status=True)
platforms = [] platforms = []
for each_process in all_process: for each_process in all_process:
platforms.append((each_process.platform_id,each_process.name)) platforms.append((each_process.id,each_process.name))
#ALOS, A3, AIRSAR, AS, ERS-1, E1, ERS-2, E2, JERS-1, J1, RADARSAT-1, R1, SEASAT, SS, Sentinel-1A, SA, Sentinel-1B, SB, SMAP, SP, UAVSAR, UA. #ALOS, A3, AIRSAR, AS, ERS-1, E1, ERS-2, E2, JERS-1, J1, RADARSAT-1, R1, SEASAT, SS, Sentinel-1A, SA, Sentinel-1B, SB, SMAP, SP, UAVSAR, UA.
......
catalog/models.py
View file @ 21cd2d18
...@@ -55,6 +55,10 @@ class Process(models.Model): ...@@ -55,6 +55,10 @@ class Process(models.Model):
platform = models.ForeignKey(Platform, on_delete=models.CASCADE, default='') platform = models.ForeignKey(Platform, on_delete=models.CASCADE, default='')
productLevel = models.CharField(max_length=8, default='') productLevel = models.CharField(max_length=8, default='')
status = models.BooleanField(default=True) status = models.BooleanField(default=True)
description = models.TextField(default="")
command = models.CharField(max_length=100, default='')
parameters = models.TextField(default="")
type = models.CharField(max_length=50)
class Search(models.Model): class Search(models.Model):
......
catalog/static/catalog/js/dataRetrieval.js
View file @ 21cd2d18
...@@ -107,11 +107,17 @@ function updateCart(){ ...@@ -107,11 +107,17 @@ function updateCart(){
}); });
}); });
hideWaitingModal(); hideWaitingModal();
if (user != "demo"){
showCarProductsTabPanel(); showCarProductsTabPanel();
}
statusUpdateCart = false; statusUpdateCart = false;
} }
}); });
} }
console.log(user);
if (user == "demo") {
window.location.href = "pay";
}
}; };
function deleteProductCar(element){ function deleteProductCar(element){
...@@ -300,6 +306,40 @@ function creatCategoryProductContainer(catalog){ ...@@ -300,6 +306,40 @@ function creatCategoryProductContainer(catalog){
}) })
} }
function creatCategoryProductContainer2(catalog){
productCategory = new Map();
console.log(catalog);
console.log(catalog[0].product.title);
console.log(catalog[0].start_date);
console.log(catalog[0].end_date);
console.log(catalog.length);
var temp_1 = document.querySelector('#product_list_category_2');
temp_1.content.querySelector('span').textContent = catalog[0].product.beginposition;
temp_1.content.querySelectorAll('span')[1].textContent = catalog[0].start_date;
temp_1.content.querySelectorAll('span')[2].textContent = catalog[0].end_date;
temp_1.content.querySelectorAll('span')[3].textContent = catalog.length;
temp_1.content.querySelector('ul .control-sidebar-menu').id = "L-"+ catalog[0].product.title;
var clone_1 = document.importNode(temp_1.content, true);
document.querySelector('#product-list-globe').appendChild(clone_1);
productCategory = new Map();
catalog.forEach(function(category){
if (!productCategory.has(category.product.tileid)){
productCategory.set(category.product.tileid, 1)
var temp_1 = document.querySelector('#product_list_category');
temp_1.content.querySelector('li').classList.add("hidden");
temp_1.content.querySelector('span').textContent = category.product.tileid;
temp_1.content.querySelector('ul .control-sidebar-menu').id = "L-"+ category.product.tileid;
var clone_1 = document.importNode(temp_1.content, true);
document.querySelector('#product-list-globe').appendChild(clone_1);
}
})
}
$('#ajax-input').focus(function () { $('#ajax-input').focus(function () {
console.log('in'); console.log('in');
INPUT_ON_FOCUS = true; INPUT_ON_FOCUS = true;
...@@ -441,7 +481,8 @@ $(document).ready(function () { ...@@ -441,7 +481,8 @@ $(document).ready(function () {
if (product_list.catalog.length > 0) { if (product_list.catalog.length > 0) {
creatCategoryProductContainer(data.catalog); if (advanced_search == 'True'){creatCategoryProductContainer(data.catalog);}
else {creatCategoryProductContainer2(data.catalog);}
requestedImages = 0 requestedImages = 0
catalogLength = data.catalog.length catalogLength = data.catalog.length
data.catalog.forEach(function (data, index) { data.catalog.forEach(function (data, index) {
......
catalog/templates/base_top.html
View file @ 21cd2d18
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous"> integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
<!-- Fengyuan Chen's Datepicker --> <!-- Fengyuan Chen's Datepicker -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datepicker/0.6.5/datepicker.min.css" integrity="sha256-b88RdwbRJEzRx95nCuuva+hO5ExvXXnpX+78h8DjyOE=" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datepicker/0.6.5/datepicker.min.css"
integrity="sha256-b88RdwbRJEzRx95nCuuva+hO5ExvXXnpX+78h8DjyOE=" crossorigin="anonymous"/>
{% block headMedia %}{% endblock %} {% block headMedia %}{% endblock %}
...@@ -90,11 +91,15 @@ ...@@ -90,11 +91,15 @@
{% block user %}{% endblock %} {% block user %}{% endblock %}
</li> </li>
<!-- Control Sidebar Toggle Button --> <!-- Control Sidebar Toggle Button -->
<li id="panelShowCart">{% if showcart %} {% if request.user.username == "demo" %}
{% else %}
<li id="panelShowCart">
{% if showcart %}
<a id="product-list-toggle" href="#" data-toggle="control-sidebar"><i <a id="product-list-toggle" href="#" data-toggle="control-sidebar"><i
class="fa fa-shopping-cart"></i></a> class="fa fa-shopping-cart"></i></a>
{% endif %} {% endif %}
</li> </li>
{% endif %}
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
...@@ -129,9 +134,12 @@ ...@@ -129,9 +134,12 @@
<ul class="nav nav-tabs nav-justified control-sidebar-tabs"> <ul class="nav nav-tabs nav-justified control-sidebar-tabs">
<li id="globe" class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i <li id="globe" class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i
class="fa fa-globe"></i></a></li> class="fa fa-globe"></i></a></li>
{% if request.user.username == 'demo' %}
{% else %}
<li id="cart"><a href="#control-sidebar-settings-tab" onclick="updateCart()" data-toggle="tab"><i <li id="cart"><a href="#control-sidebar-settings-tab" onclick="updateCart()" data-toggle="tab"><i
class="fa fa-shopping-cart"></i></a> class="fa fa-shopping-cart"></i></a>
</li> </li>
{% endif %}
</ul> </ul>
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
...@@ -145,7 +153,12 @@ ...@@ -145,7 +153,12 @@
</div> </div>
<div class="sidebar-button"> <div class="sidebar-button">
<button type="submit" name="search" id="add-cart" class="btn btn-primary"> <button type="submit" name="search" id="add-cart" class="btn btn-primary">
{% if request.user.username == 'demo' %}
Process
{% else %}
Add to cart Add to cart
{% endif %}
</button> </button>
</div> </div>
</div> </div>
...@@ -216,8 +229,10 @@ ...@@ -216,8 +229,10 @@
<!-- Chartsjs --> <!-- Chartsjs -->
<script src="{% static 'catalog/js/Chart.min.js' %}" type="text/javascript"></script> <script src="{% static 'catalog/js/Chart.min.js' %}" type="text/javascript"></script>
<!-- Fengyuan Chen's Datepicker --> <!-- Fengyuan Chen's Datepicker -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/datepicker/0.6.5/datepicker.min.js" integrity="sha256-/7FLTdzP6CfC1VBAj/rsp3Rinuuu9leMRGd354hvk0k=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/datepicker/0.6.5/datepicker.min.js"
<script src="{% static 'catalog/adminlte/bower_components/guides-master/dist/guides.min.js' %}" type="text/javascript"></script> integrity="sha256-/7FLTdzP6CfC1VBAj/rsp3Rinuuu9leMRGd354hvk0k=" crossorigin="anonymous"></script>
<script src="{% static 'catalog/adminlte/bower_components/guides-master/dist/guides.min.js' %}"
type="text/javascript"></script>
{% block footer %}{% endblock %} {% block footer %}{% endblock %}
{% block scripts %}{% endblock %} {% block scripts %}{% endblock %}
<div id="ol"></div> <div id="ol"></div>
......
catalog/templates/map.html
View file @ 21cd2d18
...@@ -367,6 +367,9 @@ ...@@ -367,6 +367,9 @@
var prod_from_cartDB_url = "{% url 'from-cart-rqst' %}"; // url for requesting product from cart table in DB var prod_from_cartDB_url = "{% url 'from-cart-rqst' %}"; // url for requesting product from cart table in DB
var purch_prod_url = "{% url 'purch-prod-rqst' %}"; var purch_prod_url = "{% url 'purch-prod-rqst' %}";
var del_prod_cartDB_url = "{% url 'del-cart-rqst' %}"; var del_prod_cartDB_url = "{% url 'del-cart-rqst' %}";
var advanced_search = '{{ advanced_search }}';
var user = '{{ request.user }}';
console.log(user);
</script> </script>
<script> <script>
......
catalog/templates/templates.html
View file @ 21cd2d18
<!-- <!--
Templates for filling with info in dataRetrieval.js file Templates for filling with info in dataRetrieval.js file
--> -->
...@@ -20,9 +19,51 @@ ...@@ -20,9 +19,51 @@
</template> </template>
<!-- city list template --> <!-- city list template -->
<template id="product_list_category_2">
<li class="treeview">
<a href="#">
<div class="row">
<div class="col-lg-2" style="padding-top:33px">
<i class="fa fa-cubes"></i>
</div>
<div class="col-lg-8" style="padding: 0px">
<div>
<span id=""></span>
</div>
<div>
<label>Start Date: </label>
<span></span>
</div>
<div>
<label>End Date: </label>
<span></span>
</div>
<div>
<label>Number of objects: </label>
<span></span>
</div>
<span class="pull-right-container">
<span class="label label-primary pull-right"></span>
</span>
</div>
<!--div class="col-lg-2" style="padding-top:33px">
<i class="glyphicon glyphicon-remove" style="" onclick="deleteProductCar(this);"></i>
</div-->
</div>
</a>
<ul class="treeview-menu sidebar-form">
<li>
<ul id="" class="control-sidebar-menu product_list_category"></ul>
</li>
</ul>
</li>
</template>
<!-- product list template --> <!-- product list template -->
<template id="product_list_category"> <template id="product_list_category">
<li class="treeview"> <li class="treeview" id="lista_productos">
<a href="#"> <a href="#">
<i class="fa fa-cubes"></i> <i class="fa fa-cubes"></i>
<span></span> <span></span>
...@@ -38,6 +79,7 @@ ...@@ -38,6 +79,7 @@
</li> </li>
</template> </template>
<template id="product_list_template"> <template id="product_list_template">
<div id="" class="single-product-input"> <div id="" class="single-product-input">
<input type="checkbox" name="product_selected" value="" checked> <input type="checkbox" name="product_selected" value="" checked>
...@@ -78,7 +120,7 @@ ...@@ -78,7 +120,7 @@
</div> </div>
<div class="col-lg-8" style="padding: 0px"> <div class="col-lg-8" style="padding: 0px">
<div> <div>
<span id="" ></span> <span id=""></span>
</div> </div>
<div> <div>
<label>Process: </label> <label>Process: </label>
......
catalog/templates/user_button.html
View file @ 21cd2d18
...@@ -28,12 +28,18 @@ ...@@ -28,12 +28,18 @@
<li> <li>
<a class="treeview " href="{% url 'reports' %}"> <a class="treeview " href="{% url 'reports' %}">
<i class="fa fa-history"></i> <i class="fa fa-history"></i>
{% if request.user.username == "demo" %}
<span>Reports</span>
{% else %}
<span>Shopping History</span> <span>Shopping History</span>
{% endif %}
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label label-primary pull-right"></span> <span class="label label-primary pull-right"></span>
</span> </span>
</a> </a>
</li> </li>
{% if request.user.username == "demo" %}
{% else %}
<li> <li>
<a class="treeview " href="{% url 'show-cart' %}"> <a class="treeview " href="{% url 'show-cart' %}">
<i class="fa fa-shopping-cart"></i> <i class="fa fa-shopping-cart"></i>
...@@ -43,6 +49,7 @@ ...@@ -43,6 +49,7 @@
</span> </span>
</a> </a>
</li> </li>
{% endif %}
<li> <li>
<a class="treeview " href="{% url 'logout' %}?next={{ request.path }}"> <a class="treeview " href="{% url 'logout' %}?next={{ request.path }}">
<i class="glyphicon glyphicon-log-out"></i> <i class="glyphicon glyphicon-log-out"></i>
......
catalog/views.py
View file @ 21cd2d18
...@@ -34,8 +34,8 @@ API_SENTINEL_PASS = config['API_SENTINEL']['SENTINEL_PASS'] ...@@ -34,8 +34,8 @@ API_SENTINEL_PASS = config['API_SENTINEL']['SENTINEL_PASS']
sys.path.append(SENTINEL_PATH) sys.path.append(SENTINEL_PATH)
sentinel = APISentinel.APISentinel(API_SENTINEL_USER, API_SENTINEL_PASS) sentinel = APISentinel.APISentinel(API_SENTINEL_USER, API_SENTINEL_PASS)
os.environ["PATH"] += os.pathsep + "/home/agei/REPSAT/GeoSentinel/tools" os.environ["PATH"] += os.pathsep + SENTINEL_PATH +"/tools"
os.environ["PATH"] += os.pathsep + "/home/agei/REPSAT/GeoSentinel/geosentinel" os.environ["PATH"] += os.pathsep + SENTINEL_PATH +"/geosentinel"
# Create your views here. # Create your views here.
...@@ -104,13 +104,22 @@ def productList(request): ...@@ -104,13 +104,22 @@ def productList(request):
description = req['area_description'][0] description = req['area_description'][0]
print(search_name)
cloud_percentage = "[0 TO " + req['cloudPercentage'][0] + "]" cloud_percentage = "[0 TO " + req['cloudPercentage'][0] + "]"
process_info = Process.objects.values('name', 'platform_id', 'productLevel','type','platform__name').filter(id = process)
#print(process_info)
platform_name = process_info[0]['platform__name'] # Sentinel-2 ó Sentinel-1
product_type = process_info[0]['type'] # S2MSI1C o S2MSI2A
platform_id = process_info[0]['platform_id']
#print(platform_name)
#print(product_type)
## ----- aqui llamada a api sentinel ## ----- aqui llamada a api sentinel
## ----- antes consultar en DB si no se tiene ya el producto ## ----- antes consultar en DB si no se tiene ya el producto
date = ("".join(init_date.split('-')), "".join(end_date.split('-'))) date = ("".join(init_date.split('-')), "".join(end_date.split('-')))
params = {"platformname": "Sentinel-2"} params = {"platformname": platform_name}
# if cloud_percentage.strip(): # if cloud_percentage.strip():
# params['cloudcoverpercentage'] = cloud_percentage # params['cloudcoverpercentage'] = cloud_percentage
...@@ -120,19 +129,19 @@ def productList(request): ...@@ -120,19 +129,19 @@ def productList(request):
pol_bbox = polygonToBox.getWKTPolygonBoundingBox(area, True) pol_bbox = polygonToBox.getWKTPolygonBoundingBox(area, True)
##producttype: ##producttype:
type = " " type = product_type
print(process) #print(process)
if process == str(1): #~ if process == str(1):
type = "S2MSI1C" #~ type = "S2MSI1C"
if process == str(2): #~ if process == str(2):
type = "S2MSI2A" #~ type = "S2MSI2A"
## requesting producto to sentinel api ## requesting producto to sentinel api
##products = sentinel.getProducts(pol_bbox, date, params) ##products = sentinel.getProducts(pol_bbox, date, params)
products = sentinel.getProducts(pol_bbox, date, products = sentinel.getProducts(pol_bbox, date,
{"platformname": "Sentinel-2", "producttype": type, "cloudcoverpercentage": cloud_percentage},"Contains") ##intenta obtener los productos que contienen el polígono {"platformname": platform_name, "producttype": type, "cloudcoverpercentage": cloud_percentage},"Contains") ##intenta obtener los productos que contienen el polígono
if len(products) <= 0: if len(products) <= 0:
products = sentinel.getProducts(pol_bbox, date, {"platformname": "Sentinel-2", "producttype": type,"cloudcoverpercentage": cloud_percentage}) ## si no hay que contengan el polígono busca los que lo intersecan products = sentinel.getProducts(pol_bbox, date, {"platformname": platform_name, "producttype": type,"cloudcoverpercentage": cloud_percentage}) ## si no hay que contengan el polígono busca los que lo intersecan
##-- ##--
...@@ -169,7 +178,7 @@ def productList(request): ...@@ -169,7 +178,7 @@ def productList(request):
}) })
# Se tiene que pasar a Search el objeto completo correspondiente al process # Se tiene que pasar a Search el objeto completo correspondiente al process
index = Process.objects.filter(platform_id=process) index = Process.objects.filter(platform_id=platform_id)
proceso = index[0] proceso = index[0]
if (len(catalog) != 0): if (len(catalog) != 0):
......
reports/static/reports/js/reportImg.js
View file @ 21cd2d18
...@@ -32,6 +32,9 @@ document.getElementById("myChart").onclick = function (evt) { ...@@ -32,6 +32,9 @@ document.getElementById("myChart").onclick = function (evt) {
layerDate: label layerDate: label
}); });
// update date slider
$('input[id="inputRange"]').val(firstPoint._index);
//console.log(myChart.legend.legendItems[firstPoint._datasetIndex].text) //nombre de la capa a la que pertenece (vegetación, agua, etc.) //console.log(myChart.legend.legendItems[firstPoint._datasetIndex].text) //nombre de la capa a la que pertenece (vegetación, agua, etc.)
//if (!firstPoint) return; //if (!firstPoint) return;
activePoints.forEach(function (value, index) { activePoints.forEach(function (value, index) {
......
reports/templates/sclData.html
View file @ 21cd2d18
...@@ -317,8 +317,6 @@ ...@@ -317,8 +317,6 @@
var sliderPos = slider3.value / slider3.max; var sliderPos = slider3.value / slider3.max;
var pixelPostion = slider3.clientWidth * sliderPos; var pixelPostion = slider3.clientWidth * sliderPos;
//this is your pixel value
console.log(pixelPostion);
addImageLayer({ addImageLayer({
layerDate: valor layerDate: valor
...@@ -328,12 +326,9 @@ ...@@ -328,12 +326,9 @@
$("#maptitle").append("Map Date: " + fecha); $("#maptitle").append("Map Date: " + fecha);
$("#tooltiptext").empty(); $("#tooltiptext").empty();
$("#tooltiptext").append(fecha); $("#tooltiptext").append(fecha);
console.log(position);
$("#rangecontrol2").empty(); $("#rangecontrol2").empty();
$("#rangecontrol2").append('<span class="arrow_box" id="tooltiptext">'+fecha+'</span>'); $("#rangecontrol2").append('<span class="arrow_box" id="tooltiptext">'+fecha+'</span>');
$('.arrow_box').css({'left':Math.round(pixelPostion-35) + 'px'}) $('.arrow_box').css({'left':Math.round(pixelPostion-35) + 'px'})
}); });
/* /*
var slider2 = document.getElementById("inputRange"); var slider2 = document.getElementById("inputRange");
......
users/templates/User_profile.html
View file @ 21cd2d18
...@@ -157,7 +157,11 @@ ...@@ -157,7 +157,11 @@
</li> </li>
<!-- timeline item --> <!-- timeline item -->
<li> <li>
{% if request.user.username == "demo" %}
<i class="fa fa-file-text bg-green-active"></i>
{% else %}
<i class="fa fa-cart-arrow-down bg-green-active"></i> <i class="fa fa-cart-arrow-down bg-green-active"></i>
{% endif %}
<div class="timeline-item"> <div class="timeline-item">
<span class="time"> <span class="time">
...@@ -169,7 +173,7 @@ ...@@ -169,7 +173,7 @@
</a> </a>
</span> </span>
<h3 class="timeline-header no-border">You bought <h3 class="timeline-header no-border">
<br>Process: <b>{{ product.process }}</b> <br>Process: <b>{{ product.process }}</b>
<br>Area: <b>{{ product.search_name }}</b> <br>Area: <b>{{ product.search_name }}</b>
<br>Size: <b>{{ product.size }}</b> <br>Size: <b>{{ product.size }}</b>
...@@ -200,7 +204,12 @@ ...@@ -200,7 +204,12 @@
<hr> <hr>
</div> </div>
<div class="container"> <div class="container">
{% if request.user.username == "demo" %}
<h3 class="box-title" id="purchases_in">Reports Per Month</h3>
{% else %}
<h3 class="box-title" id="purchases_in">Purchases Per Month</h3> <h3 class="box-title" id="purchases_in">Purchases Per Month</h3>
{% endif %}
<div id="mostrar"> <div id="mostrar">
</div> </div>
...@@ -364,7 +373,12 @@ ...@@ -364,7 +373,12 @@
var label = myChart.data.labels[firstPoint._index]; var label = myChart.data.labels[firstPoint._index];
//if (!firstPoint) return; //if (!firstPoint) return;
$('#purchases_in').empty(); $('#purchases_in').empty();
$('#purchases_in').append("Purchases in " + label); {% if request.user.username == "demo" %}
$('#purchases_in').append("Reports in " + label);
{% else %}
$('#purchases_in').append("Reports in " + label);
{% endif %}
$.ajax({ $.ajax({
...@@ -382,7 +396,7 @@ ...@@ -382,7 +396,7 @@
"<tr>" + "<tr>" +
"<th class=\"text-center\">Zone</th>" + "<th class=\"text-center\">Zone</th>" +
"<th class=\"text-center\">Process</th>" + "<th class=\"text-center\">Process</th>" +
"<th class=\"text-center\">Purchase Date</th>" + "<th class=\"text-center\">Consultation Date</th>" +
"<th class=\"text-center\">Start Date</th>" + "<th class=\"text-center\">Start Date</th>" +
"<th class=\"text-center\">End Date</th>" + "<th class=\"text-center\">End Date</th>" +
"</tr>" + "</tr>" +
......
users/templates/profile.html
View file @ 21cd2d18
...@@ -80,9 +80,16 @@ ...@@ -80,9 +80,16 @@
<i class="fa fa-search margin-r-5"></i> <b>Searches</b> <a <i class="fa fa-search margin-r-5"></i> <b>Searches</b> <a
class="pull-right">{{ data.searches }}</a> class="pull-right">{{ data.searches }}</a>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<i class="fa fa-shopping-cart margin-r-5"></i> <b>Purchases</b> <a <i class="fa fa-shopping-cart margin-r-5"></i>
class="pull-right">{{ data.purchases }}</a> {% if request.user.username == "demo" %}
<b>Reports</b>
{% else %}
<b>Purchases</b>
{% endif %}
<a class="pull-right">{{ data.purchases }}</a>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<i class="fa fa-download margin-r-5"></i> <b>In Process</b> <a <i class="fa fa-download margin-r-5"></i> <b>In Process</b> <a
...@@ -148,16 +155,16 @@ ...@@ -148,16 +155,16 @@
<script> <script>
function change_permission(user_id) { function change_permission(user_id) {
var checkBox = document.getElementById(user_id); var checkBox = document.getElementById(user_id);
if (checkBox.checked == true) { if (checkBox.checked == true) {
permission(user_id, 'True'); permission(user_id, 'True');
} else { } else {
permission(user_id, 'False'); permission(user_id, 'False');
} }
} }
function permission(user_id, status) { function permission(user_id, status) {
$.ajax({ $.ajax({
dataType: "json", dataType: "json",
url: 'ws/change_permission', url: 'ws/change_permission',
...@@ -166,6 +173,6 @@ function permission(user_id, status) { ...@@ -166,6 +173,6 @@ function permission(user_id, status) {
alert(data); alert(data);
} }
}); });
} }
</script> </script>
\ No newline at end of file
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