descripcion reportes

administration/templates/dashboard.html

@@ -147,7 +147,7 @@
                         <span class="info-box-text">Active Users</span>
                         <span class="info-box-number">{{ Usuarios }}</span>
                         <span class="info-box-more pull-right">
-                            <a href="../../administration/users" class="small-box-footer">
+                            <a href="{% url 'active_users' %}" class="small-box-footer">
                             More info <i class="fa fa-arrow-circle-right"></i>
                             </a>
                         </span>
@@ -169,7 +169,7 @@
                         <span class="info-box-text">User Registrations</span>
                         <span class="info-box-number">{{ Solicitud }}</span>
                         <span class="info-box-more pull-right">
-                            <a href="../../administration/request" class="small-box-footer">
+                            <a href="{% url 'request' %}" class="small-box-footer">
                             More info <i class="fa fa-arrow-circle-right"></i>
                             </a>
                         </span>
@@ -187,9 +187,7 @@
                         <span class="info-box-text">Processing</span>
                         <span class="info-box-number">{{ Descargando }}</span>
                         <span class="info-box-more pull-right">
-                            <a href="#" class="small-box-footer">
-                            More info <i class="fa fa-arrow-circle-right"></i>
-                            </a>
+
                         </span>
                     </div>
                     <!-- /.info-box-content -->
@@ -205,9 +203,6 @@
                         <span class="info-box-text">Repsat Storage</span>
                         <span class="info-box-number">{{ size_repsat }}</span>
                         <span class="info-box-more pull-right">
-                            <a href="#" class="small-box-footer">
-                            More info <i class="fa fa-arrow-circle-right"></i>
-                            </a>
                         </span>
                     </div>
                     <!-- /.info-box-content -->
@@ -223,9 +218,6 @@
                         <span class="info-box-text">Sentinel Storage</span>
                         <span class="info-box-number">{{ size_sentinel }}</span>
                         <span class="info-box-more pull-right">
-                            <a href="#" class="small-box-footer">
-                            More info <i class="fa fa-arrow-circle-right"></i>
-                            </a>
                         </span>
                     </div>
                     <!-- /.info-box-content -->

catalog/templates/user_button.html

@@ -15,7 +15,7 @@
     <ul class="sidebar-menu" data-widget="tree">
         <!-- History element -->
         <li>
-            <a class="treeview " href="../../../users">
+            <a class="treeview " href="{% url 'users' %}">
                 <i class="fa fa-user-circle"></i>
                 <span>Profile</span>
                 <span class="pull-right-container">
@@ -26,7 +26,7 @@
         <!-- End History element -->
         <!-- History element -->
         <li>
-            <a class="treeview " href="{{ BASE_URL }}/reports">
+            <a class="treeview " href="{% url 'reports' %}">
                 <i class="fa fa-history"></i>
                 <span>Shopping History</span>
                 <span class="pull-right-container">
@@ -35,7 +35,7 @@
             </a>
         </li>
         <li>
-            <a class="treeview " href="{{ BASE_URL }}/catalog/cart">
+            <a class="treeview " href="{% url 'show-cart' %}">
                 <i class="fa fa-shopping-cart"></i>
                 <span>View shopping cart</span>
                 <span class="pull-right-container">

reports/templates/Reports.html

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

users/templates/User_profile.html

@@ -122,7 +122,7 @@
             User Profile
         </h1>
         <ol class="breadcrumb">
-            <li><a href="../"><i class="fa fa-home"></i> Home</a></li>
+            <li><a href="{% url 'map' %}"><i class="fa fa-home"></i> Home</a></li>
             <li class="active">User profile</li>
         </ol>
     </section>
@@ -368,7 +368,8 @@
                 type: 'POST',
                 dataType: "json",
                 data: {'title': label, "user_id": $('#user_id').val()},
-                url: '../../users/ws/report_table',
+                //url: '../../users/ws/report_table',
+                url: '{% url "wsPurchasesPM" %}',
                 success: function (data) {
                     console.log(data);
                     $('#mostrar').empty();

users/templates/users_aside.html

@@ -2,7 +2,7 @@
     <br>
     <ul class="sidebar-menu" data-widget="tree">
         <li>
-            <a class="treeview " href="{{ BASE_URL }}/reports">
+            <a class="treeview " href="{% url 'reports' %}">
                 <i class="fa fa-files-o"></i>
                 <span>Reports</span>
                 <span class="pull-right-container">

users/views.py

@@ -269,13 +269,13 @@ def wsPurchasesPM(request):
 
         table_data = []
         data = Purchase.objects.values('user_id', 'search__endDate', 'search__startDate', 'aggreg_date',
-                                       'search__process_id__name', 'search__search_name').filter(
+                                       'search__process_id__name', 'name').filter(
             user_id=request.POST.get('user_id'), purchased=True,
             aggreg_date__month=to_if(request.POST.get('title'))).order_by('aggreg_date')
 
         for producto in data:
             table_data.append({
-                "search_name": producto['search__search_name'],
+                "search_name": producto['name'],
                 "process": producto['search__process_id__name'],
                 "purchase_date": str(producto['aggreg_date'])[:10],
                 "startDate": str(producto['search__startDate'])[:10],