diff --git a/osinaweb/osinacore/templates/dashboard-main.html b/osinaweb/osinacore/templates/dashboard-main.html new file mode 100644 index 00000000..6a579f79 --- /dev/null +++ b/osinaweb/osinacore/templates/dashboard-main.html @@ -0,0 +1,1276 @@ +{% load static %} + + + + + + + + {% block title %} Osina {% endblock %} + + + + + + + + + + + + + + +
+ {% include 'chat_templates/chat-widget.html' %} +
+ + + + +
+ Users +
+ + + + + + + + +
+
+
+
+ + + +

13 New Notifications

+
+ + + +
+ +
+
+
+
+
+ +
+
+
+

Salim Elliye added a reaction on your + status

+
+
+ +
+ + + +
+
+ + +
+
+
+
+ +
+
+
+

Salim Elliye added you into Osimenu + Project

+
+
+ +
+ + + +
+
+ +
+
+
+

You are now offline!

+
+
+ +
+ + + +
+
+ +
+
+
+

Your Osimenu subscription expires in 3 + days. Save on your renewal now.

+
+
+ +
+ + + +
+
+ + + +
+
+
+ + +
+ +
+ +
+ +
+ +
+ + +
+ +
+ + + +
+
+ + +
+ + + {% if user.is_superuser %} +
+
+
+ + + +

Accounts

+
+
+ + +
+
+ + +
+ {% endif %} + + +
+
+
+ + + +

My Work

+
+
+ + +
+
+ + +
+ + +
+
+
+ + + +

Support

+
+
+ + +
+
+ + +
+ + + + {% if user.is_superuser %} +
+
+
+ + + +

Billing

+
+
+ + +
+
+ + +
+ {% endif %} + + + +
+
+
+ + + +

Utilities

+
+
+ + +
+
+ + +
+ + +
+ + + +

Activity

+
+ + + +
+ + + + + +

Address Book

+
+ + +
+
+
+ + + + + +

Sales

+
+
+ + +
+
+ + +
+ + +
+
+ + +
+
+
+ Ositcom Logo +

Powered By OSITCOM

+
+

Copyrights © 2024 All Rights Reserved

+
+
+
+ + + + + + +
+ +
+
+
+
+
+
+
+ + +
+ + +
+ +
+
+

1

+
+
+ + + +
+
+ + +
+
+
+
+ user-image +
+
+ +
+

{{request.user.first_name}} {{request.user.last_name}}

+ + +
+
+ + + +
+
+
+ + + +
+ + + + +
+
+
+
+
+ + +
+ + + + + + + +
+
+
+ + + + + +

Accessibilites

+
+ + + + + + +
+ +
+
+
+
+

Recent Status

+
+ + + + +
+
+ {% include 'recent-status.html' %} +
+
+ +
+
+
+

Tasks

+ +
+
+

{{total_tasks}}

+
+
+
+ +
+
+
+

Projects

+ +
+
+

2

+
+
+
+ +
+
+
+

Tickets

+ +
+
+

2

+
+
+
+
+
+ + +
+
+
+
+ + +
+

My Notes

+ + +
+
+ + +
+ + + +
+
+ + + +
+ + {% block content %} + replace me + {% endblock content %} + + +
+ + +
+ + {% include 'details_templates/partials/recently-online.html' %} +
+ + +
+
+
+ Ositcom Logo +

Powered By OSITCOM

+
+

Copyrights © 2024 All Rights Reserved

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/osinaweb/osinacore/templates/projects-dashboard.html b/osinaweb/osinacore/templates/projects-dashboard.html index cca540fe..4d0945ba 100644 --- a/osinaweb/osinacore/templates/projects-dashboard.html +++ b/osinaweb/osinacore/templates/projects-dashboard.html @@ -1,4 +1,4 @@ -{% extends "main.html" %} +{% extends "dashboard-main.html" %} {% load static %} {% block content %} @@ -78,7 +78,7 @@ {% for staff in staffs %} {% endfor %} @@ -142,6 +142,32 @@ {% endfor %} +
+
+ {% if points.has_previous %} + + + + + + {% endif %} + {% for num in page_range %} + +

{{ num }}

