Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug in LearningRecord datetime where current time was always used #71

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fixed bug in LearningRecord datetime where current time was always used #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion clatoolkit_project/clatoolkit/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from django.db import models, migrations
import django_pgjson.fields
import django.utils.timezone
from django.conf import settings


Expand Down Expand Up @@ -79,7 +80,7 @@ class Migration(migrations.Migration):
('platformparentid', models.CharField(max_length=5000, blank=True)),
('parent_user_external', models.CharField(max_length=5000, null=True, blank=True)),
('message', models.TextField(blank=True)),
('datetimestamp', models.DateTimeField(auto_now_add=True, null=True)),
('datetimestamp', models.DateTimeField(default=django.utils.timezone.now)),
('senttolrs', models.CharField(max_length=5000, blank=True)),
('parent_user', models.ForeignKey(related_name='parent_user', to=settings.AUTH_USER_MODEL, null=True)),
],
Expand Down
3 changes: 2 additions & 1 deletion clatoolkit_project/clatoolkit/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.contrib.auth.models import User
from django_pgjson.fields import JsonField
from django.core.exceptions import ObjectDoesNotExist
from django.utils import timezone
import os

class UserProfile(models.Model):
Expand Down Expand Up @@ -225,7 +226,7 @@ class LearningRecord(models.Model):
parent_user = models.ForeignKey(User, null=True, related_name="parent_user")
parent_user_external = models.CharField(max_length=5000, blank=True, null=True)
message = models.TextField(blank=True)
datetimestamp = models.DateTimeField(auto_now_add=True, null=True)
datetimestamp = models.DateTimeField(default=timezone.now)
senttolrs = models.CharField(max_length=5000, blank=True)


Expand Down