Assigned tasks for schedule views. Ready for pulling.

blizzardblast/templates/schedule.html

@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block content %}
+
 <h1 class='view-title'>Schedule </h1>
 <table id="scheduling-table">
   <tr>
@@ -15,15 +16,15 @@
     <th>Role</th>
     <th>Day-Mgr</th>
   </tr>
-  
-  {% for m in manager%}
-  <tr>
-    <td> {{m.role_date}}</td>
-    <td> {{m.employee.employee_name}} </td>
-    <td> {{m.role_description}} </td>
-    <td> {{m.is_manager}} </td>
-  </tr>
-  {% endfor %}
+
+    {% for m in manager%}
+    <tr>
+      <td> {{m.role_date}}</td>
+      <td> {{m.employee.employee_name}} </td>
+      <td> {{m.role_description}} </td>
+      <td> {{m.is_manager}} </td>
+    </tr>
+    {% endfor %}
 </table>
 
 {% endblock %}

main/views.py

@@ -22,57 +22,31 @@ def inventory(request):
 
 
 def schedule(request):
-
-    # 😁 filter employees and roles by date in order
-    for row in EmployeeRole.objects.raw('''SELECT * FROM employeerole RIGHT JOIN employee ON (employeerole.employee_id=employee.employee_id)
-     ORDER BY role_date ASC'''):
-        print(row.employee_name, row.role_description, row.role_date)
-
-    # 😁 filter employees and roles in alphabetical order
-    for row in EmployeeRole.objects.raw('''SELECT * FROM employeerole RIGHT JOIN employee ON (employeerole.employee_id=employee.employee_id)
-     ORDER BY employee_name, role_date ASC'''):
-        print(row.employee_name, row.role_description, row.role_date)
-
-    # 😁 filter employees by roles
-    for row in EmployeeRole.objects.raw('''SELECT role_id,employee_name, role_date FROM employeerole RIGHT JOIN employee ON (employeerole.employee_id=employee.employee_id)
-    WHERE role_description ILIKE 'cashier' '''):
-        print(row.employee_name, row.role_description, row.role_date, '- filter by roles')
-
-    # 😁 filter employees by manager for the day
-    for row in EmployeeRole.objects.raw('''SELECT role_id,employee_name, role_date FROM employeerole RIGHT JOIN employee ON (employeerole.employee_id=employee.employee_id)
-    WHERE is_manager ILIKE 'Y' '''):
-
-        print(row.employee_name, row.role_description, row.role_date, '- manager for the day')
-
-    # 😁 filter employees by week
-    for row in EmployeeRole.objects.raw('''SELECT * FROM employeerole RIGHT JOIN employee ON (employeerole.employee_id=employee.employee_id)
-    WHERE role_date <= '2025-09-06' AND role_date >= '2025-09-01' ORDER BY role_date '''):
-        pass
-
-    # 1: FILTER EMPLOYEES BY MANAGER FOR THE DAY 
+    # 1: FILTER EMPLOYEES BY MANAGER FOR THE DAY - mate
     ismanager_query = EmployeeRole.objects.all().filter(is_manager='Y')
     
-    # 2: FILTER EMPLOYEES AND ROLES IN ALPHABETICAL ORDER
+    # 2: FILTER EMPLOYEES AND ROLES IN ALPHABETICAL ORDER - felizia
     employee_role_order_query = EmployeeRole.objects.all().order_by('role_description')
 
-    # 3 : FILTER BY WEEK
+    # 3 : FILTER BY WEEK - dedz
     week_query1 = EmployeeRole.objects.all().filter(role_date__range=["2025-09-01", "2025-09-06"]).order_by('role_date') 
     week_query2 = EmployeeRole.objects.all().filter(role_date__range=["2025-09-08", "2025-09-13"]).order_by('role_date')
 
-    # 4: FILTER EMPLOYEES BY ROLES
+    # 4: FILTER EMPLOYEES BY ROLES - xtine
     role_query1 = EmployeeRole.objects.all().filter(role_description='Cashier')
     role_query2 = EmployeeRole.objects.all().filter(role_description='Preparation')
     role_query3 = EmployeeRole.objects.all().filter(role_description='Cleaning')
 
-    # 5: FILTER EMPLOYEES AND ROLES BY DATE IN ORDER 
+    # 5: FILTER EMPLOYEES AND ROLES BY DATE IN ORDER - xx
     date_order_query = EmployeeRole.objects.all().order_by('role_date')
 
     return render(request, "blizzardblast/templates/schedule.html", {
-        'manager': employee_role_order_query
+        'manager': ismanager_query
         }
     )
 
 
+
 def report(request):
     return render(request, "blizzardblast/templates/report.html")