Commit eb146bfc authored by Luis Ernesto Dominguez Uriostegui's avatar Luis Ernesto Dominguez Uriostegui

Cambios realizados a dataRetrieval, db, migratios, Ulises

parents 9c0ca0a5 f98a7eee
......@@ -122,7 +122,7 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization
# https://docs.djangoproject.com/en/1.11/topics/i18n/
LANGUAGE_CODE = 'en-us'
LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC'
......
# Generated by Django 2.0.5 on 2019-02-06 15:55
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('catalog', '0010_process'),
]
operations = [
migrations.CreateModel(
name='Purchase',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('productList', models.TextField(verbose_name='JSON Product List')),
('purchased', models.BooleanField(default=False)),
('price', models.FloatField(default=0.0)),
],
),
migrations.CreateModel(
name='Search',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('startDate', models.DateTimeField(verbose_name='Start Date')),
('endDate', models.DateTimeField(verbose_name='End Date')),
('clouds', models.IntegerField(default=4)),
],
),
migrations.RenameField(
model_name='process',
old_name='tag',
new_name='name',
),
migrations.AddField(
model_name='process',
name='platform',
field=models.ForeignKey(default='', on_delete=django.db.models.deletion.CASCADE, to='catalog.Platform'),
),
migrations.AddField(
model_name='process',
name='productLevel',
field=models.CharField(default='', max_length=8),
),
migrations.AddField(
model_name='search',
name='process',
field=models.ForeignKey(default='', on_delete=django.db.models.deletion.CASCADE, to='catalog.Process'),
),
migrations.AddField(
model_name='search',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='purchase',
name='search',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='catalog.Search'),
),
migrations.AddField(
model_name='purchase',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
# Generated by Django 2.1.5 on 2019-02-06 18:43
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('catalog', '0011_auto_20190206_1555'),
]
operations = [
migrations.AlterField(
model_name='polygon',
name='name',
field=models.CharField(max_length=100, verbose_name='Polygon Name'),
),
migrations.AlterField(
model_name='polygon',
name='source',
field=models.CharField(max_length=100, null=True, verbose_name='Source'),
),
migrations.AlterField(
model_name='product_l1c',
name='file_path',
field=models.CharField(max_length=150),
),
migrations.AlterField(
model_name='product_l1c',
name='identifier',
field=models.CharField(max_length=100),
),
migrations.AlterField(
model_name='product_l2a',
name='file_path',
field=models.CharField(max_length=150),
),
migrations.AlterField(
model_name='product_l2a',
name='identifier',
field=models.CharField(max_length=100),
),
]
......@@ -8,61 +8,63 @@ from django.db import models
class Platform(models.Model):
name = models.CharField(max_length=64)
name = models.CharField(max_length=64)
acronym = models.CharField(max_length=16)
class Polygon(models.Model):
name = models.CharField(verbose_name="Polygon Name", max_length=50)
json_info = models.TextField(verbose_name="JSON Info")
name = models.CharField(verbose_name="Polygon Name", max_length=100)
json_info = models.TextField(verbose_name="JSON Info")
description = models.TextField(verbose_name="Description", null=True)
source = models.CharField(verbose_name="Source", max_length=50, null=True)
CVE_ENT = models.CharField(verbose_name="State Key", max_length=10, null=True)
CVE_MUN = models.CharField(verbose_name="City Key", max_length=10, null=True)
CVE_LOC = models.CharField(verbose_name="Location Key", max_length=10, null=True)
CVE_AGEB = models.CharField(verbose_name="AGEB Key", max_length=10, null=True)
E_ENT = models.CharField(verbose_name="State Stratum", max_length=10, null=True)
E_MUN = models.CharField(verbose_name="City Stratum", max_length=10, null=True)
E_AGEB = models.CharField(verbose_name="AGEB Stratum", max_length=10, null=True)
source = models.CharField(verbose_name="Source", max_length=100, null=True)
CVE_ENT = models.CharField(verbose_name="State Key", max_length=10, null=True)
CVE_MUN = models.CharField(verbose_name="City Key", max_length=10, null=True)
CVE_LOC = models.CharField(verbose_name="Location Key", max_length=10, null=True)
CVE_AGEB = models.CharField(verbose_name="AGEB Key", max_length=10, null=True)
E_ENT = models.CharField(verbose_name="State Stratum", max_length=10, null=True)
E_MUN = models.CharField(verbose_name="City Stratum", max_length=10, null=True)
E_AGEB = models.CharField(verbose_name="AGEB Stratum", max_length=10, null=True)
wkt_polygon = models.TextField(null=True)
class Product_l1c(models.Model):
uuid = models.CharField(max_length=50)
identifier = models.CharField(max_length=50)
file_path = models.CharField(max_length=50)
json = models.TextField(null=True)
uuid = models.CharField(max_length=50)
identifier = models.CharField(max_length=100)
file_path = models.CharField(max_length=150)
json = models.TextField(null=True)
class Product_l2a(models.Model):
prod_l1c = models.ForeignKey(Product_l1c, on_delete=models.CASCADE)
identifier = models.CharField(max_length=50)
file_path = models.CharField(max_length=50)
prod_l1c = models.ForeignKey(Product_l1c, on_delete=models.CASCADE)
identifier = models.CharField(max_length=100)
file_path = models.CharField(max_length=150)
class CartProduct(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
uuid = models.CharField(max_length=50)
user = models.ForeignKey(User, on_delete=models.CASCADE)
uuid = models.CharField(max_length=50)
aggreg_date = models.DateTimeField(auto_now=True) ## date of product aggregation
info = models.TextField(null=True)
purchased = models.NullBooleanField()
info = models.TextField(null=True)
purchased = models.NullBooleanField()
#-------------------------------------------------------------------------------------------
# -------------------------------------------------------------------------------------------
class Process(models.Model):
name = models.CharField(max_length=50)
platform = models.ForeignKey(Platform, on_delete=models.CASCADE, default='')
productLevel = models.CharField(max_length=8, default='')
name = models.CharField(max_length=50)
platform = models.ForeignKey(Platform, on_delete=models.CASCADE, default='')
productLevel = models.CharField(max_length=8, default='')
class Search(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
startDate = models.DateTimeField(verbose_name='Start Date')
endDate = models.DateTimeField(verbose_name='End Date')
process = models.ForeignKey(Process, on_delete=models.CASCADE, default='')
clouds = models.IntegerField(default=4)
user = models.ForeignKey(User, on_delete=models.CASCADE)
startDate = models.DateTimeField(verbose_name='Start Date')
endDate = models.DateTimeField(verbose_name='End Date')
process = models.ForeignKey(Process, on_delete=models.CASCADE, default='')
clouds = models.IntegerField(default=4)
class Purchase(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
search = models.ForeignKey(Search, on_delete=models.CASCADE)
productList = models.TextField(verbose_name="JSON Product List")
purchased = models.BooleanField(default=False)
price = models.FloatField(default=0.0)
user = models.ForeignKey(User, on_delete=models.CASCADE)
search = models.ForeignKey(Search, on_delete=models.CASCADE)
productList = models.TextField(verbose_name="JSON Product List")
purchased = models.BooleanField(default=False)
price = models.FloatField(default=0.0)
......@@ -484,7 +484,11 @@ $(document).ready(function () {
url : purch_prod_url,
data : {
'csrfmiddlewaretoken' : document.getElementsByName('csrfmiddlewaretoken')[0].value,
'product_objects' : JSON.stringify(productObject)
'product_objects' : JSON.stringify(productObject),
'wkt' : $("#product-form input[name=polygon]").val(),
'startDate' : $("#product-form input[name=start]").val(),
'endDate' : $("#product-form input[name=end]").val(),
'clouds' : $("#product-form input[name=cloudPercentage]").val(),
},
dataType : 'json'
});
......
......@@ -251,7 +251,39 @@ def purchaseProduct(request):
"""
For now to purchase a product consists in verifying whether L1C products in cart already exist in DB.
"""
# ------------- crear archivo findProducts.json
print("Comprar productos!!!!")
print(request)
print("start date:")
print(request.POST['wkt'])
print(request.POST['startDate'])
print(request.POST['endDate'])
print(request.POST['clouds'])
#obtiene los datos para el json
data = {}
data['wkt'] = request.POST['wkt']
data['platform'] = 'Sentinel-2'
data['productLevel'] = 'L2A'
data['startDate'] = request.POST['startDate']
data['endDate'] = request.POST['endDate']
data['clouds'] = request.POST['clouds']
data['productsDir'] = '/home/david/NAS/sentinelImages/L2A/'
data['linksDir'] = '/home/david/centroGEO/repsat/tests/L2A/'
data['username'] = 'mario-chirinos'
data['password'] = 'r4nc0r4u'
#json_data = json.dumps(data, indent=4,sort_keys=True)
#formatea el json
json_data = json.dumps(data, indent=4)
print(json_data)
#escribe el json en el archivo
fidProductsFile = open("/home/david/centroGEO/repsat/GeoInt_SIDT/findProducts.json", "w")
fidProductsFile.write(json_data)
fidProductsFile.close()
#-------------------------------------------------
products = json.loads(request.POST['product_objects'])
orderedProducts = OrderedDict()
......
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