Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 21a0421e authored by Ulises Morales Ramírez's avatar Ulises Morales Ramírez
Browse files
Options

descripcion reportes

parent 6ef5c08f
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 111 deletions
administration/templates/dashboard.html
View file @ 21a0421e
...@@ -405,7 +405,14 @@ ...@@ -405,7 +405,14 @@
<!-- /.content --> <!-- /.content -->
</div> </div>
<footer class=" page-footer font-small special-color-dark pt-5" style="bottom: 0; position: absolute">
{% endblock %}
{% block footer %}
<footer class=" page-footer font-small special-color-dark pt-5" style="bottom: 0; position: absolute">
<!-- Footer Elements --> <!-- Footer Elements -->
<div class="container"> <div class="container">
<!-- Social buttons <!-- Social buttons
...@@ -450,18 +457,6 @@ ...@@ -450,18 +457,6 @@
</footer> </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 %} {% endblock %}
{% block templates %} {% block templates %}
...@@ -546,7 +541,7 @@ ...@@ -546,7 +541,7 @@
"<th class=\"text-center\">User</th>" + "<th class=\"text-center\">User</th>" +
"<th class=\"text-center\">E-Mail</th>" + "<th class=\"text-center\">E-Mail</th>" +
"<th class=\"text-center\">Purchases</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>" + "<th class=\"text-center\">Downloads in process</th>" +
"</tr>" + "</tr>" +
"</thead>" + "</thead>" +
...@@ -558,7 +553,7 @@ ...@@ -558,7 +553,7 @@
"<td>"+val['username']+"</td>"+ "<td>"+val['username']+"</td>"+
"<td>"+val['email']+"</td>"+ "<td>"+val['email']+"</td>"+
"<td>"+val['purchases']+"</td>"+ "<td>"+val['purchases']+"</td>"+
"<td>"+val['storage']+"</td>"+ //"<td>"+val['storage']+"</td>"+
"<td>"+val['in_process']+"</td>"+ "<td>"+val['in_process']+"</td>"+
"</tr>" "</tr>"
); );
......
catalog/templates/base_top.html
View file @ 21a0421e
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
<div class="wrmapper"> <div class="wrmapper">
<header class="main-header"> <header class="main-header">
<!-- Logo --> <!-- 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 --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><b>G</b>eo</span> <span class="logo-mini"><b>G</b>eo</span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
...@@ -45,44 +46,44 @@ ...@@ -45,44 +46,44 @@
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
</a> </a>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<div class="navbar-custom-menu"> <div class="navbar-custom-menu">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li> <li>
{% if request.user.is_superuser or request.user.is_staff %} {% if request.user.is_superuser or request.user.is_staff %}
<a href="../../../administration" title="super user"><i <a href="../../../administration" title="super user"><i
class="fa fa-gears"></i></a> class="fa fa-gears"></i></a>
{% endif %}
</li>
<!-- Messages: style can be found in dropdown.less-->
<!-- <li class="dropdown messages-menu"> -->
{#% block messages %#}{#% endblock %#}
<!-- </li> -->
<!-- Notifications: style can be found in dropdown.less -->
<!-- <li class="dropdown notifications-menu"> -->
{#% block notifications %#}{#% endblock %#}
<!-- </li> -->
<!-- Tasks: style can be found in dropdown.less -->
<!-- <li class="dropdown tasks-menu"> -->
{#% block tasks %}{% endblock %#}
<!-- </li> -->
<!-- History -->
<li class="dropdown user user-menu">
{% block history %}
{% endblock %}
</li>
<!-- History -->
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
{% block user %}{% endblock %}
</li>
<!-- Control Sidebar Toggle Button -->
<li>{% if showcart %}
<a id="product-list-toggle" href="#" data-toggle="control-sidebar"><i
class="fa fa-shopping-cart"></i></a>
{% endif %} {% endif %}
</li> </li>
<!-- Messages: style can be found in dropdown.less--> </ul>
<!-- <li class="dropdown messages-menu"> --> </div>
{#% block messages %#}{#% endblock %#}
<!-- </li> -->
<!-- Notifications: style can be found in dropdown.less -->
<!-- <li class="dropdown notifications-menu"> -->
{#% block notifications %#}{#% endblock %#}
<!-- </li> -->
<!-- Tasks: style can be found in dropdown.less -->
<!-- <li class="dropdown tasks-menu"> -->
{#% block tasks %}{% endblock %#}
<!-- </li> -->
<!-- History -->
<li class="dropdown user user-menu">
{% block history %}
{% endblock %}
</li>
<!-- History -->
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
{% block user %}{% endblock %}
</li>
<!-- Control Sidebar Toggle Button -->
<li>{% if showcart %}
<a id="product-list-toggle" href="#" data-toggle="control-sidebar"><i
class="fa fa-shopping-cart"></i></a>
{% endif %}
</li>
</ul>
</div>
{% endif %} {% endif %}
</nav> </nav>
</header> </header>
...@@ -113,38 +114,40 @@ ...@@ -113,38 +114,40 @@
<aside class="control-sidebar control-sidebar-dark"> <aside class="control-sidebar control-sidebar-dark">
<!-- Create the tabs --> <!-- Create the tabs -->
<ul class="nav nav-tabs nav-justified control-sidebar-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="globe" class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i
<li id="cart"><a href="#control-sidebar-settings-tab" onclick="updateCart()" data-toggle="tab"><i class="fa fa-shopping-cart"></i></a> 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> </li>
</ul> </ul>
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
<!-- Home tab content --> <!-- Home tab content -->
<div class="tab-pane active" id="control-sidebar-home-tab"> <div class="tab-pane active" id="control-sidebar-home-tab">
<form id='product-to-cart-form' role="form" method="post"> <form id='product-to-cart-form' role="form" method="post">
{% csrf_token %} {% csrf_token %}
<div class="container"> <div class="container">
<div class="sidebar-title"> <div class="sidebar-title">
<h3><b>Products</b></h3> <h3><b>Products</b></h3>
</div> </div>
<div class="sidebar-button"> <div class="sidebar-button">
<button type="submit" name="search" id="add-cart" class="btn btn-primary"> <button type="submit" name="search" id="add-cart" class="btn btn-primary">
Add to cart Add to cart
</button> </button>
</div> </div>
</div> </div>
<!-- this ul element is filled with data --> <!-- this ul element is filled with data -->
<ul id="product-list-globe" class="control-sidebar-menu" data-widget="tree"></ul> <ul id="product-list-globe" class="control-sidebar-menu" data-widget="tree"></ul>
<!-- /.control-sidebar-menu --> <!-- /.control-sidebar-menu -->
</form> </form>
</div> </div>
<!-- /.tab-pane --> <!-- /.tab-pane -->
<!-- Stats tab content --> <!-- Stats tab content -->
<div class="tab-pane" id="control-sidebar-stats-tab">Stats Tab Content</div> <div class="tab-pane" id="control-sidebar-stats-tab">Stats Tab Content</div>
<!-- /.tab-pane --> <!-- /.tab-pane -->
<!-- Settings tab content --> <!-- Settings tab content -->
<div class="tab-pane" id="control-sidebar-settings-tab"> <div class="tab-pane" id="control-sidebar-settings-tab">
{% comment %}<form id='purchased-product-form' role="form" method="post"> {% comment %}<form id='purchased-product-form' role="form" method="post">
{% csrf_token %} {% csrf_token %}
<div class="container"> <div class="container">
<div class="sidebar-title"> <div class="sidebar-title">
...@@ -159,22 +162,22 @@ ...@@ -159,22 +162,22 @@
<!-- this ul element is filled with data --> <!-- this ul element is filled with data -->
<ul id="product-list-cart" class="sidebar-menu" data-widget="tree"></ul> <ul id="product-list-cart" class="sidebar-menu" data-widget="tree"></ul>
</form>{% endcomment %} </form>{% endcomment %}
<div class="container"> <div class="container">
<div class="sidebar-title"> <div class="sidebar-title">
<h3><b>My cart</b></h3> <h3><b>My cart</b></h3>
</div> </div>
<div class="sidebar-button"> <div class="sidebar-button">
{% comment %}<button type="submit" name="search" id="purchase" class="btn btn-primary"> {% comment %}<button type="submit" name="search" id="purchase" class="btn btn-primary">
Purchase Purchase
</button>{% endcomment %} </button>{% endcomment %}
{% comment %}<a href="cart" id="purchase" class="btn btn-primary">Purchase</a>{% endcomment %} {% comment %}<a href="cart" id="purchase" class="btn btn-primary">Purchase</a>{% endcomment %}
<button onclick="location.href='cart'" id="purchase" class="btn btn-primary">Purchase</button> <button onclick="location.href='cart'" id="purchase" class="btn btn-primary">Purchase</button>
</div>
</div> </div>
</div> <!-- this ul element is filled with data -->
<!-- this ul element is filled with data --> <ul id="product-list-cart" class="control-sidebar-menu" data-widget="tree"></ul>
<ul id="product-list-cart" class="control-sidebar-menu" data-widget="tree"></ul> </div>
</div> <!-- /.tab-pane -->
<!-- /.tab-pane -->
</div> </div>
</aside> </aside>
<!-- /.control-sidebar --> <!-- /.control-sidebar -->
...@@ -202,6 +205,17 @@ ...@@ -202,6 +205,17 @@
{% block footer %}{% endblock %} {% block footer %}{% endblock %}
{% block scripts %}{% 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> </body>
</html> </html>
users/views.py
View file @ 21a0421e
...@@ -35,14 +35,14 @@ def Users(request): ...@@ -35,14 +35,14 @@ def Users(request):
purchases = Purchase.objects.filter(user_id=user.id) purchases = Purchase.objects.filter(user_id=user.id)
in_process = Purchase.objects.filter(user_id=user.id).exclude(progress=100) in_process = Purchase.objects.filter(user_id=user.id).exclude(progress=100)
bytes_size = 0 #bytes_size = 0
for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/" + user.email): #for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/" + user.email):
for filename in files: # for filename in files:
bytes_size += os.lstat(os.path.join(path, filename)).st_size # bytes_size += os.lstat(os.path.join(path, filename)).st_size
for directory in directories: # for directory in directories:
bytes_size += os.lstat(os.path.join(path, directory)).st_size # bytes_size += os.lstat(os.path.join(path, directory)).st_size
bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/" + user.email) #bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/" + user.email)
size_repsat = best_unit_size(bytes_size) #size_repsat = best_unit_size(bytes_size)
user_data.append({ user_data.append({
"user_id": user.id, "user_id": user.id,
...@@ -50,7 +50,7 @@ def Users(request): ...@@ -50,7 +50,7 @@ def Users(request):
"searches": searches.count(), "searches": searches.count(),
"purchases": purchases.count(), "purchases": purchases.count(),
"in_process": in_process.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( for search in Search.objects.values('search_name').filter(user_id=user.id).annotate(
...@@ -155,13 +155,13 @@ def User_id(request, user_id): ...@@ -155,13 +155,13 @@ def User_id(request, user_id):
in_process = Purchase.objects.filter(user_id=user.id).exclude(progress=100) in_process = Purchase.objects.filter(user_id=user.id).exclude(progress=100)
bytes_size = 0 bytes_size = 0
for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/"+user.email): #for path, directories, files in os.walk(USERS_PATH + "repsat_test_dev/"+user.email):
for filename in files: # for filename in files:
bytes_size += os.lstat(os.path.join(path, filename)).st_size # bytes_size += os.lstat(os.path.join(path, filename)).st_size
for directory in directories: # for directory in directories:
bytes_size += os.lstat(os.path.join(path, directory)).st_size # bytes_size += os.lstat(os.path.join(path, directory)).st_size
bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/"+user.email) #bytes_size += os.path.getsize(USERS_PATH + "repsat_test_dev/"+user.email)
size_repsat = best_unit_size(bytes_size) #size_repsat = best_unit_size(bytes_size)
user_data.append({ user_data.append({
"user_id": user.id, "user_id": user.id,
...@@ -169,7 +169,7 @@ def User_id(request, user_id): ...@@ -169,7 +169,7 @@ def User_id(request, user_id):
"searches": searches.count(), "searches": searches.count(),
"purchases": purchases.count(), "purchases": purchases.count(),
"in_process": in_process.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( for search in Search.objects.values('search_name').filter(user_id=user.id).annotate(
......
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