vvmurthy · Rheakoparde · Jan 28, 2019
diff --git a/UserProfile/forms.py b/UserProfile/forms.py
@@ -5,7 +5,7 @@
 class ProfileForm(forms.ModelForm):
     class Meta:
         model = UserProfile
-        fields = ['occupation', 'institution', 'birthday', 'bio']
+        fields = ['name','institution', 'bio']
         exclude = ['user',]
 
     _PROFILE_FIELDS = Meta.fields
@@ -41,4 +41,4 @@ def save(self, user):
                 profile_object = UserProfile.objects.get(user_id=user.id)
                 setattr(profile_object, field, self.cleaned_data.get(field))
                 profile_object.save()
-
+
diff --git a/UserProfile/migrations/0002_auto_20180918_1949.py b/UserProfile/migrations/0002_auto_20180918_1949.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-09-18 19:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserProfile', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Hospital',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=255)),
+                ('location', models.CharField(blank=True, max_length=255)),
+                ('description', models.TextField(blank=True, max_length=1000)),
+            ],
+            options={
+                'db_table': 'hospitals',
+            },
+        ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='location',
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='institution',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='UserProfile.Hospital'),
+        ),
+        migrations.AlterModelTable(
+            name='userprofile',
+            table='user_profile',
+        ),
+    ]
diff --git a/UserProfile/migrations/0003_auto_20190115_2106.py b/UserProfile/migrations/0003_auto_20190115_2106.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2019-01-15 21:06
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserProfile', '0002_auto_20180918_1949'),
+    ]
+
+    operations = [
+        migrations.AlterModelTable(
+            name='userprofile',
+            table=None,
+        ),
+    ]
diff --git a/UserProfile/migrations/0004_userprofile_name.py b/UserProfile/migrations/0004_userprofile_name.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2019-01-15 21:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserProfile', '0003_auto_20190115_2106'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='name',
+            field=models.CharField(default='default', max_length=30),
+            preserve_default=False,
+        ),
+    ]
diff --git a/UserProfile/models.py b/UserProfile/models.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models
+from django.forms import ModelForm
 from django.contrib.auth.models import User
 
 from django.db.models.signals import post_save
@@ -19,11 +20,10 @@ def __str__(self):
 
 class UserProfile(models.Model):
 	class Meta:
-		db_table = 'user_profile'
+		#db_table = 'user_profile'
 	user = models.OneToOneField(User, on_delete=models.CASCADE)
-	occupation = models.CharField(max_length=30, blank=True)
+	name = models.CharField(max_length=VARCHAR)
 	institution = models.ForeignKey(Hospital, blank=True, null=True, on_delete=models.CASCADE)
-	birthday = models.DateField(null=True, blank=True)
 	bio = models.TextField(max_length=1000, blank=True)
 	def __str__(self):
 		return self.user.username

diff --git a/UserProfile/templates/users/options.html b/UserProfile/templates/users/options.html
@@ -8,16 +8,16 @@
 {% block content %}
 
 <div class="login-wrapper">
-	<h2>Update Account Settings</h2><br>
+	<h1>Update Account Settings</h1><br>
 
-	<h4>Update Profile Information</h4><br>
+	<h2>Profile Information</h2><br>
 	<form method="POST">
 	  {% csrf_token %}
 	  {{ form.as_p }}
 	  <br><button class="btn btn-success" type="submit">Update Information</button>
 	</form>
 
-	<h4>Update User Information</h4><br>
+	<!-- <h4>Update User Information</h4><br>-->
 
   </div>
 {% endblock %}
diff --git a/UserProfile/urls.py b/UserProfile/urls.py
@@ -15,4 +15,7 @@
 
 	#/users/options/
 	url(r'^options/$', views.options, name='options')
+
+
+
 ]
diff --git a/UserProfile/views.py b/UserProfile/views.py
@@ -27,6 +27,7 @@ def options(request):
 #def login(request):
 #	return render(request, 'users/login.html')
 
+
 def signup(request):
 	if request.method == 'POST':
 		form = UserCreationForm(request.POST)