+ + {% endfor %} + {% if points.has_next %} + + + + + + {% endif %} +
+
+ diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 77f1ec6e..b34b5945 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -948,10 +948,15 @@ def projects_dashboard(request): pointactivity__end_time__date__range=[start_date, end_date] ).distinct() + paginator = Paginator(points, 30) # Show 10 points per page + page_number = request.GET.get('page') # Get the page number from the GET request + page_obj = paginator.get_page(page_number) + context = { 'projects': all_projects, 'staffs': all_staff, - 'points': points, + # 'points': points, + 'points': page_obj, # Pass the paginated points 'selected_projects': [int(id) for id in selected_project_ids if id], 'selected_staff': [int(id) for id in selected_staff_ids if id], 'start_date': start_date_str if start_date else '', diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index d0b91e2c..4939c0c2 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -995,6 +995,10 @@ video { display: flex; } +.inline-flex { + display: inline-flex; +} + .table { display: table; } @@ -1240,6 +1244,10 @@ video { width: 0.375rem; } +.w-1\/6 { + width: 16.666667%; +} + .w-10 { width: 2.5rem; } @@ -1473,10 +1481,6 @@ video { max-width: 48rem; } -.max-w-\[300px\] { - max-width: 300px; -} - .max-w-\[80\%\] { max-width: 80%; } @@ -1761,6 +1765,10 @@ video { border-color: rgb(229 231 235 / var(--tw-divide-opacity)); } +.self-start { + align-self: flex-start; +} + .self-end { align-self: flex-end; } @@ -2039,6 +2047,11 @@ video { background-color: rgb(0 0 0 / var(--tw-bg-opacity)); } +.bg-blue-100 { + --tw-bg-opacity: 1; + background-color: rgb(219 234 254 / var(--tw-bg-opacity)); +} + .bg-blue-200 { --tw-bg-opacity: 1; background-color: rgb(191 219 254 / var(--tw-bg-opacity)); @@ -2099,6 +2112,11 @@ video { background-color: rgb(107 114 128 / var(--tw-bg-opacity)); } +.bg-green-100 { + --tw-bg-opacity: 1; + background-color: rgb(220 252 231 / var(--tw-bg-opacity)); +} + .bg-green-200 { --tw-bg-opacity: 1; background-color: rgb(187 247 208 / var(--tw-bg-opacity)); @@ -2149,6 +2167,11 @@ video { background-color: rgb(233 213 255 / var(--tw-bg-opacity)); } +.bg-red-100 { + --tw-bg-opacity: 1; + background-color: rgb(254 226 226 / var(--tw-bg-opacity)); +} + .bg-red-200 { --tw-bg-opacity: 1; background-color: rgb(254 202 202 / var(--tw-bg-opacity)); @@ -2203,6 +2226,11 @@ video { background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } +.bg-yellow-100 { + --tw-bg-opacity: 1; + background-color: rgb(254 249 195 / var(--tw-bg-opacity)); +} + .bg-yellow-200 { --tw-bg-opacity: 1; background-color: rgb(254 240 138 / var(--tw-bg-opacity)); @@ -2635,6 +2663,11 @@ video { color: rgb(59 130 246 / var(--tw-text-opacity)); } +.text-blue-800 { + --tw-text-opacity: 1; + color: rgb(30 64 175 / var(--tw-text-opacity)); +} + .text-fifthosiblue { --tw-text-opacity: 1; color: rgb(146 156 183 / var(--tw-text-opacity)); @@ -2685,6 +2718,11 @@ video { color: rgb(21 128 61 / var(--tw-text-opacity)); } +.text-green-800 { + --tw-text-opacity: 1; + color: rgb(22 101 52 / var(--tw-text-opacity)); +} + .text-orange-500 { --tw-text-opacity: 1; color: rgb(249 115 22 / var(--tw-text-opacity)); @@ -2700,6 +2738,11 @@ video { color: rgb(239 68 68 / var(--tw-text-opacity)); } +.text-red-800 { + --tw-text-opacity: 1; + color: rgb(153 27 27 / var(--tw-text-opacity)); +} + .text-secondosiblue { --tw-text-opacity: 1; color: rgb(55 74 122 / var(--tw-text-opacity)); @@ -2720,6 +2763,11 @@ video { color: rgb(234 179 8 / var(--tw-text-opacity)); } +.text-yellow-800 { + --tw-text-opacity: 1; + color: rgb(133 77 14 / var(--tw-text-opacity)); +} + .underline { text-decoration-line: underline; }