descripcion reportes

administration/templates/dashboard.html

@@ -405,6 +405,13 @@
 
     <!-- /.content -->
     </div>
+
+
+
+
+{% endblock %}
+
+{% block footer %}
         <footer class=" page-footer font-small special-color-dark pt-5" style="bottom: 0; position: absolute">
         <!-- Footer Elements -->
         <div class="container">
@@ -450,18 +457,6 @@
 
 
     </footer>
-    {% if messages %}
-        <div class="container col-md-2 col-lg-2 col-xs-2 col-sm-2" style="bottom: 0; right: 0;position: absolute">
-            {% for message in messages %}
-                <div {% if message.tags %} class="fade in alert alert-dismissible alert-{{ message.tags }}"{% endif %}>
-                    <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
-                    <strong>{{ message.tags }}!</strong> {{ message }}.
-                </div>
-            {% endfor %}
-        </div>
-    {% endif %}
-    <div id="ol"></div>
-
 {% endblock %}
 
 {% block templates %}
@@ -546,7 +541,7 @@
                         "<th class=\"text-center\">User</th>" +
                         "<th class=\"text-center\">E-Mail</th>" +
                         "<th class=\"text-center\">Purchases</th>" +
-                        "<th class=\"text-center\">Storage</th>" +
+                        //"<th class=\"text-center\">Storage</th>" +
                         "<th class=\"text-center\">Downloads in process</th>" +
                         "</tr>" +
                         "</thead>" +
@@ -558,7 +553,7 @@
                             "<td>"+val['username']+"</td>"+
                             "<td>"+val['email']+"</td>"+
                             "<td>"+val['purchases']+"</td>"+
-                            "<td>"+val['storage']+"</td>"+
+                            //"<td>"+val['storage']+"</td>"+
                             "<td>"+val['in_process']+"</td>"+
                             "</tr>"
                         );

catalog/templates/base_top.html

@@ -31,7 +31,8 @@
 <div class="wrmapper">
     <header class="main-header">
         <!-- Logo -->
-        <a {% if request.user.is_authenticated %}href="{{ BASE_URL }}/catalog" {% else %} href="../../../" {% endif %}class="logo">
+        <a {% if request.user.is_authenticated %}href="{{ BASE_URL }}/catalog" {% else %}
+           href="../../../" {% endif %}class="logo">
             <!-- mini logo for sidebar mini 50x50 pixels -->
             <span class="logo-mini"><b>G</b>eo</span>
             <!-- logo for regular state and mobile devices -->
@@ -113,8 +114,10 @@
     <aside class="control-sidebar control-sidebar-dark">
         <!-- Create the tabs -->
         <ul class="nav nav-tabs nav-justified control-sidebar-tabs">
-            <li id="globe" class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i class="fa fa-globe"></i></a></li>
-            <li id="cart"><a href="#control-sidebar-settings-tab" onclick="updateCart()" data-toggle="tab"><i class="fa fa-shopping-cart"></i></a>
+            <li id="globe" class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i
+                    class="fa fa-globe"></i></a></li>
+            <li id="cart"><a href="#control-sidebar-settings-tab" onclick="updateCart()" data-toggle="tab"><i
+                    class="fa fa-shopping-cart"></i></a>
             </li>
         </ul>
         <!-- Tab panes -->
@@ -202,6 +205,17 @@
 
 {% block footer %}{% endblock %}
 {% block scripts %}{% endblock %}
+<div id="ol"></div>
+{% if messages %}
+    <div class="container col-md-2 col-lg-2 col-xs-2 col-sm-2" style="bottom: 0; right: 0;position: absolute">
+        {% for message in messages %}
+            <div {% if message.tags %} class="fade in alert alert-dismissible alert-{{ message.tags }}"{% endif %}>
+                <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+                <strong>{{ message.tags }}!</strong> {{ message }}.
+            </div>
+        {% endfor %}
+    </div>
+{% endif %}
 </body>
 </html>
 

users/views.py

@@ -35,14 +35,14 @@ def Users(request):
     purchases = Purchase.objects.filter(user_id=user.id)
     in_process = Purchase.objects.filter(user_id=user.id).exclude(progress=100)
 
-    bytes_size = 0
-    for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/" + user.email):
-        for filename in files:
-            bytes_size += os.lstat(os.path.join(path, filename)).st_size
-        for directory in directories:
-            bytes_size += os.lstat(os.path.join(path, directory)).st_size
-    bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/" + user.email)
-    size_repsat = best_unit_size(bytes_size)
+    #bytes_size = 0
+    #for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/" + user.email):
+    #    for filename in files:
+    #        bytes_size += os.lstat(os.path.join(path, filename)).st_size
+    #    for directory in directories:
+    #        bytes_size += os.lstat(os.path.join(path, directory)).st_size
+    #bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/" + user.email)
+    #size_repsat = best_unit_size(bytes_size)
 
     user_data.append({
         "user_id": user.id,
@@ -50,7 +50,7 @@ def Users(request):
         "searches": searches.count(),
         "purchases": purchases.count(),
         "in_process": in_process.count(),
-        "size": size_repsat,
+        #"size": size_repsat,
     })
 
     for search in Search.objects.values('search_name').filter(user_id=user.id).annotate(
@@ -155,13 +155,13 @@ def User_id(request, user_id):
     in_process = Purchase.objects.filter(user_id=user.id).exclude(progress=100)
 
     bytes_size = 0
-    for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/"+user.email):
-        for filename in files:
-            bytes_size += os.lstat(os.path.join(path, filename)).st_size
-        for directory in directories:
-            bytes_size += os.lstat(os.path.join(path, directory)).st_size
-    bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/"+user.email)
-    size_repsat = best_unit_size(bytes_size)
+    #for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/"+user.email):
+    #    for filename in files:
+    #        bytes_size += os.lstat(os.path.join(path, filename)).st_size
+    #    for directory in directories:
+    #        bytes_size += os.lstat(os.path.join(path, directory)).st_size
+    #bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/"+user.email)
+    #size_repsat = best_unit_size(bytes_size)
 
     user_data.append({
         "user_id": user.id,
@@ -169,7 +169,7 @@ def User_id(request, user_id):
         "searches": searches.count(),
         "purchases": purchases.count(),
         "in_process": in_process.count(),
-        "size": size_repsat,
+        #"size": size_repsat,
     })
 
     for search in Search.objects.values('search_name').filter(user_id=user.id).annotate(