OS-1 Minor issues resolved

FusionIIIT/applications/visitor_hostel/forms.py

@@ -5,41 +5,37 @@
 
 from applications.visitor_hostel.models import *
 
-from .models import Inventory
-
 #class booking_request(forms.Form):
 CHOICES = (('A', 'A',), ('B', 'B',), ('C', 'C',), ('D', 'D',))
 
 class ViewBooking(forms.Form):
-	date_from = forms.DateField(initial=datetime.date.today)
-	date_to = forms.DateField(initial=datetime.date.today)
+        date_from = forms.DateField(initial=datetime.date.today)
+        date_to = forms.DateField(initial=datetime.date.today)
 
-class MealBooking(ModelForm):
-	date = forms.DateField(initial=datetime.date.today)
-	class Meta:
-		model = MealRecord
-		exclude = ['meal_date']
 
 class RoomAvailability(forms.Form):
-	date_from = forms.DateField(initial=datetime.date.today)
-	date_to = forms.DateField(initial=datetime.date.today)
+        date_from = forms.DateField(initial=datetime.date.today)
+        date_to = forms.DateField(initial=datetime.date.today)
 
 
-class InventoryForm(forms.ModelForm):
-	class Meta:
-		model = Inventory
-		fields = ["item_name", "quantity", "consumable"]
+# class InventoryForm(forms.Form):
+#         # class Meta:
+#         #     model = Inventory
+#         #     fields = ["item_name", "quantity"]
+#         item_name = forms.CharField(max_length=20)
+#         quantity = forms.IntegerField(min_value=0)
+#         consumable = forms.BooleanField(initial=False)
+#         # checkbox = ["consumable"]
 
 
 class Room_booking(forms.Form):
-	name = forms.CharField(max_length=100)
-	mob = forms.CharField(max_length=12)
-	email = forms.CharField(max_length=40)
-	address = forms.CharField(max_length=200)
-	country = forms.CharField(max_length=25)
-	category = forms.ChoiceField(widget=forms.RadioSelect, choices=CHOICES)
-	total_persons = forms.IntegerField()
-	purpose = forms.CharField(widget=forms.Textarea)
-	date_from = forms.DateField(initial=datetime.date.today)
-	date_to = forms.DateField(initial=datetime.date.today)
-
+        name = forms.CharField(max_length=100)
+        mob = forms.CharField(max_length=12)
+        email = forms.CharField(max_length=40)
+        address = forms.CharField(max_length=200)
+        country = forms.CharField(max_length=25)
+        category = forms.ChoiceField(widget=forms.RadioSelect, choices=CHOICES)
+        total_persons = forms.IntegerField()
+        purpose = forms.CharField(widget=forms.Textarea)
+        date_from = forms.DateField(initial=datetime.date.today)
+        date_to = forms.DateField(initial=datetime.date.today)

FusionIIIT/applications/visitor_hostel/migrations/0002_auto_20230401_1704.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.1.5 on 2023-04-01 16:04
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('visitor_hostel', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bill',
+            name='bill_date',
+            field=models.DateField(blank=True, default=django.utils.timezone.now),
+        ),
+        migrations.DeleteModel(
+            name='MealRecord',
+        ),
+        migrations.CreateModel(
+            name='MealRecord',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('meal_date', models.DateField()),
+                ('morning_tea', models.IntegerField(default=0)),
+                ('eve_tea', models.IntegerField(default=0)),
+                ('breakfast', models.IntegerField(default=0)),
+                ('lunch', models.IntegerField(default=0)),
+                ('dinner', models.IntegerField(default=0)),
+                ('persons', models.IntegerField(default=0)),
+                ('booking', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='visitor_hostel.bookingdetail')),
+                ('visitor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='visitor_hostel.visitordetail')),
+            ],
+        ),
+    ]

FusionIIIT/applications/visitor_hostel/models.py

@@ -58,7 +58,6 @@ class VisitorDetail(models.Model):
     visitor_address = models.TextField(blank=True)
     nationality = models.CharField(max_length=20, blank=True)
 
-
     def __str__(self):
         return '{} - {}'.format(self.id, self.visitor_name, self.visitor_email, self.visitor_organization, self.visitor_address, self.visitor_phone)
 
@@ -100,21 +99,20 @@ class BookingDetail(models.Model):
     number_of_rooms_alloted =  models.IntegerField(default=1,null=True,blank=True)
     booking_date = models.DateField(auto_now_add=False, auto_now=False, default=timezone.now)
     bill_to_be_settled_by = models.CharField(max_length=15, choices=BILL_TO_BE_SETTLED_BY ,default ="Intender")
-    
+
     def __str__(self):
         return '%s ----> %s - %s id is %s and category is %s' % (self.id, self.visitor, self.status, self.id, self.visitor_category)
 
 
 class MealRecord(models.Model):
     booking = models.ForeignKey(BookingDetail, on_delete=models.CASCADE)
     visitor = models.ForeignKey(VisitorDetail, on_delete=models.CASCADE)
-    room = models.ForeignKey(RoomDetail, on_delete=models.CASCADE, default=0)
     meal_date = models.DateField()
-    morning_tea = models.BooleanField(default=False)
-    eve_tea = models.BooleanField(default=False)
-    breakfast = models.BooleanField(default=False)
-    lunch = models.BooleanField(default=False)
-    dinner = models.BooleanField(default=False)
+    morning_tea = models.IntegerField(default=0)
+    eve_tea = models.IntegerField(default=0)
+    breakfast = models.IntegerField(default=0)
+    lunch = models.IntegerField(default=0)
+    dinner = models.IntegerField(default=0)
     persons=models.IntegerField(default=0)
 
 
@@ -125,6 +123,7 @@ class Bill(models.Model):
     meal_bill = models.IntegerField(default=0)
     room_bill = models.IntegerField(default=0)
     payment_status = models.BooleanField(default=False)
+    bill_date = models.DateField(default=timezone.now, blank=True)
 
     def __str__(self):
         return '%s ----> %s - %s id is %s' % (self.booking.id, self.meal_bill, self.room_bill, self.payment_status)
@@ -154,5 +153,3 @@ class InventoryBill(models.Model):
 
     def __str__(self):
         return str(self.bill_number)
-
-