update
This commit is contained in:
@ -22,6 +22,7 @@ db = Db(dbname=env("POSTGRES_DBNAME"), user=env("POSTGRES_USER"), password=env("
|
||||
|
||||
|
||||
class RogUser(models.Model):
|
||||
user=models.OneToOneField(User, on_delete=models.CASCADE)
|
||||
email=models.EmailField(_('Email'))
|
||||
phone=models.CharField(_('Phone Number'), max_length=55)
|
||||
first_name=models.CharField(_('First Name'), max_length=255)
|
||||
@ -32,9 +33,9 @@ class RogUser(models.Model):
|
||||
language=models.CharField(_('Language'), max_length=255, default='Japanese')
|
||||
prefecture=models.CharField(_('Prefecture'), max_length=255, blank=True, null=True)
|
||||
sex=models.CharField(_('Sex'), max_length=255, default='unknown', blank=True, null=True)
|
||||
birth_year=models.IntegerField(_('Birth year'), blank=True, null=True)
|
||||
birthyear=models.IntegerField(_('Birth year'), blank=True, null=True)
|
||||
family_structure =models.IntegerField(_('Family Structure'), blank=True, null=True)
|
||||
introducer = models.IntegerField(_('Introducerr'), blank=True, null=True, default=0)
|
||||
introducer = models.ForeignKey(User, related_name='introduced_uesr', on_delete=models.DO_NOTHING)
|
||||
level= models.IntegerField(_('Level'), blank=True, null=True, default=0)
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512)
|
||||
created_at=models.DateTimeField(auto_now_add=True)
|
||||
@ -53,7 +54,7 @@ class SystemSettings(models.Model):
|
||||
last_updated_at=models.DateTimeField(auto_now=True)
|
||||
|
||||
class Location(models.Model):
|
||||
location_id=models.IntegerField(_('Location Name'), blank=True, null=True)
|
||||
location_id=models.IntegerField(_('Location id'), blank=True, null=True)
|
||||
location_name=models.CharField(_('Location Name'), max_length=255)
|
||||
category=models.CharField(_('Category'), max_length=255, blank=True, null=True)
|
||||
zip=models.CharField(_('Zip code'), max_length=12, blank=True, null=True)
|
||||
@ -63,7 +64,15 @@ class Location(models.Model):
|
||||
city= models.CharField(_('City'), max_length=255, blank=True, null=True)
|
||||
photos=models.JSONField(_('Phptos'), blank=True, null=True)
|
||||
videos=models.JSONField(_('Videos'), blank=True, null=True)
|
||||
web_content=models.JSONField(_('Web Content'), blank=True, null=True)
|
||||
webcontents=models.JSONField(_('Web Content'), blank=True, null=True)
|
||||
status=models.CharField(_('Status'),max_length=255, blank=True, null=True)
|
||||
portal=models.CharField(_('Status'), max_length=255,blank=True, null=True)
|
||||
group=models.CharField(_('Status'), max_length=255,blank=True, null=True)
|
||||
phone=models.CharField(_('Status'), max_length=255,blank=True, null=True)
|
||||
fax=models.CharField(_('Status'), max_length=255, blank=True, null=True)
|
||||
email=models.EmailField(_('Email'), max_length=255,blank=True, null=True)
|
||||
facility=models.CharField(_('Status'), max_length=255, blank=True, null=True)
|
||||
remark=models.CharField(_('Status'), max_length=255, blank=True, null=True)
|
||||
tags=models.CharField(_('Tags'), max_length=512, blank=True, null=True)
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512, blank=True, null=True)
|
||||
created_at=models.DateTimeField(auto_now_add=True)
|
||||
@ -75,6 +84,29 @@ class Location(models.Model):
|
||||
return self.location_name
|
||||
|
||||
|
||||
EVENT_STATUS = (
|
||||
("PREPARING", _("Preparing")),
|
||||
("PROMOTION", _("Promotion")),
|
||||
("EVENT", _("Event")),
|
||||
("END", _("End"))
|
||||
)
|
||||
|
||||
|
||||
|
||||
class Event(models.Model):
|
||||
tagname=models.CharField(_('Parameters'), max_length=512, blank=True, null=True)
|
||||
status=models.CharField(max_length=256, choices=EVENT_STATUS)
|
||||
price=models.IntegerField(_('Paid Amount'), default=0)
|
||||
promotion_date=models.DateTimeField(_('Promotion date'), blank=True, null=True)
|
||||
event_start=models.DateTimeField(_('Promotion date'), blank=True, null=True)
|
||||
event_end=models.DateTimeField(_('Promotion date'), blank=True, null=True)
|
||||
remark=models.CharField(max_length=256, blank=True, null=True)
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512, blank=True, null=True)
|
||||
created_at=models.DateTimeField(auto_now_add=True)
|
||||
last_updated_user=models.ForeignKey(User, related_name="event_updated_user", on_delete=models.DO_NOTHING,blank=True, null=True)
|
||||
last_updated_at=models.DateTimeField(auto_now=True)
|
||||
|
||||
|
||||
ROG_STATUS = (
|
||||
("REGISTERED", _("Registered")),
|
||||
("ACCEPTED", _("accepted")),
|
||||
@ -85,11 +117,11 @@ ROG_STATUS = (
|
||||
|
||||
class JoinedEvent(models.Model):
|
||||
user=models.ForeignKey(User, on_delete=models.DO_NOTHING)
|
||||
tag_name=models.CharField(_('Tag Name'), max_length=255, blank=True, null=True)
|
||||
tagname=models.CharField(_('Tag Name'), max_length=255, blank=True, null=True)
|
||||
status=models.CharField(max_length=256, choices=ROG_STATUS)
|
||||
registration_id=models.CharField(_('Registration Id'), max_length=56)
|
||||
registrationid=models.CharField(_('Registration Id'), max_length=56)
|
||||
payment_code=models.CharField(_('Payment Code'), max_length=255)
|
||||
paied_amount=models.IntegerField(_('Paid Amount'), default=0)
|
||||
paid=models.IntegerField(_('Paid Amount'), default=0)
|
||||
remark=models.CharField(_('Remark'), max_length=255, blank=True, null=True)
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512)
|
||||
created_at=models.DateTimeField(auto_now_add=True)
|
||||
@ -97,6 +129,7 @@ class JoinedEvent(models.Model):
|
||||
last_updated_at=models.DateTimeField(auto_now=True)
|
||||
|
||||
|
||||
|
||||
class Favorite(models.Model):
|
||||
user=models.ForeignKey(User, on_delete=models.DO_NOTHING)
|
||||
location=models.ForeignKey(Location, on_delete=models.CASCADE)
|
||||
@ -104,38 +137,48 @@ class Favorite(models.Model):
|
||||
favorite=models.IntegerField(_('Favorite'), default=0)
|
||||
evaluation=models.IntegerField(_('Evaluation'), default=0)
|
||||
number_visit=models.IntegerField(_('Good'), default=0)
|
||||
last_visited=models.DateTimeField(_('Last Visited'))
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512)
|
||||
last_visited=models.DateTimeField(_('Last Visited'), blank=True, null=True)
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512, blank=True, null=True)
|
||||
created_at=models.DateTimeField(auto_now_add=True)
|
||||
last_updated_user=models.ForeignKey(User, related_name="favorite_updated_user", on_delete=models.DO_NOTHING)
|
||||
last_updated_at=models.DateTimeField(auto_now=True)
|
||||
|
||||
|
||||
|
||||
TRAVEL_CATEGORY = (
|
||||
("PRIVATE", _("Private")),
|
||||
("GROUP", _("Group")),
|
||||
("AGENT", _("Agent")),
|
||||
("ROGAINING", _("Rogaining"))
|
||||
)
|
||||
|
||||
|
||||
|
||||
class TravelList(models.Model):
|
||||
travel_id= models.IntegerField(_('Travel Id'))
|
||||
user=models.ForeignKey(User, on_delete=models.DO_NOTHING)
|
||||
start_date=models.DateTimeField()
|
||||
finish_date=models.DateTimeField()
|
||||
category=models.CharField(_('Category'), max_length=255)
|
||||
start_date=models.DateTimeField(_('Start date') ,blank=True, null=True)
|
||||
finish_date=models.DateTimeField(_('End date') ,blank=True, null=True)
|
||||
category=models.CharField(max_length=256, choices=TRAVEL_CATEGORY)
|
||||
title=models.CharField(_('Title'), max_length=255)
|
||||
transportation=models.CharField(_('Transpotation'), max_length=255)
|
||||
moving_distance=models.IntegerField()
|
||||
duration=models.DurationField(_('Duration'))
|
||||
eta=models.DateTimeField()
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512)
|
||||
transportation=models.CharField(_('Transpotation'), max_length=255 ,blank=True, null=True)
|
||||
moving_distance=models.IntegerField(blank=True, null=True)
|
||||
duration=models.DurationField(_('Duration') ,blank=True, null=True)
|
||||
eta=models.DateTimeField(blank=True, null=True)
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512 ,blank=True, null=True)
|
||||
created_at=models.DateTimeField(auto_now_add=True)
|
||||
last_updated_user=models.ForeignKey(User, related_name="travel_list_updated_user", on_delete=models.DO_NOTHING)
|
||||
last_updated_at=models.DateTimeField(auto_now=True)
|
||||
|
||||
|
||||
class TravelPoint(models.Model):
|
||||
travel_id= models.IntegerField(_('Travel Id'))
|
||||
travel_list= models.ForeignKey(TravelList, on_delete=models.DO_NOTHING)
|
||||
location=models.ForeignKey(Location, on_delete=models.CASCADE)
|
||||
distance=models.FloatField()
|
||||
transportation=models.CharField(_('Transpotation'), max_length=255)
|
||||
eta=models.DateTimeField()
|
||||
order_number=models.IntegerField()
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512)
|
||||
distance=models.FloatField(blank=True, null=True)
|
||||
transportation=models.CharField(_('Transpotation'), max_length=255 ,blank=True, null=True)
|
||||
eta=models.DateTimeField(blank=True, null=True)
|
||||
order_number=models.IntegerField(blank=True, null=True)
|
||||
parammeters=models.CharField(_('Parameters'), max_length=512 ,blank=True, null=True)
|
||||
created_at=models.DateTimeField(auto_now_add=True)
|
||||
last_updated_user=models.ForeignKey(User, related_name="travelpoint_updated_user", on_delete=models.DO_NOTHING)
|
||||
last_updated_at=models.DateTimeField(auto_now=True)
|
||||
|
||||
Reference in New Issue
Block a user