diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc index f735b665..0bff3b41 100644 Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc index c2528438..47dffaf3 100644 Binary files a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/billing/templates/add_templates/add-payment-method-modal.html b/osinaweb/billing/templates/add_templates/add-payment-method-modal.html index fb2a3144..2ee4bc0f 100644 --- a/osinaweb/billing/templates/add_templates/add-payment-method-modal.html +++ b/osinaweb/billing/templates/add_templates/add-payment-method-modal.html @@ -53,7 +53,7 @@ - + diff --git a/osinaweb/billing/templates/edit_templates/edit-payment-method.html b/osinaweb/billing/templates/edit_templates/edit-payment-method.html index 450e9499..42520df2 100644 --- a/osinaweb/billing/templates/edit_templates/edit-payment-method.html +++ b/osinaweb/billing/templates/edit_templates/edit-payment-method.html @@ -68,6 +68,6 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/customercore/templates/add_templates/customer-add-ticket.html b/osinaweb/customercore/templates/add_templates/customer-add-ticket.html index 851fe552..0123d05a 100644 --- a/osinaweb/customercore/templates/add_templates/customer-add-ticket.html +++ b/osinaweb/customercore/templates/add_templates/customer-add-ticket.html @@ -93,10 +93,10 @@ - + - + {% endblock %} \ No newline at end of file diff --git a/osinaweb/customercore/templates/details_templates/inner-customer-project.html b/osinaweb/customercore/templates/details_templates/inner-customer-project.html index c9e5107a..d51e30dd 100644 --- a/osinaweb/customercore/templates/details_templates/inner-customer-project.html +++ b/osinaweb/customercore/templates/details_templates/inner-customer-project.html @@ -274,5 +274,5 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html b/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html index 53c38ea7..1fc596fe 100644 --- a/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html +++ b/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html @@ -335,10 +335,10 @@ - + - + - + {% endblock %} \ No newline at end of file diff --git a/osinaweb/customercore/templates/listing_pages/customer-projects.html b/osinaweb/customercore/templates/listing_pages/customer-projects.html index bf9d3fc8..a08b985a 100644 --- a/osinaweb/customercore/templates/listing_pages/customer-projects.html +++ b/osinaweb/customercore/templates/listing_pages/customer-projects.html @@ -53,6 +53,6 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/customercore/templates/listing_pages/customer-tickets.html b/osinaweb/customercore/templates/listing_pages/customer-tickets.html index 9634f3a1..f50f23ba 100644 --- a/osinaweb/customercore/templates/listing_pages/customer-tickets.html +++ b/osinaweb/customercore/templates/listing_pages/customer-tickets.html @@ -183,6 +183,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 8f26ae9a..c33e43b3 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc index bd8bf270..a85a46c1 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/osinacore/templates/add-edit-main.html b/osinaweb/osinacore/templates/add-edit-main.html index 3fbc6cfd..b0a23613 100644 --- a/osinaweb/osinacore/templates/add-edit-main.html +++ b/osinaweb/osinacore/templates/add-edit-main.html @@ -804,10 +804,10 @@ - + - + \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-business.html b/osinaweb/osinacore/templates/add_templates/add-business.html index 633a7e5a..4c9878fa 100644 --- a/osinaweb/osinacore/templates/add_templates/add-business.html +++ b/osinaweb/osinacore/templates/add_templates/add-business.html @@ -104,7 +104,7 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-customer.html b/osinaweb/osinacore/templates/add_templates/add-customer.html index b917c967..ab5c7f95 100644 --- a/osinaweb/osinacore/templates/add_templates/add-customer.html +++ b/osinaweb/osinacore/templates/add_templates/add-customer.html @@ -79,7 +79,7 @@ - + diff --git a/osinaweb/osinacore/templates/add_templates/add-project.html b/osinaweb/osinacore/templates/add_templates/add-project.html index 9d321897..311e7c76 100644 --- a/osinaweb/osinacore/templates/add_templates/add-project.html +++ b/osinaweb/osinacore/templates/add_templates/add-project.html @@ -119,6 +119,6 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-staff.html b/osinaweb/osinacore/templates/add_templates/add-staff.html index 6fbf1860..f615e3e6 100644 --- a/osinaweb/osinacore/templates/add_templates/add-staff.html +++ b/osinaweb/osinacore/templates/add_templates/add-staff.html @@ -104,7 +104,7 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-task.html b/osinaweb/osinacore/templates/add_templates/add-task.html index 57e6d4b6..2332e887 100644 --- a/osinaweb/osinacore/templates/add_templates/add-task.html +++ b/osinaweb/osinacore/templates/add_templates/add-task.html @@ -138,7 +138,7 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-ticket.html b/osinaweb/osinacore/templates/add_templates/add-ticket.html index 817a46e3..652567c1 100644 --- a/osinaweb/osinacore/templates/add_templates/add-ticket.html +++ b/osinaweb/osinacore/templates/add_templates/add-ticket.html @@ -105,10 +105,10 @@ - + - + {% endblock %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/details_templates/project-details.html b/osinaweb/osinacore/templates/details_templates/project-details.html index 3118228f..b58f8022 100644 --- a/osinaweb/osinacore/templates/details_templates/project-details.html +++ b/osinaweb/osinacore/templates/details_templates/project-details.html @@ -7,13 +7,44 @@
-
+ {% if project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %} bg-opacity-70">

{{project.name}}

-

{{project.project_id}}

+ {% for type in project.project_type.all %} +

+ {{type.name}} {% if not forloop.last %} | {% endif %} +

+ {% endfor %} + +
+ + + + +
+ +
@@ -52,11 +83,11 @@ class="w-full md:w-fit text-base px-3 py-2 bg-transparent text-osiblue outline-none border border-osiblue duration-300 rounded-md cursor-pointer hover:bg-osiblue hover:text-white">Create Story - - - + + + + +
+
+

Statuses

+
- - +
+ {% for status in statuses %} +
+

{{status.status}}

+

{{status.date}}

+
+ {% endfor %} +
+
-
- {% for member in members %} -
+ - - + +
@@ -625,10 +768,10 @@ - + - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/details_templates/task-details.html b/osinaweb/osinacore/templates/details_templates/task-details.html index 53762fc6..3bd1e5e4 100644 --- a/osinaweb/osinacore/templates/details_templates/task-details.html +++ b/osinaweb/osinacore/templates/details_templates/task-details.html @@ -6,7 +6,7 @@
+ class="w-full rounded-md flex flex-col justify-center items-center py-3 {% if task.status == 'Open' %} bg-osiblue {% endif %} {% if task.status == 'Working On' %} bg-yellow-500 {% endif %} {% if task.status == 'Closed' %} bg-green-700 {% endif %} bg-opacity-70">

{{task.name}}

diff --git a/osinaweb/osinacore/templates/details_templates/ticket-details.html b/osinaweb/osinacore/templates/details_templates/ticket-details.html index e8ba939c..4da65c5d 100644 --- a/osinaweb/osinacore/templates/details_templates/ticket-details.html +++ b/osinaweb/osinacore/templates/details_templates/ticket-details.html @@ -422,9 +422,9 @@ - - + + - + {% endblock %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/edit_templates/edit-business.html b/osinaweb/osinacore/templates/edit_templates/edit-business.html index e4d8f761..0f3c0499 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-business.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-business.html @@ -133,6 +133,6 @@
- + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/edit_templates/edit-staff.html b/osinaweb/osinacore/templates/edit_templates/edit-staff.html index 0c5912a8..1316e513 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-staff.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-staff.html @@ -103,7 +103,7 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/edit_templates/edit-task.html b/osinaweb/osinacore/templates/edit_templates/edit-task.html index fcc2251d..760336eb 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-task.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-task.html @@ -122,6 +122,6 @@ - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/listing_pages/projects.html b/osinaweb/osinacore/templates/listing_pages/projects.html index d15b28d2..39276a7b 100644 --- a/osinaweb/osinacore/templates/listing_pages/projects.html +++ b/osinaweb/osinacore/templates/listing_pages/projects.html @@ -54,114 +54,6 @@
- -
@@ -175,9 +67,12 @@
-
-

{{project.name}}

-
+ +
+

{{project.name}}

+
+
+
@@ -260,7 +155,6 @@
- {% endif %}
@@ -282,9 +176,9 @@ - + - + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/listing_pages/tickets.html b/osinaweb/osinacore/templates/listing_pages/tickets.html index 6cbd1be3..9d5636fe 100644 --- a/osinaweb/osinacore/templates/listing_pages/tickets.html +++ b/osinaweb/osinacore/templates/listing_pages/tickets.html @@ -2,11 +2,10 @@ {%load static%} {% block content %} +
-

Tickets

-
@@ -23,7 +22,7 @@
-
+
@@ -31,11 +30,14 @@
- + +
+
-
+
@@ -90,52 +92,51 @@ @@ -145,10 +146,10 @@
-

{{ticket.ticketupdate_set.all.last.added_by.first_name}}

+

{{ticket.ticketupdate_set.all.last.added_by.first_name}} +

-
- + -