Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions FusionIIIT/applications/eis/static/fusion/css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"url": "https://github.com/Semantic-Org/Semantic-UI/issues"
},
"dependencies": {
"jquery": "x.*"
"jquery": "x.*",
"semantic-ui-css": "file:"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Generated by Django 3.1.5 on 2025-02-10 23:09

from django.db import migrations, models


class Migration(migrations.Migration):

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

operations = [
migrations.CreateModel(
name='ModuleAccess',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('designation', models.CharField(max_length=155)),
('program_and_curriculum', models.BooleanField(default=False)),
('course_registration', models.BooleanField(default=False)),
('course_management', models.BooleanField(default=False)),
('other_academics', models.BooleanField(default=False)),
('spacs', models.BooleanField(default=False)),
('department', models.BooleanField(default=False)),
('examinations', models.BooleanField(default=False)),
('hr', models.BooleanField(default=False)),
('iwd', models.BooleanField(default=False)),
('complaint_management', models.BooleanField(default=False)),
('fts', models.BooleanField(default=False)),
('purchase_and_store', models.BooleanField(default=False)),
('rspc', models.BooleanField(default=False)),
('hostel_management', models.BooleanField(default=False)),
('mess_management', models.BooleanField(default=False)),
('gymkhana', models.BooleanField(default=False)),
('placement_cell', models.BooleanField(default=False)),
('visitor_hostel', models.BooleanField(default=False)),
('phc', models.BooleanField(default=False)),
],
),
migrations.AddField(
model_name='extrainfo',
name='last_selected_role',
field=models.CharField(blank=True, max_length=20, null=True),
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"url": "https://github.com/Semantic-Org/Semantic-UI/issues"
},
"dependencies": {
"jquery": "x.*"
"jquery": "x.*",
"semantic-ui-css": "file:"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@
"bugs": {
"url": "https://github.com/Semantic-Org/Semantic-UI/issues"
},
"devDependencies": {}
"dependencies": {
"semantic": "file:"
}
}
19 changes: 12 additions & 7 deletions FusionIIIT/applications/iwdModuleV2/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,13 @@ def created_requests(request):
designation=params.get('role'),
src_module="IWD"
)
print(inbox_files)
for result in inbox_files:
print("hello1")
src_object_id = result['src_object_id']
request_object = Requests.objects.filter(id=src_object_id).first()
if request_object:
print("hello")
file_obj = get_object_or_404(File, src_object_id=request_object.id, src_module="IWD")
element = {
'request_id': request_object.id,
Expand Down Expand Up @@ -1174,28 +1177,30 @@ def handle_settle_bill_requests(request):
@api_view(['POST'])
@permission_classes([IsAuthenticated])
def create_proposal(request):
data = request.data
data = request.data.copy()
data["created_by"] = str(request.user)
print(data)
print(data.get('role'))
data["request"] = data.get('id')
print(Requests.objects.get(id=data.get('id')))
print(request.user)
# print(Requests.objects.get(id=data.get('id')))
# print(request.user)
receiver_desg, receiver_user = data.get('designation').split('|')
serializer = ProposalSerializer(data=data)
if serializer.is_valid():
proposal = serializer.save()
file_id = create_file(
uploader=request.user.username,
uploader_designation=data.get('role'),
receiver=receiver_user,
receiver_designation=receiver_desg,
src_module="IWD",
src_object_id=str(data.get("id")),
src_object_id=str(proposal.id),
file_extra_JSON={"value": 2},
attached_file=None
)
file_instance = File.objects.get(id=file_id)
proposal = serializer.save(
file=file_instance
)
proposal.file = file_instance
proposal.save()
return Response(serializer.data, status=status.HTTP_201_CREATED)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Generated by Django 3.1.5 on 2025-02-10 23:09

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


class Migration(migrations.Migration):

dependencies = [
('academic_information', '0001_initial'),
('online_cms', '0002_auto_20250128_1656'),
]

operations = [
migrations.AddField(
model_name='attendance',
name='no_of_attendance',
field=models.IntegerField(default=1),
),
migrations.CreateModel(
name='StudentEvaluation',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('marks', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
('total_marks', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
('evaluation_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.gradingscheme')),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
),
]