GAD-6 --> Latest Staging

FusionIIIT/applications/ps1/api/views.py

@@ -53,7 +53,6 @@ def createProposal(request):
         designation = Designation.objects.get(id=HoldsDesignation.objects.select_related('user', 'working', 'designation').get(id=design).designation_id)
         upload_file = request.FILES.get('myfile')
         item_name = request.data.get('item_name')
-        grade = request.data.get('grade')
         quantity = request.data.get('quantity')
         present_stock = request.data.get('present_stock')
         estimated_cost = request.data.get('estimated_cost')
@@ -89,7 +88,6 @@ def createProposal(request):
             estimated_cost=estimated_cost,
             purpose=purpose,
             specification=specification,
-            grade=grade,
             item_type=item_type,
             nature=nature,
             indigenous=indigenous,
@@ -445,12 +443,11 @@ def currentStockView(request,id):
         else:
             return Response({"message": "Invalid designation"}, status=status.HTTP_403_FORBIDDEN)
 
-        grouped_items = stocks.values('StockEntryId__item_id__item_type', 'StockEntryId__item_id__grade', 'department').annotate(total_quantity=Count('id'))
+        grouped_items = stocks.values('StockEntryId__item_id__item_type', 'department').annotate(total_quantity=Count('id'))
 
         grouped_items_list = [
             {
                 'item_type': item['StockEntryId__item_id__item_type'],
-                'grade': item['StockEntryId__item_id__grade'],
                 'department': DepartmentInfo.objects.get(id=item['department']).name,
                 'total_quantity': item['total_quantity']
             }
@@ -462,25 +459,22 @@ def currentStockView(request,id):
     elif request.method == 'POST':
         # Handle POST request
         department = request.data.get('department')
-        grade = request.data.get('grade')
         item_type = request.data.get('item_type')
 
-        if not department or not grade or not item_type:
+        if not department or not item_type:
             return Response({"message": "Missing required parameters"}, status=status.HTTP_400_BAD_REQUEST)
 
         # Filter StockItem based on provided filters
         StockItems = StockItem.objects.filter(
             department=department,
-            StockEntryId__item_id__grade=grade,
             StockEntryId__item_id__item_type=item_type
         )
 
-        grouped_items = StockItems.values('StockEntryId__item_id__item_type', 'StockEntryId__item_id__grade', 'department').annotate(total_quantity=Count('id'))
+        grouped_items = StockItems.values('StockEntryId__item_id__item_type', 'department').annotate(total_quantity=Count('id'))
 
         grouped_items_list = [
             {
                 'item_type': item['StockEntryId__item_id__item_type'],
-                'grade': item['StockEntryId__item_id__grade'],
                 'department': DepartmentInfo.objects.get(id=department).name,
                 'total_quantity': item['total_quantity']
             }
@@ -544,11 +538,9 @@ def stockTransfer(request,id):
     temp1=IndentFile.objects.get(file_info=temp)
 
     item_type_required =temp1.item_type
-    item_grade_required = temp1.grade
 
     available_items=StockItem.objects.filter(
         StockEntryId__item_id__item_type=item_type_required,
-        StockEntryId__item_id__grade=item_grade_required,
         inUse=False  
     )
 

FusionIIIT/applications/ps1/models.py

@@ -15,7 +15,6 @@ class IndentFile(models.Model):
     estimated_cost=models.IntegerField(null=True, blank=False)
     purpose=models.CharField(max_length=250,blank=False )
     specification=models.CharField(max_length=250)
-    grade = models.CharField(max_length=1, choices=[('A', 'A'), ('B', 'B'), ('C', 'C')],default='A')
     item_type=models.CharField(max_length=250)
     nature=models.BooleanField(default = False)
     indigenous= models.BooleanField(default = False)
@@ -34,14 +33,11 @@ class Meta:
 
 class Constants:
     Locations = (
-        ('H1', 'Vashistha Hostel'),
-        ('H4', 'Vivekananda Hostel'),
-        ('H3', 'AryaBhatta Hostel'),
-        ('SR1', 'Storage Room 1'),
-        ('SR2', 'Storage Room 2'),
-        ('SR3', 'Storage Room 3'),
-        ('SR4', 'Storage Room 4'),
-        ('SR5', 'Storage Room 5'),
+        ('SR1', 'LHTC'),
+        ('SR2', 'Computer Center'),
+        ('SR3', 'Panini Hostel'),
+        ('SR4', 'Lab complex'),
+        ('SR5', 'Admin Block'),
     )
 
 class StockEntry(models.Model):

FusionIIIT/applications/ps1/urls.py

@@ -12,21 +12,22 @@
     url(r'^composed_indents/$', views.composed_indents, name='composed_indents'),
 
     # here id is the Holdsdesignation id.
-    url(r'^indentview/(?P<id>\d+)$', views.indentview, name='indentview'),
+    url(r'^indentview/(?P<id>\d+)/$', views.indentview, name='indentview'),
+    url(r'^archieveview/(?P<id>\d+)/$', views.archieveview, name='archieveview'),
 
     url(r'^drafts/$', views.drafts, name='drafts'),
-    url(r'^draftview/(?P<id>\d+)$', views.draftview, name='draftview'),
+    url(r'^draftview/(?P<id>\d+)/$', views.draftview, name='draftview'),
     url(r'^inwardIndent/$', views.inward, name='inward'),
 
     # indentview2 is to get all the indentFiles inwarded towards the request.user.
 
-    url(r'^indentview2/(?P<id>\d+)$', views.indentview2, name='indentview2'),
-    url(r'^confirmdelete/(?P<id>\d+)$', views.confirmdelete, name='confirm_delete'),
-    url(r'^delete/(?P<id>\d+)$',views.delete, name='delete'),
+    url(r'^indentview2/(?P<id>\d+)/$', views.indentview2, name='indentview2'),
+    url(r'^confirmdelete/(?P<id>\d+)/$', views.confirmdelete, name='confirm_delete'),
+    url(r'^delete/(?P<id>\d+)/$',views.delete, name='delete'),
     # forward Indent is to see a specific forwarded indent to ourselves 
     url(r'^forwardindent/(?P<id>\d+)/$', views.forwardindent, name='forwardindent'),
     url(r'^createdindent/(?P<id>\d+)/$', views.createdindent, name='createdindent'),
-
+    url(r'^forwardedIndent/(?P<id>\d+)/$', views.forwardedIndent, name='forwardedIndent'),
 
     url(r'^entry/$', views.entry, name='entry'),
     url(r'^StockEntry/$', views.Stock_Entry, name='Stock_Entry'),
@@ -43,6 +44,7 @@
     # to display stock items which are having similar item_type ,grade and department.(used in current_stock_view)
     url(r'^stock_item_view/$', views.stock_item_view, name='stock_item_view'),
 
+    url(r'^archieved_indents/$', views.archieved_files, name='archieved_indents_view'),
 
 
 
@@ -62,7 +64,7 @@
     url(r'^stock_transfer/$', views.stock_transfer, name='stock_transfer'),
     url(r'^view_transfer/$', views.view_transfer, name='view_transfer'),
 
-    url(r'^outboxview2/$', views.outboxview2, name='outboxview2'),
+    url(r'^outboxview2/(?P<id>\d+)/$', views.outboxview2, name='outboxview2'),
     url(r'^outboxview/$', views.outboxview, name='outboxview'),