+
+ {% include 'content/section.html.j2' with tab=form.tabs.milestones %}
+
+
+
+
+
+ | Name |
+ Completed |
+ Started |
+ Finished |
+
+ {% if milestones %}
+ {% for milestone in milestones %}
+
+ |
+
+ {{ milestone.name }}
+
+ |
+ {{ milestone.percent_completed }} |
+ {{ milestone.start_date }} |
+ {{ milestone.finish_date }} |
+
+ {% endfor %}
+ {% else %}
+ | Nothing Found |
+ {% endif %}
+
+
+
diff --git a/app/project_management/templates/project_management/project_milestone.html.j2 b/app/project_management/templates/project_management/project_milestone.html.j2
new file mode 100644
index 000000000..221bc7e5e
--- /dev/null
+++ b/app/project_management/templates/project_management/project_milestone.html.j2
@@ -0,0 +1,79 @@
+{% extends 'detail.html.j2' %}
+
+{% block additional-stylesheet %}
+ {% load static %}
+
+{% endblock additional-stylesheet %}
+
+{% load json %}
+{% load markdown %}
+
+
+{% block tabs %}
+
+
+
+ {% include 'content/section.html.j2' with tab=form.tabs.details %}
+
+
+
+
+
+ {% include 'content/section.html.j2' with tab=form.tabs.tasks %}
+
+
+
+
+
+
+
+ {% include 'content/section.html.j2' with tab=form.tabs.notes %}
+
+ {{ notes_form }}
+
+
+
+
+
+{% endblock %}
diff --git a/app/project_management/urls.py b/app/project_management/urls.py
index 3fb94dcf0..1288be39c 100644
--- a/app/project_management/urls.py
+++ b/app/project_management/urls.py
@@ -1,6 +1,6 @@
from django.urls import path
-from .views import project
+from .views import project, project_milestones
from core.views import ticket, ticket_comment
@@ -14,6 +14,11 @@
path("project/
/edit", project.Change.as_view(), name="_project_change"),
path("project//delete", project.Delete.as_view(), name="_project_delete"),
+ path('project//milestone/add', project_milestones.Add.as_view(), name="_project_milestone_add"),
+ path('project//milestone//edit', project_milestones.Change.as_view(), name="_project_milestone_change"),
+ path('project//milestone//delete', project_milestones.Delete.as_view(), name="_project_milestone_delete"),
+ path('project//milestone/', project_milestones.View.as_view(), name="_project_milestone_view"),
+
path('project///add', ticket.Add.as_view(), name="_project_task_add"),
path('project////edit', ticket.Change.as_view(), name="_project_task_change"),
path('project////delete', ticket.Delete.as_view(), name="_project_task_delete"),
diff --git a/app/project_management/views/project.py b/app/project_management/views/project.py
index 7b6f5f227..76432e9dc 100644
--- a/app/project_management/views/project.py
+++ b/app/project_management/views/project.py
@@ -13,8 +13,8 @@
from core.models.ticket.ticket import Ticket
from core.views.common import AddView, ChangeView, DeleteView, DisplayView, IndexView
-from project_management.forms.project import ProjectForm, DetailForm
-from project_management.models.projects import Project
+from project_management.forms.project import Project, ProjectForm, DetailForm
+from project_management.models.project_milestone import ProjectMilestone
from settings.models.user_settings import UserSettings
@@ -170,6 +170,8 @@ def get_context_data(self, **kwargs):
# context['notes_form'] = AddNoteForm(prefix='note')
# context['notes'] = Notes.objects.filter(service=self.kwargs['pk'])
+ context['milestones'] = ProjectMilestone.objects.filter(project__id=self.kwargs['pk'])
+
context['project_tasks'] = Ticket.objects.filter(
project = self.object,
)
diff --git a/app/project_management/views/project_milestones.py b/app/project_management/views/project_milestones.py
new file mode 100644
index 000000000..af37e6333
--- /dev/null
+++ b/app/project_management/views/project_milestones.py
@@ -0,0 +1,182 @@
+import json
+
+from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.core.paginator import Paginator
+from django.db.models import Q
+from django.urls import reverse
+from django.views import generic
+
+from access.mixin import OrganizationPermission
+
+from core.forms.comment import AddNoteForm
+from core.models.notes import Notes
+from core.models.ticket.ticket import Ticket
+from core.views.common import AddView, ChangeView, DeleteView, DisplayView, IndexView
+
+from project_management.forms.project_milestone import DetailForm, ProjectMilestone, ProjectMilestoneForm
+
+from settings.models.user_settings import UserSettings
+
+
+
+class Add(AddView):
+
+ form_class = ProjectMilestoneForm
+
+ model = ProjectMilestone
+
+ permission_required = [
+ 'project_management.add_projectmilestone',
+ ]
+
+ template_name = 'form.html.j2'
+
+
+ def get_initial(self):
+ initial = super().get_initial()
+
+ initial.update({
+ 'project': self.kwargs['project_id']
+ })
+
+ return initial
+
+ def form_valid(self, form):
+ form.instance.is_global = False
+ return super().form_valid(form)
+
+
+ def get_success_url(self, **kwargs):
+
+ return reverse('Project Management:_project_view', kwargs={'pk': self.kwargs['project_id']}) + '?tab=milestones'
+
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+
+ context['content_title'] = 'Create a Project Milestone'
+
+ return context
+
+
+
+class Change(ChangeView):
+
+ form_class = ProjectMilestoneForm
+
+ model = ProjectMilestone
+
+ permission_required = [
+ 'project_management.change_projectmilestone',
+ ]
+
+ template_name = 'form.html.j2'
+
+
+ def form_valid(self, form):
+ form.instance.is_global = False
+ return super().form_valid(form)
+
+
+ def get_success_url(self, **kwargs):
+
+ return reverse('Project Management:_project_view', kwargs={'pk': self.kwargs['pk']})
+
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+
+ context['content_title'] = 'Edit'
+
+ return context
+
+
+
+class Delete(DeleteView):
+
+ model = ProjectMilestone
+
+ permission_required = [
+ 'project_management.delete_projectmilestone',
+ ]
+
+ template_name = 'form.html.j2'
+
+
+ def get_success_url(self, **kwargs):
+
+ return reverse('Project Management:_project_view', kwargs={'pk': self.kwargs['project_id']}) + '?tab=milestones'
+
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+
+ context['content_title'] = 'Delete ' + self.object.name
+
+ return context
+
+
+
+class View(ChangeView):
+
+ model = ProjectMilestone
+
+ permission_required = [
+ 'project_management.view_projectmilestone'
+ ]
+
+ template_name = 'project_management/project_milestone.html.j2'
+
+ form_class = DetailForm
+
+ context_object_name = "project"
+
+
+ def get_initial(self):
+ initial = super().get_initial()
+
+ initial.update({
+ 'project': self.kwargs['project_id']
+ })
+
+ return initial
+
+
+ def get_context_data(self, **kwargs):
+
+ context = super().get_context_data(**kwargs)
+
+ context['tasks'] = Ticket.objects.filter(
+ project = self.object.project,
+ milestone = self.kwargs['pk'],
+ )
+
+ context['model_docs_path'] = self.model._meta.app_label + '/' + self.model._meta.model_name + '/'
+
+ context['model_pk'] = self.kwargs['pk']
+ context['model_name'] = self.model._meta.verbose_name.replace(' ', '')
+
+ context['model_delete_url'] = reverse('Project Management:_project_milestone_delete', kwargs={'project_id': self.kwargs['project_id'], 'pk': self.kwargs['pk']})
+
+ context['content_title'] = context['project'].name
+
+ return context
+
+
+ # def post(self, request, *args, **kwargs):
+
+ # project = self.model.objects.get(pk=self.kwargs['pk'])
+
+ # notes = AddNoteForm(request.POST, prefix='note')
+
+ # if notes.is_bound and notes.is_valid() and notes.instance.note != '':
+
+ # if request.user.has_perm('core.add_notes'):
+
+ # notes.instance.organization = device.organization
+ # notes.instance.project = project
+ # notes.instance.usercreated = request.user
+
+ # notes.save()
+
+ # return super().post(request, *args, **kwargs)