Merge pull request #1500 from SharanKumar06/rspc--latest_staging

Rspc latest staging
FusionIIIT · Apr 22, 2024 · 3f15cb3 · 3f15cb3
2 parents 059afbe + fef9a29
commit 3f15cb3
Show file tree

Hide file tree

Showing 17 changed files with 704 additions and 195 deletions.
diff --git a/FusionIIIT/applications/research_procedures/models.py b/FusionIIIT/applications/research_procedures/models.py
@@ -46,7 +46,7 @@ class financial_outlay(models.Model):
     year=models.IntegerField()
     status= models.IntegerField(default=0)
     staff_limit=models.IntegerField(default=0)
-    utilized_amount=models.IntegerField(default=0)
+    utilized_amount=models.IntegerField(default=0,null= True)
 
     def __str__(self):
         return str(self.financial_outlay_id)
@@ -77,7 +77,9 @@ class staff_allocations(models.Model):
     year=models.IntegerField()
     stipend=models.IntegerField()
     staff_type=models.CharField(max_length=100,default="research")
-
+    start_date=models.DateField(default=datetime.date.today()) #default=datetime.date.today()
+    end_date=models.DateField(null=True, blank=True)
+
     def __str__(self):
         return str(self.staff_allocation_id)
 

diff --git a/FusionIIIT/applications/research_procedures/urls.py b/FusionIIIT/applications/research_procedures/urls.py
@@ -15,7 +15,6 @@
       # path('add_requests/<id>/<pj_id>/',views.add_requests,name='add_requests'),
       url(r'^api/',include('applications.research_procedures.api.urls')),
       # path('view_requests/<id>/',views.view_requests),
-
       path('view_project_info/<id>/',views.view_project_info),
       # path('submit_closure_report/<id>/',views.submit_closure_report, name="submit_closure_report"),
       # path('add_fund_requests/<pj_id>/',views.add_fund_requests, name="add_fund_requests"),
@@ -30,10 +29,14 @@
       path('add_staff_request/<id>/',views.add_staff_request, name="add_staff_request"),
       path('inbox',views.inbox, name="inbox"),
       path('view_request_inbox',views.view_request_inbox, name="view_request_inbox"),
-      path('forward_request',views.forward_request, name="forward_request"),
+      path('forward_request/<id>/',views.forward_request, name="forward_request"),
       path('update_financial_outlay/<pid>/',views.update_financial_outlay,name="update_financial_outlay"),
       path('approve_request/<id>/',views.approve_request,name="approve_request"),
-
+      path('view_file/<id>/',views.view_file,name="view_file"),
+      path('update_time_period/<id>/',views.update_time_period,name="update_time_period"),
+      path('change_year/<id>/',views.change_year,name="change_year"),
+      path('change_end_date/<id>/',views.change_end_date,name="change_end_date"),
+      path('download_project_pdf/<int:project_id>/', views.download_project_pdf, name='download_project_pdf'),
       #  path('serve-pdf/<str:filename>/', serve_pdf, name='serve_pdf'),