First commit of claude's rework in django + vanillajs fronted
This commit is contained in:
0
apps/calibers/__init__.py
Normal file
0
apps/calibers/__init__.py
Normal file
11
apps/calibers/admin.py
Normal file
11
apps/calibers/admin.py
Normal file
@@ -0,0 +1,11 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import Caliber
|
||||
|
||||
|
||||
@admin.register(Caliber)
|
||||
class CaliberAdmin(admin.ModelAdmin):
|
||||
list_display = ['name', 'short_name', 'status', 'submitted_by']
|
||||
list_filter = ['status']
|
||||
search_fields = ['name', 'short_name']
|
||||
readonly_fields = ['submitted_by', 'reviewed_by', 'reviewed_at', 'created_at', 'updated_at']
|
||||
6
apps/calibers/apps.py
Normal file
6
apps/calibers/apps.py
Normal file
@@ -0,0 +1,6 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class CalibersConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.calibers'
|
||||
60
apps/calibers/migrations/0001_initial.py
Normal file
60
apps/calibers/migrations/0001_initial.py
Normal file
@@ -0,0 +1,60 @@
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Caliber',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=100, unique=True, verbose_name='name')),
|
||||
('short_name', models.CharField(blank=True, max_length=50, verbose_name='short name')),
|
||||
('case_length_mm', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='case length (mm)')),
|
||||
('overall_length_mm', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='overall length (mm)')),
|
||||
('bullet_diameter_mm', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='bullet diameter (mm)')),
|
||||
('case_head_diameter_mm', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='case head diameter (mm)')),
|
||||
('rim_diameter_mm', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='rim diameter (mm)')),
|
||||
('max_pressure_mpa', models.DecimalField(blank=True, decimal_places=1, max_digits=6, null=True, verbose_name='max pressure (MPa)')),
|
||||
('notes', models.TextField(blank=True, verbose_name='notes')),
|
||||
('status', models.CharField(
|
||||
choices=[('PENDING', 'Pending Verification'), ('VERIFIED', 'Verified'), ('REJECTED', 'Rejected')],
|
||||
default='PENDING',
|
||||
max_length=10,
|
||||
verbose_name='status',
|
||||
)),
|
||||
('reviewed_at', models.DateTimeField(blank=True, null=True, verbose_name='reviewed at')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
|
||||
('updated_at', models.DateTimeField(auto_now=True, verbose_name='updated at')),
|
||||
('reviewed_by', models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name='reviewed_calibers',
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name='reviewed by',
|
||||
)),
|
||||
('submitted_by', models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name='submitted_calibers',
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name='submitted by',
|
||||
)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'caliber',
|
||||
'verbose_name_plural': 'calibers',
|
||||
'ordering': ['name'],
|
||||
},
|
||||
),
|
||||
]
|
||||
0
apps/calibers/migrations/__init__.py
Normal file
0
apps/calibers/migrations/__init__.py
Normal file
76
apps/calibers/models.py
Normal file
76
apps/calibers/models.py
Normal file
@@ -0,0 +1,76 @@
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
|
||||
class CaliberStatus(models.TextChoices):
|
||||
PENDING = 'PENDING', _('Pending Verification')
|
||||
VERIFIED = 'VERIFIED', _('Verified')
|
||||
REJECTED = 'REJECTED', _('Rejected')
|
||||
|
||||
|
||||
class Caliber(models.Model):
|
||||
name = models.CharField(_('name'), max_length=100, unique=True)
|
||||
short_name = models.CharField(_('short name'), max_length=50, blank=True)
|
||||
|
||||
# CIP standard dimensions
|
||||
case_length_mm = models.DecimalField(
|
||||
_('case length (mm)'), max_digits=5, decimal_places=2, null=True, blank=True
|
||||
)
|
||||
overall_length_mm = models.DecimalField(
|
||||
_('overall length (mm)'), max_digits=5, decimal_places=2, null=True, blank=True
|
||||
)
|
||||
bullet_diameter_mm = models.DecimalField(
|
||||
_('bullet diameter (mm)'), max_digits=5, decimal_places=2, null=True, blank=True
|
||||
)
|
||||
case_head_diameter_mm = models.DecimalField(
|
||||
_('case head diameter (mm)'), max_digits=5, decimal_places=2, null=True, blank=True
|
||||
)
|
||||
rim_diameter_mm = models.DecimalField(
|
||||
_('rim diameter (mm)'), max_digits=5, decimal_places=2, null=True, blank=True
|
||||
)
|
||||
max_pressure_mpa = models.DecimalField(
|
||||
_('max pressure (MPa)'), max_digits=6, decimal_places=1, null=True, blank=True
|
||||
)
|
||||
notes = models.TextField(_('notes'), blank=True)
|
||||
|
||||
# Moderation
|
||||
status = models.CharField(
|
||||
_('status'), max_length=10, choices=CaliberStatus.choices, default=CaliberStatus.PENDING
|
||||
)
|
||||
submitted_by = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, null=True, blank=True,
|
||||
on_delete=models.SET_NULL, related_name='submitted_calibers',
|
||||
verbose_name=_('submitted by'),
|
||||
)
|
||||
reviewed_by = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, null=True, blank=True,
|
||||
on_delete=models.SET_NULL, related_name='reviewed_calibers',
|
||||
verbose_name=_('reviewed by'),
|
||||
)
|
||||
reviewed_at = models.DateTimeField(_('reviewed at'), null=True, blank=True)
|
||||
created_at = models.DateTimeField(_('created at'), auto_now_add=True)
|
||||
updated_at = models.DateTimeField(_('updated at'), auto_now=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _('caliber')
|
||||
verbose_name_plural = _('calibers')
|
||||
ordering = ['name']
|
||||
|
||||
def __str__(self):
|
||||
if self.short_name:
|
||||
return f"{self.name} ({self.short_name})"
|
||||
return self.name
|
||||
|
||||
def verify(self, reviewed_by):
|
||||
self.status = CaliberStatus.VERIFIED
|
||||
self.reviewed_by = reviewed_by
|
||||
self.reviewed_at = timezone.now()
|
||||
self.save(update_fields=['status', 'reviewed_by', 'reviewed_at'])
|
||||
|
||||
def reject(self, reviewed_by):
|
||||
self.status = CaliberStatus.REJECTED
|
||||
self.reviewed_by = reviewed_by
|
||||
self.reviewed_at = timezone.now()
|
||||
self.save(update_fields=['status', 'reviewed_by', 'reviewed_at'])
|
||||
23
apps/calibers/serializers.py
Normal file
23
apps/calibers/serializers.py
Normal file
@@ -0,0 +1,23 @@
|
||||
from rest_framework import serializers
|
||||
|
||||
from .models import Caliber
|
||||
|
||||
|
||||
class CaliberSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Caliber
|
||||
fields = [
|
||||
'id', 'name', 'short_name',
|
||||
'case_length_mm', 'overall_length_mm', 'bullet_diameter_mm',
|
||||
'case_head_diameter_mm', 'rim_diameter_mm', 'max_pressure_mpa',
|
||||
'notes',
|
||||
'status', 'submitted_by', 'reviewed_by', 'reviewed_at',
|
||||
'created_at', 'updated_at',
|
||||
]
|
||||
read_only_fields = ['status', 'submitted_by', 'reviewed_by', 'reviewed_at', 'created_at', 'updated_at']
|
||||
|
||||
|
||||
class CaliberListSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Caliber
|
||||
fields = ['id', 'name', 'short_name', 'status', 'max_pressure_mpa']
|
||||
8
apps/calibers/urls.py
Normal file
8
apps/calibers/urls.py
Normal file
@@ -0,0 +1,8 @@
|
||||
from rest_framework.routers import DefaultRouter
|
||||
|
||||
from .views import CaliberViewSet
|
||||
|
||||
router = DefaultRouter()
|
||||
router.register(r'calibers', CaliberViewSet, basename='caliber')
|
||||
|
||||
urlpatterns = router.urls
|
||||
50
apps/calibers/views.py
Normal file
50
apps/calibers/views.py
Normal file
@@ -0,0 +1,50 @@
|
||||
from django.db.models import Q
|
||||
from rest_framework import viewsets
|
||||
from rest_framework.decorators import action
|
||||
from rest_framework.permissions import AllowAny, IsAdminUser, IsAuthenticated
|
||||
from rest_framework.response import Response
|
||||
|
||||
from .models import Caliber, CaliberStatus
|
||||
from .serializers import CaliberListSerializer, CaliberSerializer
|
||||
|
||||
|
||||
class CaliberViewSet(viewsets.ModelViewSet):
|
||||
queryset = Caliber.objects.select_related('submitted_by', 'reviewed_by')
|
||||
serializer_class = CaliberSerializer
|
||||
filterset_fields = ['status']
|
||||
search_fields = ['name', 'short_name']
|
||||
|
||||
def get_permissions(self):
|
||||
if self.action in ('list', 'retrieve'):
|
||||
return [AllowAny()]
|
||||
if self.action in ('update', 'partial_update', 'destroy'):
|
||||
return [IsAdminUser()]
|
||||
return [IsAuthenticated()]
|
||||
|
||||
def get_queryset(self):
|
||||
qs = super().get_queryset()
|
||||
user = self.request.user
|
||||
if user.is_authenticated:
|
||||
return qs.filter(
|
||||
Q(status=CaliberStatus.VERIFIED) |
|
||||
Q(status=CaliberStatus.PENDING, submitted_by=user)
|
||||
)
|
||||
return qs.filter(status=CaliberStatus.VERIFIED)
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(
|
||||
status=CaliberStatus.PENDING,
|
||||
submitted_by=self.request.user,
|
||||
)
|
||||
|
||||
@action(detail=True, methods=['post'], permission_classes=[IsAdminUser])
|
||||
def verify(self, request, pk=None):
|
||||
caliber = self.get_object()
|
||||
caliber.verify(request.user)
|
||||
return Response(self.get_serializer(caliber).data)
|
||||
|
||||
@action(detail=True, methods=['post'], permission_classes=[IsAdminUser])
|
||||
def reject(self, request, pk=None):
|
||||
caliber = self.get_object()
|
||||
caliber.reject(request.user)
|
||||
return Response(self.get_serializer(caliber).data)
|
||||
Reference in New Issue
Block a user