users

GeoInt_SIDT/settings.py

@@ -43,6 +43,7 @@ INSTALLED_APPS = [
     'reports.apps.ReportsConfig',
     'mail.apps.MailConfig',
     'administration.apps.AdministrationConfig',
+    'users.apps.UsersConfig',
     'django_extensions',
 ]
 

GeoInt_SIDT/urls.py

@@ -30,5 +30,6 @@ urlpatterns = [
     #url(r'^accounts/', include('registration')),
     url(r'^mail/', include('mail.urls')),
     url(r'^administration/', include('administration.urls')),
+    url(r'^users/', include('users.urls')),
 ]
 # + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

administration/views.py

@@ -24,7 +24,7 @@ size_repsat=0
 
 #------------------------------------------------------------
 def Dashboard(request):
-    if not request.user.is_superuser or not request.user.is_staff:
+    if not request.user.is_superuser and not request.user.is_staff:
         return redirect('../')
 
     # Total de compras #
@@ -101,7 +101,7 @@ def Dashboard(request):
 
 # ----------------------------------------------------------
 def Request_users(request):
-    if not request.user.is_superuser or not request.user.is_staff:
+    if not request.user.is_superuserandnot and request.user.is_staff:
         return redirect('../')
     if request.user.is_superuser or request.user.is_staff:
         user_list = []
@@ -123,7 +123,7 @@ def Request_users(request):
 
 # ------------------------------------------------------------------------
 def update_user(request):
-    if not request.user.is_superuser or not request.user.is_staff:
+    if not request.user.is_superuserandnot and request.user.is_staff:
         return redirect('../')
     is_active = False
     is_staff = False
@@ -148,7 +148,7 @@ def update_user(request):
 
 #------------------------------------------------------------------------
 def active_users(request):
