salim
/
newosinadjango
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New

Browse Source
main
emile 11 months ago
parent 63dc850095
commit 0970ecba52
16 changed files with 197 additions and 193 deletions
Show Stats Download Patch File Download Diff File

BIN
osinaweb/db.sqlite3
View File

Binary file not shown.

BIN
osinaweb/osinacore/__pycache__/admin.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinacore/__pycache__/models.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinacore/__pycache__/views.cpython-310.pyc
View File

Binary file not shown.

1
osinaweb/osinacore/admin.py
Unescape Escape View File

@ -37,6 +37,7 @@ admin.site.register(StaffProfile)
admin.site.register(ProjectType) admin.site.register(ProjectType)
admin.site.register(Project, ProjectAdmin) admin.site.register(Project, ProjectAdmin)
admin.site.register(ProjectStatus) admin.site.register(ProjectStatus)
admin.site.register(PinnedProject)
admin.site.register(Epic) admin.site.register(Epic)
admin.site.register(Note) admin.site.register(Note)
admin.site.register(Task) admin.site.register(Task)

BIN
osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc
View File

Binary file not shown.

1
osinaweb/osinacore/edit/urls.py
Unescape Escape View File

@ -9,6 +9,7 @@ urlpatterns = [
path('business/<str:business_id>/', views.edit_business, name='editbusiness'), path('business/<str:business_id>/', views.edit_business, name='editbusiness'),
path('staff/<str:staff_id>/', views.edit_staff, name='editstaff'), path('staff/<str:staff_id>/', views.edit_staff, name='editstaff'),
path('project/<str:project_id>/', views.edit_project, name='editproject'), path('project/<str:project_id>/', views.edit_project, name='editproject'),
path('project/<int:project_id>/toggle_pin/', views.toggle_pin_project, name='toggle_pin_project'),
path('projectstatus/<str:project_id>/', views.edit_project_status_modal, name='editprojectstatusmodal'), path('projectstatus/<str:project_id>/', views.edit_project_status_modal, name='editprojectstatusmodal'),
path('task/<str:task_id>/', views.edit_task, name='edittask'), path('task/<str:task_id>/', views.edit_task, name='edittask'),
path('task-status/<str:task_id>/', views.edit_task_status_modal, name='edittaskstatusmodal'), path('task-status/<str:task_id>/', views.edit_task_status_modal, name='edittaskstatusmodal'),

14
osinaweb/osinacore/edit/views.py
Unescape Escape View File

@ -232,6 +232,20 @@ def edit_project_status_modal(request, project_id):
@staff_login_required
def toggle_pin_project(request, project_id):
project = get_object_or_404(Project, id=project_id)
if PinnedProject.objects.filter(user=request.user, project=project):
PinnedProject.objects.filter(user=request.user, project=project).delete()
else:
PinnedProject.objects.create(user=request.user, project=project)
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
@staff_login_required @staff_login_required
def edit_task(request, task_id): def edit_task(request, task_id):
task = get_object_or_404(Task, task_id=task_id) task = get_object_or_404(Task, task_id=task_id)

24
osinaweb/osinacore/migrations/0082_pinnedproject.py
Unescape Escape View File

@ -0,0 +1,24 @@
# Generated by Django 4.2.5 on 2024-05-29 06:37
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('osinacore', '0081_status_task'),
]
operations = [
migrations.CreateModel(
name='PinnedProject',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='osinacore.project')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]

BIN
osinaweb/osinacore/migrations/__pycache__/0082_pinnedproject.cpython-310.pyc
View File

Binary file not shown.

31
osinaweb/osinacore/models.py
Unescape Escape View File

