Sa 3

FusionIIIT/Fusion/urls.py

@@ -24,40 +24,38 @@
 
 
 urlpatterns = [
-    url(r'^', include('applications.globals.urls')),
-    url(r'^feeds/', include('applications.feeds.urls')),
-    url(r'^admin/', admin.site.urls),
-    url(r'^academic-procedures/', include('applications.academic_procedures.urls')),
-    url(r'^aims/', include('applications.academic_information.urls')),
-    url(r'^notifications/', include('applications.notifications_extension.urls')),
-    url(r'^estate/', include('applications.estate_module.urls')),
-    url(r'^dep/', include('applications.department.urls')),
-    url(r'^programme_curriculum/',include('applications.programme_curriculum.urls')),
-    url(r'^iwdModuleV2/', include('applications.iwdModuleV2.urls')),
-    url(r'^__debug__/', include(debug_toolbar.urls)),
-    url(r'^research_procedures/', include('applications.research_procedures.urls')),
-    url(r'^accounts/', include('allauth.urls')),
-
-
-    url(r'^eis/', include('applications.eis.urls')),
-    url(r'^mess/', include('applications.central_mess.urls')),
-    url(r'^complaint/', include('applications.complaint_system.urls')),
-    url(r'^healthcenter/', include('applications.health_center.urls')),
-    url(r'^leave/', include('applications.leave.urls')),
-    url(r'^placement/', include('applications.placement_cell.urls')),
-    url(r'^filetracking/', include('applications.filetracking.urls')),
-    url(r'^spacs/', include('applications.scholarships.urls')),
-    url(r'^visitorhostel/', include('applications.visitor_hostel.urls')),
-    url(r'^office/', include('applications.office_module.urls')),
-    url(r'^finance/', include('applications.finance_accounts.urls')),
-    url(r'^purchase-and-store/', include('applications.ps1.urls')),
-    url(r'^gymkhana/', include('applications.gymkhana.urls')),
-    url(r'^library/', include('applications.library.urls')),
-    url(r'^establishment/', include('applications.establishment.urls')),
-    url(r'^ocms/', include('applications.online_cms.urls')),
-    url(r'^counselling/', include('applications.counselling_cell.urls')),
-    url(r'^hostelmanagement/', include('applications.hostel_management.urls')),
-    url(r'^income-expenditure/', include('applications.income_expenditure.urls')),
-    url(r'^hr2/', include('applications.hr2.urls')),
-    url(r'^recruitment/', include('applications.recruitment.urls')),
+    url(r"^", include("applications.globals.urls")),
+    url(r"^feeds/", include("applications.feeds.urls")),
+    url(r"^admin/", admin.site.urls),
+    url(r"^academic-procedures/", include("applications.academic_procedures.urls")),
+    url(r"^aims/", include("applications.academic_information.urls")),
+    url(r"^notifications/", include("applications.notifications_extension.urls")),
+    url(r"^estate/", include("applications.estate_module.urls")),
+    url(r"^dep/", include("applications.department.urls")),
+    url(r"^programme_curriculum/", include("applications.programme_curriculum.urls")),
+    url(r"^iwdModuleV2/", include("applications.iwdModuleV2.urls")),
+    url(r"^__debug__/", include(debug_toolbar.urls)),
+    url(r"^research_procedures/", include("applications.research_procedures.urls")),
+    url(r"^accounts/", include("allauth.urls")),
+    url(r"^eis/", include("applications.eis.urls")),
+    url(r"^mess/", include("applications.central_mess.urls")),
+    url(r"^complaint/", include("applications.complaint_system.urls")),
+    url(r"^healthcenter/", include("applications.health_center.urls")),
+    url(r"^leave/", include("applications.leave.urls")),
+    url(r"^placement/", include("applications.placement_cell.urls")),
+    url(r"^filetracking/", include("applications.filetracking.urls")),
+    url(r"^spacs/", include("applications.scholarships.urls")),
+    url(r"^visitorhostel/", include("applications.visitor_hostel.urls")),
+    url(r"^office/", include("applications.office_module.urls")),
+    url(r"^finance/", include("applications.finance_accounts.urls")),
+    url(r"^purchase-and-store/", include("applications.ps1.urls")),
+    url(r"^gymkhana/", include("applications.gymkhana.urls")),
+    url(r"^library/", include("applications.library.urls")),
+    url(r"^establishment/", include("applications.establishment.urls")),
+    url(r"^ocms/", include("applications.online_cms.urls")),
+    url(r"^counselling/", include("applications.counselling_cell.urls")),
+    url(r"^hostelmanagement/", include("applications.hostel_management.urls")),
+    url(r"^income-expenditure/", include("applications.income_expenditure.urls")),
+    url(r"^hr2/", include("applications.hr2.urls")),
+    url(r"^recruitment/", include("applications.recruitment.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

FusionIIIT/applications/globals/migrations/0002_auto_20240302_1616.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2024-03-02 16:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extrainfo',
+            name='user_status',
+            field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
+        ),
+    ]

FusionIIIT/applications/globals/migrations/0003_auto_20240302_1621.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2024-03-02 16:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0002_auto_20240302_1616'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extrainfo',
+            name='user_status',
+            field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50),
+        ),
+    ]

FusionIIIT/applications/gymkhana/urls.py

@@ -15,6 +15,8 @@
     #academic administration
     url(r'^club_approve/$', views.club_approve, name='club_approve'),
     url(r'^club_reject/$', views.club_reject, name='club_reject'),
+    url(r'^budget_approve/$', views.budget_approve, name='budget_approve'),
+    url(r'^budget_reject/$', views.budget_reject, name='budget_reject'),
     # This is post method which takes username and password to generates/return Token
     url(r'^login/$', obtain_auth_token, name='login'),
     # api for "clubdetails" method="get" with TokenAuthentication