diff --git a/FusionIIIT/applications/central_mess/migrations/0001_initial.py b/FusionIIIT/applications/central_mess/migrations/0001_initial.py index 7e80bedf5..b392627e5 100644 --- a/FusionIIIT/applications/central_mess/migrations/0001_initial.py +++ b/FusionIIIT/applications/central_mess/migrations/0001_initial.py @@ -149,17 +149,17 @@ class Migration(migrations.Migration): ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), ], ), - migrations.CreateModel( - name='Payments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('amount_paid', models.IntegerField(default=0)), - ('payment_month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)), - ('payment_year', models.IntegerField(default=applications.central_mess.models.current_year)), - ('payment_date', models.DateField(default=datetime.date(2024, 6, 19))), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), + # migrations.CreateModel( + # name='Payments', + # fields=[ + # ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + # ('amount_paid', models.IntegerField(default=0)), + # ('payment_month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)), + # ('payment_year', models.IntegerField(default=applications.central_mess.models.current_year)), + # ('payment_date', models.DateField(default=datetime.date(2024, 6, 19))), + # ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), + # ], + # ), migrations.CreateModel( name='Mess_minutes', fields=[ diff --git a/FusionIIIT/applications/central_mess/migrations/0002_auto_20241021_2042.py b/FusionIIIT/applications/central_mess/migrations/0002_auto_20241021_2042.py new file mode 100644 index 000000000..d550199fa --- /dev/null +++ b/FusionIIIT/applications/central_mess/migrations/0002_auto_20241021_2042.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.5 on 2024-10-21 20:42 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('central_mess', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='payments', + name='payment_date', + field=models.DateField(default=datetime.date(2024, 10, 21)), + ), + migrations.AlterUniqueTogether( + name='payments', + unique_together=set(), + ), + ] diff --git a/FusionIIIT/applications/iwdModuleV2/api/views.py b/FusionIIIT/applications/iwdModuleV2/api/views.py index 4d12d800a..73edf2c10 100644 --- a/FusionIIIT/applications/iwdModuleV2/api/views.py +++ b/FusionIIIT/applications/iwdModuleV2/api/views.py @@ -787,7 +787,8 @@ def handleUpdateRequests(request): @permission_classes([IsAuthenticated]) def issueWorkOrder(request): obj = [] - desg = request.session.get('currentDesignationSelected') + params = request.query_params + desg = params.get('role') # Retrieve inbox files inbox_files = view_inbox( @@ -801,10 +802,10 @@ def issueWorkOrder(request): src_object_id = result['src_object_id'] request_object = Requests.objects.filter( id=src_object_id, - directorApproval=1, + # directorApproval=1, issuedWorkOrder=0 ).first() - + print(request_object, 11) if request_object: element = { "id": request_object.id, diff --git a/FusionIIIT/applications/online_cms/migrations/0002_auto_20241021_2042.py b/FusionIIIT/applications/online_cms/migrations/0002_auto_20241021_2042.py new file mode 100644 index 000000000..19fbf8d5f --- /dev/null +++ b/FusionIIIT/applications/online_cms/migrations/0002_auto_20241021_2042.py @@ -0,0 +1,40 @@ +# Generated by Django 3.1.5 on 2024-10-21 20:42 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('academic_information', '0001_initial'), + ('online_cms', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='attendance', + name='no_of_attendance', + field=models.IntegerField(default=1), + ), + migrations.AlterField( + model_name='attendance', + name='present', + field=models.IntegerField(default=0), + ), + migrations.AlterField( + model_name='gradingscheme', + name='type_of_evaluation', + field=models.CharField(max_length=100), + ), + 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')), + ], + ), + ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0002_auto_20241021_2042.py b/FusionIIIT/applications/research_procedures/migrations/0002_auto_20241021_2042.py new file mode 100644 index 000000000..2214841bb --- /dev/null +++ b/FusionIIIT/applications/research_procedures/migrations/0002_auto_20241021_2042.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.5 on 2024-10-21 20:42 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('research_procedures', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='staff_allocations', + name='start_date', + field=models.DateField(default=datetime.date(2024, 10, 21)), + ), + ]