@ -160,6 +160,31 @@ class Project(models.Model):
new_id = str(int(max_id[-4:]) + 1).zfill(4) if max_id else '0001' # If no existing records, start with '0001' new_id = str(int(max_id[-4:]) + 1).zfill(4) if max_id else '0001' # If no existing records, start with '0001'
self.project_id = 'P' + current_year + new_id # Add 'p' prefix self.project_id = 'P' + current_year + new_id # Add 'p' prefix
super(Project, self).save(*args, **kwargs) super(Project, self).save(*args, **kwargs)
def is_pinned(self, user):
return PinnedProject.objects.filter(user=user, project=self).exists()
def total_time_worked(self, user):
total_time_seconds = 0
tasks = self.task_set.all() if user.is_superuser else self.task_set.filter(assigned_to=user.staffprofile)
for task in tasks:
total_time_hours, total_time_minutes, total_time_seconds_task = task.total_task_time()
total_time_seconds += (total_time_hours * 3600) + (total_time_minutes * 60) + total_time_seconds_task
total_time_hours = total_time_seconds // 3600
total_time_minutes = (total_time_seconds % 3600) // 60
total_time_seconds = total_time_seconds % 60
return {
'hours': total_time_hours,
'minutes': total_time_minutes,
'seconds': total_time_seconds
}
def open_tasks_count(self, user):
if user.is_superuser:
return Task.objects.filter(project=self).exclude(status='Closed').count()
else:
return Task.objects.filter(project=self, assigned_to=user.staffprofile).exclude(status='Closed').count()
class ProjectStatus(models.Model): class ProjectStatus(models.Model):
@ -175,6 +200,12 @@ class ProjectStatus(models.Model):
class PinnedProject(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
project = models.ForeignKey(Project, on_delete=models.CASCADE)
class Milestone(models.Model): class Milestone(models.Model):
title = models.CharField(max_length=150) title = models.CharField(max_length=150)
description = models.TextField() description = models.TextField()

56
osinaweb/osinacore/templates/details_templates/project-details.html
Unescape Escape View File

@ -21,32 +21,36 @@
{% endfor %} {% endfor %}
</div> </div>
<div class="absolute top-3 right-3 cursor-pointer" id="pinProject"> <a href="{% url 'toggle_pin_project' project.id %}">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 s:w-7 h-6 s:h-7 text-white" {% if not is_pinned %}
color="#000000" fill="none"> <div class="absolute top-3 right-3 cursor-pointer" id="pinProject">
<path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 s:w-7 h-6 s:h-7 text-white"
stroke-linejoin="round" /> color="#000000" fill="none">
<path <path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
d="M13.2585 18.8714C9.51516 18.0215 5.97844 14.4848 5.12853 10.7415C4.99399 10.1489 4.92672 9.85266 5.12161 9.37197C5.3165 8.89129 5.55457 8.74255 6.03071 8.44509C7.10705 7.77265 8.27254 7.55888 9.48209 7.66586C11.1793 7.81598 12.0279 7.89104 12.4512 7.67048C12.8746 7.44991 13.1622 6.93417 13.7376 5.90269L14.4664 4.59604C14.9465 3.73528 15.1866 3.3049 15.7513 3.10202C16.316 2.89913 16.6558 3.02199 17.3355 3.26771C18.9249 3.84236 20.1576 5.07505 20.7323 6.66449C20.978 7.34417 21.1009 7.68401 20.898 8.2487C20.6951 8.8134 20.2647 9.05346 19.4039 9.53358L18.0672 10.2792C17.0376 10.8534 16.5229 11.1406 16.3024 11.568C16.0819 11.9955 16.162 12.8256 16.3221 14.4859C16.4399 15.7068 16.2369 16.88 15.5555 17.9697C15.2577 18.4458 15.1088 18.6839 14.6283 18.8786C14.1477 19.0733 13.8513 19.006 13.2585 18.8714Z" stroke-linejoin="round" />
stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" /> <path
</svg> d="M13.2585 18.8714C9.51516 18.0215 5.97844 14.4848 5.12853 10.7415C4.99399 10.1489 4.92672 9.85266 5.12161 9.37197C5.3165 8.89129 5.55457 8.74255 6.03071 8.44509C7.10705 7.77265 8.27254 7.55888 9.48209 7.66586C11.1793 7.81598 12.0279 7.89104 12.4512 7.67048C12.8746 7.44991 13.1622 6.93417 13.7376 5.90269L14.4664 4.59604C14.9465 3.73528 15.1866 3.3049 15.7513 3.10202C16.316 2.89913 16.6558 3.02199 17.3355 3.26771C18.9249 3.84236 20.1576 5.07505 20.7323 6.66449C20.978 7.34417 21.1009 7.68401 20.898 8.2487C20.6951 8.8134 20.2647 9.05346 19.4039 9.53358L18.0672 10.2792C17.0376 10.8534 16.5229 11.1406 16.3024 11.568C16.0819 11.9955 16.162 12.8256 16.3221 14.4859C16.4399 15.7068 16.2369 16.88 15.5555 17.9697C15.2577 18.4458 15.1088 18.6839 14.6283 18.8786C14.1477 19.0733 13.8513 19.006 13.2585 18.8714Z"
</div> stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
</svg>
<div class="absolute top-3 right-3 cursor-pointer hidden" id="unpinProject"> </div>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 s:w-7 h-6 s:h-7 text-white" {% else %}
color="#000000" fill="none"> <div class="absolute top-3 right-3 cursor-pointer" id="unpinProject">
<path <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 s:w-7 h-6 s:h-7 text-white"
d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5" color="#000000" fill="none">
stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" /> <path
<path d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5"
d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" /> <path
<path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
stroke-linejoin="round" /> stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
<path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" <path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" /> stroke-linejoin="round" />
</svg> <path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
</div> stroke-linejoin="round" />
</svg>
</div>
{% endif %}
</a>
</div> </div>

248
osinaweb/osinacore/templates/index.html
Unescape Escape View File

@ -5,191 +5,107 @@
<!-- LEFT SIDE --> <!-- LEFT SIDE -->
<div class="w-full xxlg1:w-[75%] flex flex-col gap-5"> <div class="w-full xxlg1:w-[75%] flex flex-col gap-5">
<!-- PINNED PROJECTS --> <!-- PINNED PROJECTS -->
<div class="w-full grid grid-cols-1 md:grid-cols-2 gap-5"> {% if pinned_projects_with_time %}
<div class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer"> <div class="w-full grid grid-cols-1 md:grid-cols-2 gap-5">
<div class="w-full bg-white h-fit rounded-md border border-gray-200">
<div
class="w-full px-5 pt-4 pb-1 bg-orange-500 flex flex-col gap-1 justify-center items-center text-center text-white rounded-t-md text-[17px] s:text-[20px] bg-opacity-70 relative">
<p>hallo</p>
<div class="w-full flex justify-between items-center gap-3 text-white text-[12px] opacity-80">
<p>20-2-24</p>
<p>20-2-24</p>
</div>
<div class="absolute top-3 right-3 cursor-pointer z-20" id="unpinProject"> {% for pinned in pinned_projects_with_time %}
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white" <a href="{% url 'detailed-project' pinned.project.project_id %}">
color="#000000" fill="none"> <div class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer">
<path <div class="w-full bg-white h-fit rounded-md border border-gray-200">
d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5" <div
stroke="currentColor" stroke-width="1.5" stroke-linecap="round" class="w-full px-5 pt-4 pb-1 flex flex-col gap-1 justify-center items-center text-center text-white rounded-t-md text-[17px] s:text-[20px] bg-opacity-70 relative
stroke-linejoin="round" /> {% if pinned.project.projectstatus_set.all.last.status == 'Completed' %}bg-green-700{% endif %}
<path {% if pinned.project.projectstatus_set.all.last.status == 'Cancelled' %}bg-red-500{% endif %}
d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12" {% if pinned.project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %}
stroke="currentColor" stroke-width="1.5" stroke-linecap="round" {% if pinned.project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %}">
stroke-linejoin="round" /> <p>{{pinned.project.name}}</p>
<path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" /> <div class="w-full flex justify-between items-center gap-3 text-white text-[12px] opacity-80">
<path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" <p>{{ pinned.project.start_date|date:'d-m-Y' }}</p>
stroke-linejoin="round" /> <p>{{ pinned.project.end_date|date:'d-m-Y' }}</p>
</svg> </div>
</div>
</div>
<!-- Progress Bar --> <div class="absolute top-3 right-3 cursor-pointer z-20" id="unpinProject">
<div class="w-full h-[8px] bg-gray-100 mainBar"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white"
<div class="h-full progressBar"> color="#000000" fill="none">
</div> <path
</div> d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5"
stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
<path
d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
</svg>
</div>
<div class="w-full flex flex-col justify-between">
<!-- Details -->
<div class="w-full flex flex-col gap-3 p-5">
<div class="w-full flex justify-start items-center gap-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6 text-secondosiblue">
<path stroke-linecap="round" stroke-linejoin="round"
d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
</svg>
<p class="text-secondosiblue"><span
class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open
{% if project.open_user_tasks_count == 1 %} Task {% else %} Tasks {% endif %}</p>
</div> </div>
<div class="w-full flex justify-start items-center gap-2"> <!-- Progress Bar -->
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" <div class="w-full h-[8px] bg-gray-100 mainBar">
class="w-6 h-6 text-secondosiblue" color="#000000" fill="none"> <div class="h-full progressBar">
<path </div>
d="M2.46433 9.34375C2.21579 9.34375 1.98899 9.14229 2.00041 8.87895C2.06733 7.33687 2.25481 6.33298 2.78008 5.53884C3.08228 5.08196 3.45765 4.68459 3.88923 4.36468C5.05575 3.5 6.70139 3.5 9.99266 3.5H14.0074C17.2986 3.5 18.9443 3.5 20.1108 4.36468C20.5424 4.68459 20.9177 5.08196 21.2199 5.53884C21.7452 6.33289 21.9327 7.33665 21.9996 8.87843C22.011 9.14208 21.7839 9.34375 21.5351 9.34375C20.1493 9.34375 19.0259 10.533 19.0259 12C19.0259 13.467 20.1493 14.6562 21.5351 14.6562C21.7839 14.6562 22.011 14.8579 21.9996 15.1216C21.9327 16.6634 21.7452 17.6671 21.2199 18.4612C20.9177 18.918 20.5424 19.3154 20.1108 19.6353C18.9443 20.5 17.2986 20.5 14.0074 20.5H9.99266C6.70139 20.5 5.05575 20.5 3.88923 19.6353C3.45765 19.3154 3.08228 18.918 2.78008 18.4612C2.25481 17.667 2.06733 16.6631 2.00041 15.1211C1.98899 14.8577 2.21579 14.6562 2.46433 14.6562C3.85012 14.6562 4.97352 13.467 4.97352 12C4.97352 10.533 3.85012 9.34375 2.46433 9.34375Z"
stroke="currentColor" stroke-width="1.5" stroke-linejoin="round" />
<path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
</svg>
<p class="text-secondosiblue"><span
class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open
{% if project.open_user_tasks_count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
</div> </div>
<div class="w-full flex flex-col justify-between">
<!-- Details -->
<div class="w-full flex flex-col gap-3 p-5">
<div class="w-full flex justify-start items-center gap-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6 text-secondosiblue">
<path stroke-linecap="round" stroke-linejoin="round"
d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
</svg>
<p class="text-secondosiblue"><span
class="font-poppinsBold">{{pinned.open_tasks}}</span> Open
{% if pinned.project.open_tasks == 1 %} Task {% else %} Tasks {% endif %}</p>
</div>
<div class="w-full flex justify-start items-center gap-2"> <div class="w-full flex justify-start items-center gap-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
stroke="currentColor" class="w-6 h-6 text-secondosiblue"> class="w-6 h-6 text-secondosiblue" color="#000000" fill="none">
<path stroke-linecap="round" stroke-linejoin="round" <path
d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" /> d="M2.46433 9.34375C2.21579 9.34375 1.98899 9.14229 2.00041 8.87895C2.06733 7.33687 2.25481 6.33298 2.78008 5.53884C3.08228 5.08196 3.45765 4.68459 3.88923 4.36468C5.05575 3.5 6.70139 3.5 9.99266 3.5H14.0074C17.2986 3.5 18.9443 3.5 20.1108 4.36468C20.5424 4.68459 20.9177 5.08196 21.2199 5.53884C21.7452 6.33289 21.9327 7.33665 21.9996 8.87843C22.011 9.14208 21.7839 9.34375 21.5351 9.34375C20.1493 9.34375 19.0259 10.533 19.0259 12C19.0259 13.467 20.1493 14.6562 21.5351 14.6562C21.7839 14.6562 22.011 14.8579 21.9996 15.1216C21.9327 16.6634 21.7452 17.6671 21.2199 18.4612C20.9177 18.918 20.5424 19.3154 20.1108 19.6353C18.9443 20.5 17.2986 20.5 14.0074 20.5H9.99266C6.70139 20.5 5.05575 20.5 3.88923 19.6353C3.45765 19.3154 3.08228 18.918 2.78008 18.4612C2.25481 17.667 2.06733 16.6631 2.00041 15.1211C1.98899 14.8577 2.21579 14.6562 2.46433 14.6562C3.85012 14.6562 4.97352 13.467 4.97352 12C4.97352 10.533 3.85012 9.34375 2.46433 9.34375Z"
</svg> stroke="currentColor" stroke-width="1.5" stroke-linejoin="round" />
<path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
</svg>
<p class="text-secondosiblue"><span
class="font-poppinsBold">{{pinned.project.ticket_set.all.count}}</span> Open
{% if pinned.project.ticket_set.all.count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
</div>
<p class="text-secondosiblue">Total Time: <span
class="font-poppinsBold">{{project.total_time_worked_hours}}hr
{{project.total_time_worked_minutes}}min
{{project.total_time_worked_seconds}}sec</span>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer"> <div class="w-full flex justify-start items-center gap-2">
<div class="w-full bg-white h-fit rounded-md border border-gray-200"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
<div stroke="currentColor" class="w-6 h-6 text-secondosiblue">
class="w-full px-5 pt-4 pb-1 bg-yellow-500 flex flex-col gap-1 justify-center items-center text-center text-white rounded-t-md text-[17px] s:text-[20px] bg-opacity-70 hover:bg-opacity-100 duration-300 relative"> <path stroke-linecap="round" stroke-linejoin="round"
<p>hallo</p> d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
</svg>
<div class="w-full flex justify-between items-center gap-3 text-white text-[12px] opacity-80">
<p>20-2-24</p>
<p>20-2-24</p>
</div>
<div class="absolute top-3 right-3 cursor-pointer hidden" id="pinProject">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white"
color="#000000" fill="none">
<path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
<path
d="M13.2585 18.8714C9.51516 18.0215 5.97844 14.4848 5.12853 10.7415C4.99399 10.1489 4.92672 9.85266 5.12161 9.37197C5.3165 8.89129 5.55457 8.74255 6.03071 8.44509C7.10705 7.77265 8.27254 7.55888 9.48209 7.66586C11.1793 7.81598 12.0279 7.89104 12.4512 7.67048C12.8746 7.44991 13.1622 6.93417 13.7376 5.90269L14.4664 4.59604C14.9465 3.73528 15.1866 3.3049 15.7513 3.10202C16.316 2.89913 16.6558 3.02199 17.3355 3.26771C18.9249 3.84236 20.1576 5.07505 20.7323 6.66449C20.978 7.34417 21.1009 7.68401 20.898 8.2487C20.6951 8.8134 20.2647 9.05346 19.4039 9.53358L18.0672 10.2792C17.0376 10.8534 16.5229 11.1406 16.3024 11.568C16.0819 11.9955 16.162 12.8256 16.3221 14.4859C16.4399 15.7068 16.2369 16.88 15.5555 17.9697C15.2577 18.4458 15.1088 18.6839 14.6283 18.8786C14.1477 19.0733 13.8513 19.006 13.2585 18.8714Z"
stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
</svg>
</div>
<div class="absolute top-3 right-3 cursor-pointer z-20" id="unpinProject"> <p class="text-secondosiblue">Total Time: <span
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white" class="font-poppinsBold">{{pinned.total_time_worked.hours}}hr
color="#000000" fill="none"> {{pinned.total_time_worked.minutes}}min
<path {{pinned.total_time_worked.seconds}}sec</span>
d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5" </p>
stroke="currentColor" stroke-width="1.5" stroke-linecap="round" </div>
stroke-linejoin="round" />
<path
d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
<path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
</svg>
</div>
</div>
<!-- Progress Bar --> </div>
<div class="w-full h-[8px] bg-gray-100 mainBar"> </div>
<div class="h-full progressBar">
</div> </div>
</div> </div>
</a>
{% endfor %}
<div class="w-full flex flex-col justify-between">
<!-- Details -->
<div class="w-full flex flex-col gap-3 p-5">
<div class="w-full flex justify-start items-center gap-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6 text-secondosiblue">
<path stroke-linecap="round" stroke-linejoin="round"
d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
</svg>
<p class="text-secondosiblue"><span
class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open
{% if project.open_user_tasks_count == 1 %} Task {% else %} Tasks {% endif %}</p>
</div>
<div class="w-full flex justify-start items-center gap-2">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
class="w-6 h-6 text-secondosiblue" color="#000000" fill="none">
<path
d="M2.46433 9.34375C2.21579 9.34375 1.98899 9.14229 2.00041 8.87895C2.06733 7.33687 2.25481 6.33298 2.78008 5.53884C3.08228 5.08196 3.45765 4.68459 3.88923 4.36468C5.05575 3.5 6.70139 3.5 9.99266 3.5H14.0074C17.2986 3.5 18.9443 3.5 20.1108 4.36468C20.5424 4.68459 20.9177 5.08196 21.2199 5.53884C21.7452 6.33289 21.9327 7.33665 21.9996 8.87843C22.011 9.14208 21.7839 9.34375 21.5351 9.34375C20.1493 9.34375 19.0259 10.533 19.0259 12C19.0259 13.467 20.1493 14.6562 21.5351 14.6562C21.7839 14.6562 22.011 14.8579 21.9996 15.1216C21.9327 16.6634 21.7452 17.6671 21.2199 18.4612C20.9177 18.918 20.5424 19.3154 20.1108 19.6353C18.9443 20.5 17.2986 20.5 14.0074 20.5H9.99266C6.70139 20.5 5.05575 20.5 3.88923 19.6353C3.45765 19.3154 3.08228 18.918 2.78008 18.4612C2.25481 17.667 2.06733 16.6631 2.00041 15.1211C1.98899 14.8577 2.21579 14.6562 2.46433 14.6562C3.85012 14.6562 4.97352 13.467 4.97352 12C4.97352 10.533 3.85012 9.34375 2.46433 9.34375Z"
stroke="currentColor" stroke-width="1.5" stroke-linejoin="round" />
<path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
stroke-linejoin="round" />
</svg>
<p class="text-secondosiblue"><span
class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open
{% if project.open_user_tasks_count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
</div>
<div class="w-full flex justify-start items-center gap-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6 text-secondosiblue">
<path stroke-linecap="round" stroke-linejoin="round"
d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
</svg>
<p class="text-secondosiblue">Total Time: <span
class="font-poppinsBold">{{project.total_time_worked_hours}}hr
{{project.total_time_worked_minutes}}min
{{project.total_time_worked_seconds}}sec</span>
</p>
</div>
</div>
</div>
</div>
</div> </div>
</div> {% endif %}
<!-- TICKETS --> <!-- TICKETS -->

2
osinaweb/osinacore/templates/listing_pages/projects.html
Unescape Escape View File

@ -153,7 +153,7 @@
<path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" /> <path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
</svg> </svg>
<p class="text-secondosiblue"><span <p class="text-secondosiblue"><span
class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open {% if project.open_user_tasks_count == 1 %} Ticket {% else %} Tickets {% endif %}</p> class="font-poppinsBold">{{project.ticket_set.all.count}}</span> Open {% if project.ticket_set.all.count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
</div> </div>

13
osinaweb/osinacore/views.py
Unescape Escape View File

@ -181,10 +181,21 @@ def home(request, *args, **kwargs):
else: else:
# Non-superadmin user can only see their assigned tasks # Non-superadmin user can only see their assigned tasks
tasks = Task.objects.filter(Q(assigned_to=request.user.staffprofile) & (Q(status='Open') | Q(status='Working On'))).order_by('-status_date', '-id') tasks = Task.objects.filter(Q(assigned_to=request.user.staffprofile) & (Q(status='Open') | Q(status='Working On'))).order_by('-status_date', '-id')
pinned_projects = PinnedProject.objects.filter(user=request.user).order_by('-id')[:3]
pinned_projects_with_time = []
for pinned_project in pinned_projects:
project = pinned_project.project
total_time_worked = project.total_time_worked(request.user)
open_tasks = project.open_tasks_count(request.user)
pinned_projects_with_time.append({'project': project, 'total_time_worked': total_time_worked, 'open_tasks': open_tasks})
context = { context = {
'notes': notes, 'notes': notes,
'recent_note': recent_note, 'recent_note': recent_note,
'tasks': tasks, 'tasks': tasks,
'pinned_projects_with_time': pinned_projects_with_time,
} }
return render(request, 'index.html', context) return render(request, 'index.html', context)
@ -648,6 +659,7 @@ def timeline_modal(request, task_id):
@staff_login_required @staff_login_required
def projectdetails(request, project_id): def projectdetails(request, project_id):
project = get_object_or_404(Project, project_id=project_id) project = get_object_or_404(Project, project_id=project_id)
is_pinned = project.is_pinned(request.user)
epics = Epic.objects.filter(project=project).order_by('-id') epics = Epic.objects.filter(project=project).order_by('-id')
project_notes = Note.objects.filter(project=project).order_by('-id') project_notes = Note.objects.filter(project=project).order_by('-id')
@ -687,6 +699,7 @@ def projectdetails(request, project_id):
'members': members, 'members': members,
'statuses' : statuses, 'statuses' : statuses,
'all_tickets_ordered': all_tickets_ordered, 'all_tickets_ordered': all_tickets_ordered,
'is_pinned': is_pinned,
} }
return render(request, 'details_templates/project-details.html', context) return render(request, 'details_templates/project-details.html', context)

Write Preview
Loading…
Cancel
Save