Skip to content
Merged
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
b6a35ad
deployment ports config
whhygee Feb 13, 2023
f62c502
gad-4: Created fileTrackingNotAllowed.html (#1082)
prakhar-da-gama Feb 16, 2023
e52a590
gad-4: new views.py to remove students from file tracking (#1104)
prakhar-da-gama Feb 16, 2023
8debd86
Merge branch 'main' into gad-4
akshatnema Feb 17, 2023
a2e68c3
Merge remote-tracking branch 'origin/test-temp' into gad-4
akshatnema Feb 17, 2023
eee3d46
Merge branch 'main' into gad-4
akshatnema Feb 18, 2023
079fbaa
Merge branch 'test-temp' into gad-4
akshatnema Feb 18, 2023
69e97fb
fix: reverting deployment changes
manavdesai27 Feb 22, 2023
5c61a54
GAD-5: Fix responsiveness (#1125)
Lawful2002 Feb 23, 2023
4ca90b3
Merge branch 'main' into gad-4
akshatnema Mar 15, 2023
9a4fc4d
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
33b55f6
Merge branch 'main' into gad-4
akshatnema Mar 15, 2023
b295d7f
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
304f45b
Merge branch 'main' into gad-4
akshatnema Mar 18, 2023
72e34e7
Merge branch 'main' into gad-5
akshatnema Mar 18, 2023
2f9017d
Merge branch 'main' into gad-4
akshatnema Mar 19, 2023
721ee82
Merge branch 'main' into gad-5
akshatnema Mar 19, 2023
c2e2e8e
Merge branch 'test-temp' into os-2
akshatnema Mar 20, 2023
54bf66d
OS -2 : Week 4 : Addition of important personal information during bo…
Apc010101 Mar 20, 2023
b1482e1
Merge branch 'main' into gad-4
akshatnema Mar 23, 2023
91ef4e9
Merge branch 'main' into gad-5
akshatnema Mar 23, 2023
7f0341a
Merge branch 'main' into os-2
akshatnema Mar 23, 2023
ee8f6be
Merge branch 'main' into gad-4
akshatnema Mar 26, 2023
da49572
Merge branch 'main' into gad-5
akshatnema Mar 26, 2023
a2b8539
Merge branch 'main' into os-2
akshatnema Mar 26, 2023
c22fd4b
Added Sdk module for Approve/Forwd and Indent file, add/view stock, g…
aniket2003 Feb 18, 2024
d65e0a1
ps1 changes
aniket2003 Feb 23, 2024
9e3b0fa
ps1 changes 1.0
aniket2003 Feb 23, 2024
89e0831
ps1 changes 20
aniket2003 Feb 23, 2024
263eadc
ps1 changes 3.0
aniket2003 Feb 23, 2024
5879abf
ps1 changes 3.0
aniket2003 Feb 23, 2024
4962f02
GAD-4: FTS SDK
theoden42 Mar 11, 2024
c1359b7
Added pylint (#1302)
hardiksharma11 Mar 11, 2024
ed210c1
Revert "Added pylint (#1302)" (#1324)
ChaudharyRaman Mar 11, 2024
47af12c
GAD -5 Dashboard Changes (#1325)
BlackHAWK2001 Mar 11, 2024
5b920d8
made some changes
aniket2003 Mar 12, 2024
ed642ee
dashboard and usercard updated (#1329)
Arpittak Mar 12, 2024
6de59f0
changes in programme_cuuriculam,adding version to models (#1330)
anudeeps0306 Mar 12, 2024
487c0f4
added sdk in inbox,outbox and some changes
aniket2003 Mar 16, 2024
1e02e5a
Merge remote-tracking branch 'upstream/main'
ThisisMS11 Mar 17, 2024
74352be
Merge remote-tracking branch 'upstream/gad-5'
ThisisMS11 Mar 17, 2024
d0760f7
Added Dashboard Changes
ThisisMS11 Mar 17, 2024
01bf0c9
Gad 5 (#1341)
abhi87374 Mar 18, 2024
1db64d7
Os 2 (#1346)
prem-charan Mar 19, 2024
48bf988
Revert "Os 2" (#1352)
prajjwalkapoor Mar 19, 2024
8fee0c6
Os 2 (#1353)
prem-charan Mar 19, 2024
6625f30
OS-1 | VH Module (#1334)
prajjwalkapoor Mar 19, 2024
ef28e8c
Merge pull request #1360 from abhi87374/os-2
Shivkant-Chauhan Mar 19, 2024
b829689
GAD-4 Updated according to Dashboard changes (#1361)
Aragorn-64 Mar 20, 2024
eddb6b0
Sa 2 (#1362)
abhi87374 Mar 20, 2024
d2f731e
Merge branch 'staging' into gad-4
prajjwalkapoor Mar 20, 2024
16523a7
Ac 1 Request to merge in staging again. (#1373)
Kushagra-Yadav Mar 20, 2024
31c7b6e
Revert "Ac 1 Request to merge in staging again. (#1373)" (#1376)
abhi87374 Mar 20, 2024
68e43d4
Removed conflicts with ps-1 and remove migrations files
ThisisMS11 Mar 20, 2024
a34ff3c
Improvised stockEntry Modals, StockView and StockEdit for updated req…
ThisisMS11 Mar 22, 2024
4ae33f1
Added StockITem and StockTransfer Table and improvised others views r…
ThisisMS11 Mar 25, 2024
871e979
added filters in stock view and added stock_transfer_view pages
ThisisMS11 Mar 29, 2024
4785c7f
Added ps-1 API for Flutter APP
ThisisMS11 Apr 10, 2024
791bf35
Changes With migrations
ThisisMS11 Apr 11, 2024
9c38b48
GAD-4: Fix edit draft functionality and usertype Access (#1410)
Aragorn-64 Apr 11, 2024
3f9e3c9
added migrations
ThisisMS11 Apr 12, 2024
38928de
completed_merge
ThisisMS11 Apr 12, 2024
333f828
Improved UI and added some buttons
ThisisMS11 Apr 12, 2024
d82ec16
Added more apis for flutter app
ThisisMS11 Apr 13, 2024
9f8fc36
Merge branch 'FusionIIIT:main' into mohit_fusion_1
ThisisMS11 Apr 14, 2024
885f59a
Added more apis for flutter app
ThisisMS11 Apr 13, 2024
4bca813
resolved some issues
ThisisMS11 Apr 14, 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
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,4 @@ node_modules/

FusionIIIT/static/
package-lock.json

# migrations
migrations/
*.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
# Generated by Django 3.1.5 on 2023-03-15 18:53

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

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

operations = [
migrations.CreateModel(
name='Calendar',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('from_date', models.DateField()),
('to_date', models.DateField()),
('description', models.CharField(max_length=40)),
],
options={
'db_table': 'Calendar',
},
),
migrations.CreateModel(
name='Course',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('course_name', models.CharField(max_length=600)),
('course_details', models.TextField(max_length=500)),
],
options={
'db_table': 'Course',
},
),
migrations.CreateModel(
name='Curriculum',
fields=[
('curriculum_id', models.AutoField(primary_key=True, serialize=False)),
('course_code', models.CharField(max_length=20)),
('credits', models.IntegerField()),
('course_type', models.CharField(choices=[('Professional Core', 'Professional Core'), ('Professional Elective', 'Professional Elective'), ('Professional Lab', 'Professional Lab'), ('Engineering Science', 'Engineering Science'), ('Natural Science', 'Natural Science'), ('Humanities', 'Humanities'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('Management Science', 'Management Science')], max_length=25)),
('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)),
('branch', models.CharField(choices=[('CSE', 'CSE'), ('ECE', 'ECE'), ('ME', 'ME'), ('DESIGN', 'DESIGN'), ('Common', 'Common')], default='Common', max_length=10)),
('batch', models.IntegerField()),
('sem', models.IntegerField()),
('optional', models.BooleanField(default=False)),
('floated', models.BooleanField(default=False)),
('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
],
options={
'db_table': 'Curriculum',
'unique_together': {('course_code', 'batch', 'programme')},
},
),
migrations.CreateModel(
name='Curriculum_Instructor',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('chief_inst', models.BooleanField(default=False)),
('curriculum_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')),
('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'Curriculum_Instructor',
'unique_together': {('curriculum_id', 'instructor_id')},
},
),
migrations.CreateModel(
name='Exam_timetable',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('upload_date', models.DateField(auto_now_add=True)),
('exam_time_table', models.FileField(upload_to='Administrator/academic_information/')),
('batch', models.IntegerField(default='2016')),
('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)),
],
options={
'db_table': 'Exam_Timetable',
},
),
migrations.CreateModel(
name='Holiday',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('holiday_date', models.DateField()),
('holiday_name', models.CharField(max_length=40)),
('holiday_type', models.CharField(choices=[('restricted', 'restricted'), ('closed', 'closed'), ('vacation', 'vacation')], default='restricted', max_length=30)),
],
options={
'db_table': 'Holiday',
},
),
migrations.CreateModel(
name='Meeting',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('venue', models.CharField(max_length=50)),
('date', models.DateField()),
('time', models.CharField(max_length=20)),
('agenda', models.TextField()),
('minutes_file', models.CharField(max_length=40)),
],
options={
'db_table': 'Meeting',
},
),
migrations.CreateModel(
name='Student',
fields=[
('id', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='globals.extrainfo')),
('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)),
('batch', models.IntegerField(default=2016)),
('cpi', models.FloatField(default=0)),
('category', models.CharField(choices=[('GEN', 'General'), ('SC', 'Scheduled Castes'), ('ST', 'Scheduled Tribes'), ('OBC', 'Other Backward Classes')], max_length=10)),
('father_name', models.CharField(default='', max_length=40)),
('mother_name', models.CharField(default='', max_length=40)),
('hall_no', models.IntegerField(default=0)),
('room_no', models.CharField(blank=True, max_length=10, null=True)),
('specialization', models.CharField(choices=[('Power and Control', 'Power and Control'), ('Microwave and Communication Engineering', 'Microwave and Communication Engineering'), ('Micro-nano Electronics', 'Micro-nano Electronics'), ('CAD/CAM', 'CAD/CAM'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('CSE', 'CSE'), ('Mechatronics', 'Mechatronics'), ('MDes', 'MDes'), ('None', 'None')], default='', max_length=40, null=True)),
('curr_semester_no', models.IntegerField(default=1)),
('batch_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.batch')),
],
),
migrations.CreateModel(
name='Timetable',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('upload_date', models.DateTimeField(auto_now_add=True)),
('time_table', models.FileField(upload_to='Administrator/academic_information/')),
('batch', models.IntegerField(default='2016')),
('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)),
('branch', models.CharField(choices=[('CSE', 'CSE'), ('ECE', 'ECE'), ('ME', 'ME'), ('DESIGN', 'DESIGN'), ('Common', 'Common')], default='Common', max_length=10)),
],
options={
'db_table': 'Timetable',
},
),
migrations.CreateModel(
name='Student_attendance',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateField()),
('present', models.BooleanField(default=False)),
('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum_instructor')),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
options={
'db_table': 'Student_attendance',
},
),
migrations.CreateModel(
name='Grades',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('grade', models.CharField(max_length=4)),
('verify', models.BooleanField(default=False)),
('curriculum_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
options={
'db_table': 'Grades',
},
),
migrations.CreateModel(
name='Spi',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('sem', models.IntegerField()),
('spi', models.FloatField(default=0)),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
options={
'db_table': 'Spi',
'unique_together': {('student_id', 'sem')},
},
),
]
Empty file.
Loading