diff --git a/training/admin.py b/training/admin.py
index 455c4a5f4..b71201981 100755
--- a/training/admin.py
+++ b/training/admin.py
@@ -1,6 +1,15 @@
from django.contrib import admin
# Register your models here.
-from .models import ILWFossMdlCourses
+from .models import ILWFossMdlCourses, TrainingEvents
+
+
+class TrainingEventsAdmin(admin.ModelAdmin):
+ list_display = ('event_name', 'entry_user', 'event_type', 'event_fee', 'state', 'host_college', 'foss', 'Language_of_workshop', 'event_start_date', 'event_end_date', 'event_coordinator_name', 'event_coordinator_email', 'event_coordinator_contact_no', 'registartion_start_date', 'registartion_end_date', 'training_status', 'entry_date')
+ list_filter = ('event_type', 'state', 'foss', 'Language_of_workshop', 'event_start_date', 'event_end_date', 'training_status')
+ search_fields = ('event_name', 'event_coordinator_name', 'event_coordinator_email', 'event_coordinator_contact_no')
+ ordering = ('-entry_date',)
+
admin.site.register(ILWFossMdlCourses)
+admin.site.register(TrainingEvents, TrainingEventsAdmin)
diff --git a/training/models.py b/training/models.py
index f7dc2d35d..1123fa675 100755
--- a/training/models.py
+++ b/training/models.py
@@ -44,6 +44,9 @@ class TrainingEvents(models.Model):
def __str__(self):
return self.event_name
+ class Meta:
+ verbose_name_plural = "Training Events"
+
class Participant(models.Model):
name = models.CharField(max_length=255,null=True)
diff --git a/training/validators.py b/training/validators.py
index 38f242401..0208687b3 100644
--- a/training/validators.py
+++ b/training/validators.py
@@ -42,10 +42,11 @@ def validate_csv_file(csv_file):
try:
EmailValidator()(col[2].strip())
ASCIIUsernameValidator()(col[2].strip())
- if not validate_email(col[2].strip(), verify=True):
- error.update(dict(lname="Email: "+ col[2] +" has errors."))
+ if col[2].strip().split("@")[-1].lower() != "yopmail.com":
+ if not validate_email(col[2].strip(), verify=True):
+ error.update(dict(lname="Email: " + col[2] + " has errors."))
except:
- error.update(dict(lname="Email: "+ col[2] +" has errors."))
+ error.update(dict(lname="Email: " + col[2] + " has errors."))
try:
ASCIIValidator()(col[3].strip())
except:
diff --git a/training/views.py b/training/views.py
index a0a6e1e7e..6e65cbb35 100644
--- a/training/views.py
+++ b/training/views.py
@@ -88,13 +88,13 @@ def dispatch(self, *args, **kwargs):
self.show_myevents = True
if self.status == 'completed':
- self.events = TrainingEvents.objects.filter(event_end_date__lt=today)
+ self.events = TrainingEvents.objects.filter(event_end_date__lt=today).order_by('registartion_end_date', 'registartion_start_date')
if self.status == 'ongoing':
- self.events = TrainingEvents.objects.filter(event_end_date__gte=today)
+ self.events = TrainingEvents.objects.filter(event_end_date__gte=today).order_by('registartion_end_date', 'registartion_start_date')
if self.status == 'myevents':
participant = Participant.objects.filter(
Q(payment_status__status=1)|Q(registartion_type__in=(1,3)),
- user_id=self.request.user.id)
+ user_id=self.request.user.id).order_by('registartion_end_date', 'registartion_start_date')
self.events = participant
self.raw_get_data = self.request.GET.get('o', None)