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 modified backend/.DS_Store
Binary file not shown.
89 changes: 0 additions & 89 deletions backend/content_extractor/data/json/example3_goldstandard.json

This file was deleted.

89 changes: 0 additions & 89 deletions backend/content_extractor/data/json/example4_goldstandard.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions desktop_app/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
default_app_config = 'users.apps.UsersConfig'
Binary file modified desktop_app/db.sqlite3
Binary file not shown.
Binary file modified desktop_app/desktop_app/__pycache__/settings.cpython-310.pyc
Binary file not shown.
Binary file modified desktop_app/desktop_app/__pycache__/wsgi.cpython-310.pyc
Binary file not shown.
3 changes: 2 additions & 1 deletion desktop_app/desktop_app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
}
}


# Password validation
# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators

Expand Down Expand Up @@ -130,3 +129,5 @@

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

LOGIN_REDIRECT_URL = 'home'
LOGIN_URL = 'login'
Binary file modified desktop_app/ui/__pycache__/admin.cpython-310.pyc
Binary file not shown.
Binary file modified desktop_app/ui/__pycache__/apps.cpython-310.pyc
Binary file not shown.
Binary file added desktop_app/ui/__pycache__/forms.cpython-310.pyc
Binary file not shown.
Binary file modified desktop_app/ui/__pycache__/models.cpython-310.pyc
Binary file not shown.
Binary file modified desktop_app/ui/__pycache__/urls.cpython-310.pyc
Binary file not shown.
Binary file modified desktop_app/ui/__pycache__/views.cpython-310.pyc
Binary file not shown.
3 changes: 2 additions & 1 deletion desktop_app/ui/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib import admin
from .models import Profile

# Register your models here.
admin.site.register(Profile)
6 changes: 6 additions & 0 deletions desktop_app/ui/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@
class UiConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'ui'
class UsersConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'users'

def ready(self):
import users.signals
15 changes: 15 additions & 0 deletions desktop_app/ui/forms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from django import forms
from .models import Profile
from django.contrib.auth.models import User

class UserForm(forms.ModelForm):
password = forms.CharField(widget=forms.PasswordInput)

class Meta:
model = User
fields = ['username', 'password']

class ProfileForm(forms.ModelForm):
class Meta:
model = Profile
fields = ['full_name', 'blood_report']
28 changes: 28 additions & 0 deletions desktop_app/ui/migrations/0004_profile_delete_user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 5.1 on 2024-08-15 09:56

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('ui', '0003_remove_user_email'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Profile',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('full_name', models.CharField(max_length=100)),
('blood_report', models.BooleanField(default=False)),
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.DeleteModel(
name='User',
),
]
Binary file modified desktop_app/ui/migrations/__pycache__/0001_initial.cpython-310.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified desktop_app/ui/migrations/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
22 changes: 8 additions & 14 deletions desktop_app/ui/models.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
from django.db import models
from django.contrib.auth.models import User
from django.db.models.signals import post_save
from django.dispatch import receiver

class User(models.Model):
user_id = models.AutoField(primary_key=True)
first_name = models.CharField(max_length=100)
last_name = models.CharField(max_length=100)
gender = models.CharField(max_length=10)
birth_date = models.IntegerField()
# email = models.EmailField(unique=True)
phone_number = models.CharField(max_length=15)

class Meta:
db_table = 'USER'

def __str__(self):
return self.first_name + ' ' + self.last_name
#1. Create a Profile Model
class Profile(models.Model):
user = models.OneToOneField(User, on_delete=models.CASCADE)
full_name = models.CharField(max_length=100)
blood_report = models.BooleanField(default=False) # True = Blood Report
13 changes: 13 additions & 0 deletions desktop_app/ui/signals.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from django.db.models.signals import post_save
from django.dispatch import receiver
from django.contrib.auth.models import User
from .models import Profile

@receiver(post_save, sender=User)
def create_user_profile(sender, instance, created, **kwargs):
if created:
Profile.objects.create(user=instance)

@receiver(post_save, sender=User)
def save_user_profile(sender, instance, **kwargs):
instance.profile.save()
Loading