Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AC-1 : Add functionality to add and update courses #1300

Merged
merged 20 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7990c79
Add functionality to add and update courses
Ravichendraa Feb 20, 2024
8906f37
Course version added
Ravichendraa Mar 17, 2024
3b83423
Delete FusionIIIT/Fusion/settings/development.py
Ravichendraa Mar 17, 2024
b03e6d6
Delete FusionIIIT/applications/academic_procedures/migrations/0002_au…
Ravichendraa Mar 17, 2024
82be6ef
Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py
Ravichendraa Mar 17, 2024
df7210b
Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_…
Ravichendraa Mar 17, 2024
053558e
Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_…
Ravichendraa Mar 17, 2024
616b7c5
Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_…
Ravichendraa Mar 17, 2024
d973ac7
Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_…
Ravichendraa Mar 17, 2024
cfb1e06
Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_…
Ravichendraa Mar 17, 2024
18f55a0
Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_…
Ravichendraa Mar 17, 2024
48718c6
Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_…
Ravichendraa Mar 17, 2024
d50a1e0
Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_…
Ravichendraa Mar 17, 2024
9aac94f
Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_…
Ravichendraa Mar 17, 2024
49bf296
Delete FusionIIIT/applications/scholarships/migrations/0002_auto_2024…
Ravichendraa Mar 17, 2024
e2bffa8
Delete requirements.txt
Ravichendraa Mar 17, 2024
73bd368
Delete FusionIIIT/applications/programme_curriculum/migrations/0002_a…
Ravichendraa Mar 17, 2024
e034e53
Delete FusionIIIT/applications/programme_curriculum/migrations/0003_a…
Ravichendraa Mar 17, 2024
886cc68
Delete FusionIIIT/applications/programme_curriculum/migrations/0004_c…
Ravichendraa Mar 17, 2024
2404386
Delete FusionIIIT/applications/programme_curriculum/migrations/0005_a…
Ravichendraa Mar 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FusionIIIT/Fusion/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
'NAME': 'fusionlab',
'HOST': os.environ.get("DB_HOST", default='localhost'),
'USER': 'fusion_admin',
'PASSWORD': 'hello123',
'PASSWORD': '123',
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Generated by Django 3.1.5 on 2024-02-18 12:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('academic_procedures', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='assistantshipclaim',
name='year',
field=models.IntegerField(choices=[(2024, 2024), (2023, 2023)]),
),
migrations.AlterField(
model_name='course_registration',
name='working_year',
field=models.IntegerField(blank=True, choices=[(2024, 2024), (2023, 2023)], null=True),
),
migrations.AlterField(
model_name='finalregistrations',
name='batch',
field=models.IntegerField(default=2024),
),
migrations.AlterField(
model_name='messdue',
name='year',
field=models.IntegerField(choices=[(2024, 2024), (2023, 2023)]),
),
migrations.AlterField(
model_name='register',
name='year',
field=models.IntegerField(default=2024),
),
]
53 changes: 53 additions & 0 deletions FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Generated by Django 3.1.5 on 2024-02-18 12:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('eis', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='emp_achievement',
name='a_year',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_confrence_organised',
name='k_year',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_expert_lectures',
name='l_year',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_keynote_address',
name='k_year',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_mtechphd_thesis',
name='s_year',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_patents',
name='p_year',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_published_books',
name='pyear',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_research_papers',
name='year',
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), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], max_length=10, null=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 12:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 12:35

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0002_auto_20240218_1206'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 12:42

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0003_auto_20240218_1235'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 13:25

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0004_auto_20240218_1242'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 13:36

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0005_auto_20240218_1325'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 16:01

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0006_auto_20240218_1336'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 19:42

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0007_auto_20240218_1601'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-19 22:17

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0008_auto_20240218_1942'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-19 22:32

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0009_auto_20240219_2217'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
),
]
11 changes: 8 additions & 3 deletions FusionIIIT/applications/programme_curriculum/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib import admin
from django.contrib.admin.options import ModelAdmin
from .models import Programme, Discipline, Curriculum, Semester, Course, Batch, CourseSlot,CourseInstructor
from .models import Programme, Discipline, Curriculum, Semester, Course, Batch, CourseSlot,CourseInstructor, CourseProposal,UpdateCourseProposal


class ProgrammeAdmin(admin.ModelAdmin):
Expand Down Expand Up @@ -29,7 +29,10 @@ class BatchAdmin(admin.ModelAdmin):
class CourseSlotAdmin(admin.ModelAdmin):
list_display = ('name', 'type', 'course_slot_info','semester')
list_filter = ('type', 'courses',)

class CourseProposalAdmin(admin.ModelAdmin):
list_display = ('faculty_name','faculty_code', 'name', 'code',)
class UpdateCourseProposalAdmin(admin.ModelAdmin):
list_display = ('faculty_name','faculty_code', 'name', 'code',)

# Register your models here.
admin.site.register(Discipline, DisciplineAdmin)
Expand All @@ -39,4 +42,6 @@ class CourseSlotAdmin(admin.ModelAdmin):
admin.site.register(Course, CourseAdmin)
admin.site.register(Batch, BatchAdmin)
admin.site.register(CourseSlot, CourseSlotAdmin)
admin.site.register(CourseInstructor)
admin.site.register(CourseInstructor)
admin.site.register(CourseProposal,CourseProposalAdmin)
admin.site.register(UpdateCourseProposal,UpdateCourseProposalAdmin)
Loading
Loading