FusionIIIT
diff --git a/‎FusionIIIT/applications/ps1/api/serializers.py‎
Lines changed: 15 additions & 1 deletion b/‎FusionIIIT/applications/ps1/api/serializers.py‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎FusionIIIT/applications/ps1/api/urls.py‎
Lines changed: 24 additions & 7 deletions b/‎FusionIIIT/applications/ps1/api/urls.py‎
Lines changed: 24 additions & 7 deletions
@@ -1,5 +1,5 @@
 from rest_framework import serializers #type:ignore
-from applications.ps1.models import IndentFile, File ,StockEntry,StockItem,StockTransfer
+from applications.ps1.models import IndentFile, File ,StockEntry,StockItem,StockTransfer,IndentItem
 from applications.globals.models import ExtraInfo, HoldsDesignation
 from applications.filetracking.models import Tracking
 
@@ -8,10 +8,24 @@ class Meta:
         model = File
         fields = '__all__'
 
+# class IndentFileSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model = IndentFile
+#         fields = '__all__'
+
+# arun__________start______
+class IndentItemSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = IndentItem
+        fields = '__all__'
+
 class IndentFileSerializer(serializers.ModelSerializer):
+    items = IndentItemSerializer(many=True, read_only=True)  # Nested serializer for related items
+
     class Meta:
         model = IndentFile
         fields = '__all__'
+# arun__________end______
 
 class ExtraInfoSerializer(serializers.ModelSerializer):
     class Meta:
 
@@ -1,25 +1,35 @@
 from django.conf.urls import url
-
+from django.urls import path
 from . import views
 
 urlpatterns = [
     # to create a new indent file
     url(r'^create_proposal/', views.createProposal, name='create-proposal'),
-
+    url(r'^create_draft/', views.createDraft, name='create-draft'),
+    url(r'^delete_indent/', views.delete_indent, name='delete-indents'),
+    url(r'^view_indent/', views.getOneFiledIndent, name='view-indent'),
+    # path('create_indent/<int:id>/', views.createIndent, name='create-indent'),
+    path('forward_indent/<int:id>/', views.forwardIndent, name='create-indent'),
     # PENDING : TO CREATE A INDENT FILE DRAFT
-
+    path('user-suggestions', views.user_suggestions, name='user-suggestions'),
     # GET DESIGNATIONS USING USER TOKEN 
     url(r'^getDesignations/', views.getDesignations, name='get-designations'),
 
     # to get the indent files created by the user
-    url(r'^indentview/(?P<id>\d+)$', views.indentView, name='indent-view'),
+    path('indentview/<str:username>/', views.indentView, name='indent-view'),
+    path('indentview2/<str:username>/', views.indentView2, name='indent-view2'),
+    # url(r'^indentview2/(?P<id>\d+)$', views.indentView2, name='indent-view2'),
 
     # to get the indent Files drafts by a user
-    url(r'^draftview/(?P<id>\d+)$', views.draftView, name='draft-view'),
+    path('draftview/<str:username>/', views.draftView, name='draft-view'),
 
     # to get all the indent files inwarded to the user  'id' is holdsDesignation id.
     url(r'^inwardIndents/(?P<id>\d+)$', views.inwardIndents, name='inward-indents'),
 
+
+    # url(r'^outboxview2/(?P<id>\d+)/$', views.outboxview2, name='outboxview2'),
+
+
     # to see the details of a specifc indent file
     url(r'^indentFile/(?P<id>\d+)$', views.indentFile, name='indent-file'),
 
@@ -31,7 +41,7 @@
     url(r'^entry/(?P<id>\d+)$', views.entry, name='entry'),
 
     # To add stock corresponding to a Indent File
-    url(r'^stockEntry/(?P<id>\d+)$', views.stockEntry, name='stock-entry'),
+    # url(r'^stockEntry/(?P<id>\d+)$', views.stockEntry, name='stock-entry'),
 
     # To view all the stock entry details
     url(r'^stock_entry_view/(?P<id>\d+)$', views.stockEntryView, name='stock-entry-view'),
@@ -50,4 +60,11 @@
 
 
     url(r'^perform_transfer/(?P<id>\d+)$', views.performTransfer, name='perform-transfer'),
-]
+    # url(r'^archieveview/(?P<id>\d+)$', views.archieveview, name='archievedview'),
+
+    url(r'^archieve_indent/(?P<id>\d+)/$', views.archieve_file, name='archieve-file'),
+
+    path('archieveview/<str:username>/', views.archieveview, name='archievedview'),
+    path('outboxview2/<str:username>/', views.outboxview2, name='outboxview2'),
+    path('stockEntry/<str:username>/', views.stockEntry, name='stock-entry'),
+]