Production

.gitignore

@@ -6,6 +6,7 @@
 *.swp
 **/__pycache__
 db.sqlite3
+*.sqlite3
 media
 
 # Backup files # 

access_ctrl/admin.py

@@ -1,8 +1,36 @@
 from django.contrib import admin
 from .models import *
+from django.contrib.auth.models import User
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 
 # Register your models here.
 
+class CustomUserAdmin(BaseUserAdmin):
+    # Remove 'groups' and 'user_permissions' from the fieldsets
+    fieldsets = (
+        (None, {'fields': ('username', 'password')}),
+        ('Personal info', {'fields': ('first_name', 'last_name', 'email')}),
+        ('Important dates', {'fields': ('last_login', 'date_joined')}),
+        ('Status', {'fields': ('is_active', 'is_staff', 'is_superuser', 'user_permissions')}),
+    )
+
+    # Remove them from add_fieldsets too (user creation form)
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('username', 'password1', 'password2'),
+        }),
+    )
+
+    # Hide columns in the list display if you don’t want them there
+    def get_fieldsets(self, request, obj=None):
+        return super().get_fieldsets(request, obj)
+
+# Unregister the original UserAdmin
+admin.site.unregister(User)
+# Register our custom one
+admin.site.register(User, CustomUserAdmin)
+
 # -----------------------------
 # Permission Admin
 # -----------------------------
@@ -27,7 +55,7 @@ class RoleAdmin(admin.ModelAdmin):
 @admin.register(RolePermission)
 class RolePermissionAdmin(admin.ModelAdmin):
     list_display = ("role",)
-    filter_horizontal = ("permissions",)  # Makes ManyToMany easy to edit
+    filter_horizontal = ("permissions",)
     search_fields = ("role__name",)
 
 # -----------------------------
@@ -36,7 +64,7 @@ class RolePermissionAdmin(admin.ModelAdmin):
 @admin.register(UserPermission)
 class UserPermissionAdmin(admin.ModelAdmin):
     list_display = ("user",)
-    filter_horizontal = ("permissions",)  # Makes ManyToMany easy to edit
+    filter_horizontal = ("permissions",)
     search_fields = ("user__username",)
 
 # -----------------------------

access_ctrl/apps.py

@@ -1,6 +1,22 @@
 from django.apps import AppConfig
+from django.contrib.auth.apps import AuthConfig as BaseAuthConfig
 
 
 class AccessCtrlConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'access_ctrl'
+
+class CustomAuthConfig(BaseAuthConfig):
+    verbose_name = "User Management"
+
+    def ready(self):
+        super().ready()  # registers User & Group
+        from django.contrib import admin
+        from django.contrib.auth.models import Group
+
+        # Unregister Group after it's registered
+        try:
+            admin.site.unregister(Group)
+        except admin.sites.NotRegistered:
+            pass
+

access_ctrl/utils.py

@@ -7,6 +7,9 @@ def user_has_permission(user, codename, obj=None):
         """
         Check if a user has a permission, directly, via role, or object-level.
         """
+        if user.is_superuser:
+            return True
+
         try:
             perm = Perms.objects.get(codename=codename)
         except Perms.DoesNotExist:

core/admin.py

@@ -2,6 +2,7 @@
 from core.models import Token_Session, Registered_Participant, Token_Participant
 
 # Register your models here.
+
 @admin.register(Token_Session)
 class SessionAdmin(admin.ModelAdmin):
 

core/templates/coordinator_dashboard.html

