Merge pull request #364 from amruthasangeeth/ShiftEventsToCBV

Migrated Events app to CBV

Author: tapaswenipathak

vms/event/forms.py

@@ -1,37 +1,36 @@
-from django import forms
-from django.db import models
-from django.forms import ModelForm
-
-from event.models import Event
-
-
-class EventForm(ModelForm):
-    class Meta:
-        model = Event
-        fields = [
-            'name',
-            'start_date',
-            'end_date',
-            'country',
-            'state',
-            'city',
-            'address',
-            'venue'
-            ]
-
-    def clean(self):
-
-        start_date = self.cleaned_data.get('start_date')
-        end_date = self.cleaned_data.get('end_date')
-
-        if start_date and end_date:
-            if start_date > end_date:
-                msg = u"Start date must be before the end date"
-                self._errors['start_date'] = self.error_class([msg])
-
-        return self.cleaned_data
-
-
-class EventDateForm(forms.Form):
-    start_date = forms.DateField(required=True)
-    end_date = forms.DateField(required=True)
+from django import forms
+from django.db import models
+from django.forms import ModelForm
+
+from event.models import Event
+
+
+class EventForm(ModelForm):
+    class Meta:
+        model = Event
+        fields = [
+            'name',
+            'start_date',
+            'end_date',
+            'country',
+            'state',
+            'city',
+            'address',
+            'venue'
+            ]
+
+    def clean(self):
+        start_date = self.cleaned_data.get('start_date')
+        end_date = self.cleaned_data.get('end_date')
+
+        if start_date and end_date:
+            if start_date > end_date:
+                msg = u"Start date must be before the end date"
+                self._errors['start_date'] = self.error_class([msg])
+
+        return self.cleaned_data
+
+
+class EventDateForm(forms.Form):
+    start_date = forms.DateField(required=True)
+    end_date = forms.DateField(required=True)

vms/event/models.py

@@ -1,67 +1,68 @@
-from django.core.validators import RegexValidator
-from django.db import models
-
-
-class Event(models.Model):
-    name = models.CharField(
-        max_length=75,
-        validators=[
-            RegexValidator(
-                r'^[(A-Z)|(a-z)|(0-9)|(\s)|(\.)|(,)|(\-)|(!)|(\')]+$',
-            ),
-        ],
-    )
-    start_date = models.DateField()
-    end_date = models.DateField()
-
-    address = models.CharField(
-        max_length=30,
-        validators=[
-            RegexValidator(
-                r'^[(A-Z)|(a-z)|(0-9)|(\s)|(\-)|(\')]+$',
-            ),
-        ],
-        blank=True,
-        null=True,
-    )
-    city = models.CharField(
-        max_length=30,
-        validators=[
-            RegexValidator(
-                r'^[(A-Z)|(a-z)|(\s)|(\-)|(\')]+$',
-            ),
-        ],
-        blank=True,
-        null=True,
-    )
-    state = models.CharField(
-        max_length=30,
-        validators=[
-            RegexValidator(
-                r'^[(A-Z)|(a-z)|(\s)|(\-)]+$',
-            ),
-        ],
-        blank=True,
-        null=True,
-    )
-    country = models.CharField(
-        max_length=30,
-        validators=[
-            RegexValidator(
-                r'^[(A-Z)|(a-z)|(\s)|(\-)|(\')]+$',
-            ),
-        ],
-        blank=True,
-        null=True,
-    )
-
-    venue = models.CharField(
-        max_length=30,
-        validators=[
-            RegexValidator(
-                r'^[(A-Z)|(a-z)|(\s)|(\-)|(\')]+$',
-            ),
-        ],
-        blank=True,
-        null=True,
-    )
+from django.core.validators import RegexValidator
+from django.db import models
+
+
+class Event(models.Model):
+    id = models.AutoField(primary_key=True)
+    name = models.CharField(
+        max_length=75,
+        validators=[
+            RegexValidator(
+                r'^[(A-Z)|(a-z)|(0-9)|(\s)|(\.)|(,)|(\-)|(!)|(\')]+$',
+            ),
+        ],
+    )
+    start_date = models.DateField()
+    end_date = models.DateField()
+
+    address = models.CharField(
+        max_length=30,
+        validators=[
+            RegexValidator(
+                r'^[(A-Z)|(a-z)|(0-9)|(\s)|(\-)|(\')]+$',
+            ),
+        ],
+        blank=True,
+        null=True,
+    )
+    city = models.CharField(
+        max_length=30,
+        validators=[
+            RegexValidator(
+                r'^[(A-Z)|(a-z)|(\s)|(\-)|(\')]+$',
+            ),
+        ],
+        blank=True,
+        null=True,
+    )
+    state = models.CharField(
+        max_length=30,
+        validators=[
+            RegexValidator(
+                r'^[(A-Z)|(a-z)|(\s)|(\-)]+$',
+            ),
+        ],
+        blank=True,
+        null=True,
+    )
+    country = models.CharField(
+        max_length=30,
+        validators=[
+            RegexValidator(
+                r'^[(A-Z)|(a-z)|(\s)|(\-)|(\')]+$',
+            ),
+        ],
+        blank=True,
+        null=True,
+    )
+
+    venue = models.CharField(
+        max_length=30,
+        validators=[
+            RegexValidator(
+                r'^[(A-Z)|(a-z)|(\s)|(\-)|(\')]+$',
+            ),
+        ],
+        blank=True,
+        null=True,
+    )

vms/event/templates/event/delete.html

@@ -4,7 +4,7 @@
 
 {% block setting_content %}
     <div class="spacer"></div>
-    <form class="form-horizontal" action="{% url 'event:delete' event_id %}" method="post">
+    <form class="form-horizontal" action="" method="post">
         {% csrf_token %}
         <div class="panel panel-danger">
             <div class="panel-heading">