diff --git a/dsrt/urls.py b/dsrt/urls.py
@@ -25,11 +25,13 @@
     url(r'^admin/', admin.site.urls),
     url(r'^upload/',include('upload.urls')),
     url(r'^users/', include('UserProfile.urls')),
+
 
     url(r'^home/', views.home, name='home'),
     url(r'^about/', views.about, name='about'),
     url(r'^features/', views.features, name='features'),
     url(r'^faq/', views.faq, name='faq'),
+
 
     #keep the below url pattern at the very bottom
     url(r'^$', views.index, name='index'),

diff --git a/requirments.txt b/requirments.txt
@@ -1,9 +1,7 @@
 amqp==2.2.2
 anyjson==0.3.3
-apt-xapian-index==0.45
 billiard==3.5.0.3
 celery==4.1.0
-chardet==2.0.1
 colorama==0.2.5
 configobj==4.7.2
 dicom==0.9.9.post1

diff --git a/static/userprofile/css/login.css b/static/userprofile/css/login.css
@@ -2,3 +2,16 @@
 	padding-left: 50px;
 	padding-top: 50px;
 }
+
+h1{
+
+	text-align:center;
+
+}
+
+h2{
+
+	font-size: 15px;
+
+
+}
diff --git a/upload/migrations/0004_auto_20180918_1949.py b/upload/migrations/0004_auto_20180918_1949.py
@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-09-18 19:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserProfile', '0002_auto_20180918_1949'),
+        ('upload', '0003_ovh_sts'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RTIsoDose',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('RowPosition', models.TextField()),
+                ('ColumnPosition', models.TextField()),
+                ('IsDoseValue', models.IntegerField()),
+            ],
+            options={
+                'db_table': 'rt_isodose',
+            },
+        ),
+        migrations.RemoveField(
+            model_name='rtisdose',
+            name='fk_ct_image_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtisdose',
+            name='fk_dose_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtisdose',
+            name='fk_patient_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtisdose',
+            name='fk_series_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtisdose',
+            name='fk_study_id',
+        ),
+        migrations.RemoveField(
+            model_name='ctimages',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='ovh',
+            name='OAR_id',
+        ),
+        migrations.RemoveField(
+            model_name='ovh',
+            name='binAmount',
+        ),
+        migrations.RemoveField(
+            model_name='ovh',
+            name='binValue',
+        ),
+        migrations.RemoveField(
+            model_name='patient',
+            name='EnthicGroup',
+        ),
+        migrations.RemoveField(
+            model_name='patient',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtdose',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtdoseimage',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtdvh',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtroi',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='rtstructureset',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='series',
+            name='fk_user_id',
+        ),
+        migrations.RemoveField(
+            model_name='sts',
+            name='OAR_id',
+        ),
+        migrations.RemoveField(
+            model_name='study',
+            name='fk_user_id',
+        ),
+        migrations.AddField(
+            model_name='ovh',
+            name='bin_amount',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='ovh',
+            name='bin_value',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='ovh',
+            name='oar_id',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AddField(
+            model_name='patient',
+            name='EthnicGroup',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='patient',
+            name='fk_hospital_id',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='UserProfile.Hospital'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='sts',
+            name='oar_id',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.DeleteModel(
+            name='RTIsDose',
+        ),
+        migrations.AddField(
+            model_name='rtisodose',
+            name='fk_ct_image_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='upload.CTImages'),
+        ),
+        migrations.AddField(
+            model_name='rtisodose',
+            name='fk_dose_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='upload.RTDose'),
+        ),
+        migrations.AddField(
+            model_name='rtisodose',
+            name='fk_patient_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='upload.Patient'),
+        ),
+        migrations.AddField(
+            model_name='rtisodose',
+            name='fk_series_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='upload.Series'),
+        ),
+        migrations.AddField(
+            model_name='rtisodose',
+            name='fk_study_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='upload.Study'),
+        ),
+    ]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,7 @@

		#/users/options/
		url(r'^options/$', views.options, name='options')



		]