Skip to content

Commit 2f69a13

Browse files
shivansh1010shivansh1010
authored
Merge pull request #1 from FusionIIIT/master
Merge latest from main repo
2 parents 9b29dc7 + 5881127 commit 2f69a13

File tree

13 files changed

+264
-133
lines changed

13 files changed

+264
-133
lines changed

‎FusionIIIT/applications/academic_procedures/migrations/0012_auto_20200123_2047.py‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.27 on 2020-01-23 20:47
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('academic_procedures', '0011_auto_20191127_1056'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='finalregistrations',
17+
name='batch',
18+
field=models.IntegerField(default=2020),
19+
),
20+
migrations.AlterField(
21+
model_name='initialregistrations',
22+
name='batch',
23+
field=models.IntegerField(default=2020),
24+
),
25+
migrations.AlterField(
26+
model_name='register',
27+
name='year',
28+
field=models.IntegerField(default=2020),
29+
),
30+
]

‎FusionIIIT/applications/central_mess/migrations/0003_auto_20200123_2047.py‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.27 on 2020-01-23 20:47
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('central_mess', '0002_auto_20191101_0008'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='monthly_bill',
17+
name='month',
18+
field=models.CharField(default=1, max_length=20),
19+
),
20+
migrations.AlterField(
21+
model_name='monthly_bill',
22+
name='year',
23+
field=models.IntegerField(default=2020),
24+
),
25+
migrations.AlterField(
26+
model_name='payments',
27+
name='year',
28+
field=models.IntegerField(default=2020),
29+
),
30+
]

‎FusionIIIT/applications/eis/migrations/0002_auto_20200123_2047.py‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.27 on 2020-01-23 20:47
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('eis', '0001_initial'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='emp_achievement',
17+
name='a_year',
18+
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
19+
),
20+
migrations.AlterField(
21+
model_name='emp_confrence_organised',
22+
name='k_year',
23+
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
24+
),
25+
migrations.AlterField(
26+
model_name='emp_expert_lectures',
27+
name='l_year',
28+
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
29+
),
30+
migrations.AlterField(
31+
model_name='emp_keynote_address',
32+
name='k_year',
33+
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
34+
),
35+
migrations.AlterField(
36+
model_name='emp_mtechphd_thesis',
37+
name='s_year',
38+
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
39+
),
40+
migrations.AlterField(
41+
model_name='emp_patents',
42+
name='p_year',
43+
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
44+
),
45+
migrations.AlterField(
46+
model_name='emp_published_books',
47+
name='pyear',
48+
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], null=True, verbose_name='year'),
49+
),
50+
migrations.AlterField(
51+
model_name='emp_research_papers',
52+
name='year',
53+
field=models.CharField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020)], max_length=10, null=True),
54+
),
55+
]

‎FusionIIIT/applications/gymkhana/admin.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@
33
from .models import (Club_budget, Club_info, Club_member, Club_report,
44
Core_team, Fest_budget, Other_report, Session_info)
55

6+
67
# Register your models here.
78

8-
admin.site.register(Club_info)
9-
admin.site.register(Club_member)
9+
class ClubInfoAdmin(admin.ModelAdmin):
10+
raw_id_fields = ("co_ordinator", "co_coordinator")
11+
12+
13+
class ClubMemberAdmin(admin.ModelAdmin):
14+
raw_id_fields = ("member",)
15+
16+
17+
admin.site.register(Club_info, ClubInfoAdmin)
18+
admin.site.register(Club_member, ClubMemberAdmin)
1019
admin.site.register(Core_team)
1120
admin.site.register(Club_budget)
1221
admin.site.register(Session_info)

‎FusionIIIT/applications/gymkhana/urls.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
url(r'^festbudget/$', views.fest_budget, name='fest_budget'),
1919
url(r'^approve/$', views.approve, name='approve'),
2020
url(r'^reject/$', views.reject, name='reject'),
21+
url(r'^club_approve/$', views.club_approve, name='club_approve'),
22+
url(r'^club_reject/$', views.club_reject, name='club_reject'),
2123
url(r'^cancel/$', views.cancel, name='cancel'),
2224
url(r'^date_sessions/$', views.date_sessions, name='date_sessions'),
2325
url(r'^get_venue/$', views.getVenue, name='get_venue'),

‎FusionIIIT/applications/gymkhana/views.py‎

Lines changed: 70 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -539,53 +539,87 @@ def fest_budget(request):
539539

540540
@login_required
541541
def approve(request):
542+
lis = list(request.POST.getlist('check'))
543+
print(lis)
544+
for user in lis:
545+
# pos = lis.index(user)
546+
re = "remarks" + user
547+
print(re)
548+
remarks = request.POST.getlist(re)
549+
print(remarks)
550+
user = user.split(',')
551+
print(user)
552+
info = user[0].split(' - ')
553+
print(info)
554+
555+
# getting queryset class objects
556+
user_name = get_object_or_404(User, username=info[1])
557+
print(user_name)
558+
extra1 = get_object_or_404(ExtraInfo, id=info[0], user=user_name)
559+
print(extra1)
560+
student = get_object_or_404(Student, id=extra1)
561+
print(student)
562+
563+
club_member = get_object_or_404(Club_member, club=user[1], member=student)
564+
print(club_member)
565+
club_member.status = "confirmed"
566+
club_member.remarks = remarks[0]
567+
club_member.save()
568+
messages.success(request, "Successfully Approved !!!")
569+
570+
return redirect('/gymkhana/')
542571

