listar directorios

administration/views.py

@@ -3,7 +3,7 @@ from django.contrib.auth.models import User
 from django.shortcuts import render, redirect
 import json
 from django.http import HttpResponse, HttpResponseRedirect
-
+from PIL import Image
 
 # Create your views here.
 def Request (request):
@@ -26,6 +26,7 @@ def Request (request):
         return redirect('../')
 #------------------------------------------------------------------------
 def update_user(request):
+    """
     is_active = False
     is_staff = False
     is_superuser = False
@@ -44,4 +45,6 @@ def update_user(request):
     user.save()
 
     messages.success(request, 'the user was updated')
-    return HttpResponseRedirect('../')
\ No newline at end of file
+    return HttpResponseRedirect('../')
+    """
+    imagen = Image.open("")
\ No newline at end of file

reports/templates/L2ASCL_data.html

@@ -126,6 +126,28 @@
             </span>
                 </a>
             </li>
+            <li class="treeview">
+                <a href="#">
+                    <i class="fa fa-file-archive-o"></i>
+                    <span>Report</span>
+                    <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+                </a>
+                <ul class="treeview-menu sidebar-form">
+                    {% for folder in folders %}
+                        <li>
+                        <a class="treeview " href="{{ folder }}_sclData" >
+                            <i class="fa fa-pie-chart"></i>
+                            <span>{{ folder }}</span>
+                            <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                        </a>
+                    </li>
+                    {% endfor %}
+                </ul>
+            </li>
             <li class="treeview">
                 <a href="#">
                     <i class="fa fa-area-chart"></i>
@@ -243,6 +265,7 @@
     <!-- Main content -->
     <div id="reportPage" class="wrapper" style="background-color: #ecf0f5">
         <div class="text-center"><h1>{{ report_name }}</h1></div>
+
         <!-- Content Wrapper. Contains page content -->
         <!-- Main content -->
         <section class="content">

reports/templates/Reports.html

@@ -100,6 +100,7 @@
     </ul>
 {% endblock %}
 {% block sidebar %}
+
     <div class="form-group">
         <br>
         <ul class="sidebar-menu" data-widget="tree">
@@ -165,7 +166,9 @@
                                     <div id="action_buttons{{ product.purchase_id }}" {% if product.progress != 100 %}
                                          class="hidden" {% endif %}>
                                         <a title="View Report"
-                                           href="../reports/T15QZD_sclData/{{ product.purchase_id }}"
+                                           {% if product.initial_folder %}
+                                           href="../reports/{{ product.purchase_id }}/{{ product.initial_folder }}_sclData"
+                                           {% endif %}
                                            class="btn btn-success">
                                             <i class="fa fa-eye"></i>
                                         </a>

reports/urls.py

@@ -5,7 +5,7 @@ from reports import views
 
 urlpatterns = [
 
-    url(r'^(?P<report>[\w\-]+)/(?P<purchase_id>(\d+))$', views.report_L2ASCL, name='report'),
+    url(r'^(?P<purchase_id>(\d+))/(?P<report>[\w\-]+)$', views.report_L2ASCL, name='report'),
     url(r'^$', views.Reports, name='reports'),
     url(r'^ws/process_progress$', views.wsProcessProgress, name='wsProcessProgress'),
 

reports/views.py

@@ -30,8 +30,12 @@ USERS_PATH = config['PATHS']['PATH_USERS']
 
 
 def report_L2ASCL(request, report, purchase_id):
+
     # image_path =USERS_PATH + request.user.email+"/"+purchase_id+"/"+"out/T15QZD/TCI/"
     image_path = request.user.email + "/" + purchase_id + "/" + "out/T15QZD/TCI/"
+    absolute_path = USERS_PATH + request.user.email + "/" + purchase_id + "/out"
+
+    folders = os.listdir(path=absolute_path)
     with open(USERS_PATH + request.user.email + "/" + purchase_id + "/" + report + ".json") as f:
         json_data = OrderedDict(json.load(f))
         graphData = dict()
@@ -78,7 +82,7 @@ def report_L2ASCL(request, report, purchase_id):
         #		graphData['options']['maintainAspectRatio']=False
         # print(json.dumps(graphData).encode("utf-8")) 
 
-    return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": report, "IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset})
+    return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": "SCL Image Classification Data(Km²)", "IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset, "folders" : folders })
 
     # -------------------------------------------------------------------------------def Reports(request):
 
@@ -121,6 +125,11 @@ def Reports(request):
             else:
                 final_size = str(round(size, 2)) + " MB"
 
+        absolute_path = USERS_PATH + request.user.email + "/" +str(producto['id'])+ "/out"
+        folders = os.listdir(path=absolute_path)
+        for folder in folders:
+            initial_folder=folder
+
         productList.append({
             "process": producto['search__process_id__name'],
             "purchase_date": producto['aggreg_date'],
@@ -131,11 +140,16 @@ def Reports(request):
             "purchase_id": producto['id'],
             "progress": progress,
             "log_info": log,
+            "initial_folder" :initial_folder,
         })
         size = 0
         final_size = 0
         log_info = ""
         progress = 0
+        initial_folder = ""
+
+
+
     ##############################################
     #                paginacion                  #
     ##############################################