Skip to content

Commit

Permalink
Merge pull request #1567 from xenouno/latest_staging
Browse files Browse the repository at this point in the history 
corrected ac-4 module
  • Loading branch information
@prabhatsuman
prabhatsuman authored Apr 24, 2024
2 parents 312b20c + 5f2eb17 commit 23e9af8
Show file tree
Hide file tree
Showing 70 changed files with 9,853 additions and 1 deletion.
1 change: 1 addition & 0 deletions FusionIIIT/Fusion/settings/common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
'applications.ps1',
'applications.programme_curriculum',
'applications.placement_cell',
'applications.otheracademic',
'applications.recruitment',
'applications.scholarships',
'applications.visitor_hostel',
Expand Down
1 change: 1 addition & 0 deletions FusionIIIT/Fusion/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,5 @@
url(r'^hr2/', include('applications.hr2.urls')),
url(r'^recruitment/', include('applications.recruitment.urls')),
url(r'^examination/', include('applications.examination.urls')),
url(r'^otheracademic/', include('applications.otheracademic.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
Empty file added FusionIIIT/applications/otheracademic/__init__.py
View file
Empty file.
18 changes: 18 additions & 0 deletions FusionIIIT/applications/otheracademic/admin.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
from django.contrib import admin

# Register your models here.

from applications.otheracademic.models import GraduateSeminarFormTable,LeaveFormTable,BonafideFormTableUpdated,AssistantshipClaimFormStatusUpd,NoDues,LeavePG,LeavePGUpdTable

admin.site.register(LeaveFormTable)

admin.site.register(BonafideFormTableUpdated)
admin.site.register(GraduateSeminarFormTable)

admin.site.register(AssistantshipClaimFormStatusUpd)

admin.site.register(NoDues)
admin.site.register(LeavePGUpdTable)
admin.site.register(LeavePG)


6 changes: 6 additions & 0 deletions FusionIIIT/applications/otheracademic/apps.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class OtheracademicConfig(AppConfig):

name = 'otheracademic'
226 changes: 226 additions & 0 deletions FusionIIIT/applications/otheracademic/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
# Generated by Django 3.1.5 on 2024-04-16 20:30

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


class Migration(migrations.Migration):

initial = True

dependencies = [
('globals', '__first__'),
]

operations = [
migrations.CreateModel(
name='GraduateSeminarFormTable',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('roll_no', models.CharField(max_length=20)),
('semester', models.CharField(max_length=100)),
('date_of_seminar', models.DateField()),
],
options={
'db_table': 'GraduateSeminarFormTable',
},
),
migrations.CreateModel(
name='NoDues',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('library_clear', models.BooleanField(default=False)),
('library_notclear', models.BooleanField(default=False)),
('hostel_clear', models.BooleanField(default=False)),
('hostel_notclear', models.BooleanField(default=False)),
('mess_clear', models.BooleanField(default=False)),
('mess_notclear', models.BooleanField(default=False)),
('ece_clear', models.BooleanField(default=False)),
('ece_notclear', models.BooleanField(default=False)),
('physics_lab_clear', models.BooleanField(default=False)),
('physics_lab_notclear', models.BooleanField(default=False)),
('mechatronics_lab_clear', models.BooleanField(default=False)),
('mechatronics_lab_notclear', models.BooleanField(default=False)),
('cc_clear', models.BooleanField(default=False)),
('cc_notclear', models.BooleanField(default=False)),
('workshop_clear', models.BooleanField(default=False)),
('workshop_notclear', models.BooleanField(default=False)),
('signal_processing_lab_clear', models.BooleanField(default=False)),
('signal_processing_lab_notclear', models.BooleanField(default=False)),
('vlsi_clear', models.BooleanField(default=False)),
('vlsi_notclear', models.BooleanField(default=False)),
('design_studio_clear', models.BooleanField(default=False)),
('design_studio_notclear', models.BooleanField(default=False)),
('design_project_clear', models.BooleanField(default=False)),
('design_project_notclear', models.BooleanField(default=False)),
('bank_clear', models.BooleanField(default=False)),
('bank_notclear', models.BooleanField(default=False)),
('icard_dsa_clear', models.BooleanField(default=False)),
('icard_dsa_notclear', models.BooleanField(default=False)),
('account_clear', models.BooleanField(default=False)),
('account_notclear', models.BooleanField(default=False)),
('btp_supervisor_clear', models.BooleanField(default=False)),
('btp_supervisor_notclear', models.BooleanField(default=False)),
('discipline_office_clear', models.BooleanField(default=False)),
('discipline_office_notclear', models.BooleanField(default=False)),
('student_gymkhana_clear', models.BooleanField(default=False)),
('student_gymkhana_notclear', models.BooleanField(default=False)),
('alumni_clear', models.BooleanField(default=False)),
('alumni_notclear', models.BooleanField(default=False)),
('placement_cell_clear', models.BooleanField(default=False)),
('placement_cell_notclear', models.BooleanField(default=False)),
('discipline_office_dsa_clear', models.BooleanField(default=False)),
('discipline_office_dsa_notclear', models.BooleanField(default=False)),
('hostel_credential', models.CharField(max_length=100)),
('bank_credential', models.CharField(max_length=100)),
('btp_credential', models.CharField(max_length=100)),
('cse_credential', models.CharField(max_length=100)),
('design_credential', models.CharField(max_length=100)),
('acad_credential', models.CharField(max_length=100)),
('ece_credential', models.CharField(max_length=100)),
('library_credential', models.CharField(max_length=100)),
('me_credential', models.CharField(max_length=100)),
('mess_credential', models.CharField(max_length=100)),
('physics_credential', models.CharField(max_length=100)),
('discipline_credential', models.CharField(max_length=100)),
('acad_admin_float', models.BooleanField(default=False)),
('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'NoDues',
},
),
migrations.CreateModel(
name='LeavePGUpdTable',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('student_name', models.CharField(max_length=100)),
('programme', models.CharField(max_length=100)),
('discipline', models.CharField(max_length=100)),
('Semester', models.CharField(max_length=100)),
('date_from', models.DateField()),
('date_to', models.DateField()),
('date_of_application', models.DateField()),
('upload_file', models.FileField(upload_to='leave_doc')),
('address', models.CharField(max_length=100)),
('purpose', models.TextField()),
('leave_type', models.CharField(choices=[('Casual', 'Casual'), ('Medical', 'Medical'), ('Vacation', 'Vacation'), ('Duty', 'Duty')], max_length=20)),
('mobile_no', models.CharField(max_length=100)),
('parent_mobile_no', models.CharField(max_length=100)),
('alt_mobile_no', models.CharField(max_length=100)),
('ta_approved', models.BooleanField()),
('ta_rejected', models.BooleanField()),
('hod_approved', models.BooleanField()),
('hod_rejected', models.BooleanField()),
('ta_supervisor', models.CharField(max_length=100)),
('hod', models.CharField(max_length=100)),
('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'LeavePGUpdTable',
},
),
migrations.CreateModel(
name='LeavePG',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('student_name', models.CharField(max_length=100)),
('programme', models.CharField(max_length=100)),
('discipline', models.CharField(max_length=100)),
('Semester', models.CharField(max_length=100)),
('date_from', models.DateField()),
('date_to', models.DateField()),
('date_of_application', models.DateField()),
('upload_file', models.FileField(upload_to='leave_doc')),
('address', models.CharField(max_length=100)),
('purpose', models.TextField()),
('leave_type', models.CharField(choices=[('Casual', 'Casual'), ('Medical', 'Medical'), ('Vacation', 'Vacation'), ('Duty', 'Duty')], max_length=20)),
('mobile_no', models.CharField(max_length=100)),
('parent_mobile_no', models.CharField(max_length=100)),
('alt_mobile_no', models.CharField(max_length=100)),
('ta_approved', models.BooleanField()),
('ta_rejected', models.BooleanField()),
('hod_approved', models.BooleanField()),
('hod_rejected', models.BooleanField()),
('ta_supervisor', models.CharField(max_length=100)),
('hod', models.CharField(max_length=100)),
('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'LeavePG',
},
),
migrations.CreateModel(
name='LeaveFormTable',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('student_name', models.CharField(max_length=100)),
('date_from', models.DateField()),
('date_to', models.DateField()),
('date_of_application', models.DateField()),
('upload_file', models.FileField(blank=True, upload_to='')),
('address', models.CharField(max_length=100)),
('purpose', models.TextField()),
('leave_type', models.CharField(choices=[('Casual', 'Casual'), ('Medical', 'Medical')], max_length=20)),
('approved', models.BooleanField()),
('rejected', models.BooleanField()),
('hod', models.CharField(max_length=100)),
('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'LeaveFormTable',
},
),
migrations.CreateModel(
name='BonafideFormTableUpdated',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('student_names', models.CharField(max_length=100)),
('branch_types', models.CharField(max_length=50)),
('semester_types', models.CharField(max_length=20)),
('purposes', models.TextField()),
('date_of_applications', models.DateField()),
('approve', models.BooleanField()),
('reject', models.BooleanField()),
('download_file', models.FileField(default='not available', upload_to='Bonafide')),
('roll_nos', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'BonafideFormTableUpdated',
},
),
migrations.CreateModel(
name='AssistantshipClaimFormStatusUpd',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('student_name', models.CharField(max_length=100)),
('discipline', models.CharField(max_length=100)),
('dateFrom', models.DateField()),
('dateTo', models.DateField()),
('bank_account', models.CharField(max_length=100)),
('student_signature', models.FileField(upload_to='student_signatures/')),
('dateApplied', models.DateField()),
('ta_supervisor', models.CharField(max_length=100)),
('thesis_supervisor', models.CharField(max_length=100)),
('hod', models.CharField(max_length=100)),
('applicability', models.CharField(max_length=100)),
('TA_approved', models.BooleanField()),
('TA_rejected', models.BooleanField()),
('Ths_approved', models.BooleanField()),
('Ths_rejected', models.BooleanField()),
('HOD_approved', models.BooleanField()),
('HOD_rejected', models.BooleanField()),
('Acad_approved', models.BooleanField()),
('Acad_rejected', models.BooleanField()),
('amount', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
('rate', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
('half_day_leave', models.IntegerField(default=0)),
('full_day_leave', models.IntegerField(default=0)),
('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'AssistantshipClaimFormStausUpd',
},
),
]
Empty file added FusionIIIT/applications/otheracademic/migrations/__init__.py
View file
Empty file.
Loading

0 comments on commit 23e9af8

Please sign in to comment.