Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 8c60ef81 authored by Sergio Adrian Gongora Euan's avatar Sergio Adrian Gongora Euan
Browse files
Options

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

parents 571c128b f7d2d7c0
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 42 deletions
catalog/views.py
View file @ 8c60ef81
...@@ -270,54 +270,76 @@ def purchaseProduct(request): ...@@ -270,54 +270,76 @@ def purchaseProduct(request):
For now to purchase a product consists in verifying whether L1C products in cart already exist in DB. For now to purchase a product consists in verifying whether L1C products in cart already exist in DB.
""" """
# ------------- crear archivo findProducts.json # ------------- crear archivo findProducts.json
print("Comprar productos!!!!") print("Comprar productos!!!!")
print(request)
print("start date:")
print(request.POST['wkt'])
print(request.POST['startDate'])
print(request.POST['endDate'])
print(request.POST['clouds'])
print(request.POST['usuario'])
username = request.POST['usuario'] user = User.objects.get(id=request.user.id)
fecha_inicio = request.POST['startDate'] prod_list = []
fecha_fin = request.POST['endDate'] product_list = Search.objects.values('user', 'area', 'startDate', 'endDate','clouds').filter(user=user, purchased=0)
data = {}
for products in product_list:
print(products)
#~ product = json.loads(products['productList'])
#~ prod_list.append({
#~ 'purchased': products['purchased'],
#~ 'price' : products['price'],
#~ 'aggreg_date' : products['aggreg_date'],
#~ 'catalog': product
#~ })
#~ return JsonResponse({'product_list': prod_list})
print(fecha_inicio.replace("-", ""))
print(fecha_fin.replace("-", ""))
userdir = NAS_PATH + "repsat_test_dev/"+username ##crea el directorio del usuario #~ print("Comprar productos!!!!")
if not os.path.exists(userdir): #~ print(request)
os.makedirs(userdir) #~ print("start date:")
#~ print(request.POST['wkt'])
#~ print(request.POST['startDate'])
#~ print(request.POST['endDate'])
#~ print(request.POST['clouds'])
#~ print(request.POST['usuario'])
#~ username = request.POST['usuario']
#~ fecha_inicio = request.POST['startDate']
#~ fecha_fin = request.POST['endDate']
#~ print(fecha_inicio.replace("-", ""))
#~ print(fecha_fin.replace("-", ""))
#~ userdir = NAS_PATH + "repsat_test_dev/"+username ##crea el directorio del usuario
#~ if not os.path.exists(userdir):
#~ os.makedirs(userdir)
products_dir = NAS_PATH + "sentinelImages/L2A/" #~ products_dir = NAS_PATH + "sentinelImages/L2A/"
linksDir = userdir+"/L2A/" #~ linksDir = userdir+"/L2A/"
#obtiene los datos para el json #~ #obtiene los datos para el json
data = {} #~ data = {}
data['wkt'] = request.POST['wkt'] #~ data['wkt'] = request.POST['wkt']
data['platform'] = 'Sentinel-2' #~ data['platform'] = 'Sentinel-2'
data['productLevel'] = 'L2A' #~ data['productLevel'] = 'L2A'
data['startDate'] = fecha_inicio.replace("-", "") #quita los guiones de la fecha #~ data['startDate'] = fecha_inicio.replace("-", "") #quita los guiones de la fecha
data['endDate'] = fecha_fin.replace("-", "") #quita los guiones de la fecha #~ data['endDate'] = fecha_fin.replace("-", "") #quita los guiones de la fecha
#~ data['startDate'] = request.POST['startDate'] #~ # data['startDate'] = request.POST['startDate']
#~ data['endDate'] = request.POST['endDate'] #~ # data['endDate'] = request.POST['endDate']
data['clouds'] = request.POST['clouds'] #~ data['clouds'] = request.POST['clouds']
#~ data['productsDir'] = '/home/david/NAS/sentinelImages/L2A/' #~ # data['productsDir'] = '/home/david/NAS/sentinelImages/L2A/'
#~ data['linksDir'] = '/home/david/centroGEO/repsat/tests/L2A/' #~ # data['linksDir'] = '/home/david/centroGEO/repsat/tests/L2A/'
data['productsDir'] = products_dir #~ data['productsDir'] = products_dir
data['linksDir'] = linksDir #~ data['linksDir'] = linksDir
data['username'] = 'mario-chirinos' #~ data['username'] = 'mario-chirinos'
data['password'] = 'r4nc0r4u' #~ data['password'] = 'r4nc0r4u'
#json_data = json.dumps(data, indent=4,sort_keys=True) #~ #json_data = json.dumps(data, indent=4,sort_keys=True)
#formatea el json #~ #formatea el json
json_data = json.dumps(data, indent=4) #~ json_data = json.dumps(data, indent=4)
print(json_data) #~ print(json_data)
#escribe el json en el archivo #~ #escribe el json en el archivo
fidProductsFile = open(userdir+"/findProducts.json", "w") #~ fidProductsFile = open(userdir+"/findProducts.json", "w")
fidProductsFile.write(json_data) #~ fidProductsFile.write(json_data)
fidProductsFile.close() #~ fidProductsFile.close()
#------------------------------------------------- #-------------------------------------------------
...@@ -405,6 +427,85 @@ def purchaseProduct(request): ...@@ -405,6 +427,85 @@ def purchaseProduct(request):
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
def showCart(request): def showCart(request):
#---------------test process----------------------
print("showcart!!!")
user = User.objects.get(id=request.user.id)
query = []
query = Purchase.objects.values('search__area','user','user__username','user__email', 'search_id', 'search__clouds','search__startDate','search__endDate').filter(user=user, purchased=0)
for values in query:
print(values['user__username'])
print(values['user__email'])
print(values['search_id'])
print(str(values['search__startDate'].date()).replace("-", ""))
print(str(values['search__endDate'].date()).replace("-", ""))
print(values['search__clouds'])
print(values['search__area'])
username = values['user__username']
useremail = values['user__email']
userdir = NAS_PATH + "repsat_test_dev/"+useremail ##crea el directorio del usuario
if not os.path.exists(userdir):
os.makedirs(userdir)
search_dir = userdir+"/"+str(values['search_id'])
if not os.path.exists(search_dir):
os.makedirs(search_dir)
products_dir = NAS_PATH + "sentinelImages/L2A/"
linksDir = search_dir+"/L2A/"
#obtiene los datos para el json
data = {}
data['wkt'] = values['search__area']
data['platform'] = 'Sentinel-2'
data['productLevel'] = 'L2A'
data['startDate'] = str(values['search__startDate'].date()).replace("-", "") #quita los guiones de la fecha
data['endDate'] = str(values['search__endDate'].date()).replace("-", "") #quita los guiones de la fecha
# data['startDate'] = request.POST['startDate']
# data['endDate'] = request.POST['endDate']
data['clouds'] = values['search__clouds']
# data['productsDir'] = '/home/david/NAS/sentinelImages/L2A/'
# data['linksDir'] = '/home/david/centroGEO/repsat/tests/L2A/'
data['productsDir'] = products_dir
data['linksDir'] = linksDir
data['username'] = 'emmhp'
data['password'] = 'geoemm29'
#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(search_dir+"/findProducts.json", "w")
fidProductsFile.write(json_data)
fidProductsFile.close()
#~ user = User.objects.get(id=request.user.id)
#~ prod_list = []
#~ product_list = Search.objects.values('user', 'area', 'startDate', 'endDate','clouds').filter(user=user)
#~ data = {}
#~ for products in product_list:
#~ print(products)
#~ product = json.loads(products['productList'])
#~ prod_list.append({
#~ 'purchased': products['purchased'],
#~ 'price' : products['price'],
#~ 'aggreg_date' : products['aggreg_date'],
#~ 'catalog': product
#~ })
#~ return JsonResponse({'product_list': prod_list})
#-------------------------------------
user = User.objects.get(id=request.user.id) user = User.objects.get(id=request.user.id)
prod_list = [] prod_list = []
product_list = Purchase.objects.values('user', 'productList', 'purchased', 'price', 'aggreg_date').filter(user=user, purchased=0) product_list = Purchase.objects.values('user', 'productList', 'purchased', 'price', 'aggreg_date').filter(user=user, purchased=0)
......
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