543-
lis = list(request.POST.getlist('check'))
544572

545-
for user in lis :
546-
#pos = lis.index(user)
547-
re = "remarks"+user
548-
remarks = request.POST.getlist(re)
549-
user = user.split(',')
550-
info = user[0].split(' - ')
573+
@login_required
574+
def club_approve(request):
575+
lisx = list(request.POST.getlist('check'))
576+
print(lisx)
577+
for club in lisx:
578+
print(club)
579+
club_name = get_object_or_404(Club_info, club_name=club)
580+
club_name.status = "confirmed"
581+
club_name.save()
582+
messages.success(request, "Successfully Approved !!!")
583+
584+
return redirect('/gymkhana/')
551585

552-
#getting queryset class objects
553-
user_name = get_object_or_404(User, username = info[1])
554-
extra1 = get_object_or_404(ExtraInfo, id = info[0], user = user_name)
555-
student = get_object_or_404(Student, id = extra1)
586+
@login_required
587+
def club_reject(request):
588+
lisx = list(request.POST.getlist('check'))
589+
print(lisx)
590+
for club in lisx:
591+
print(club)
592+
club_name = get_object_or_404(Club_info, club_name=club)
593+
club_name.status = "rejected"
594+
club_name.save()
595+
messages.success(request, "Successfully Rejected !!!")
556596

557-
club_member = get_object_or_404(Club_member, club = user[1], member = student)
558-
club_member.status = "confirmed"
559-
club_member.remarks = remarks[0]
560-
club_member.save()
561-
messages.success(request,"Successfully Approved !!!")
597+
return redirect('/gymkhana/')
562598

563-
return redirect ('/gymkhana/')
564599

565600
@login_required
566601
def reject(request):
602+
lis = list(request.POST.getlist('check'))
567603

568-
lis = list(request.POST.getlist('check'))
569-
570-
for user in lis :
571-
#pos = lis.index(user)
572-
re = "remarks"+user
573-
remarks = request.POST.getlist(re)
574-
user = user.split(',')
575-
info = user[0].split(' - ')
604+
for user in lis:
605+
# pos = lis.index(user)
606+
re = "remarks" + user
607+
remarks = request.POST.getlist(re)
608+
user = user.split(',')
609+
info = user[0].split(' - ')
576610

577-
#getting queryset class objects
578-
user_name = get_object_or_404(User, username = info[1])
579-
extra1 = get_object_or_404(ExtraInfo, id = info[0], user = user_name)
580-
student = get_object_or_404(Student, id = extra1)
611+
# getting queryset class objects
612+
user_name = get_object_or_404(User, username=info[1])
613+
extra1 = get_object_or_404(ExtraInfo, id=info[0], user=user_name)
614+
student = get_object_or_404(Student, id=extra1)
581615

582-
club_member = get_object_or_404(Club_member, club = user[1], member = student)
583-
club_member.status = "rejectd"
584-
club_member.remarks = remarks[0]
585-
club_member.save()
586-
messages.success(request,"Successfully rejected !!!")
616+
club_member = get_object_or_404(Club_member, club=user[1], member=student)
617+
club_member.status = "rejected"
618+
club_member.remarks = remarks[0]
619+
club_member.save()
620+
messages.success(request, "Successfully Rejected !!!")
587621

588-
return redirect ('/gymkhana/')
622+
return redirect('/gymkhana/')
589623

590624
@login_required
591625
def cancel(request):
@@ -651,4 +685,4 @@ def conflict_algorithm(date, start_time, end_time, venue):
651685
if (flag == 0):
652686
return "success"
653687
else:
654-
return "error"
688+
return "error"

‎FusionIIIT/applications/scholarships/migrations/0002_auto_20200123_2047.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.27 on 2020-01-23 20:47
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('scholarships', '0001_initial'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='previous_winner',
17+
name='year',
18+
field=models.IntegerField(default=2020),
19+
),
20+
]

‎FusionIIIT/media/documents/placement/schedule/requirements.txt‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎FusionIIIT/templates/dashboard/sidenavbar.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ <h4>Central Mess Module</h4>
6565
</a>
6666
{% endif %}
6767

68+
<a class="item" href="{% url 'feeds:feeds' %}">
69+
<h4>Feeds Module</h4>
70+
</a>
71+
6872
<a class="item" href="{% url 'healthcenter:healthcenter' %}">
6973
<h4>Health Center Module</h4>
7074
</a>

0 commit comments

Comments
 (0)