diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index aa4e00d3..158585bf 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc index 89a0e19b..a2fd1662 100644 Binary files a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index 0c04fd35..dffd31f2 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/migrations/__pycache__/0046_task_requirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc new file mode 100644 index 00000000..e92c87fc Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc differ diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 395e6686..ae2ca033 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -220,8 +220,12 @@ def staff_positions(request): def detailed_project(request, project_id): project = get_object_or_404(Project, project_id=project_id) epics = Epic.objects.filter(project=project) + latest_epic = Epic.objects.filter(project=project).last() - selected_epic_id = request.GET.get('epic_id') # Get the selected epic_id from the query parameters + # if latest_epic: + # epics = epics.exclude(pk=latest_epic.pk) + + selected_epic_id = request.GET.get('epic_id') if selected_epic_id: selected_epic = get_object_or_404(Epic, id=selected_epic_id) @@ -233,8 +237,9 @@ def detailed_project(request, project_id): context = { 'project': project, 'epics': epics, - 'selected_epic': selected_epic, # Pass the selected epic to the template - 'related_tasks': related_tasks, # Pass the related tasks to the template + 'selected_epic': selected_epic, + 'related_tasks': related_tasks, + 'latest_epic': latest_epic } return render(request, 'details_pages/project-details.html', context) diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 1740af22..1fad44b9 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/static/dist/output.css b/osinaweb/static/dist/output.css index 96ade3e5..16037a79 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -1025,10 +1025,6 @@ video { width: 45px; } -.w-\[50\%\] { - width: 50%; -} - .w-\[50px\] { width: 50px; } @@ -2271,6 +2267,11 @@ video { color: rgb(59 130 246 / var(--tw-text-opacity)); } +.hover\:text-green-700:hover { + --tw-text-opacity: 1; + color: rgb(21 128 61 / var(--tw-text-opacity)); +} + .hover\:text-red-500:hover { --tw-text-opacity: 1; color: rgb(239 68 68 / var(--tw-text-opacity)); diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/templates/details_pages/project-details.html index 2dbbc026..7a6631bd 100644 --- a/osinaweb/templates/details_pages/project-details.html +++ b/osinaweb/templates/details_pages/project-details.html @@ -198,106 +198,190 @@ + + +
User Stories
+Requirements:
-+ Story + | ++ Related Task + | ++ Actions + | +
---|---|---|
+ {{requirement.content}} + |
+
+ + Cars and classics inner pages + | + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
Related Files:
-File Name
-File
-Date Entered
-Related files
{{file.name}}
-{{file.file}}
-{{file.date}}
-+ File Name + | ++ File + | ++ Date Entered + | +
---|---|---|
+ {{file.name}} + |
+
+ + {{file.file}} + | + ++ {{file.date}} + | +
Credentials:
-Email or Username
-Password
-Used for
-Credentials
+ Email or Username + | ++ Password + | ++ Used For + | +
---|---|---|
+ {{credential.emailorusername}} + |
+
+ + {{credential.password}} + | + ++ {{credential.usedfor}} + | +