migration changes

hostel_mess/templates/login.html

@@ -44,7 +44,8 @@
                   </div>
                   <form class="user" action="{% url 'login' %}" method="POST">
                     {% csrf_token %}
-                    <div class="form-group">
+                    <input type="hidden" name="next" value="{{ request.GET.next }}" />
+                    <div class="form-group text-danger font-weight-bold">
                       <label id='error_msg'>{{ error_msg }}</label>
                     </div>
                     <div class="form-group">

hostel_mess/usermgmt/admin.py

 from django.contrib import admin
 
+from .models import Student, RebateReq, Meal, OverheadReq	
 # Register your models here.
+
+admin.site.register(Student)
+admin.site.register(RebateReq)
+admin.site.register(Meal)
+admin.site.register(OverheadReq)
\ No newline at end of file

hostel_mess/usermgmt/migrations/0001_initial.py

+# Generated by Django 2.2.7 on 2019-11-26 22:24
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0011_update_proxy_permissions'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Meal',
+            fields=[
+                ('mealType', models.CharField(choices=[('B', 'breakfast'), ('L', 'lunch'), ('S', 'snacks'), ('D', 'dinner')], max_length=1, primary_key=True, serialize=False)),
+                ('price', models.IntegerField(choices=[(30, 'breakfast'), (60, 'lunch'), (30, 'snacks'), (60, 'dinner')], default=60)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Student',
+            fields=[
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
+                ('cardNo', models.TextField(blank=True, max_length=15)),
+                ('phoneNo', models.IntegerField(blank=True)),
+                ('foodType', models.CharField(choices=[('v', 'veg'), ('nv', 'nonveg'), ('j', 'jain')], default='v', max_length=2)),
+                ('roomNo', models.IntegerField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='rebateReq',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fromDate', models.DateField(auto_now_add=True, help_text='format : DDMMYYYY', max_length=10, null=True)),
+                ('toDate', models.DateField(auto_now_add=True, help_text='format : DDMMYYYY', max_length=10, null=True)),
+                ('status', models.CharField(choices=[('Y', 'yes'), ('N', 'no'), ('W', 'wait')], max_length=1)),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='usermgmt.Student')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='overheadReq',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField(auto_now_add=True, help_text='format : DDMMYYYY', max_length=10, null=True)),
+                ('status', models.CharField(choices=[('Y', 'yes'), ('N', 'no'), ('W', 'wait')], max_length=1)),
+                ('count', models.IntegerField(default=1)),
+                ('mealType', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='usermgmt.Meal')),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='usermgmt.Student')),
+            ],
+        ),
+    ]

hostel_mess/usermgmt/migrations/0002_auto_20191126_2235.py

+# Generated by Django 2.2.7 on 2019-11-26 22:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('usermgmt', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='meal',
+            name='price',
+            field=models.IntegerField(default=60),
+        ),
+    ]

hostel_mess/usermgmt/migrations/0003_auto_20191126_2236.py

+# Generated by Django 2.2.7 on 2019-11-26 22:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('usermgmt', '0002_auto_20191126_2235'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='student',
+            name='cardNo',
+            field=models.CharField(blank=True, max_length=4),
+        ),
+    ]

hostel_mess/usermgmt/migrations/0004_auto_20191126_2244.py

+# Generated by Django 2.2.7 on 2019-11-26 22:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('usermgmt', '0003_auto_20191126_2236'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='overheadreq',
+            name='mealType',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='usermgmt.Meal'),
+        ),
+        migrations.AlterField(
+            model_name='overheadreq',
+            name='student',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='usermgmt.Student'),
+        ),
+        migrations.AlterField(
+            model_name='rebatereq',
+            name='fromDate',
+            field=models.DateField(help_text='format : DDMMYYYY', max_length=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='rebatereq',
+            name='student',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='usermgmt.Student'),
+        ),
+        migrations.AlterField(
+            model_name='rebatereq',
+            name='toDate',
+            field=models.DateField(help_text='format : DDMMYYYY', max_length=10, null=True),
+        ),
+    ]

hostel_mess/usermgmt/models.py

@@ -5,24 +5,36 @@ from django.dispatch import receiver
 
 class Student(models.Model):
 	user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True)
-	cardNo = models.TextField(max_length=15, blank=True)
+	cardNo = models.CharField(max_length=4, blank=True)
 	phoneNo = models.IntegerField(blank=True)
 	foodType = models.CharField(max_length = 2, choices = [('v','veg'),('nv','nonveg'),('j','jain')], default = 'v')
 	roomNo = models.IntegerField()
 
-class rebateReq(models.Model):
-	student = models.ForeignKey(Student,on_delete=models.CASCADE)
-	fromDate = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True, auto_now_add=True)
-	toDate = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True, auto_now_add=True)
+	def __str__(self):
+		return self.user.username
+
+class RebateReq(models.Model):
+	student = models.OneToOneField(Student,on_delete=models.CASCADE)
+	fromDate = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True)
+	toDate = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True)
 	status = models.CharField(max_length = 1, choices = [('Y','yes'),('N','no'), ('W','wait')])
 
+	def __str__(self):
+		return f'{self.student.user.username}({self.fromDate}-{self.toDate})'
+
 class Meal(models.Model):
 	mealType = models.CharField(max_length=1, choices=[('B','breakfast'),('L','lunch'),('S','snacks'),('D','dinner')], primary_key=True)
-	price = models.IntegerField(default = 60, choices = [(30,'breakfast'),(60,'lunch'),(30,'snacks'),(60,'dinner')])
+	price = models.IntegerField(default = 60)
 
-class overheadReq(models.Model):
-	student = models.ForeignKey(Student, on_delete=models.CASCADE)
-	mealType = models.ForeignKey(Meal,on_delete=models.CASCADE)
+	def __str__(self):
+		return self.mealType
+
+class OverheadReq(models.Model):
+	student = models.OneToOneField(Student, on_delete=models.CASCADE)
+	mealType = models.OneToOneField(Meal,on_delete=models.CASCADE)
 	date = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True, auto_now_add=True)
 	status = models.CharField(max_length = 1, choices = [('Y','yes'),('N','no'), ('W','wait')])
 	count = models.IntegerField(default = 1)
+
+	def __str__(self):
+		return f'{self.student.user.username}({self.date}-{self.count})'
\ No newline at end of file

hostel_mess/usermgmt/views.py

@@ -18,7 +18,7 @@ def login_view(request):
 			return redirect('homepage')
 			# return render(request, 'viewreq.html', context=None)
 		else:
-			return render(request, 'login.html', context=None)
+			return render(request, 'login.html')
 
 	elif request.method == 'POST':
 		# return HttpResponse('<p> Great! logged in!</p>')
@@ -28,7 +28,7 @@ def login_view(request):
 
 		if user is not None:
 			login(request, user)
-			return redirect('homepage')
+			return redirect(request.POST.get('next','homepage'))
 		else:
 			return render(request, 'login.html', context={'error_msg':'Invalid Username/Password.'})
 			# return render(request, 'viewreq.html', context=None)