bx-865-apps #1

Merged
ksenia_mikhailova merged 140 commits from bx-865-apps into main 2024-06-27 15:03:27 +03:00
4 changed files with 30 additions and 31 deletions
Showing only changes of commit b0f05e8499 - Show all commits

View File

@ -1,5 +1,4 @@
from django.contrib import admin from django.contrib import admin
from .models import Element3D, ClickableArea from .models import Image
admin.site.register(Element3D) admin.site.register(Image)
admin.site.register(ClickableArea)

View File

@ -1,5 +1,4 @@
from django.db import models from django.db import models
import logging import logging
logger = logging.getLogger("root") logger = logging.getLogger("root")
@ -9,6 +8,7 @@ def group_based_upload_to(instance, filename):
return "files/image/{}/{}/{}".format( return "files/image/{}/{}/{}".format(
type(instance).__name__.lower(), instance.id, filename type(instance).__name__.lower(), instance.id, filename
) )
class Image(models.Model): class Image(models.Model):
file = models.ImageField(upload_to=group_based_upload_to) file = models.ImageField(upload_to=group_based_upload_to)
@ -16,22 +16,4 @@ class Image(models.Model):
title = models.CharField(max_length=255) title = models.CharField(max_length=255)
def __str__(self): def __str__(self):
return self.title return self.title
class Element3D(models.Model):
model_file = models.FileField(upload_to=group_based_upload_to)
name = models.CharField(max_length=255)
description = models.TextField()
def __str__(self):
return self.name
class ClickableArea(models.Model):
name = models.CharField(max_length=255)
description = models.TextField()
object_name = models.CharField(max_length=255)
target = models.ForeignKey(Element3D, on_delete=models.CASCADE, related_name='clickable_areas')
def __str__(self):
return self.name

View File

@ -1,5 +1,5 @@
from django.contrib import admin from django.contrib import admin
from .models import object from .models import Element3D, ClickableArea
admin.site.register(object)
admin.site.register(Element3D)
admin.site.register(ClickableArea)

View File

@ -1,9 +1,27 @@
from django.db import models from django.db import models
import logging
class Image(models.Model): logger = logging.getLogger("root")
file = models.ImageField(upload_to='images/')
alt = models.CharField(max_length=255) def group_based_upload_to(instance, filename):
title = models.CharField(max_length=255) logger.info(instance)
return "files/image/{}/{}/{}".format(
type(instance).__name__.lower(), instance.id, filename
)
class Element3D(models.Model):
model_file = models.FileField(upload_to=group_based_upload_to)
name = models.CharField(max_length=255)
description = models.TextField()
def __str__(self): def __str__(self):
return self.title return self.name
class ClickableArea(models.Model):
name = models.CharField(max_length=255)
description = models.TextField()
object_name = models.CharField(max_length=255)
target = models.ForeignKey(Element3D, on_delete=models.CASCADE, related_name='clickable_areas')
def __str__(self):
return self.name