diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 5a877bdd..3729612a 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index 48899b12..a0536ed5 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc differ diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index f2771767..4bd6f9b2 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -516,6 +516,15 @@ def add_business_modal(request, *args, **kwargs): return render(request, 'popup_modals/addbusiness-modal.html', context) +def add_user_story_modal(request): + + context = { + + } + + return render(request, 'popup_modals/add-userstory-modal.html', context) + + def staff_position_modal(request): context = { diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 088ef72a..b63d8b49 100644 Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index 6946ced2..f3c06861 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -71,6 +71,7 @@ urlpatterns = [ path('add-status/', views.add_status_modal, name='addstatus'), path('add-note/', views.add_note_modal, name='addnote'), path('add-file/', views.add_file_modal, name='addfile'), + path('add-user-story/', views.add_user_story_modal, name='adduserstory'), path('add-credentials/', views.add_credentials_modal, name='addcredentials'), path('update-status//', views.update_status_modal, name='updatestatus'), path('add-point//', views.add_point_modal, name='addpoint'), diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index 0fefbc05..22898fbf 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -790,6 +790,10 @@ video { margin-top: 0.5rem; } +.mt-20 { + margin-top: 5rem; +} + .mt-3 { margin-top: 0.75rem; } @@ -874,6 +878,10 @@ video { height: 150px; } +.h-\[210px\] { + height: 210px; +} + .h-\[25px\] { height: 25px; } @@ -882,6 +890,10 @@ video { height: 2px; } +.h-\[305px\] { + height: 305px; +} + .h-\[30px\] { height: 30px; } @@ -910,6 +922,10 @@ video { height: 60px; } +.h-\[630px\] { + height: 630px; +} + .h-\[70px\] { height: 70px; } diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index 48e093ea..d69355c9 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -62,6 +62,8 @@ document.addEventListener("DOMContentLoaded", function () { addButtonClickListener("usersActivityIcon", "400px", "600px"); addButtonClickListener("addStatusButtonMobile", "500px", "80px"); addButtonClickListener("userRecentActivitiesButton", "400px", "600px"); + addButtonClickListener("addUserStoryButton", "400px", "180px"); + // DELETE BUTTONS diff --git a/osinaweb/templates/details_pages/business-details.html b/osinaweb/templates/details_pages/business-details.html index fa81ed98..b84e7ddf 100644 --- a/osinaweb/templates/details_pages/business-details.html +++ b/osinaweb/templates/details_pages/business-details.html @@ -146,7 +146,8 @@ - diff --git a/osinaweb/templates/details_pages/customer-details.html b/osinaweb/templates/details_pages/customer-details.html index 1e78184b..cbf3e010 100644 --- a/osinaweb/templates/details_pages/customer-details.html +++ b/osinaweb/templates/details_pages/customer-details.html @@ -248,7 +248,8 @@ - diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/templates/details_pages/project-details.html index 26259b29..b8bb9d18 100644 --- a/osinaweb/templates/details_pages/project-details.html +++ b/osinaweb/templates/details_pages/project-details.html @@ -240,7 +240,7 @@ @@ -377,6 +377,7 @@ +
@@ -444,7 +445,6 @@
-

Tags:

@@ -522,7 +522,17 @@ -
diff --git a/osinaweb/templates/details_pages/staff-details.html b/osinaweb/templates/details_pages/staff-details.html index 6a92418b..8715fff4 100644 --- a/osinaweb/templates/details_pages/staff-details.html +++ b/osinaweb/templates/details_pages/staff-details.html @@ -138,7 +138,8 @@
- diff --git a/osinaweb/templates/details_pages/task-details.html b/osinaweb/templates/details_pages/task-details.html index 80f40c22..8c8de620 100644 --- a/osinaweb/templates/details_pages/task-details.html +++ b/osinaweb/templates/details_pages/task-details.html @@ -357,7 +357,8 @@ - diff --git a/osinaweb/templates/epic-fetched-tasks.html b/osinaweb/templates/epic-fetched-tasks.html index 7e6aedb9..c6700fe3 100644 --- a/osinaweb/templates/epic-fetched-tasks.html +++ b/osinaweb/templates/epic-fetched-tasks.html @@ -15,6 +15,13 @@
+ {% if task.status == 'Closed' %} +
+

{{task.status}}

+
+ {% endif %} + {% if task.status == 'Open' %}
@@ -29,6 +36,15 @@
{% endif %} + + {% if task.status == 'Closed' %} +
+

{{task.formatted_start_date}}

+
+ {% endif %} + + {% if task.status == 'Open' %}
@@ -43,6 +59,14 @@
{% endif %} + + {% if task.status == 'Closed' %} +
+

{{task.formatted_end_date}}

+
+ {% endif %} + {% if task.status == 'Open' %}
diff --git a/osinaweb/templates/index.html b/osinaweb/templates/index.html index c00d83f9..9f89d7fc 100644 --- a/osinaweb/templates/index.html +++ b/osinaweb/templates/index.html @@ -49,8 +49,8 @@ - -
@@ -507,7 +495,17 @@ - diff --git a/osinaweb/templates/listing_pages/business-types.html b/osinaweb/templates/listing_pages/business-types.html index 36d1d396..2410b40b 100644 --- a/osinaweb/templates/listing_pages/business-types.html +++ b/osinaweb/templates/listing_pages/business-types.html @@ -155,7 +155,8 @@ - diff --git a/osinaweb/templates/listing_pages/businesses.html b/osinaweb/templates/listing_pages/businesses.html index c7649220..97dfcc15 100644 --- a/osinaweb/templates/listing_pages/businesses.html +++ b/osinaweb/templates/listing_pages/businesses.html @@ -185,7 +185,8 @@ - diff --git a/osinaweb/templates/listing_pages/customers.html b/osinaweb/templates/listing_pages/customers.html index 9763b76e..da09570c 100644 --- a/osinaweb/templates/listing_pages/customers.html +++ b/osinaweb/templates/listing_pages/customers.html @@ -193,7 +193,8 @@ - diff --git a/osinaweb/templates/listing_pages/daily-reports.html b/osinaweb/templates/listing_pages/daily-reports.html index 08ba528c..61fc6311 100644 --- a/osinaweb/templates/listing_pages/daily-reports.html +++ b/osinaweb/templates/listing_pages/daily-reports.html @@ -155,7 +155,8 @@ - diff --git a/osinaweb/templates/listing_pages/project-types.html b/osinaweb/templates/listing_pages/project-types.html index 5055b5c9..ffb6a716 100644 --- a/osinaweb/templates/listing_pages/project-types.html +++ b/osinaweb/templates/listing_pages/project-types.html @@ -156,7 +156,8 @@ - diff --git a/osinaweb/templates/listing_pages/projects.html b/osinaweb/templates/listing_pages/projects.html index 8d6e14eb..ef5a5fa4 100644 --- a/osinaweb/templates/listing_pages/projects.html +++ b/osinaweb/templates/listing_pages/projects.html @@ -207,7 +207,8 @@ - diff --git a/osinaweb/templates/listing_pages/references.html b/osinaweb/templates/listing_pages/references.html index 4368f2ff..55f7ae48 100644 --- a/osinaweb/templates/listing_pages/references.html +++ b/osinaweb/templates/listing_pages/references.html @@ -165,7 +165,8 @@ - diff --git a/osinaweb/templates/listing_pages/staff-positions.html b/osinaweb/templates/listing_pages/staff-positions.html index 10f83a60..15ffb626 100644 --- a/osinaweb/templates/listing_pages/staff-positions.html +++ b/osinaweb/templates/listing_pages/staff-positions.html @@ -159,7 +159,8 @@ - diff --git a/osinaweb/templates/listing_pages/staffs.html b/osinaweb/templates/listing_pages/staffs.html index c106fa89..a8df81fd 100644 --- a/osinaweb/templates/listing_pages/staffs.html +++ b/osinaweb/templates/listing_pages/staffs.html @@ -167,7 +167,8 @@ - diff --git a/osinaweb/templates/listing_pages/tags.html b/osinaweb/templates/listing_pages/tags.html index b18cd7af..08749087 100644 --- a/osinaweb/templates/listing_pages/tags.html +++ b/osinaweb/templates/listing_pages/tags.html @@ -158,7 +158,8 @@ - diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/templates/listing_pages/tasks.html index d5cdde71..37c78fbb 100644 --- a/osinaweb/templates/listing_pages/tasks.html +++ b/osinaweb/templates/listing_pages/tasks.html @@ -463,7 +463,8 @@ - diff --git a/osinaweb/templates/popup_modals/add-userstory-modal.html b/osinaweb/templates/popup_modals/add-userstory-modal.html new file mode 100644 index 00000000..54b3188a --- /dev/null +++ b/osinaweb/templates/popup_modals/add-userstory-modal.html @@ -0,0 +1,35 @@ +{% load static %} + + + + + + + Osina + + + + + + + +
+ {% csrf_token %} +

Add User Story

+ +
+ + +
+ +
+ +
+
+ + \ No newline at end of file diff --git a/osinaweb/templates/recent-activities.html b/osinaweb/templates/recent-activities.html index 12de5855..31e52bad 100644 --- a/osinaweb/templates/recent-activities.html +++ b/osinaweb/templates/recent-activities.html @@ -4,11 +4,13 @@ +{% if latest_statuses_time_ago %} {% for latest in latest_statuses_time_ago %}
-
+
user profile @@ -43,5 +45,11 @@
+{% endfor %} +{% else %} -{% endfor %} \ No newline at end of file +
+

No statuses at the moment.

+
+ +{% endif %} \ No newline at end of file