refactor(apps): remove django apps accounts and tickets
Remove unused apps to simplify the project and reduce maintenance burden.
This commit is contained in:
63 files changed
-1556
No files matched your search
Whitespace-only changes.
Whitespace-only changes.
@@ -1,22 +0,0 @@
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.admin import UserAdmin
|
||||
|
||||
from apps.accounts.models import CustomUser, ProjectMembership
|
||||
|
||||
|
||||
@admin.register(CustomUser)
|
||||
class CustomUserAdmin(UserAdmin):
|
||||
list_display = ["username", "email", "role", "is_active"]
|
||||
list_filter = ["role", "is_active"]
|
||||
fieldsets = UserAdmin.fieldsets + (
|
||||
("Role Info", {"fields": ("role",)}),
|
||||
)
|
||||
add_fieldsets = UserAdmin.add_fieldsets + (
|
||||
("Role Info", {"fields": ("role",)}),
|
||||
)
|
||||
|
||||
|
||||
@admin.register(ProjectMembership)
|
||||
class ProjectMembershipAdmin(admin.ModelAdmin):
|
||||
list_display = ["user", "project", "joined_at"]
|
||||
list_filter = ["project"]
|
||||
@@ -1,7 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
|
||||
class AccountsConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.accounts'
|
||||
Whitespace-only changes.
@@ -1,41 +0,0 @@
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.db import models
|
||||
|
||||
|
||||
class CustomUser(AbstractUser):
|
||||
class Role(models.TextChoices):
|
||||
ADMIN = "admin", "Admin"
|
||||
CLIENT = "client", "Client"
|
||||
MEMBER = "member", "Team Member"
|
||||
|
||||
role = models.CharField(max_length=20, choices=Role.choices, default=Role.MEMBER)
|
||||
|
||||
class Meta:
|
||||
ordering = ["username"]
|
||||
verbose_name_plural = "users"
|
||||
|
||||
def is_admin(self):
|
||||
return self.role == self.Role.ADMIN or self.is_superuser
|
||||
|
||||
def is_client(self):
|
||||
return self.role == self.Role.CLIENT
|
||||
|
||||
def is_member(self):
|
||||
return self.role == self.Role.MEMBER
|
||||
|
||||
def get_initials(self):
|
||||
if self.first_name and self.last_name:
|
||||
return f"{self.first_name[0]}{self.last_name[0]}".upper()
|
||||
return self.username[:2].upper()
|
||||
|
||||
|
||||
class ProjectMembership(models.Model):
|
||||
user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name="memberships")
|
||||
project = models.ForeignKey("projects.Project", on_delete=models.CASCADE, related_name="memberships")
|
||||
joined_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
unique_together = ("user", "project")
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.user} -> {self.project}"
|
||||
Whitespace-only changes.
@@ -1,26 +0,0 @@
|
||||
import markdown
|
||||
|
||||
from django import template
|
||||
from django.utils.safestring import mark_safe
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@register.filter(name="add_class")
|
||||
def add_class(value, arg):
|
||||
return value.as_widget(attrs={"class": arg})
|
||||
|
||||
|
||||
@register.filter(name="field_type")
|
||||
def field_type(field):
|
||||
cls = field.field.__class__.__name__
|
||||
if hasattr(field.field, "widget"):
|
||||
return field.field.widget.__class__.__name__
|
||||
return cls
|
||||
|
||||
|
||||
@register.filter(name="render_markdown")
|
||||
def render_markdown(value):
|
||||
if not value:
|
||||
return ""
|
||||
return mark_safe(markdown.markdown(value, extensions=["extra", "codehilite"]))
|
||||
@@ -1,5 +0,0 @@
|
||||
"""generated with djinit"""
|
||||
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -1,25 +0,0 @@
|
||||
from django.contrib.auth.views import LogoutView
|
||||
from django.urls import path
|
||||
|
||||
from apps.accounts.views import (
|
||||
CustomLoginView,
|
||||
ProfileView,
|
||||
RegisterView,
|
||||
UserCreateView,
|
||||
UserDeleteView,
|
||||
UserDetailView,
|
||||
UserListView,
|
||||
UserUpdateView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
path("accounts/login/", CustomLoginView.as_view(), name="login"),
|
||||
path("accounts/logout/", LogoutView.as_view(), name="logout"),
|
||||
path("accounts/register/", RegisterView.as_view(), name="register"),
|
||||
path("accounts/profile/", ProfileView.as_view(), name="profile"),
|
||||
path("accounts/users/", UserListView.as_view(), name="user_list"),
|
||||
path("accounts/users/create/", UserCreateView.as_view(), name="user_create"),
|
||||
path("accounts/users/<int:pk>/", UserDetailView.as_view(), name="user_detail"),
|
||||
path("accounts/users/<int:pk>/edit/", UserUpdateView.as_view(), name="user_edit"),
|
||||
path("accounts/users/<int:pk>/delete/", UserDeleteView.as_view(), name="user_delete"),
|
||||
]
|
||||
@@ -1,70 +0,0 @@
|
||||
from django.contrib.auth import login
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.contrib.auth.views import LoginView
|
||||
from django.shortcuts import redirect
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView
|
||||
|
||||
from apps.accounts.models import CustomUser
|
||||
from apps.core.permissions import AdminRequiredMixin
|
||||
|
||||
|
||||
class CustomLoginView(LoginView):
|
||||
template_name = "pages/accounts/login.html"
|
||||
redirect_authenticated_user = True
|
||||
|
||||
|
||||
class RegisterView(CreateView):
|
||||
model = CustomUser
|
||||
template_name = "pages/accounts/register.html"
|
||||
fields = ["username", "email", "password", "first_name", "last_name"]
|
||||
success_url = reverse_lazy("home")
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.set_password(form.cleaned_data["password"])
|
||||
form.instance.role = CustomUser.Role.CLIENT
|
||||
response = super().form_valid(form)
|
||||
login(self.request, self.object)
|
||||
return response
|
||||
|
||||
|
||||
class ProfileView(LoginRequiredMixin, DetailView):
|
||||
model = CustomUser
|
||||
template_name = "pages/accounts/profile.html"
|
||||
context_object_name = "profile_user"
|
||||
|
||||
def get_object(self):
|
||||
return self.request.user
|
||||
|
||||
|
||||
class UserListView(AdminRequiredMixin, ListView):
|
||||
model = CustomUser
|
||||
template_name = "pages/accounts/user_list.html"
|
||||
context_object_name = "users"
|
||||
paginate_by = 20
|
||||
|
||||
|
||||
class UserDetailView(AdminRequiredMixin, DetailView):
|
||||
model = CustomUser
|
||||
template_name = "pages/accounts/user_detail.html"
|
||||
context_object_name = "profile_user"
|
||||
|
||||
|
||||
class UserCreateView(AdminRequiredMixin, CreateView):
|
||||
model = CustomUser
|
||||
template_name = "pages/accounts/user_form.html"
|
||||
fields = ["username", "email", "role", "first_name", "last_name", "is_active"]
|
||||
success_url = reverse_lazy("user_list")
|
||||
|
||||
|
||||
class UserUpdateView(AdminRequiredMixin, UpdateView):
|
||||
model = CustomUser
|
||||
template_name = "pages/accounts/user_form.html"
|
||||
fields = ["username", "email", "role", "first_name", "last_name", "is_active"]
|
||||
success_url = reverse_lazy("user_list")
|
||||
|
||||
|
||||
class UserDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = CustomUser
|
||||
template_name = "pages/accounts/user_confirm_delete.html"
|
||||
success_url = reverse_lazy("user_list")
|
||||
Whitespace-only changes.
@@ -1,11 +0,0 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from apps.activity.models import ActivityLog
|
||||
|
||||
|
||||
@admin.register(ActivityLog)
|
||||
class ActivityLogAdmin(admin.ModelAdmin):
|
||||
list_display = ["actor", "verb", "content_type", "object_id", "timestamp"]
|
||||
list_filter = ["verb", "timestamp"]
|
||||
search_fields = ["actor__username", "verb"]
|
||||
readonly_fields = ["actor", "verb", "content_type", "object_id", "timestamp"]
|
||||
@@ -1,7 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
|
||||
class ActivityConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.activity'
|
||||
Whitespace-only changes.
@@ -1,24 +0,0 @@
|
||||
from django.contrib.contenttypes.fields import GenericForeignKey
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.db import models
|
||||
|
||||
|
||||
class ActivityLog(models.Model):
|
||||
actor = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="activities",
|
||||
)
|
||||
verb = models.CharField(max_length=255)
|
||||
description = models.TextField(blank=True)
|
||||
content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
|
||||
object_id = models.PositiveIntegerField()
|
||||
content_object = GenericForeignKey("content_type", "object_id")
|
||||
timestamp = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name_plural = "activity logs"
|
||||
ordering = ["-timestamp"]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.actor} {self.verb} {self.content_type} #{self.object_id}"
|
||||
@@ -1,5 +0,0 @@
|
||||
"""generated with djinit"""
|
||||
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -1,7 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from apps.activity.views import ActivityLogListView
|
||||
|
||||
urlpatterns = [
|
||||
path("activity/", ActivityLogListView.as_view(), name="activity_list"),
|
||||
]
|
||||
@@ -1,12 +0,0 @@
|
||||
from django.views.generic import ListView
|
||||
|
||||
from apps.activity.models import ActivityLog
|
||||
from apps.core.permissions import AdminRequiredMixin
|
||||
|
||||
|
||||
class ActivityLogListView(AdminRequiredMixin, ListView):
|
||||
model = ActivityLog
|
||||
template_name = "pages/activity/activity_list.html"
|
||||
context_object_name = "activities"
|
||||
paginate_by = 50
|
||||
ordering = ["-timestamp"]
|
||||
Whitespace-only changes.
@@ -1,42 +0,0 @@
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.shortcuts import get_object_or_404
|
||||
|
||||
from apps.projects.models import Project
|
||||
|
||||
|
||||
class AdminRequiredMixin(LoginRequiredMixin, UserPassesTestMixin):
|
||||
def test_func(self):
|
||||
return self.request.user.is_admin()
|
||||
|
||||
|
||||
class ClientOrAdminMixin(LoginRequiredMixin, UserPassesTestMixin):
|
||||
def test_func(self):
|
||||
user = self.request.user
|
||||
return user.is_admin() or user.is_client()
|
||||
|
||||
|
||||
class ProjectMemberMixin(LoginRequiredMixin, UserPassesTestMixin):
|
||||
def test_func(self):
|
||||
pk = self.kwargs.get("pk") or self.kwargs.get("project_pk")
|
||||
if not pk:
|
||||
return False
|
||||
project = get_object_or_404(Project, pk=pk)
|
||||
return project.members.filter(pk=self.request.user.pk).exists()
|
||||
|
||||
|
||||
class ProjectMemberRequired:
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
project = get_object_or_404(Project, pk=kwargs.get("pk"))
|
||||
if not project.members.filter(pk=request.user.pk).exists():
|
||||
raise PermissionDenied
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
|
||||
|
||||
def project_membership_required(view_func):
|
||||
def wrapper(request, *args, **kwargs):
|
||||
project = get_object_or_404(Project, pk=kwargs.get("pk"))
|
||||
if not project.members.filter(pk=request.user.pk).exists():
|
||||
raise PermissionDenied
|
||||
return view_func(request, *args, **kwargs)
|
||||
return wrapper
|
||||
Whitespace-only changes.
@@ -1,31 +0,0 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from apps.finance.models import Expense, Invoice, Payment, TeamPayment
|
||||
|
||||
|
||||
class PaymentInline(admin.TabularInline):
|
||||
model = Payment
|
||||
extra = 1
|
||||
|
||||
|
||||
@admin.register(Invoice)
|
||||
class InvoiceAdmin(admin.ModelAdmin):
|
||||
list_display = ["id", "project", "client", "amount", "due_date", "status"]
|
||||
list_filter = ["status"]
|
||||
inlines = [PaymentInline]
|
||||
|
||||
|
||||
@admin.register(Payment)
|
||||
class PaymentAdmin(admin.ModelAdmin):
|
||||
list_display = ["invoice", "amount", "method", "paid_at"]
|
||||
|
||||
|
||||
@admin.register(Expense)
|
||||
class ExpenseAdmin(admin.ModelAdmin):
|
||||
list_display = ["project", "category", "amount", "raised_by", "date"]
|
||||
list_filter = ["category"]
|
||||
|
||||
|
||||
@admin.register(TeamPayment)
|
||||
class TeamPaymentAdmin(admin.ModelAdmin):
|
||||
list_display = ["member", "period", "amount", "paid_at"]
|
||||
@@ -1,7 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
|
||||
class FinanceConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.finance'
|
||||
Whitespace-only changes.
@@ -1,65 +0,0 @@
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Invoice(models.Model):
|
||||
class Status(models.TextChoices):
|
||||
PENDING = "pending"
|
||||
PAID = "paid"
|
||||
OVERDUE = "overdue"
|
||||
|
||||
project = models.ForeignKey("projects.Project", on_delete=models.CASCADE, related_name="invoices")
|
||||
client = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE, related_name="invoices")
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
due_date = models.DateField()
|
||||
status = models.CharField(max_length=20, choices=Status.choices, default=Status.PENDING)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-created_at"]
|
||||
|
||||
def __str__(self):
|
||||
return f"Invoice #{self.id} - {self.amount}"
|
||||
|
||||
|
||||
class Payment(models.Model):
|
||||
invoice = models.ForeignKey(Invoice, on_delete=models.CASCADE, related_name="payments")
|
||||
paid_at = models.DateTimeField()
|
||||
method = models.CharField(max_length=100)
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
reference = models.CharField(max_length=255, blank=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-paid_at"]
|
||||
|
||||
def __str__(self):
|
||||
return f"Payment {self.method} for Invoice #{self.invoice_id}"
|
||||
|
||||
|
||||
class Expense(models.Model):
|
||||
project = models.ForeignKey("projects.Project", on_delete=models.CASCADE, related_name="expenses")
|
||||
raised_by = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE, related_name="expenses")
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
category = models.CharField(max_length=100)
|
||||
description = models.TextField(blank=True)
|
||||
date = models.DateField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-date"]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.category} - {self.amount}"
|
||||
|
||||
|
||||
class TeamPayment(models.Model):
|
||||
member = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE, related_name="team_payments")
|
||||
period = models.DateField()
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
paid_at = models.DateTimeField(null=True, blank=True)
|
||||
notes = models.TextField(blank=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-period"]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.member} - {self.period} - {self.amount}"
|
||||
@@ -1,5 +0,0 @@
|
||||
"""generated with djinit"""
|
||||
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -1,35 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from apps.finance.views import (
|
||||
ExpenseCreateView,
|
||||
ExpenseDeleteView,
|
||||
ExpenseListView,
|
||||
InvoiceCreateView,
|
||||
InvoiceDeleteView,
|
||||
InvoiceDetailView,
|
||||
InvoiceListView,
|
||||
InvoiceUpdateView,
|
||||
PaymentCreateView,
|
||||
PaymentDeleteView,
|
||||
PaymentListView,
|
||||
TeamPaymentCreateView,
|
||||
TeamPaymentDeleteView,
|
||||
TeamPaymentListView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
path("finance/invoices/", InvoiceListView.as_view(), name="invoice_list"),
|
||||
path("finance/invoices/create/", InvoiceCreateView.as_view(), name="invoice_create"),
|
||||
path("finance/invoices/<int:pk>/", InvoiceDetailView.as_view(), name="invoice_detail"),
|
||||
path("finance/invoices/<int:pk>/edit/", InvoiceUpdateView.as_view(), name="invoice_edit"),
|
||||
path("finance/invoices/<int:pk>/delete/", InvoiceDeleteView.as_view(), name="invoice_delete"),
|
||||
path("finance/payments/", PaymentListView.as_view(), name="payment_list"),
|
||||
path("finance/payments/create/", PaymentCreateView.as_view(), name="payment_create"),
|
||||
path("finance/payments/<int:pk>/delete/", PaymentDeleteView.as_view(), name="payment_delete"),
|
||||
path("finance/expenses/", ExpenseListView.as_view(), name="expense_list"),
|
||||
path("finance/expenses/create/", ExpenseCreateView.as_view(), name="expense_create"),
|
||||
path("finance/expenses/<int:pk>/delete/", ExpenseDeleteView.as_view(), name="expense_delete"),
|
||||
path("finance/team-payments/", TeamPaymentListView.as_view(), name="team_payment_list"),
|
||||
path("finance/team-payments/create/", TeamPaymentCreateView.as_view(), name="team_payment_create"),
|
||||
path("finance/team-payments/<int:pk>/delete/", TeamPaymentDeleteView.as_view(), name="team_payment_delete"),
|
||||
]
|
||||
@@ -1,130 +0,0 @@
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView
|
||||
|
||||
from apps.core.permissions import AdminRequiredMixin
|
||||
from apps.finance.models import Expense, Invoice, Payment, TeamPayment
|
||||
|
||||
|
||||
class InvoiceListView(LoginRequiredMixin, ListView):
|
||||
model = Invoice
|
||||
template_name = "pages/finance/invoice_list.html"
|
||||
context_object_name = "invoices"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = Invoice.objects.select_related("project", "client")
|
||||
if user.is_admin():
|
||||
return qs.all()
|
||||
return qs.filter(client=user)
|
||||
|
||||
|
||||
class InvoiceDetailView(LoginRequiredMixin, DetailView):
|
||||
model = Invoice
|
||||
template_name = "pages/finance/invoice_detail.html"
|
||||
context_object_name = "invoice"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["payments"] = self.object.payments.all()
|
||||
return context
|
||||
|
||||
|
||||
class InvoiceCreateView(AdminRequiredMixin, CreateView):
|
||||
model = Invoice
|
||||
template_name = "pages/finance/invoice_form.html"
|
||||
fields = ["project", "client", "amount", "due_date"]
|
||||
success_url = reverse_lazy("invoice_list")
|
||||
|
||||
|
||||
class InvoiceUpdateView(AdminRequiredMixin, UpdateView):
|
||||
model = Invoice
|
||||
template_name = "pages/finance/invoice_form.html"
|
||||
fields = ["project", "client", "amount", "due_date", "status"]
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("invoice_detail", kwargs={"pk": self.object.pk})
|
||||
|
||||
|
||||
class InvoiceDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = Invoice
|
||||
template_name = "pages/finance/invoice_confirm_delete.html"
|
||||
success_url = reverse_lazy("invoice_list")
|
||||
|
||||
|
||||
class PaymentListView(AdminRequiredMixin, ListView):
|
||||
model = Payment
|
||||
template_name = "pages/finance/payment_list.html"
|
||||
context_object_name = "payments"
|
||||
ordering = ["-paid_at"]
|
||||
|
||||
|
||||
class PaymentCreateView(AdminRequiredMixin, CreateView):
|
||||
model = Payment
|
||||
template_name = "pages/finance/payment_form.html"
|
||||
fields = ["invoice", "paid_at", "method", "amount", "reference"]
|
||||
success_url = reverse_lazy("payment_list")
|
||||
|
||||
|
||||
class PaymentDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = Payment
|
||||
template_name = "pages/finance/payment_confirm_delete.html"
|
||||
success_url = reverse_lazy("payment_list")
|
||||
|
||||
|
||||
class ExpenseListView(LoginRequiredMixin, ListView):
|
||||
model = Expense
|
||||
template_name = "pages/finance/expense_list.html"
|
||||
context_object_name = "expenses"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = Expense.objects.select_related("project", "raised_by")
|
||||
if user.is_admin():
|
||||
return qs.all()
|
||||
return qs.filter(raised_by=user)
|
||||
|
||||
|
||||
class ExpenseCreateView(LoginRequiredMixin, CreateView):
|
||||
model = Expense
|
||||
template_name = "pages/finance/expense_form.html"
|
||||
fields = ["project", "amount", "category", "description"]
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.raised_by = self.request.user
|
||||
return super().form_valid(form)
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("expense_list")
|
||||
|
||||
|
||||
class ExpenseDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = Expense
|
||||
template_name = "pages/finance/expense_confirm_delete.html"
|
||||
success_url = reverse_lazy("expense_list")
|
||||
|
||||
|
||||
class TeamPaymentListView(LoginRequiredMixin, ListView):
|
||||
model = TeamPayment
|
||||
template_name = "pages/finance/team_payment_list.html"
|
||||
context_object_name = "payments"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = TeamPayment.objects.select_related("member")
|
||||
if user.is_admin():
|
||||
return qs.all()
|
||||
return qs.filter(member=user)
|
||||
|
||||
|
||||
class TeamPaymentCreateView(AdminRequiredMixin, CreateView):
|
||||
model = TeamPayment
|
||||
template_name = "pages/finance/team_payment_form.html"
|
||||
fields = ["member", "period", "amount"]
|
||||
success_url = reverse_lazy("team_payment_list")
|
||||
|
||||
|
||||
class TeamPaymentDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = TeamPayment
|
||||
template_name = "pages/finance/team_payment_confirm_delete.html"
|
||||
success_url = reverse_lazy("team_payment_list")
|
||||
Whitespace-only changes.
@@ -1,21 +0,0 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from apps.issues.models import Issue, IssueComment
|
||||
|
||||
|
||||
class IssueCommentInline(admin.TabularInline):
|
||||
model = IssueComment
|
||||
extra = 1
|
||||
|
||||
|
||||
@admin.register(Issue)
|
||||
class IssueAdmin(admin.ModelAdmin):
|
||||
list_display = ["title", "project", "status", "priority", "assignee", "created_at"]
|
||||
list_filter = ["status", "priority"]
|
||||
search_fields = ["title"]
|
||||
inlines = [IssueCommentInline]
|
||||
|
||||
|
||||
@admin.register(IssueComment)
|
||||
class IssueCommentAdmin(admin.ModelAdmin):
|
||||
list_display = ["issue", "author", "created_at"]
|
||||
@@ -1,7 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
|
||||
class IssuesConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.issues'
|
||||
Whitespace-only changes.
@@ -1,57 +0,0 @@
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Issue(models.Model):
|
||||
class Status(models.TextChoices):
|
||||
OPEN = "open"
|
||||
IN_PROGRESS = "in_progress"
|
||||
RESOLVED = "resolved"
|
||||
CLOSED = "closed"
|
||||
|
||||
class Priority(models.TextChoices):
|
||||
LOW = "low"
|
||||
MEDIUM = "medium"
|
||||
HIGH = "high"
|
||||
|
||||
project = models.ForeignKey(
|
||||
"projects.Project",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="issues",
|
||||
)
|
||||
reporter = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="reported_issues",
|
||||
)
|
||||
assignee = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
null=True,
|
||||
blank=True,
|
||||
on_delete=models.SET_NULL,
|
||||
related_name="assigned_issues",
|
||||
)
|
||||
title = models.CharField(max_length=255)
|
||||
description = models.TextField(blank=True)
|
||||
status = models.CharField(max_length=20, choices=Status.choices, default=Status.OPEN)
|
||||
priority = models.CharField(max_length=20, choices=Priority.choices, default=Priority.MEDIUM)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-created_at"]
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
|
||||
class IssueComment(models.Model):
|
||||
issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name="comments")
|
||||
author = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE)
|
||||
body = models.TextField()
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["created_at"]
|
||||
|
||||
def __str__(self):
|
||||
return f"Comment by {self.author} on {self.issue}"
|
||||
@@ -1,5 +0,0 @@
|
||||
"""generated with djinit"""
|
||||
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -1,19 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from apps.issues.views import (
|
||||
IssueCommentCreateView,
|
||||
IssueCreateView,
|
||||
IssueDeleteView,
|
||||
IssueDetailView,
|
||||
IssueListView,
|
||||
IssueUpdateView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
path("issues/", IssueListView.as_view(), name="issue_list"),
|
||||
path("issues/create/", IssueCreateView.as_view(), name="issue_create"),
|
||||
path("issues/<int:pk>/", IssueDetailView.as_view(), name="issue_detail"),
|
||||
path("issues/<int:pk>/edit/", IssueUpdateView.as_view(), name="issue_edit"),
|
||||
path("issues/<int:pk>/delete/", IssueDeleteView.as_view(), name="issue_delete"),
|
||||
path("issues/<int:issue_pk>/comments/", IssueCommentCreateView.as_view(), name="issue_comment"),
|
||||
]
|
||||
@@ -1,83 +0,0 @@
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.db import models
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView, View
|
||||
|
||||
from apps.core.permissions import AdminRequiredMixin
|
||||
from apps.issues.models import Issue, IssueComment
|
||||
|
||||
|
||||
class IssueListView(LoginRequiredMixin, ListView):
|
||||
model = Issue
|
||||
template_name = "pages/issues/issue_list.html"
|
||||
context_object_name = "issues"
|
||||
paginate_by = 20
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = Issue.objects.select_related("project", "assignee", "reporter")
|
||||
if user.is_admin():
|
||||
return qs.all()
|
||||
if user.is_client():
|
||||
return qs.filter(project__client=user)
|
||||
return qs.filter(models.Q(assignee=user) | models.Q(reporter=user))
|
||||
|
||||
|
||||
class IssueDetailView(LoginRequiredMixin, DetailView):
|
||||
model = Issue
|
||||
template_name = "pages/issues/issue_detail.html"
|
||||
context_object_name = "issue"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = Issue.objects.select_related("project", "assignee", "reporter")
|
||||
if user.is_admin():
|
||||
return qs.all()
|
||||
if user.is_client():
|
||||
return qs.filter(project__client=user)
|
||||
return qs.filter(models.Q(assignee=user) | models.Q(reporter=user))
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["comments"] = self.object.comments.select_related("author").all()
|
||||
return context
|
||||
|
||||
|
||||
class IssueCreateView(LoginRequiredMixin, CreateView):
|
||||
model = Issue
|
||||
template_name = "pages/issues/issue_form.html"
|
||||
fields = ["project", "title", "description", "priority", "assignee"]
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.reporter = self.request.user
|
||||
return super().form_valid(form)
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("issue_detail", kwargs={"pk": self.object.pk})
|
||||
|
||||
|
||||
class IssueUpdateView(LoginRequiredMixin, UpdateView):
|
||||
model = Issue
|
||||
template_name = "pages/issues/issue_form.html"
|
||||
fields = ["title", "description", "status", "priority", "assignee"]
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("issue_detail", kwargs={"pk": self.object.pk})
|
||||
|
||||
|
||||
class IssueDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = Issue
|
||||
template_name = "pages/issues/issue_confirm_delete.html"
|
||||
success_url = reverse_lazy("issue_list")
|
||||
|
||||
|
||||
class IssueCommentCreateView(LoginRequiredMixin, View):
|
||||
def post(self, request, issue_pk):
|
||||
issue = get_object_or_404(Issue, pk=issue_pk)
|
||||
body = request.POST.get("body", "")
|
||||
if body:
|
||||
IssueComment.objects.create(issue=issue, author=request.user, body=body)
|
||||
if request.htmx:
|
||||
return render(request, "partials/issues/comment_list.html", {"comments": issue.comments.all()})
|
||||
return render(request, "pages/issues/issue_detail.html", {"issue": issue, "comments": issue.comments.all()})
|
||||
Whitespace-only changes.
@@ -1,30 +0,0 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from apps.kanban.models import Board, Card, Column
|
||||
|
||||
|
||||
class ColumnInline(admin.TabularInline):
|
||||
model = Column
|
||||
extra = 1
|
||||
|
||||
|
||||
class CardInline(admin.TabularInline):
|
||||
model = Card
|
||||
extra = 1
|
||||
|
||||
|
||||
@admin.register(Board)
|
||||
class BoardAdmin(admin.ModelAdmin):
|
||||
list_display = ["name", "owner", "project"]
|
||||
inlines = [ColumnInline]
|
||||
|
||||
|
||||
@admin.register(Column)
|
||||
class ColumnAdmin(admin.ModelAdmin):
|
||||
list_display = ["name", "board", "order"]
|
||||
inlines = [CardInline]
|
||||
|
||||
|
||||
@admin.register(Card)
|
||||
class CardAdmin(admin.ModelAdmin):
|
||||
list_display = ["title", "column", "due_date", "order"]
|
||||
@@ -1,9 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class KanbanConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "apps.kanban"
|
||||
|
||||
def ready(self):
|
||||
import apps.kanban.signals # noqa
|
||||
@@ -1,16 +0,0 @@
|
||||
from django import forms
|
||||
from .models import Card
|
||||
|
||||
|
||||
class CardForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Card
|
||||
fields = [
|
||||
"title", "description", "priority", "assignee",
|
||||
"start_date", "end_date", "due_date", "deadline_notification",
|
||||
]
|
||||
widgets = {
|
||||
"start_date": forms.DateInput(attrs={"type": "date"}),
|
||||
"end_date": forms.DateInput(attrs={"type": "date"}),
|
||||
"due_date": forms.DateInput(attrs={"type": "date"}),
|
||||
}
|
||||
Whitespace-only changes.
@@ -1,100 +0,0 @@
|
||||
from django.db import models
|
||||
|
||||
|
||||
class BoardQuerySet(models.QuerySet):
|
||||
def for_user(self, user):
|
||||
return self.filter(owner=user)
|
||||
|
||||
|
||||
class Board(models.Model):
|
||||
owner = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="boards",
|
||||
)
|
||||
project = models.ForeignKey(
|
||||
"projects.Project",
|
||||
null=True,
|
||||
blank=True,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="boards",
|
||||
)
|
||||
name = models.CharField(max_length=255, default="My Board")
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
objects = BoardQuerySet.as_manager()
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name} ({self.owner})"
|
||||
|
||||
|
||||
class Column(models.Model):
|
||||
board = models.ForeignKey(Board, on_delete=models.CASCADE, related_name="columns")
|
||||
name = models.CharField(max_length=100)
|
||||
order = models.PositiveIntegerField(default=0)
|
||||
|
||||
class Meta:
|
||||
ordering = ["order"]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name}"
|
||||
|
||||
|
||||
class Card(models.Model):
|
||||
class Priority(models.TextChoices):
|
||||
LOW = "low", "Low"
|
||||
MEDIUM = "medium", "Medium"
|
||||
HIGH = "high", "High"
|
||||
URGENT = "urgent", "Urgent"
|
||||
|
||||
column = models.ForeignKey(Column, on_delete=models.CASCADE, related_name="cards")
|
||||
title = models.CharField(max_length=255)
|
||||
description = models.TextField(blank=True)
|
||||
priority = models.CharField(
|
||||
max_length=10, choices=Priority.choices, default=Priority.MEDIUM
|
||||
)
|
||||
assignee = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
null=True,
|
||||
blank=True,
|
||||
on_delete=models.SET_NULL,
|
||||
related_name="assigned_cards",
|
||||
)
|
||||
start_date = models.DateField(null=True, blank=True)
|
||||
end_date = models.DateField(null=True, blank=True)
|
||||
due_date = models.DateField(null=True, blank=True)
|
||||
deadline_notification = models.BooleanField(default=False)
|
||||
order = models.PositiveIntegerField(default=0)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["order"]
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
|
||||
class CardComment(models.Model):
|
||||
card = models.ForeignKey(Card, on_delete=models.CASCADE, related_name="comments")
|
||||
author = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="card_comments",
|
||||
)
|
||||
body = models.TextField()
|
||||
parent = models.ForeignKey(
|
||||
"self",
|
||||
null=True,
|
||||
blank=True,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="replies",
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["created_at"]
|
||||
|
||||
def __str__(self):
|
||||
return f"Comment by {self.author} on {self.card}"
|
||||
@@ -1,13 +0,0 @@
|
||||
from django.db.models.signals import post_save
|
||||
from django.dispatch import receiver
|
||||
|
||||
from apps.kanban.models import Board, Column
|
||||
|
||||
DEFAULT_COLUMNS = ["To Do", "In Progress", "Done"]
|
||||
|
||||
|
||||
@receiver(post_save, sender=Board)
|
||||
def create_default_columns(sender, instance, created, **kwargs):
|
||||
if created:
|
||||
for i, name in enumerate(DEFAULT_COLUMNS):
|
||||
Column.objects.create(board=instance, name=name, order=i)
|
||||
@@ -1,5 +0,0 @@
|
||||
"""generated with djinit"""
|
||||
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -1,31 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from apps.kanban.views import (
|
||||
BoardCreateView,
|
||||
BoardDeleteView,
|
||||
BoardDetailView,
|
||||
BoardListView,
|
||||
BoardUpdateView,
|
||||
CardCommentCreateView,
|
||||
CardCreateView,
|
||||
CardDeleteView,
|
||||
CardDetailView,
|
||||
CardMoveView,
|
||||
CardUpdateView,
|
||||
ColumnCreateView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
path("boards/", BoardListView.as_view(), name="board_list"),
|
||||
path("boards/create/", BoardCreateView.as_view(), name="board_create"),
|
||||
path("boards/<int:pk>/", BoardDetailView.as_view(), name="board_detail"),
|
||||
path("boards/<int:pk>/edit/", BoardUpdateView.as_view(), name="board_edit"),
|
||||
path("boards/<int:pk>/delete/", BoardDeleteView.as_view(), name="board_delete"),
|
||||
path("boards/<int:board_pk>/columns/create/", ColumnCreateView.as_view(), name="column_create"),
|
||||
path("boards/<int:board_pk>/columns/<int:column_pk>/cards/create/", CardCreateView.as_view(), name="card_create"),
|
||||
path("cards/<int:pk>/", CardDetailView.as_view(), name="card_detail"),
|
||||
path("cards/<int:pk>/edit/", CardUpdateView.as_view(), name="card_edit"),
|
||||
path("cards/<int:pk>/delete/", CardDeleteView.as_view(), name="card_delete"),
|
||||
path("cards/<int:pk>/move/", CardMoveView.as_view(), name="card_move"),
|
||||
path("cards/<int:pk>/comment/", CardCommentCreateView.as_view(), name="card_comment"),
|
||||
]
|
||||
@@ -1,217 +0,0 @@
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.db import models
|
||||
from django.http import HttpResponse, HttpResponseRedirect
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView, View
|
||||
|
||||
from apps.core.permissions import AdminRequiredMixin
|
||||
from apps.kanban.forms import CardForm
|
||||
from apps.kanban.models import Board, Card, CardComment, Column
|
||||
|
||||
|
||||
class BoardListView(LoginRequiredMixin, ListView):
|
||||
model = Board
|
||||
template_name = "pages/kanban/board_list.html"
|
||||
context_object_name = "boards"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
if user.is_admin():
|
||||
return Board.objects.all()
|
||||
return Board.objects.for_user(user)
|
||||
|
||||
|
||||
class BoardDetailView(LoginRequiredMixin, DetailView):
|
||||
model = Board
|
||||
template_name = "pages/kanban/board_detail.html"
|
||||
context_object_name = "board"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
if user.is_admin():
|
||||
return Board.objects.all()
|
||||
return Board.objects.for_user(user)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["columns"] = self.object.columns.prefetch_related("cards").all()
|
||||
context["users"] = self.get_users()
|
||||
return context
|
||||
|
||||
def get_users(self):
|
||||
from apps.accounts.models import CustomUser
|
||||
return CustomUser.objects.filter(is_active=True)
|
||||
|
||||
|
||||
class BoardCreateView(LoginRequiredMixin, CreateView):
|
||||
model = Board
|
||||
template_name = "pages/kanban/board_form.html"
|
||||
fields = ["name", "project"]
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.owner = self.request.user
|
||||
return super().form_valid(form)
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("board_detail", kwargs={"pk": self.object.pk})
|
||||
|
||||
|
||||
class BoardUpdateView(LoginRequiredMixin, UpdateView):
|
||||
model = Board
|
||||
template_name = "pages/kanban/board_form.html"
|
||||
fields = ["name", "project"]
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("board_detail", kwargs={"pk": self.object.pk})
|
||||
|
||||
|
||||
class BoardDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = Board
|
||||
template_name = "pages/kanban/board_confirm_delete.html"
|
||||
success_url = reverse_lazy("board_list")
|
||||
|
||||
|
||||
class ColumnCreateView(LoginRequiredMixin, CreateView):
|
||||
model = Column
|
||||
fields = ["name"]
|
||||
|
||||
def form_valid(self, form):
|
||||
board = get_object_or_404(Board, pk=self.kwargs["board_pk"])
|
||||
form.instance.board = board
|
||||
form.instance.order = board.columns.count()
|
||||
return super().form_valid(form)
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("board_detail", kwargs={"pk": self.kwargs["board_pk"]})
|
||||
|
||||
|
||||
class CardCreateView(LoginRequiredMixin, CreateView):
|
||||
model = Card
|
||||
form_class = CardForm
|
||||
template_name = "pages/kanban/card_form.html"
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
self.board = get_object_or_404(Board, pk=self.kwargs["board_pk"])
|
||||
self.column = get_object_or_404(Column, pk=self.kwargs["column_pk"])
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.column = self.column
|
||||
form.instance.order = self.column.cards.count()
|
||||
return super().form_valid(form)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["board"] = self.board
|
||||
context["column"] = self.column
|
||||
context["is_create"] = True
|
||||
return context
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("board_detail", kwargs={"pk": self.board.pk})
|
||||
|
||||
|
||||
class CardDetailView(LoginRequiredMixin, DetailView):
|
||||
model = Card
|
||||
template_name = "pages/kanban/card_detail.html"
|
||||
context_object_name = "card"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["comments"] = self.object.comments.filter(parent=None).prefetch_related("replies__author", "author")
|
||||
return context
|
||||
|
||||
|
||||
class CardUpdateView(LoginRequiredMixin, UpdateView):
|
||||
model = Card
|
||||
form_class = CardForm
|
||||
template_name = "pages/kanban/card_form.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["board"] = self.object.column.board
|
||||
context["column"] = self.object.column
|
||||
context["is_create"] = False
|
||||
context["comments"] = self.object.comments.filter(parent=None).prefetch_related("replies__author", "author")
|
||||
return context
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("board_detail", kwargs={"pk": self.object.column.board.pk})
|
||||
|
||||
|
||||
class CardDeleteView(LoginRequiredMixin, View):
|
||||
def post(self, request, pk):
|
||||
card = get_object_or_404(Card, pk=pk)
|
||||
board_pk = card.column.board.pk
|
||||
card.delete()
|
||||
if request.htmx:
|
||||
return HttpResponse(status=200)
|
||||
return HttpResponseRedirect(reverse("board_detail", kwargs={"pk": board_pk}))
|
||||
|
||||
|
||||
class CardMoveView(LoginRequiredMixin, View):
|
||||
def post(self, request, pk):
|
||||
card = get_object_or_404(Card, pk=pk)
|
||||
column_id = request.POST.get("column_id")
|
||||
new_order = request.POST.get("order")
|
||||
new_order = int(new_order) if new_order else None
|
||||
|
||||
old_column_id = card.column_id
|
||||
|
||||
if column_id and str(column_id) != str(old_column_id):
|
||||
new_column_id = int(column_id)
|
||||
old_column = card.column
|
||||
|
||||
old_column.cards.filter(order__gt=card.order).update(
|
||||
order=models.F("order") - 1
|
||||
)
|
||||
|
||||
Card.objects.filter(column_id=new_column_id, order__gte=new_order).exclude(
|
||||
pk=card.pk
|
||||
).update(order=models.F("order") + 1)
|
||||
|
||||
card.column_id = new_column_id
|
||||
elif new_order is not None:
|
||||
current_order = card.order
|
||||
if new_order > current_order:
|
||||
Card.objects.filter(
|
||||
column=card.column,
|
||||
order__gt=current_order,
|
||||
order__lte=new_order,
|
||||
).exclude(pk=card.pk).update(order=models.F("order") - 1)
|
||||
elif new_order < current_order:
|
||||
Card.objects.filter(
|
||||
column=card.column,
|
||||
order__gte=new_order,
|
||||
order__lt=current_order,
|
||||
).exclude(pk=card.pk).update(order=models.F("order") + 1)
|
||||
|
||||
if new_order is not None:
|
||||
card.order = new_order
|
||||
card.save()
|
||||
|
||||
return render(request, "partials/kanban/card.html", {"card": card})
|
||||
|
||||
|
||||
class CardCommentCreateView(LoginRequiredMixin, View):
|
||||
def post(self, request, pk):
|
||||
card = get_object_or_404(Card, pk=pk)
|
||||
body = request.POST.get("body", "").strip()
|
||||
parent_pk = request.POST.get("parent")
|
||||
if not body:
|
||||
return HttpResponse(status=400)
|
||||
|
||||
comment = CardComment.objects.create(
|
||||
card=card,
|
||||
author=request.user,
|
||||
body=body,
|
||||
parent_id=parent_pk if parent_pk else None,
|
||||
)
|
||||
|
||||
if request.htmx:
|
||||
return render(request, "partials/kanban/comment.html", {"comment": comment})
|
||||
|
||||
return HttpResponseRedirect(
|
||||
reverse("card_detail", kwargs={"pk": card.pk})
|
||||
)
|
||||
Whitespace-only changes.
@@ -1,10 +0,0 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from apps.projects.models import Project
|
||||
|
||||
|
||||
@admin.register(Project)
|
||||
class ProjectAdmin(admin.ModelAdmin):
|
||||
list_display = ["name", "client", "status", "created_at"]
|
||||
list_filter = ["status"]
|
||||
search_fields = ["name"]
|
||||
@@ -1,7 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
|
||||
class ProjectsConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.projects'
|
||||
Whitespace-only changes.
@@ -1,34 +0,0 @@
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Project(models.Model):
|
||||
class Status(models.TextChoices):
|
||||
PLANNING = "planning"
|
||||
ACTIVE = "active"
|
||||
REVIEW = "review"
|
||||
DONE = "done"
|
||||
|
||||
name = models.CharField(max_length=255)
|
||||
client = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="client_projects",
|
||||
)
|
||||
status = models.CharField(
|
||||
max_length=20,
|
||||
choices=Status.choices,
|
||||
default=Status.PLANNING,
|
||||
)
|
||||
members = models.ManyToManyField(
|
||||
"accounts.CustomUser",
|
||||
through="accounts.ProjectMembership",
|
||||
related_name="projects",
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-updated_at"]
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
@@ -1,5 +0,0 @@
|
||||
"""generated with djinit"""
|
||||
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -1,19 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from apps.projects.views import (
|
||||
DashboardView,
|
||||
ProjectCreateView,
|
||||
ProjectDeleteView,
|
||||
ProjectDetailView,
|
||||
ProjectListView,
|
||||
ProjectUpdateView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
path("", DashboardView.as_view(), name="home"),
|
||||
path("projects/", ProjectListView.as_view(), name="project_list"),
|
||||
path("projects/<int:pk>/", ProjectDetailView.as_view(), name="project_detail"),
|
||||
path("projects/create/", ProjectCreateView.as_view(), name="project_create"),
|
||||
path("projects/<int:pk>/edit/", ProjectUpdateView.as_view(), name="project_edit"),
|
||||
path("projects/<int:pk>/delete/", ProjectDeleteView.as_view(), name="project_delete"),
|
||||
]
|
||||
@@ -1,97 +0,0 @@
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.db.models import Count
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import CreateView, DeleteView, DetailView, ListView, TemplateView, UpdateView
|
||||
|
||||
from apps.core.permissions import AdminRequiredMixin
|
||||
from apps.issues.models import Issue
|
||||
from apps.projects.models import Project
|
||||
from apps.tickets.models import Ticket
|
||||
|
||||
|
||||
class DashboardView(LoginRequiredMixin, TemplateView):
|
||||
template_name = "pages/dashboard.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
user = self.request.user
|
||||
|
||||
user_projects = Project.objects.filter(members=user)
|
||||
if user.is_admin():
|
||||
user_projects = Project.objects.all()
|
||||
|
||||
context["total_projects"] = user_projects.count()
|
||||
context["active_projects"] = user_projects.filter(status=Project.Status.ACTIVE).count()
|
||||
context["projects"] = user_projects.order_by("-updated_at")[:5]
|
||||
|
||||
issues = Issue.objects.filter(project__in=user_projects)
|
||||
context["total_issues"] = issues.count()
|
||||
context["open_issues"] = issues.filter(status=Issue.Status.OPEN).count()
|
||||
context["recent_issues"] = issues.select_related("project").order_by("-created_at")[:5]
|
||||
|
||||
tickets = Ticket.objects.filter(project__in=user_projects)
|
||||
context["total_tickets"] = tickets.count()
|
||||
context["new_tickets"] = tickets.filter(status=Ticket.Status.NEW).count()
|
||||
context["recent_tickets"] = tickets.select_related("project").order_by("-created_at")[:5]
|
||||
|
||||
return context
|
||||
|
||||
|
||||
class ProjectListView(LoginRequiredMixin, ListView):
|
||||
model = Project
|
||||
template_name = "pages/projects/project_list.html"
|
||||
context_object_name = "projects"
|
||||
paginate_by = 20
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
if user.is_admin():
|
||||
return Project.objects.all()
|
||||
return Project.objects.filter(members=user)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["status_counts"] = (
|
||||
self.get_queryset().values("status").annotate(count=Count("id"))
|
||||
)
|
||||
return context
|
||||
|
||||
|
||||
class ProjectDetailView(LoginRequiredMixin, DetailView):
|
||||
model = Project
|
||||
template_name = "pages/projects/project_detail.html"
|
||||
context_object_name = "project"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
if user.is_admin():
|
||||
return Project.objects.all()
|
||||
return Project.objects.filter(members=user)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
project = self.object
|
||||
context["issues"] = project.issues.select_related("assignee").all()
|
||||
context["open_issues"] = project.issues.filter(status=Issue.Status.OPEN).count()
|
||||
context["tickets"] = project.tickets.all()[:5]
|
||||
return context
|
||||
|
||||
|
||||
class ProjectCreateView(LoginRequiredMixin, CreateView):
|
||||
model = Project
|
||||
template_name = "pages/projects/project_form.html"
|
||||
fields = ["name", "client", "status", "members"]
|
||||
success_url = reverse_lazy("project_list")
|
||||
|
||||
|
||||
class ProjectUpdateView(AdminRequiredMixin, UpdateView):
|
||||
model = Project
|
||||
template_name = "pages/projects/project_form.html"
|
||||
fields = ["name", "client", "status", "members"]
|
||||
success_url = reverse_lazy("project_list")
|
||||
|
||||
|
||||
class ProjectDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = Project
|
||||
template_name = "pages/projects/project_confirm_delete.html"
|
||||
success_url = reverse_lazy("project_list")
|
||||
Whitespace-only changes.
@@ -1,15 +0,0 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from apps.tickets.models import Ticket, TicketComment
|
||||
|
||||
|
||||
@admin.register(Ticket)
|
||||
class TicketAdmin(admin.ModelAdmin):
|
||||
list_display = ["title", "creator", "assignee", "ticket_type", "priority", "status", "project", "created_at"]
|
||||
list_filter = ["ticket_type", "status", "priority"]
|
||||
search_fields = ["title"]
|
||||
|
||||
|
||||
@admin.register(TicketComment)
|
||||
class TicketCommentAdmin(admin.ModelAdmin):
|
||||
list_display = ["ticket", "author", "created_at"]
|
||||
@@ -1,7 +0,0 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
|
||||
class TicketsConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.tickets'
|
||||
Whitespace-only changes.
@@ -1,66 +0,0 @@
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Ticket(models.Model):
|
||||
class TicketType(models.TextChoices):
|
||||
BUG = "bug"
|
||||
FEATURE = "feature_request"
|
||||
SUPPORT = "support"
|
||||
|
||||
class Status(models.TextChoices):
|
||||
NEW = "new"
|
||||
ACKNOWLEDGED = "acknowledged"
|
||||
IN_PROGRESS = "in_progress"
|
||||
DONE = "done"
|
||||
REJECTED = "rejected"
|
||||
|
||||
class Priority(models.TextChoices):
|
||||
LOW = "low"
|
||||
MEDIUM = "medium"
|
||||
HIGH = "high"
|
||||
|
||||
creator = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
on_delete=models.CASCADE,
|
||||
related_name="created_tickets",
|
||||
)
|
||||
project = models.ForeignKey(
|
||||
"projects.Project",
|
||||
null=True,
|
||||
blank=True,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="tickets",
|
||||
)
|
||||
assignee = models.ForeignKey(
|
||||
"accounts.CustomUser",
|
||||
null=True,
|
||||
blank=True,
|
||||
on_delete=models.SET_NULL,
|
||||
related_name="assigned_tickets",
|
||||
)
|
||||
title = models.CharField(max_length=255)
|
||||
description = models.TextField(blank=True)
|
||||
ticket_type = models.CharField(max_length=30, choices=TicketType.choices, default=TicketType.SUPPORT)
|
||||
status = models.CharField(max_length=30, choices=Status.choices, default=Status.NEW)
|
||||
priority = models.CharField(max_length=20, choices=Priority.choices, default=Priority.MEDIUM)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["-created_at"]
|
||||
|
||||
def __str__(self):
|
||||
return f"[{self.ticket_type}] {self.title}"
|
||||
|
||||
|
||||
class TicketComment(models.Model):
|
||||
ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE, related_name="comments")
|
||||
author = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE)
|
||||
body = models.TextField()
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ["created_at"]
|
||||
|
||||
def __str__(self):
|
||||
return f"Comment by {self.author} on {self.ticket}"
|
||||
@@ -1,5 +0,0 @@
|
||||
"""generated with djinit"""
|
||||
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -1,19 +0,0 @@
|
||||
from django.urls import path
|
||||
|
||||
from apps.tickets.views import (
|
||||
TicketCommentCreateView,
|
||||
TicketCreateView,
|
||||
TicketDeleteView,
|
||||
TicketDetailView,
|
||||
TicketListView,
|
||||
TicketUpdateView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
path("tickets/", TicketListView.as_view(), name="ticket_list"),
|
||||
path("tickets/create/", TicketCreateView.as_view(), name="ticket_create"),
|
||||
path("tickets/<int:pk>/", TicketDetailView.as_view(), name="ticket_detail"),
|
||||
path("tickets/<int:pk>/edit/", TicketUpdateView.as_view(), name="ticket_edit"),
|
||||
path("tickets/<int:pk>/delete/", TicketDeleteView.as_view(), name="ticket_delete"),
|
||||
path("tickets/<int:ticket_pk>/comments/", TicketCommentCreateView.as_view(), name="ticket_comment"),
|
||||
]
|
||||
@@ -1,82 +0,0 @@
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView, View
|
||||
|
||||
from apps.core.permissions import AdminRequiredMixin
|
||||
from apps.tickets.models import Ticket, TicketComment
|
||||
|
||||
|
||||
class TicketListView(LoginRequiredMixin, ListView):
|
||||
model = Ticket
|
||||
template_name = "pages/tickets/ticket_list.html"
|
||||
context_object_name = "tickets"
|
||||
paginate_by = 20
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = Ticket.objects.select_related("creator", "project", "assignee")
|
||||
if user.is_admin():
|
||||
return qs.all()
|
||||
if user.is_client():
|
||||
return qs.filter(creator=user)
|
||||
return qs.filter(project__members=user)
|
||||
|
||||
|
||||
class TicketDetailView(LoginRequiredMixin, DetailView):
|
||||
model = Ticket
|
||||
template_name = "pages/tickets/ticket_detail.html"
|
||||
context_object_name = "ticket"
|
||||
|
||||
def get_queryset(self):
|
||||
user = self.request.user
|
||||
qs = Ticket.objects.select_related("creator", "project", "assignee")
|
||||
if user.is_admin():
|
||||
return qs.all()
|
||||
if user.is_client():
|
||||
return qs.filter(creator=user)
|
||||
return qs.filter(project__members=user)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["comments"] = self.object.comments.select_related("author").all()
|
||||
return context
|
||||
|
||||
|
||||
class TicketCreateView(LoginRequiredMixin, CreateView):
|
||||
model = Ticket
|
||||
template_name = "pages/tickets/ticket_form.html"
|
||||
fields = ["project", "title", "description", "ticket_type", "priority", "assignee"]
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.creator = self.request.user
|
||||
return super().form_valid(form)
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("ticket_detail", kwargs={"pk": self.object.pk})
|
||||
|
||||
|
||||
class TicketUpdateView(LoginRequiredMixin, UpdateView):
|
||||
model = Ticket
|
||||
template_name = "pages/tickets/ticket_form.html"
|
||||
fields = ["title", "description", "ticket_type", "status", "priority", "assignee"]
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse_lazy("ticket_detail", kwargs={"pk": self.object.pk})
|
||||
|
||||
|
||||
class TicketDeleteView(AdminRequiredMixin, DeleteView):
|
||||
model = Ticket
|
||||
template_name = "pages/tickets/ticket_confirm_delete.html"
|
||||
success_url = reverse_lazy("ticket_list")
|
||||
|
||||
|
||||
class TicketCommentCreateView(LoginRequiredMixin, View):
|
||||
def post(self, request, ticket_pk):
|
||||
ticket = get_object_or_404(Ticket, pk=ticket_pk)
|
||||
body = request.POST.get("body", "")
|
||||
if body:
|
||||
TicketComment.objects.create(ticket=ticket, author=request.user, body=body)
|
||||
if request.htmx:
|
||||
return render(request, "partials/tickets/comment_list.html", {"comments": ticket.comments.all()})
|
||||
return render(request, "pages/tickets/ticket_detail.html", {"ticket": ticket, "comments": ticket.comments.all()})
|
||||
Reference in new issue
Block a user