@@ -246,17 +246,21 @@
         justify-content: space-between;
       }
       .footer {
+        display: flex;
+        margin: auto;
+        justify-content: center;
+        gap: 250px;
         background-color: #f8f8f8;
         /* color: white; */
         position: fixed;
         bottom: 0;
         width: 100%;
         text-align: center;
-        padding: 10px 0;
+        /* padding: 10px 0; */
         /* z-index: -1; */
       }
       .footer img {
-        height: 68px;
+        height: 90px;
       }
       .count {
         font-size: 1.5rem;
@@ -485,8 +489,12 @@
         td {
           padding: 5px;
         }
+        .footer{
+          gap: 40px;
+        }
         .footer img {
-          height: 27px;
+          height: 30px;
+          /* scale: 1.3; */
         }
         .count {
           font-size: 1rem;
@@ -529,11 +537,11 @@
       <div class="button-group-outerdiv">
         <div class="button-group">
           <button id="view-status">View Status</button>
-          {% if request.user|has_perm:"update_session" %}
+          {% if has_perm.update_session %}
           <button id="set-session">Set Session</button>
           {% endif %}
-          <a href="{% url 'registration:registration_form' %}" >Registration Form</a>
-          {% if request.user|has_perm:"scan_session" %}
+          <a href="{% url 'registration:registration_admin' %}" >Registration Form</a>
+          {% if has_perm.scan_session %}
           <button id="tap-to-scan">Tap to Scan</button>
           {% endif %}
         </div>
@@ -611,10 +619,10 @@
               <th>Name</th>
               <th>University</th>
               <th>Tshirt Size</th>
-              <th>Role</th>
+              {% comment %} <th>Role</th> {% endcomment %}
               <th>Contact</th>
               {% for session in token_sessions_all %}
-              {% if request.user|has_perm:"scan_any_session" or session.is_active %}
+              {% if has_perm.scan_any_session or session.is_active %}
               <th>{{session.session_name}}</th>
               {% endif %}
               {% endfor %}
@@ -628,10 +636,10 @@
               <td>{{participant.name}}</td>
               <td>{{participant.university}}</td>
               <td>{{participant.t_shirt_size}}</td>
-              <td>{{participant.role}}</td>
+              {% comment %} <td>{{participant.role}}</td> {% endcomment %}
               <td>{{participant.contact_no}}</td>
               {% for session in token_sessions_all %}
-              {% if request.user|has_perm:"scan_any_session" or session.is_active %}
+              {% if has_perm.scan_any_session or session.is_active %}
                 <td>
                   <input type="checkbox" id="{{participant.id}}_{{session.id}}" data-sl="{{participant.id}}" data-session-id={{session.id}} {% for token in participant.tokens %}{% if token.token_session.id == session.id %}checked{% endif %}{% endfor %} />
                 </td>
@@ -654,7 +662,8 @@
   </form>
 </div>
     <div class="footer">
-      <img src="{% static '/img/Logos-For-DOC-1.png' %}" alt="logo" />
+      <img src="{% static '/img/Footer1.png' %}" alt="logo" />
+      <img src="{% static '/img/Footer2.png' %}" alt="logo" />
     </div>
     <!-- Modal -->
     <div
@@ -701,7 +710,7 @@ <h2 style="font-size: 1.5em; text-align: center">Select a Session</h2>
   </div>
 
 
-  {% if request.user|has_perm:"update_session" %}
+  {% if has_perm.update_session %}
   <!-- Modal -->
   <div class="modal-overlay" id="modal-overlay">
     <div class="modal" id="set-session-modal">
@@ -756,7 +765,7 @@ <h2 style="font-size: 1.5em; text-align: center">Select a Session</h2>
             const modalOverlay = document.getElementById("modal-overlay");
             const navbarSessionText = document.querySelector(".navbar > div");
 
-            {% if request.user|has_perm:"update_session" %}
+            {% if has_perm.update_session %}
             // Open the modal
             setSessionBtn.addEventListener("click", () => {
               modalOverlay.style.display = "block";
@@ -836,7 +845,7 @@ <h2 style="font-size: 1.5em; text-align: center">Select a Session</h2>
 // Example session URLs
 const sessions = [
   {% for session in token_sessions_all %}
-  {% if request.user|has_perm:"scan_any_session" or session.is_active %}
+  {% if has_perm.scan_any_session or session.is_active %}
     { id: {{session.id}}, name: "{{session.session_name}}" },
   {% endif %}
   {% endfor %}
@@ -1175,7 +1184,7 @@ <h2 style="font-size: 1.5em; text-align: center">Select a Session</h2>
       .then((data) => {
         last_updated_date_time = new Date();
 
-        {% if request.user|has_perm:"scan_any_session" %}
+        {% if has_perm.scan_any_session %}
         for (var d in data['status']) {
           document.getElementById(`session_${d}`).innerHTML = data['status'][d];
         }

core/views.py

@@ -98,6 +98,12 @@ def dashboard(request):
     registered_participants = Core.get_all_reg_participants_with_sessions()
 
     total_participants = len(registered_participants)
+
+    permissions = {
+        'update_session':Site_Permissions.user_has_permission(request.user, 'update_session'),
+        'scan_session':Site_Permissions.user_has_permission(request.user, 'scan_session'),
+        'scan_any_session':Site_Permissions.user_has_permission(request.user, 'scan_any_session')
+    }
 
     request.session['active_sessions'] = active_sessions
 
@@ -108,14 +114,15 @@ def dashboard(request):
         'registered_participants':registered_participants,
         'total_participants':total_participants,
         'participant_universities':universities,
+        'has_perm':permissions,
     }
 
     return render(request, 'coordinator_dashboard.html', context)
 
 class SessionUpdateAjax(View):
     def post(self, request):
         try:
-            if request.user.is_authenticated and Site_Permissions.user_has_permission(request.user, 'update_session'):
+            if Site_Permissions.user_has_permission(request.user, 'update_session'):
                 sessions = json.loads(request.body)['sessions']
 
                 if(Core.update_session(sessions=sessions)):
@@ -139,7 +146,7 @@ def get(self, request):
 class GetSessionStatusAjax(View):
     def post(self, request):
         try:
-            if request.user.is_authenticated and Site_Permissions.user_has_permission(request.user, 'view_qr_dashboard'):
+            if Site_Permissions.user_has_permission(request.user, 'view_qr_dashboard'):
                 last_updated_date_time = json.loads(request.body)['last_updated_date_time']
                 token_sessions_with_participant_count = Core.get_all_token_sessions_with_participant_counts()
 
@@ -170,7 +177,7 @@ def get(self, request):
 class UpdateParticipantSessionAjax(View):
     def post(self, request):
         try:
-            if request.user.is_authenticated and Site_Permissions.user_has_permission(request.user, 'scan_session'):
+            if Site_Permissions.user_has_permission(request.user, 'scan_session'):
                 data = json.loads(request.body)
 
                 response = Core.update_participant_session(data['participant_id'], data['session_id'], data['status'])