diff --git a/helpdesk/admin.py b/helpdesk/admin.py index 04cb41d1b..dfa6121e3 100644 --- a/helpdesk/admin.py +++ b/helpdesk/admin.py @@ -3,6 +3,7 @@ from django.contrib import admin from helpdesk.models import ( FAQ, Attachment, + ClaimRequest, Comment, DepartmentManager, FAQCategory, @@ -18,3 +19,4 @@ admin.site.register(FAQ) admin.site.register(FAQCategory) admin.site.register(Attachment) admin.site.register(DepartmentManager) +admin.site.register(ClaimRequest) diff --git a/helpdesk/forms.py b/helpdesk/forms.py index f898e56b9..b907d86e7 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -27,7 +27,7 @@ from django import forms from django.template.loader import render_to_string from base.forms import ModelForm -from base.methods import is_reportingmanager +from base.methods import filtersubordinatesemployeemodel, is_reportingmanager from base.models import Department, JobPosition from employee.forms import MultipleFileField from employee.models import Employee @@ -121,14 +121,30 @@ class TicketForm(ModelForm): self.fields["attachment"] = MultipleFileField( label="Attachements", required=False ) - self.fields["tags"].choices = list(self.fields["tags"].choices) - self.fields["tags"].choices.append(("create_new_tag", "Create new tag")) - self.fields["ticket_type"].choices = list(self.fields["ticket_type"].choices) request = getattr(horilla_middlewares._thread_locals, "request", None) - if is_reportingmanager(request): + instance = kwargs.get("instance") + if instance: + employee = instance.employee_id + else: + employee = request.user.employee_get + # initialising employee queryset according to the user + self.fields["employee_id"].queryset = filtersubordinatesemployeemodel( + request, Employee.objects.filter(is_active=True), perm="helpdesk.add_ticket" + ) | Employee.objects.filter(employee_user_id=request.user) + self.fields["employee_id"].initial = employee + # appending dynamic create option according to user + if is_reportingmanager(request) or request.user.has_perm( + "helpdesk.add_tickettype" + ): + self.fields["ticket_type"].choices = list( + self.fields["ticket_type"].choices + ) self.fields["ticket_type"].choices.append( ("create_new_ticket_type", "Create new ticket type") ) + if is_reportingmanager(request) or request.user.has_perm("base.add_tags"): + self.fields["tags"].choices = list(self.fields["tags"].choices) + self.fields["tags"].choices.append(("create_new_tag", "Create new tag")) class TicketTagForm(ModelForm): @@ -152,8 +168,10 @@ class TicketTagForm(ModelForm): If an instance is provided, sets the initial value for the form's . """ super().__init__(*args, **kwargs) - self.fields["tags"].choices = list(self.fields["tags"].choices) - self.fields["tags"].choices.append(("create_new_tag", "Create new tag")) + request = getattr(horilla_middlewares._thread_locals, "request", None) + if is_reportingmanager(request) or request.user.has_perm("base.add_tags"): + self.fields["tags"].choices = list(self.fields["tags"].choices) + self.fields["tags"].choices.append(("create_new_tag", "Create new tag")) class TicketRaisedOnForm(ModelForm): @@ -215,3 +233,21 @@ class DepartmentManagerCreateForm(ModelForm): class Meta: model = DepartmentManager fields = ["department", "manager"] + widgets = { + "department": forms.Select( + attrs={ + "onchange": "getDepartmentEmployees($(this))", + } + ), + } + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + if "instance" in kwargs: + department = kwargs["instance"].department + # Get the employees related to this department + employees = department.employeeworkinformation_set.values_list( + "employee_id", flat=True + ) + # Set the manager field queryset to be those employees + self.fields["manager"].queryset = Employee.objects.filter(id__in=employees) diff --git a/helpdesk/methods.py b/helpdesk/methods.py new file mode 100644 index 000000000..e2ac89c9e --- /dev/null +++ b/helpdesk/methods.py @@ -0,0 +1,21 @@ + + +from helpdesk.models import DepartmentManager + + +def is_department_manager(request,ticket): + """ + Method used to find the user is a department manger of given ticket + """ + user_emp = request.user.employee_get + if ticket.assigning_type == "job_position": + job_position = ticket.get_raised_on_object() + department = job_position.department_id + elif ticket.assigning_type == "department": + department = ticket.get_raised_on_object() + else: + return False + return DepartmentManager.objects.filter( + manager = user_emp, + department = department + ).exists() diff --git a/helpdesk/models.py b/helpdesk/models.py index ab9ee2de5..e140f9f3f 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -60,6 +60,14 @@ class DepartmentManager(HorillaModel): Company, null=True, editable=False, on_delete=models.PROTECT ) + class Meta: + unique_together = ("department", "manager") + + def clean(self, *args, **kwargs): + super().clean(*args, **kwargs) + if not self.manager.get_department() == self.department: + raise ValidationError(_(f"This employee is not from {self.department} .")) + class TicketType(HorillaModel): title = models.CharField(max_length=100, unique=True) @@ -107,6 +115,9 @@ class Ticket(HorillaModel): related_company_field="employee_id__employee__work_info__company_id" ) + class Meta: + ordering = ["-created_date"] + def clean(self, *args, **kwargs): super().clean(*args, **kwargs) deadline = self.deadline @@ -144,6 +155,36 @@ class Ticket(HorillaModel): return get_diff(self) +class ClaimRequest(HorillaModel): + ticket_id = models.ForeignKey( + Ticket, + on_delete=models.CASCADE, + null=True, + blank=True, + ) + employee_id = models.ForeignKey( + Employee, + on_delete=models.CASCADE, + null=True, + blank=True, + ) + is_approved = models.BooleanField(default=False) + is_rejected = models.BooleanField(default=False) + + class Meta: + unique_together = ("ticket_id", "employee_id") + + def __str__(self) -> str: + return f"{self.ticket_id}|{self.employee_id}" + + def clean(self, *args, **kwargs): + super().clean(*args, **kwargs) + if not self.ticket_id: + raise ValidationError({"ticket_id": _("This field is required.")}) + if not self.employee_id: + raise ValidationError({"employee_id": _("This field is required.")}) + + class Comment(HorillaModel): comment = models.TextField(null=True, blank=True) ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE, related_name="comment") diff --git a/helpdesk/templates/department_managers/department_managers.html b/helpdesk/templates/department_managers/department_managers.html index 2376d570f..4f015305a 100644 --- a/helpdesk/templates/department_managers/department_managers.html +++ b/helpdesk/templates/department_managers/department_managers.html @@ -64,4 +64,11 @@ + + {% endblock settings %} diff --git a/helpdesk/templates/department_managers/department_managers_form.html b/helpdesk/templates/department_managers/department_managers_form.html index 98642f17d..fd53e18ed 100644 --- a/helpdesk/templates/department_managers/department_managers_form.html +++ b/helpdesk/templates/department_managers/department_managers_form.html @@ -32,7 +32,7 @@ {% else %} hx-post="{% url 'department-manager-create' %}" {% endif %} - hx-target="#deparmentManagersForm" + hx-target="#deparmentManagersModal" hx-encoding="multipart/form-data" class="oh-profile-section" > diff --git a/helpdesk/templates/helpdesk/methods.py b/helpdesk/templates/helpdesk/methods.py new file mode 100644 index 000000000..3d5c4bd6b --- /dev/null +++ b/helpdesk/templates/helpdesk/methods.py @@ -0,0 +1,3 @@ + + +def is_department_manager(request,ticket): diff --git a/helpdesk/templates/helpdesk/ticket/ticket_card.html b/helpdesk/templates/helpdesk/ticket/ticket_card.html index 6bdf0659c..57835569c 100644 --- a/helpdesk/templates/helpdesk/ticket/ticket_card.html +++ b/helpdesk/templates/helpdesk/ticket/ticket_card.html @@ -1,807 +1,971 @@ -{% load static %} {% load i18n %} {% load mathfilters %} +{% load static %} {% load i18n %} {% load mathfilters %} {% load helpdeskfilters %} {% include 'filter_tags.html' %} -
-
- {% if my_tickets %} -
-
- {% for status, label in ticket_status %} -
-
-
- - {{label}} - -
+{% if my_tickets or allocated_tickets or all_tickets %} +
+
+ {% if my_tickets %} +
+
+ {% for status, label in ticket_status %} +
+
+
+ + {{label}} + +
-
- - - - -
-
-
-
- -
- {% for ticket in my_tickets %} {% if ticket.status == status %} - -
- -
-
- {{ticket|truncatechars:15}}
- {{ticket.created_date}} -
-
-
-
- -
+ + +
-
-
-
+
+ +
+ {% for ticket in my_tickets %} {% if ticket.status == status %} + +
+ +
+
+ {{ticket|truncatechars:15}}
+ {{ticket.created_date}} +
+
+ +
+
+ +
+
+
+
+
+
+
+ {% trans "owner" %}
+ + {{ticket.employee_id}} +
+
+ {% if ticket.priority == 'low' %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% elif ticket.priority == 'medium' %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% else %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% endif %} +
+ +
+
+
+
+ {% if ticket.assigned_to.all %} +
{% trans "owner" %}
- - {{ticket.employee_id}} {% trans "Assignees" %} -
-
- {% if ticket.priority == 'low' %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% elif ticket.priority == 'medium' %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% else %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% endif %} -
- + +
+ + {{ticket.assigned_to.all|join:", "}} +
-
+ {% endif %}
- {% if ticket.assigned_to.all %} -
- {% trans "Assignees" %} - -
- - {{ticket.assigned_to.all|join:", "}} - -
-
- {% endif %} + {% endif %} {% endfor %}
- {% endif %} {% endfor %}
+ {% endfor %}
- {% endfor %}
-
- {% else %} - -
- Page not found. 404. -
{% trans "There are no tickets at the moment." %}
-
- - {% endif %} + {% else %} + +
+ +
+ {% trans "No search result found!" %} +
+
+ + {% endif %} -
-
- {% if allocated_tickets %} -
-
- {% for status, label in ticket_status %} +
+
+ {% if allocated_tickets %} +
+
+ {% for status, label in ticket_status %} -
-
-
- - {{label}} - -
+
+
+
+ + {{label}} + +
-
- - - - -
-
-
-
- -
- {% for ticket in allocated_tickets %} {% if ticket.status == status %} - -
- -
-
- {{ticket|truncatechars:15}}
- {{ticket.created_date}} -
-
-
-
-
    - {% if ticket.employee_id == request.user.employee_get or perms.helpdesk.changeticket %} -
  • - {% trans "Edit" %} -
    • - {% endif %} -
  • - {% trans "Archive" %} -
    • - {% if not ticket.assigned_to.all %} -
  • - {% trans "claim" %} -
    • - {% endif %} - {% if ticket.employee_id == request.user.employee_get or perms.helpdesk.deleteticket %} -
  • -
    - {% csrf_token %} - -
    -
    • - {% endif %} -
-
+ + +
-
-
-
+
+ +
+ {% for ticket in allocated_tickets %} {% if ticket.status == status %} + +
+ +
+
+ {{ticket|truncatechars:15}}
+ {{ticket.created_date}} +
+ +
+ +
+
+
    + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} +
  • + {% trans "Claim Requests" %} + +
    • + + {% else %} + + {% if not ticket|calim_request_exists:request.user.employee_get and request.user.employee_get not in ticket.assigned_to.all %} +
  • + {% trans "Claim" %} +
    • + {% else %} + {%if not perms.helpdesk.change_ticket or not request.user.employee_get|is_department_manager:ticket or not perms.helpdesk.delete_ticket %} + {% trans "Can't claim again" %} + {% endif %} + {% endif %} + {% endif %} + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} +
  • + {% trans "Edit" %} +
    • + {% endif %} + {% if perms.helpdesk.delete_ticket or request.user.employee_get|is_department_manager:ticket %} + {% if ticket.is_active %} +
  • + {% trans "Archive" %} +
    • + {% else %} +
  • + {% trans "Un-archive" %} +
    • + {% endif %} + {% endif %} + {% if perms.helpdesk.delete_ticket %} + {% if ticket.status == 'new' %} +
  • +
    + {% csrf_token %} + +
    +
    • + {% endif %} + {% endif %} +
