parchado de errores

administration/templates/aside.html

@@ -2,7 +2,7 @@
     <br>
     <ul class="sidebar-menu" data-widget="tree">
         <li>
-            <a class="treeview " href="{{ BASE_URL }}/catalog">
+            <a class="treeview " href="{{ BASE_URL }}/administration">
                 <i class="fa fa-map"></i>
                 <span>Home</span>
                 <span class="pull-right-container">

administration/templates/users_table.html

@@ -160,8 +160,8 @@
                                            {% if user.superuser == True %}checked{% endif %}>
                                 </td>
                                 <td>
-                                    <button type="submit" class="btn btn-success"><i class="fa fa-save"></i></button>
-                                    <a href="#" class="btn btn-danger"><i class="fa fa-trash"></i></a>
+                                    <button title="save" type="submit" class="btn btn-success"><i class="fa fa-save"></i></button>
+                                    <!--a href="#" class="btn btn-danger"><i class="fa fa-trash"></i></a-->
                                 </td>
                             </form>
                             </tr> 

reports/static/reports/tmpImages/repsat_test_dev

-/home/emmanuelhp/NAS/repsat_test_dev
\ No newline at end of file
+/home/ulises/NAS/repsat_test_dev
\ No newline at end of file

reports/templates/Reports.html

@@ -173,11 +173,9 @@
                                             <i class="fa fa-eye"></i>
                                         </a>
                                         <a title="Download zip" {% if product.progress == 100 %}
-                                           href="#"
-                                           disabled
+                                           href="../../static/reports/tmpImages/repsat_test_dev/{{ request.user.email }}/{{ product.purchase_id }}/myzip.zip"
                                         {% else %}
                                            href="#"
-                                           disabled
                                         {% endif %} class="btn btn-warning">
                                             <i class="fa fa-file-zip-o"></i>
                                         </a>
@@ -233,5 +231,6 @@
     <!-- /.modals -->
 {% endblock %}
 {% block scripts %}
-    <script src="{% static 'reports/js/Reports_scripts.js' %}"></script>
+    <script src="{% static 'reports/js/Reports_scripts.js' %}">
+    </script>
 {% endblock %}

reports/templates/aside.html

+<div class="form-group">
+    <br>
+    <ul class="sidebar-menu" data-widget="tree">
+        <li>
+            <a class="treeview " href="{{ BASE_URL }}/reports">
+                <i class="fa fa-map"></i>
+                <span>Home</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </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 submenu" 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>
+                <span>Chart Type</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+            <ul class="treeview-menu sidebar-form">
+                <li>
+                    <a class="treeview submenu" href="#" onclick="change('line')">
+                        <i class="fa fa-bar-chart"></i>
+                        <span>Line Chart</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" onclick="change('bar')">
+                        <i class="fa fa-bar-chart"></i>
+                        <span>Bar Chart</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" onclick="change('bubble')">
+                        <i class="fa fa-bar-chart"></i>
+                        <span>Bubble Chart</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" onclick="change('polarArea')">
+                        <i class="fa fa-bar-chart"></i>
+                        <span>Polar Area Chart</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" onclick="change('doughnut')">
+                        <i class="fa fa-bar-chart"></i>
+                        <span>Doughnut Chart</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" onclick="change('pie')">
+                        <i class="fa fa-bar-chart"></i>
+                        <span>Pie Chart</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" onclick="change('radar')">
+                        <i class="fa fa-bar-chart"></i>
+                        <span>Radar Chart</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+
+            </ul>
+        </li>
+        <li class="treeview">
+            <a href="#">
+                <i class="fa fa-download"></i>
+                <span>Download as</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+            <ul class="treeview-menu sidebar-form">
+                <li>
+                    <a class="treeview submenu" href="#">
+                        <i class="fa fa-file-code-o"></i>
+                        <span>Export to JSON</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+                <li>
+                    <a class="treeview submenu" href="#" id="downloadPdf">
+                        <i class="fa fa-file-pdf-o"></i>
+                        <span>Export to PDF</span>
+                        <span class="pull-right-container">
+                        <span class="label label-primary pull-right"></span>
+                    </span>
+                    </a>
+                </li>
+            </ul>
+        </li>
+    </ul>
+</div>
\ No newline at end of file

reports/views.py

@@ -115,6 +115,7 @@ def Reports(request):
     productList = []
     size = 0
     folders=[]
+    zip =""
     product_list = Purchase.objects.values('id', 'productList', 'aggreg_date', 'search__clouds', 'search__startDate',
                                            'search__endDate', 'search__process_id__name').filter(
         user_id=request.user.id, purchased=1)
@@ -160,7 +161,16 @@ def Reports(request):
             else:
                 initial_folder = folders.pop(0)+"_sclData"
 
+        zip_path = USERS_PATH + request.user.email + "/" +str(producto['id'])
+        #print(zip_path)
 
+        #"../ static / reports / tmpImages / repsat_test_dev / umorales @ centrogeo.edu.mx / "+str(producto['id']) / myzip.zip"
+
+        for file in os.listdir(path=zip_path):
+            if file.endswith(".zip"):
+                print(file)
+                zip = zip_path+"/"+file
+                print(zip)
         productList.append({
             "process": producto['search__process_id__name'],
             "purchase_date": producto['aggreg_date'],
@@ -172,12 +182,14 @@ def Reports(request):
             "progress": progress,
             "log_info": log,
             "initial_folder" :initial_folder,
+            "zip" : zip,
         })
         size = 0
         final_size = 0
         log_info = ""
         progress = 0
         initial_folder = ""
+        zip =""