Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added .DS_Store
Binary file not shown.
18 changes: 18 additions & 0 deletions UserManagement/migrations/0003_user_token.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.0.5 on 2020-10-19 22:04

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('UserManagement', '0002_research_approved'),
]

operations = [
migrations.AddField(
model_name='user',
name='token',
field=models.CharField(default='null', max_length=200),
),
]
23 changes: 23 additions & 0 deletions UserManagement/migrations/0004_auto_20201024_1712.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.0.5 on 2020-10-24 21:12

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('UserManagement', '0003_user_token'),
]

operations = [
migrations.AddField(
model_name='user',
name='first_time',
field=models.BooleanField(default=True),
),
migrations.AlterField(
model_name='user',
name='name',
field=models.CharField(max_length=30),
),
]
44 changes: 23 additions & 21 deletions UserManagement/models.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
from django.db import models
from django.contrib.auth.models import User

# Create your models here.
class User(models.Model):
name = models.CharField(max_length=30, unique=True)
email = models.CharField(max_length=100, unique=True)
role = models.CharField(max_length=15)
phone_number = models.IntegerField(blank=True, null=True, unique=True)
is_deleted = models.BooleanField(default = False)


class Research(models.Model):
name = models.CharField(max_length=30)
description = models.CharField(max_length=4000)
due_date = models.DateTimeField()
approved = models.BooleanField()

class Dashboard(models.Model):
research = models.ForeignKey(Research, on_delete=models.CASCADE)
user = models.ForeignKey(User, on_delete=models.CASCADE)
from django.db import models
from django.contrib.auth.models import User

# Create your models here.
class User(models.Model):
name = models.CharField(max_length=30)
email = models.CharField(max_length=100, unique=True)
role = models.CharField(max_length=15)
phone_number = models.IntegerField(blank=True, null=True, unique=True)
first_time = models.BooleanField(default=True)
token = models.CharField(max_length=200, default="null")
is_deleted = models.BooleanField(default = False)


class Research(models.Model):
name = models.CharField(max_length=30)
description = models.CharField(max_length=4000)
due_date = models.DateTimeField()
approved = models.BooleanField()

class Dashboard(models.Model):
research = models.ForeignKey(Research, on_delete=models.CASCADE)
user = models.ForeignKey(User, on_delete=models.CASCADE)
3 changes: 3 additions & 0 deletions UserManagement/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ def updateUser(request):
if ("name" in body_data.keys()):
newName = body_data["name"]
User.objects.filter(pk = user_id).update(name=newName)

User.objects.filter(pk = user_id).update(first_time=False)

user = User.objects.get(pk = user_id)
serializer = UserSerializer(user)
return Response(serializer.data)
Expand Down