Skip to content

Commit 4a2ed58

Browse files
authored
minor updates while updating the issue-work-order table (#4)
1 parent 2e83db6 commit 4a2ed58

File tree

5 files changed

+97
-14
lines changed

5 files changed

+97
-14
lines changed

FusionIIIT/applications/central_mess/migrations/0001_initial.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,17 @@ class Migration(migrations.Migration):
149149
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
150150
],
151151
),
152-
migrations.CreateModel(
153-
name='Payments',
154-
fields=[
155-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
156-
('amount_paid', models.IntegerField(default=0)),
157-
('payment_month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)),
158-
('payment_year', models.IntegerField(default=applications.central_mess.models.current_year)),
159-
('payment_date', models.DateField(default=datetime.date(2024, 6, 19))),
160-
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
161-
],
162-
),
152+
# migrations.CreateModel(
153+
# name='Payments',
154+
# fields=[
155+
# ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
156+
# ('amount_paid', models.IntegerField(default=0)),
157+
# ('payment_month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)),
158+
# ('payment_year', models.IntegerField(default=applications.central_mess.models.current_year)),
159+
# ('payment_date', models.DateField(default=datetime.date(2024, 6, 19))),
160+
# ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
161+
# ],
162+
# ),
163163
migrations.CreateModel(
164164
name='Mess_minutes',
165165
fields=[
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by Django 3.1.5 on 2024-10-21 20:42
2+
3+
import datetime
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('central_mess', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='payments',
16+
name='payment_date',
17+
field=models.DateField(default=datetime.date(2024, 10, 21)),
18+
),
19+
migrations.AlterUniqueTogether(
20+
name='payments',
21+
unique_together=set(),
22+
),
23+
]

FusionIIIT/applications/iwdModuleV2/api/views.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,8 @@ def handleUpdateRequests(request):
787787
@permission_classes([IsAuthenticated])
788788
def issueWorkOrder(request):
789789
obj = []
790-
desg = request.session.get('currentDesignationSelected')
790+
params = request.query_params
791+
desg = params.get('role')
791792

792793
# Retrieve inbox files
793794
inbox_files = view_inbox(
@@ -801,10 +802,10 @@ def issueWorkOrder(request):
801802
src_object_id = result['src_object_id']
802803
request_object = Requests.objects.filter(
803804
id=src_object_id,
804-
directorApproval=1,
805+
# directorApproval=1,
805806
issuedWorkOrder=0
806807
).first()
807-
808+
print(request_object, 11)
808809
if request_object:
809810
element = {
810811
"id": request_object.id,
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Generated by Django 3.1.5 on 2024-10-21 20:42
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('academic_information', '0001_initial'),
11+
('online_cms', '0001_initial'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='attendance',
17+
name='no_of_attendance',
18+
field=models.IntegerField(default=1),
19+
),
20+
migrations.AlterField(
21+
model_name='attendance',
22+
name='present',
23+
field=models.IntegerField(default=0),
24+
),
25+
migrations.AlterField(
26+
model_name='gradingscheme',
27+
name='type_of_evaluation',
28+
field=models.CharField(max_length=100),
29+
),
30+
migrations.CreateModel(
31+
name='StudentEvaluation',
32+
fields=[
33+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
34+
('marks', models.DecimalField(decimal_places=2, max_digits=10, null=True)),
35+
('total_marks', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
36+
('evaluation_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.gradingscheme')),
37+
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
38+
],
39+
),
40+
]
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 3.1.5 on 2024-10-21 20:42
2+
3+
import datetime
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('research_procedures', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='staff_allocations',
16+
name='start_date',
17+
field=models.DateField(default=datetime.date(2024, 10, 21)),
18+
),
19+
]

0 commit comments

Comments
 (0)