+
+
+
+
+
+
+
+ {% trans "owner" %}
+ + {{ticket.employee_id}} +
+
+ {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} + {% if ticket.priority == 'low' %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% elif ticket.priority == 'medium' %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% else %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% endif %} + {% else %} + {% if ticket.priority == 'low' %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+
+ {% elif ticket.priority == 'medium' %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+
+ {% else %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+
+ {% endif %} + {% endif %} +
+ +
+
+
+
+ {% if ticket.assigned_to.all %} +
{% trans "owner" %}
- - {{ticket.employee_id}} {% trans "Assignees" %} -
-
- {% if ticket.priority == 'low' %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% elif ticket.priority == 'medium' %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% else %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% endif %} -
- + +
+ + {{ticket.assigned_to.all|join:", "}} +
-
+ {% endif %}
- {% if ticket.assigned_to.all %} -
- {% trans "Assignees" %} - -
- - {{ticket.assigned_to.all|join:", "}} - -
-
- {% endif %} + {% endif %} {% endfor %}
- {% endif %} {% endfor %}
+ {% endfor %}
- {% endfor %}
-
- {% else %} - -
- Page not found. 404. -
{% trans "There are no tickets at the moment." %}
-
- - {% endif %} -
-
- {% if all_tickets %} -
-
- {% for status, label in ticket_status %} + {% else %} + +
+ +
+ {% trans "No search result found!" %} +
+
+ + {% endif %} +
+
+ {% if all_tickets %} +
+
+ {% for status, label in ticket_status %} -
-
-
- - {{label}} - -
+
+
+
+ + {{label}} + +
-
- - - + + + +
-
- -
- {% for ticket in all_tickets %} {% if ticket.status == status %}
+ {% for ticket in all_tickets %} {% if ticket.status == status %} -
-
- {{ticket|truncatechars:15}}
- {{ticket.created_date}} -
-
- -
+ +
+
+ {{ticket|truncatechars:15}}
+ {{ticket.created_date}} +
+ {% if perms.helpdesk.change_ticket or perms.helpdesk.delete_ticket or request.user.employee_get|is_department_manager:ticket %} +
- +
    + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} +
  • + {% trans "Edit" %} +
    • + {% endif %} + {% if perms.helpdesk.delete_ticket or request.user.employee_get|is_department_manager:ticket %} + {% if ticket.is_active %} +
  • + {% trans "Archive" %} +
    • + {% else %} +
  • + {% trans "Un-archive" %} +
    • + {% endif %} + {% endif %} + {% if perms.helpdesk.delete_ticket %} + {% if ticket.status == 'new' %} +
  • +
    + {% csrf_token %} + +
    +
    • + {% endif %} + {% endif %} +
+
+
+
+ {% endif %} +
+
+
+
+ {% trans "owner" %}
+ + {{ticket.employee_id}} +
+
+ {% if ticket.priority == 'low' %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% elif ticket.priority == 'medium' %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% else %} +
+ {% csrf_token %} +
+
+ {% for i in "321" %} + + + {% endfor %} +
+ + +
+
+ {% endif %} +
+ +
-
-
-
-
+ {% if ticket.assigned_to.all %} +
{% trans "owner" %}
- - {{ticket.employee_id}} {% trans "Assignees" %} -
-
- {% if ticket.priority == 'low' %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% elif ticket.priority == 'medium' %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% else %} -
- {% csrf_token %} -
-
- {% for i in "321" %} - - - {% endfor %} -
- - -
-
- {% endif %} -
- + +
+ + {{ticket.assigned_to.all|join:", "}} +
-
+ {% endif %}
- {% if ticket.assigned_to.all %} -
- {% trans "Assignees" %} - -
- - {{ticket.assigned_to.all|join:", "}} - -
-
- {% endif %} + {% endif %} {% endfor %}
- {% endif %} {% endfor %}
+ {% endfor %}
- {% endfor %}
-
- {% else %} - -
- Page not found. 404. -
{% trans "There are no tickets at the moment." %}
-
- - {% endif %} + {% else %} + +
+ +
+ {% trans "No search result found!" %} +
+
+ + {% endif %} +
-
+{% else %} +
+
+ +

+ {% trans "There are no tickets at the moment." %} +

+
+
+{% endif %} +
+
+ + +
{% trans "Claim Requests" %}
+ +
+ {% if claim_requests %} +
+
+
+
+
+
+ {% trans "Employee" %} +
+
+ {% trans "Action" %} +
+ +
+
+
+ {% for req in claim_requests %} +
+
+
+
+ +
+ {{req.employee_id}} +
+
+
+
+ {% if not req.is_approved and not req.is_rejected %} + + {% else %} + + {% endif %} + {% if not req.is_rejected %} + + {% else %} + + {% endif %} + +
+
+
+ {% endfor %} +
+
+
+
+ {% else %} +
+
+ +

+ {% trans "There are no claim requests at the moment." %} +

+
+
+ {% endif %} +
\ No newline at end of file diff --git a/helpdesk/templates/helpdesk/ticket/ticket_detail.html b/helpdesk/templates/helpdesk/ticket/ticket_detail.html index a4175f0ac..f5157538a 100644 --- a/helpdesk/templates/helpdesk/ticket/ticket_detail.html +++ b/helpdesk/templates/helpdesk/ticket/ticket_detail.html @@ -1,6 +1,6 @@ {% extends 'index.html' %} {% load static %} {% load i18n %} {% load audit_filters %} -{% load basefilters %} +{% load basefilters %} {% load helpdeskfilters %} @@ -12,10 +12,85 @@ +
{% comment %} {% endcomment %} {% block content %} + +
@@ -29,19 +104,38 @@

{{ticket.title}}

- + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket or request.user.employee_get in ticket.assigned_to.all or request.user.employee_get == ticket.employee_id %} + + + {% else %} + + {% endif %}
@@ -81,15 +175,13 @@
{{item.comment.employee_id}}
{{item.comment.employee_id}} - {% comment %} Private {% endcomment %} +
{{item.comment.date}} @@ -99,43 +191,40 @@ {{item.comment.comment}} - {% if item.comment.comment_attachment.all %} - {% for attachment in item.comment.comment_attachment.all %} -
-
- {% with extension=attachment.file.name|lower|slice:"-4:" %} -
  • - -
    - - -
    -     - - {{ attachment }} - -
    • - {% endwith %} -
    - - {{attachment}} - - +
    +
    + {% if item.comment.comment_attachment.all %} + {% for attachment in item.comment.comment_attachment.all %} + {% with extension=attachment.file.name|lower|slice:"-4:" %} + +
    + + +
    +     + {% endwith %} + {% endfor %} + {% endif %}
    - {% endfor %} - {% endif %} +
    @@ -146,7 +235,7 @@
    {{item.comment.employee_id}}
    @@ -180,32 +269,40 @@
    - {% if item.comment.comment_attachment.all %} - {% for attachment in item.comment.comment_attachment.all %} - {% with extension=attachment.file.name|lower|slice:"-4:" %} -
  • - -
    - - -
    -     - - {{ attachment }} - -
    • - {% endwith %} - {% endfor %} - {% endif %} +
    +
    + {% if item.comment.comment_attachment.all %} + {% for attachment in item.comment.comment_attachment.all %} + {% with extension=attachment.file.name|lower|slice:"-4:" %} + +
    + + +
    +     + {% endwith %} + {% endfor %} + {% endif %} +
    +
    {% endif %} @@ -270,16 +367,6 @@
    {% trans "Ticket Info" %} - {% if not ticket.assigned_to.all and request.user.employee_get != ticket.employee_id %} - - {% trans "Claim" %} - - {% endif %}
      @@ -296,8 +383,23 @@ {{ticket.created_date}}
    • -
      - {% csrf_token %} + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket or request.user.employee_get in ticket.assigned_to.all or request.user.employee_get == ticket.employee_id %} + + {% csrf_token %} +
      + {% trans "Priority" %} : +
      + {% for i in "321" %} + + + {% endfor %} +
      + + +
      +
      + {% else %}
      {% trans "Priority" %} :
      @@ -307,10 +409,7 @@ {% if i == '1' %}title="{% trans 'Low' %}"{% elif i == '2' %}title="{% trans 'Medium' %}"{% else %}title="{% trans 'High' %}"{% endif %}> {% endfor %}
      - - -
      - + {% endif %}
    • {% trans "Last activity:" %} @@ -320,15 +419,20 @@ {% endwith %}
      • - {% comment %}
    • - {% trans "Status:" %} -
      • {% endcomment %}
    {% trans "Tags:" %} + {% if perms.helpdesk.change_ticket or request.user.employee_get == ticket.employee_id or request.user.employee_get|is_department_manager:ticket %}
    {{tag_form.tags}}
    + {% else %} + + {% for tag in ticket.tags.all %} + {{tag}}, + {% endfor %} + + {% endif %}
    @@ -343,15 +447,19 @@
    {% trans "Forward to" %} - {% if perms.helpdesk.changeticket or request.user.employee_get == ticket.employee_id %} - {% trans "Change" %} + {% if perms.helpdesk.change_ticket or request.user.employee_get == ticket.employee_id %} +
    + +
    {% endif %}
    @@ -364,39 +472,47 @@
    {% trans "Assigned to" %} - {% if perms.helpdesk.changeticket %} - {% trans "Change" %} + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} +
    + + + +
    {% endif %}
    - {% for assignee in ticket.assigned_to.all %} -
    -
      -
    • -
      -
      - {{assignee}} -
      -
      - {{assignee}} -
      -
      -
      • -
    +
    +
    +
    + {% for employee in ticket.assigned_to.all %} + + {% endfor %} +
    +
    - {% endfor %}
    @@ -406,13 +522,19 @@
    {% trans "Documents" %}
    -
    - +
    @@ -481,6 +602,31 @@
    + + diff --git a/helpdesk/templates/helpdesk/ticket/ticket_individual_view.html b/helpdesk/templates/helpdesk/ticket/ticket_individual_view.html new file mode 100644 index 000000000..4c8b58d4f --- /dev/null +++ b/helpdesk/templates/helpdesk/ticket/ticket_individual_view.html @@ -0,0 +1,139 @@ +{% load static %} {% load i18n %}{% load helpdeskfilters %} + +
    + + {{ ticket }} + + + +
    +
    + +
    +
    + Mary Magdalene +
    +
    + {{ticket.employee_id.get_full_name}} + + {{ticket.employee_id.employee_work_info.department_id}} / + {{ticket.employee_id.employee_work_info.job_position_id}} +
    +
    +     +
    +
    +
    + {% trans "Ticket type" %} + + {{ticket.ticket_type}} +
    +
    + {% trans "Forward to" %} + {{ticket.get_raised_on}} +
    +
    + +
    +
    + {% trans "Dead line" %} + + {{ticket.deadline}} +
    +
    + {% trans "Priority" %} + +
    + + {% if ticket.priority == 'low' %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    +
    + {% elif ticket.priority == 'medium' %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    +
    + {% else %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    +
    + {% endif %} +
    +
    +
    +
    +
    + {% trans "Description" %} + {{ticket.description}} +
    +
    +
    +
    + {% if ticket|calim_request_exists:request.user.employee_get or request.user.employee_get in ticket.assigned_to.all %} + + + + {% else %} + + + + {% endif %} +
    +
    +
    +
    diff --git a/helpdesk/templates/helpdesk/ticket/ticket_list.html b/helpdesk/templates/helpdesk/ticket/ticket_list.html index d1003abe3..f1aacb796 100644 --- a/helpdesk/templates/helpdesk/ticket/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket/ticket_list.html @@ -1,318 +1,724 @@ {% load i18n %} {% load i18n %} {% load static %} {% include 'filter_tags.html' %} {% load mathfilters %} -
    -
    - {% if my_tickets %} -
    -
    -
    - -
    -
      -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    {% trans "Ticket ID" %}
    -
    {% trans "Title" %}
    -
    {% trans "Owner" %}
    -
    {% trans "Type" %}
    -
    {% trans "Forward to" %}
    -
    {% trans "Assigned to" %}
    -
    {% trans "Status" %}
    -
    {% trans "Priority" %}
    -
    {% trans "Tags" %}
    -
    {% trans "Actions" %}
    +{% load basefilters %} {% load helpdeskfilters %} +{% if my_tickets or allocated_tickets or all_tickets %} +
    +
    + {% if my_tickets %} +
    +
    +
    + +
    +
      +
    -
    -
    - {% for ticket in my_tickets %} -
    -
    +
    +
    +
    + +
    +
    +
    +
    +
    -
    - {% trans "Ticket ID" %}
    +
    {% trans "Title" %}
    +
    {% trans "Owner" %}
    +
    {% trans "Type" %}
    +
    {% trans "Forward to" %}
    +
    {% trans "Assigned to" %}
    +
    {% trans "Status" %}
    +
    {% trans "Priority" %}
    +
    {% trans "Tags" %}
    +
    {% trans "Actions" %}
    +
    +
    +
    + {% for ticket in my_tickets %} +
    +
    - {{ticket.ticket_type.prefix}}{{ ticket.id|stringformat:"03d" }} - - - - - -
    -
    {{ticket.title}}
    -
    {{ticket.employee_id}}
    -
    {{ticket.ticket_type}}
    -
    {{ticket.get_raised_on}}
    -
    {{ticket.assigned_to.all|join:" , "}}
    -
    {{ticket.get_status_display}}
    -
    - {% if ticket.priority == 'low' %} -
    - {% csrf_token %} -
    -
    - {% for i in "321" %} - - - {% endfor %} -
    - - -
    -
    - {% elif ticket.priority == 'medium' %} -
    - {% csrf_token %} -
    -
    - {% for i in "321" %} - - - {% endfor %} -
    - - -
    -
    - {% else %} -
    - {% csrf_token %} -
    -
    - {% for i in "321" %} - - - {% endfor %} -
    - - -
    -
    - {% endif %} -
    - -
    {{ticket.tags.all|join:" , "}}
    -
    -
    -
    +
    +
    + - - - - {% if ticket.is_active %} -
    - {% csrf_token %} - + class="text-{% if ticket.deadline < today %}danger {% elif ticket.deadline == today %}warning {% else %}success{% endif %}" + name="time-sharp" + > + + + +
    +
    {{ticket.title}}
    +
    {{ticket.employee_id}}
    +
    {{ticket.ticket_type}}
    +
    {{ticket.get_raised_on}}
    +
    {{ticket.assigned_to.all|join:" , "}}
    +
    {{ticket.get_status_display}}
    +
    + {% if ticket.priority == 'low' %} + + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    - {% else %} -
    + {% elif ticket.priority == 'medium' %} + {% csrf_token %} - +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    +
    + {% else %} +
    + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    {% endif %} +
    -
    - {% csrf_token %} +
    {{ticket.tags.all|join:" , "}}
    +
    +
    - + + {% if ticket.is_active %} +
    + {% csrf_token %} + +
    + {% else %} +
    + {% csrf_token %} + +
    + {% endif %} + {% if ticket.status == 'new' %} +
    + {% csrf_token %} + +
    + {% else %} + + {% endif %} + +
    -
    - {% endfor %} + {% endfor %} +
    -
    - + - -
    - - {% trans "Page" %} {{ my_tickets.number }} {% trans "of" %} {{ my_tickets.paginator.num_pages }}. - - +
    -
    -
    - {% else %} - -
    - -
    - {% trans "No search result found!" %} -
    -
    - - {% endif %} -
    -
    - {% if allocated_tickets %} + {% else %} + +
    + +
    + {% trans "No search result found!" %} +
    +
    + + {% endif %} +
    +
    + {% if allocated_tickets %} +
    +
    +
    + +
    +
      +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    {% trans "Ticket ID" %}
    +
    {% trans "Title" %}
    +
    {% trans "Owner" %}
    +
    {% trans "Type" %}
    +
    {% trans "Forward to" %}
    +
    {% trans "Assigned to" %}
    +
    {% trans "Status" %}
    +
    {% trans "Priority" %}
    +
    {% trans "Tags" %}
    +
    {% trans "Actions" %}
    +
    +
    +
    + {% for ticket in allocated_tickets %} +
    +
    +
    + +
    +
    +
    + + {{ticket.ticket_type.prefix}}{{ ticket.id|stringformat:"03d" }} + + + + + +
    +
    {{ticket.title}}
    +
    {{ticket.employee_id}}
    +
    {{ticket.ticket_type}}
    +
    {{ticket.get_raised_on}}
    +
    {{ticket.assigned_to.all|join:" , "}}
    +
    {{ticket.get_status_display}}
    +
    + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} + {% if ticket.priority == 'low' %} +
    + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    +
    + {% elif ticket.priority == 'medium' %} +
    + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    +
    + {% else %} +
    + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    +
    + {% endif %} + {% else %} + {% if ticket.priority == 'low' %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    +
    + {% elif ticket.priority == 'medium' %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    +
    + {% else %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    +
    + {% endif %} + {% endif %} +
    +
    {{ticket.tags.all|join:" , "}}
    +
    +
    + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} + + {% else %} + {% if ticket|calim_request_exists:request.user.employee_get or request.user.employee_get in ticket.assigned_to.all %} + + + + {% else %} + + + + {% endif %} + {% endif %} + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} + + {% endif %} + {% if perms.helpdesk.delete_ticket or request.user.employee_get|is_department_manager:ticket %} + {% if ticket.is_active %} +
    + {% csrf_token %} + +
    + {% else %} +
    + {% csrf_token %} + +
    + {% endif %} + {% endif %} + {% if perms.helpdesk.delete_ticket %} + {% if ticket.status == 'new' %} +
    + {% csrf_token %} + +
    + {% else %} + + {% endif %} + {% endif %} +
    +
    +
    + {% endfor %} +
    +
    +
    +
    + + {% trans "Page" %} {{ allocated_tickets.number }} {% trans "of" %} {{ allocated_tickets.paginator.num_pages }}. + + +
    +
    +
    + {% else %} + +
    + +
    + {% trans "No search result found!" %} +
    +
    + + {% endif %} +
    +
    + {% if all_tickets %}
    -
      +
    -
    +
    @@ -322,44 +728,47 @@
    {% trans "Ticket ID" %}
    -
    {% trans "Title" %}
    -
    {% trans "Owner" %}
    -
    {% trans "Type" %}
    -
    {% trans "Forward to" %}
    -
    {% trans "Assigned to" %}
    -
    {% trans "Status" %}
    -
    {% trans "Priority" %}
    -
    {% trans "Tags" %}
    -
    {% trans "Actions" %}
    +
    {% trans "Forward to" %}
    +
    {% trans "Assigned to" %}
    +
    {% trans "Status" %}
    +
    {% trans "Priority" %}
    +
    {% trans "Tags" %}
    + {% if perms.helpdesk.change_ticket or perms.helpdesk.delete_ticket or request.user.employee_get|is_department_manager:ticket %} +
    {% trans "Actions" %}
    + {% endif %} +
    - {% for ticket in allocated_tickets %} -
    + {% for ticket in all_tickets %} +
    @@ -376,118 +785,207 @@
    -
    {{ticket.title}}
    -
    {{ticket.employee_id}}
    -
    {{ticket.ticket_type}}
    -
    {{ticket.get_raised_on}}
    -
    {{ticket.assigned_to.all|join:" , "}}
    -
    {{ticket.get_status_display}}
    -
    - {% if ticket.priority == 'low' %} -
    - {% csrf_token %} +
    {{ticket.title}}
    +
    {{ticket.employee_id}}
    +
    {{ticket.ticket_type}}
    +
    {{ticket.get_raised_on}}
    +
    {{ticket.assigned_to.all|join:" , "}}
    +
    {{ticket.get_status_display}}
    +
    + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} + {% if ticket.priority == 'low' %} + + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    + + {% elif ticket.priority == 'medium' %} +
    + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    +
    + {% else %} +
    + {% csrf_token %} +
    +
    + {% for i in "321" %} + + + {% endfor %} +
    + + +
    +
    + {% endif %} + {% else %} + {% if ticket.priority == 'low' %}
    -
    +
    {% for i in "321" %} {% endfor %}
    - -
    - - {% elif ticket.priority == 'medium' %} -
    - {% csrf_token %} + {% elif ticket.priority == 'medium' %}
    -
    +
    {% for i in "321" %} {% endfor %}
    - -
    - - {% else %} -
    - {% csrf_token %} + {% else %}
    -
    +
    {% for i in "321" %} {% endfor %}
    - -
    - + {% endif %} {% endif %}
    -
    {{ticket.tags.all|join:" , "}}
    -
    -
    - {% if ticket.assigned_to.all or request.user.employee_get == ticket.employee_id %} - {{ticket.tags.all|join:" , "}}
    + {% if perms.helpdesk.change_ticket or perms.helpdesk.delete_ticket or request.user.employee_get|is_department_manager:ticket %} +
    +
    + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} + + {% endif %} + {% if perms.helpdesk.change_ticket or request.user.employee_get|is_department_manager:ticket %} + - {% endif %} - {% if ticket.employee_id == request.user.employee_get or perms.helpdesk.deleteticket %} -
    - {% csrf_token %} - -
    - {% endif %} + + + {% endif %} + {% if perms.helpdesk.delete_ticket or request.user.employee_get|is_department_manager:ticket %} + {% if ticket.is_active %} +
    + {% csrf_token %} + +
    + {% else %} +
    + {% csrf_token %} + +
    + {% endif %} + {% endif %} + {% if perms.helpdesk.delete_ticket %} + {% if ticket.status == 'new' %} +
    + {% csrf_token %} + +
    + {% else %} + + {% endif %} + {% endif %} +
    -
    + {% endif %}
    {% endfor %}
    @@ -495,30 +993,30 @@
    - {% trans "Page" %} {{ allocated_tickets.number }} {% trans "of" %} {{ allocated_tickets.paginator.num_pages }}. + {% trans "Page" %} {{ all_tickets.number }} {% trans "of" %} {{ all_tickets.paginator.num_pages }}.
    - {% else %} - -
    - -
    - {% trans "No search result found!" %} -
    -
    - - {% endif %} -
    -
    - {% if all_tickets %} -
    -
    -
    - -
    -
      -
    -
    + {% else %} + +
    + +
    + {% trans "No search result found!" %} +
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    {% trans "Ticket ID" %}
    -
    {% trans "Title" %}
    -
    {% trans "Owner" %}
    -
    {% trans "Type" %}
    -
    {% trans "Forward to" %}
    -
    {% trans "Assigned to" %}
    -
    {% trans "Status" %}
    -
    {% trans "Priority" %}
    -
    {% trans "Tags" %}
    -
    {% trans "Actions" %}
    -
    -
    -
    - {% for ticket in all_tickets %} -
    -
    -
    - -
    -
    -
    - - {{ticket.ticket_type.prefix}}{{ ticket.id|stringformat:"03d" }} - - - - - -
    -
    {{ticket.title}}
    -
    {{ticket.employee_id}}
    -
    {{ticket.ticket_type}}
    -
    {{ticket.get_raised_on}}
    -
    {{ticket.assigned_to.all|join:" , "}}
    -
    {{ticket.get_status_display}}
    -
    - {% if ticket.priority == 'low' %} -
    - {% csrf_token %} -
    -
    - {% for i in "321" %} - - - {% endfor %} -
    - - -
    -
    - {% elif ticket.priority == 'medium' %} -
    - {% csrf_token %} -
    -
    - {% for i in "321" %} - - - {% endfor %} -
    - - -
    -
    - {% else %} -
    - {% csrf_token %} -
    -
    - {% for i in "321" %} - - - {% endfor %} -
    - - -
    -
    - {% endif %} -
    -
    {{ticket.tags.all|join:" , "}}
    -
    -
    - - - {% if ticket.is_active %} -
    - {% csrf_token %} - -
    - {% else %} -
    - {% csrf_token %} - -
    - {% endif %} -
    - {% csrf_token %} - -
    -
    -
    -
    - {% endfor %} -
    -
    -
    -
    - - {% trans "Page" %} {{ all_tickets.number }} {% trans "of" %} {{ all_tickets.paginator.num_pages }}. - - -
    -
    + + {% endif %}
    - {% else %} - -
    - -
    - {% trans "No search result found!" %} -
    -
    - - {% endif %}
    -
    +{% else %} +
    +
    + +

    + {% trans "There are no tickets at the moment." %} +

    +
    +
    +{% endif %}