parchado de errores

parent cb184636
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
class="hidden" {% endif %}> class="hidden" {% endif %}>
<a title="View Report" <a title="View Report"
{% if product.initial_folder %} {% if product.initial_folder %}
href="../reports/{{ product.purchase_id }}/{{ product.initial_folder }}_sclData" href="../reports/{{ product.purchase_id }}/{{ product.initial_folder }}"
{% endif %} {% endif %}
class="btn btn-success"> class="btn btn-success">
<i class="fa fa-eye"></i> <i class="fa fa-eye"></i>
......
...@@ -47,62 +47,69 @@ def report_L2ASCL(request, report, purchase_id): ...@@ -47,62 +47,69 @@ def report_L2ASCL(request, report, purchase_id):
with open(USERS_PATH + request.user.email + "/" + purchase_id + "/" + report + ".json") as f: with open(USERS_PATH + request.user.email + "/" + purchase_id + "/" + report + ".json") as f:
json_data = OrderedDict(json.load(f)) json_data = OrderedDict(json.load(f))
graphData = dict() if len(json_data)==0:
graphData['type'] = "line" graphData = ""
defaultLabel=""
data = dict() defaultDataset=""
data['labels'] = [k for k, v in sorted(json_data.items())] folders.remove(reporteDir)
# data['click']="chartOnClick"
data['datasets'] = list() else:
labels = set() print("lleno")
for d in json_data: graphData = dict()
labels |= set(json_data[d].keys()) graphData['type'] = "line"
labels.remove('date')
data = dict()
labelNames = [ data['labels'] = [k for k, v in sorted(json_data.items())]
"No Data", "Saturated", "Shadows", "Cloud Shadows", "Vegetation", # data['click']="chartOnClick"
"Not-Vegetated", "Whater", "Unclassified", "Cloud Medium Probablilty", data['datasets'] = list()
"Cloud Hight Probablilty", "Thin Cirrus", "Snow" labels = set()
] for d in json_data:
labels |= set(json_data[d].keys())
colors = [ labels.remove('date')
"#383838", "#de3d3d", "#696767", "#98775b", "#44ba5d", "#fff98b",
"#659acc", "#ababab", "#dddddd", "#d9f9ff", "#99d4d9", "#ff8afa" labelNames = [
] "No Data", "Saturated", "Shadows", "Cloud Shadows", "Vegetation",
"Not-Vegetated", "Whater", "Unclassified", "Cloud Medium Probablilty",
for l in labels: "Cloud Hight Probablilty", "Thin Cirrus", "Snow"
item = dict() ]
item['label'] = labelNames[int(l)]
colors = [
# item['fill'] = "false" "#383838", "#de3d3d", "#696767", "#98775b", "#44ba5d", "#fff98b",
if l == "0": "#659acc", "#ababab", "#dddddd", "#d9f9ff", "#99d4d9", "#ff8afa"
item['hidden'] = "true" ]
item['data'] = [v[l] * 60 * 60 / 1000000. if (l in v) else 0 for k, v in sorted(json_data.items())]
item['backgroundColor'] = colors[int(l)] for l in labels:
data['datasets'].append(item) item = dict()
item['label'] = labelNames[int(l)]
data['datasets'].sort(key=lambda k: max(k['data']))
# item['fill'] = "false"
graphData['data'] = data if l == "0":
label = graphData['data']['labels'][0] item['hidden'] = "true"
defaultLabel = graphData['data']['labels'][0] item['data'] = [v[l] * 60 * 60 / 1000000. if (l in v) else 0 for k, v in sorted(json_data.items())]
defaultDataset = label[0:4]+"/"+label[4:6]+"/"+label[6:] item['backgroundColor'] = colors[int(l)]
data['datasets'].append(item)
data['datasets'].sort(key=lambda k: max(k['data']))
graphData['data'] = data
label = graphData['data']['labels'][0]
defaultLabel = graphData['data']['labels'][0]
defaultDataset = label[0:4]+"/"+label[4:6]+"/"+label[6:]
#defaultDataset = graphData['data']['datasets'][0]['label'] #defaultDataset = graphData['data']['datasets'][0]['label']
# print(settings.BASE_URL) # print(settings.BASE_URL)
# graphData['options']['responsive']=True # graphData['options']['responsive']=True
# graphData['options']['maintainAspectRatio']=False # graphData['options']['maintainAspectRatio']=False
# print(json.dumps(graphData).encode("utf-8")) # print(json.dumps(graphData).encode("utf-8"))
return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData),"name":"foo", "report_name": "SCL Image Classification Data(Km²)", "startDate": startDate,"endDate": endDate,"clouds": dataProduct['clouds'], "platform": dataProduct['platform'],"productLevel": dataProduct['productLevel'] ,"IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset, "folders" : folders,"zone":reporteDir }) return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData),"name":"foo", "report_name": "SCL Image Classification Data(Km²)", "startDate": startDate,"endDate": endDate,"clouds": dataProduct['clouds'], "platform": dataProduct['platform'],"productLevel": dataProduct['productLevel'] ,"IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset, "folders" : folders,"zone":reporteDir })
# -------------------------------------------------------------------------------def Reports(request): # -------------------------------------------------------------------------------def Reports(request):
def Reports(request): def Reports(request):
progress = 0 progress = 0
productList = [] productList = []
size = 0 size = 0
folders=[]
product_list = Purchase.objects.values('id', 'productList', 'aggreg_date', 'search__clouds', 'search__startDate', product_list = Purchase.objects.values('id', 'productList', 'aggreg_date', 'search__clouds', 'search__startDate',
'search__endDate', 'search__process_id__name').filter( 'search__endDate', 'search__process_id__name').filter(
user_id=request.user.id, purchased=1) user_id=request.user.id, purchased=1)
...@@ -143,8 +150,11 @@ def Reports(request): ...@@ -143,8 +150,11 @@ def Reports(request):
print("folder out noes not exists") print("folder out noes not exists")
else: else:
folders = os.listdir(path=absolute_path) folders = os.listdir(path=absolute_path)
for folder in folders: if len(folders)==0:
initial_folder=folder initial_folder="../#"
else:
initial_folder = folders.pop(0)+"_sclData"
productList.append({ productList.append({
"process": producto['search__process_id__name'], "process": producto['search__process_id__name'],
......
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