From 66f6343ecc9005157ea5d5495c9b3900985ab1d8 Mon Sep 17 00:00:00 2001
From: ankitamk14 <ankitamk@gmail.com>
Date: Thu, 4 Apr 2024 16:15:57 +0530
Subject: [PATCH 1/6] features

---
 static/spoken/templates/home.html | 8 ++++++++
 training/admin.py                 | 8 +++++++-
 training/validators.py            | 5 +++--
 training/views.py                 | 6 +++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/static/spoken/templates/home.html b/static/spoken/templates/home.html
index 794f2456a..301881b4b 100644
--- a/static/spoken/templates/home.html
+++ b/static/spoken/templates/home.html
@@ -201,6 +201,14 @@
 {% endblock %}
 {% block info %}
 <div class="row block-info">
+    <div class="col-sm-12">
+        <p></p>
+        <p>Challenge the talent inside you, participate in Animate 2024. Click <a href="https://animate2024.fossee.in/" style="color:gold" target="_blank"><u>here</u></a> for more details.</p>
+    </div>
+</div>
+<br>
+<div class="row block-info">
+    
   <div class="col-sm-12">
     <div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="2100">
       <!-- Indicators -->
diff --git a/training/admin.py b/training/admin.py
index 455c4a5f4..d2f76dccc 100755
--- a/training/admin.py
+++ b/training/admin.py
@@ -1,6 +1,12 @@
 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')
+    list_filter = ("entry_user",)
+
 
 admin.site.register(ILWFossMdlCourses)
+admin.site.register(TrainingEvents, TrainingEventsAdmin)
diff --git a/training/validators.py b/training/validators.py
index 38f242401..88d8bfdcd 100644
--- a/training/validators.py
+++ b/training/validators.py
@@ -42,8 +42,9 @@ 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."))
                 try:
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)

From 11cf7eaea57064f65a53326d74d9cd3cb1f20aeb Mon Sep 17 00:00:00 2001
From: ankitamk14 <ankitamk@gmail.com>
Date: Thu, 4 Apr 2024 17:18:45 +0530
Subject: [PATCH 2/6] removed admin filter

---
 training/admin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/training/admin.py b/training/admin.py
index d2f76dccc..18d241386 100755
--- a/training/admin.py
+++ b/training/admin.py
@@ -5,7 +5,6 @@
 
 class TrainingEventsAdmin(admin.ModelAdmin):
     list_display = ('event_name', 'entry_user')
-    list_filter = ("entry_user",)
 
 
 admin.site.register(ILWFossMdlCourses)

From b0c1698e912ae4455c206322d128094cc20dd3c3 Mon Sep 17 00:00:00 2001
From: ankitamk14 <ankitamk@gmail.com>
Date: Thu, 4 Apr 2024 17:55:59 +0530
Subject: [PATCH 3/6] added filter & resolved pep8 issues

---
 training/admin.py      | 2 ++
 training/models.py     | 3 +++
 training/validators.py | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/training/admin.py b/training/admin.py
index 18d241386..5c207a5b1 100755
--- a/training/admin.py
+++ b/training/admin.py
@@ -3,8 +3,10 @@
 # Register your models here.
 from .models import ILWFossMdlCourses, TrainingEvents
 
+
 class TrainingEventsAdmin(admin.ModelAdmin):
     list_display = ('event_name', 'entry_user')
+    list_filter = ('entry_user',)
 
 
 admin.site.register(ILWFossMdlCourses)
diff --git a/training/models.py b/training/models.py
index f7dc2d35d..a9229b9e8 100755
--- a/training/models.py
+++ b/training/models.py
@@ -43,6 +43,9 @@ class TrainingEvents(models.Model):
 
 	def __str__(self):
 		return self.event_name
+	
+	class Meta:
+		verbose_name_plural = "Training Events"
 
 
 class Participant(models.Model):
diff --git a/training/validators.py b/training/validators.py
index 88d8bfdcd..bdca65507 100644
--- a/training/validators.py
+++ b/training/validators.py
@@ -44,9 +44,9 @@ def validate_csv_file(csv_file):
                     ASCIIUsernameValidator()(col[2].strip())
                     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."))
+                            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:

From 4b10fb9068be9c5aa1425db9a47fe5d60d33d980 Mon Sep 17 00:00:00 2001
From: ankitamk14 <ankitamk@gmail.com>
Date: Thu, 4 Apr 2024 18:04:04 +0530
Subject: [PATCH 4/6] pep 8 issues

---
 training/models.py     | 2 +-
 training/validators.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/training/models.py b/training/models.py
index a9229b9e8..1123fa675 100755
--- a/training/models.py
+++ b/training/models.py
@@ -43,7 +43,7 @@ class TrainingEvents(models.Model):
 
 	def __str__(self):
 		return self.event_name
-	
+
 	class Meta:
 		verbose_name_plural = "Training Events"
 
diff --git a/training/validators.py b/training/validators.py
index bdca65507..0208687b3 100644
--- a/training/validators.py
+++ b/training/validators.py
@@ -44,9 +44,9 @@ def validate_csv_file(csv_file):
                     ASCIIUsernameValidator()(col[2].strip())
                     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."))
+                            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:

From 457251a6382329573c9480c725db3edf0e1526e2 Mon Sep 17 00:00:00 2001
From: ankitamk14 <ankitamk@gmail.com>
Date: Thu, 4 Apr 2024 18:34:03 +0530
Subject: [PATCH 5/6] added filters for training events admin page

---
 training/admin.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/training/admin.py b/training/admin.py
index 5c207a5b1..76a923252 100755
--- a/training/admin.py
+++ b/training/admin.py
@@ -5,8 +5,10 @@
 
 
 class TrainingEventsAdmin(admin.ModelAdmin):
-    list_display = ('event_name', 'entry_user')
-    list_filter = ('entry_user',)
+    list_display = ('event_name', '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', 'entry_user')
+    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)

From f1be179f21264796e35c37ad7142c7a6a2135989 Mon Sep 17 00:00:00 2001
From: ankitamk14 <ankitamk@gmail.com>
Date: Thu, 4 Apr 2024 18:38:27 +0530
Subject: [PATCH 6/6] modified order of columns

---
 training/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/training/admin.py b/training/admin.py
index 76a923252..b71201981 100755
--- a/training/admin.py
+++ b/training/admin.py
@@ -5,7 +5,7 @@
 
 
 class TrainingEventsAdmin(admin.ModelAdmin):
-    list_display = ('event_name', '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', 'entry_user')
+    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',)