-    if request.user.is_superuser or request.user.is_staff:
+    if request.user.is_superuser and request.user.is_staff:
         user_list = []
         for user in User.objects.filter(is_active=True):
             user_list.append({

catalog/templates/user_button.html

@@ -15,7 +15,7 @@
     <ul class="sidebar-menu" data-widget="tree">
         <!-- History element -->
         <li>
-            <a class="treeview " href="#">
+            <a class="treeview " href="../../../users">
                 <i class="fa fa-user-circle"></i>
                 <span>Profile</span>
                 <span class="pull-right-container">

users/static/users/css/scldata.css

+body
+{
+	background-color:White;
+}
+
+.next{
+	padding: 0px;
+	padding-top: 50%;
+	cursor: pointer;
+	font-size: 20px;
+}
+
+.prev{
+	padding-left: 20px;
+	padding-top: 50%;
+	cursor: pointer;
+	font-size: 20px;
+}

users/static/users/js/scripts.js

+$(document).ready(function () {
+    $('#example').DataTable
+    ({
+        language:
+            {
+                "sProcessing": "Procesando...",
+                "sLengthMenu": "Mostrar _MENU_ registros",
+                "sZeroRecords": "No se encontraron resultados",
+                "sEmptyTable": "Ningún dato disponible en esta tabla",
+                "sInfo": "Mostrando registros del _START_ al _END_ de un total de _TOTAL_ registros",
+                "sInfoEmpty": "Mostrando registros del 0 al 0 de un total de 0 registros",
+                "sInfoFiltered": "(filtrado de un total de _MAX_ registros)",
+                "sInfoPostFix": "",
+                "sSearch": "Buscar:",
+                "sUrl": "",
+                "sInfoThousands": ",",
+                "sLoadingRecords": "Cargando...",
+                "oPaginate":
+                    {
+                        "sFirst": "Primero",
+                        "sLast": "Último",
+                        "sNext": "Siguiente",
+                        "sPrevious": "Anterior"
+                    },
+                "oAria":
+                    {
+                        "sSortAscending": ": Activar para ordenar la columna de manera ascendente",
+                        "sSortDescending": ": Activar para ordenar la columna de manera descendente"
+                    }
+            },
+        responsive:
+            {
+                details:
+                    {
+                        type: 'column',
+                        target: 'tr'
+                    }
+            },
+        columnDefs:
+            [{
+                className: 'control',
+                orderable: false,
+                targets: 0
+            }],
+        order: [1, 'asc']
+    });
+});

users/templates/profile.html

+{% load staticfiles %}
+<div class="col-md-3">
+    <!-- Profile Image -->
+    <div class="box box-primary">
+        <div class="box-body box-profile">
+            <img class="profile-user-img img-responsive img-circle" src="{% static 'users/images/user_default.png' %}"
+                 alt="User profile picture">
+
+            <h3 class="profile-username text-center">{{ user.get_full_name }}</h3>
+
+            <p class="text-muted text-center">Software Engineer</p>
+
+            <ul class="list-group list-group-unbordered">
+                <li class="list-group-item">
+                    <b>Followers</b> <a class="pull-right">1,322</a>
+                </li>
+                <li class="list-group-item">
+                    <b>Following</b> <a class="pull-right">543</a>
+                </li>
+                <li class="list-group-item">
+                    <b>Friends</b> <a class="pull-right">13,287</a>
+                </li>
+            </ul>
+
+            <!--a href="#" class="btn btn-primary btn-block"><b>Follow</b></a-->
+        </div>
+        <!-- /.box-body -->
+    </div>
+    <!-- /.box -->
+    <div>
+        <br>
+    </div>
+    <!-- About Me Box -->
+    <div class="box box-primary">
+        <div class="box-header with-border">
+            <h3 class="box-title">About Me</h3>
+        </div>
+        <!-- /.box-header -->
+        <div class="box-body">
+            <strong><i class="fa fa-book margin-r-5"></i> Education</strong>
+
+            <p class="text-muted">
+                B.S. in Computer Science from the University of Tennessee at Knoxville
+            </p>
+
+            <hr>
+
+            <strong><i class="fa fa-map-marker margin-r-5"></i> Location</strong>
+
+            <p class="text-muted">Malibu, California</p>
+
+            <hr>
+
+            <strong><i class="fa fa-pencil margin-r-5"></i> Skills</strong>
+
+            <p>
+                <span class="label label-danger">UI Design</span>
+                <span class="label label-success">Coding</span>
+                <span class="label label-info">Javascript</span>
+                <span class="label label-warning">PHP</span>
+                <span class="label label-primary">Node.js</span>
+            </p>
+
+            <hr>
+
+            <strong><i class="fa fa-file-text-o margin-r-5"></i> Notes</strong>
+
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam fermentum enim neque.</p>
+        </div>
+        <!-- /.box-body -->
+    </div>
+    <!-- /.box -->
+</div>
\ No newline at end of file

users/templates/users_aside.html

+<div class="form-group">
+    <br>
+    <!--ul class="sidebar-menu" data-widget="tree">
+        <li>
+            <a class="treeview " href="{{ BASE_URL }}/administration">
+                <i class="fa fa-home"></i>
+                <span>Dashboard</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+        </li>
+        <li>
+            <a class="treeview " href="../../administration/request">
+                <i class="fa fa-user-plus"></i>
+                <span>Request</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+        </li>
+        <li>
+            <a class="treeview " href="../../administration/users">
+                <i class="fa fa-users"></i>
+                <span>Active users</span>
+                <span class="pull-right-container">
+              <span class="label label-primary pull-right"></span>
+            </span>
+            </a>
+        </li>
+    </ul-->
+</div>
\ No newline at end of file

users/urls.py

+"""GeoInt_SIDT URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/1.11/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.conf.urls import url, include
+    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
+"""
+from django.conf.urls import url
+from django.contrib import admin
+
+from django.conf.urls import include
+from django.views.generic import RedirectView
+from django.conf import settings
+from django.conf.urls.static import static
+
+from users import views
+
+urlpatterns = [
+    url(r'^$', views.Users, name='users'),
+]
+# + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)