gad-3 : workers would be assigned by Section Incharge instead of Caretaker

FusionIIIT/applications/complaint_system/admin.py

@@ -1,8 +1,9 @@
 from django.contrib import admin
 
-from .models import Caretaker, StudentComplain, Supervisor, Workers
+from .models import Caretaker, StudentComplain, Supervisor, Workers,  SectionIncharge
 
 admin.site.register(Caretaker)
 admin.site.register(Workers)
 admin.site.register(StudentComplain)
 admin.site.register(Supervisor)
+admin.site.register(SectionIncharge)

FusionIIIT/applications/complaint_system/models.py

@@ -12,11 +12,13 @@ class Constants:
         ('hall-1', 'hall-1'),
         ('hall-3', 'hall-3'),
         ('hall-4', 'hall-4'),
-        ('CC1', 'CC1'),
-        ('CC2', 'CC2'),
+        ('library', 'CC1'),
+        ('computer center', 'CC2'),
         ('core_lab', 'core_lab'),
         ('LHTC', 'LHTC'),
         ('NR2', 'NR2'),
+        ('NR3', 'NR3'),
+        ('Admin building', 'Admin building'),
         ('Rewa_Residency', 'Rewa_Residency'),
         ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'),
         ('Nagarjun Hostel', 'Nagarjun Hostel'),
@@ -44,9 +46,16 @@ class Caretaker(models.Model):
     def __str__(self):
         return str(self.id) + '-' + self.area
 
+class SectionIncharge(models.Model):
+    staff_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
+    work_type = models.CharField(choices=Constants.COMPLAINT_TYPE,
+                                   max_length=20, default='Electricity')
+
+    def __str__(self):
+        return str(self.id) + '-' + self.work_type
 
 class Workers(models.Model):
-    caretaker_id = models.ForeignKey(Caretaker, on_delete=models.CASCADE)
+    secincharge_id = models.ForeignKey(SectionIncharge, on_delete=models.CASCADE)
     name = models.CharField(max_length=50)
     age = models.CharField(max_length=10)
     phone = models.BigIntegerField(blank=True)
@@ -83,6 +92,6 @@ def __str__(self):
 class Supervisor(models.Model):
     sup_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
     area = models.CharField(choices=Constants.AREA, max_length=20)
-
+    
     def __str__(self):
         return str(self.sup_id.user.username)

FusionIIIT/applications/complaint_system/urls.py

@@ -9,43 +9,37 @@
     url(r'^$', views.check, name='complaint'),
   #  url(r'^login/$', views.login1, name='complaint'),
     url(r'^user/$', views.user),
-
     url(r'^user/caretakerfb/$' , views.caretaker_feedback),
-
     url(r'^user/(?P<complaint_id>[0-9]+)/$', views.submitfeedback),
     url(r'^user/detail/(?P<detailcomp_id1>[0-9]+)/$', views.detail,name='detail'),
-   # url(r'^user/check_complaint/$', views.save_comp),
-
+   # url(r'^user/check_complaint/$', views.save_comp),   
 
     # caretaker
     url(r'^caretaker/$', views.caretaker, name='caretaker'),
     url(r'^caretaker/feedback/(?P<feedcomp_id>[0-9]+)/$', views.feedback_care),
-    url(r'^caretaker/worker_id_know_more/(?P<wid>[0-9]+)/complaint_reassign/(?P<cid>[0-9]+)/discharge_worker/$', views.discharge_worker,name='discharge_worker'),
-    url(r'^caretaker/worker_id_know_more/(?P<work_id>[0-9]+)/$', views.worker_id_know_more, name='come_back_to_this'),
-    url(r'^caretaker/worker_id_know_more/(?P<wid>[0-9]+)/complaint_reassign/(?P<iid>[0-9]+)/$', views.complaint_reassign),
-    #url(r'^caretaker/list_caretakers_area/$', views.caretaker, name='caretaker'),
     url(r'^caretaker/pending/(?P<cid>[0-9]+)/$', views.resolvepending),
-    url(r'^caretaker/detail2/(?P<detailcomp_id1>[0-9]+)/$', views.detail2,name='detail2'),
+    url(r'^caretaker/detail/(?P<detailcomp_id1>[0-9]+)/$', views.detail),
     url(r'^caretaker/search_complaint$', views.search_complaint),
-
-
+    url(r'^caretaker/(?P<complaint_id>[0-9]+)/(?P<status>[0-9]+)/$', views.changestatus),
+
+    # secincharge
+    url(r'^secincharge/$', views.section_incharge, name='department_head'),
+    url(r'^secincharge/worker_id_know_more/(?P<wid>[0-9]+)/complaint_reassign/(?P<cid>[0-9]+)/discharge_worker/$', views.discharge_worker,name='discharge_worker'),
+    url(r'^secincharge/worker_id_know_more/(?P<work_id>[0-9]+)/$', views.worker_id_know_more, name='come_back_to_this'),
+    url(r'^secincharge/worker_id_know_more/(?P<wid>[0-9]+)/complaint_reassign/(?P<iid>[0-9]+)/$', views.complaint_reassign),
+    url(r'^secincharge/detail2/(?P<detailcomp_id1>[0-9]+)/$', views.detail2,name='detail2'),  
+    url(r'^secincharge/worker_id_know_more/(?P<work_id>[0-9]+)/removew/$', views.removew),
+    url(r'^secincharge/(?P<comp_id1>[0-9]+)/$', views.assign_worker,name='assign_worker'),
+    url(r'^secincharge/deletecomplaint/(?P<comp_id1>[0-9]+)/$', views.deletecomplaint),
+
     # supervisor
     url(r'^supervisor/$', views.supervisor),
     url(r'^supervisor/feedback/(?P<feedcomp_id>[0-9]+)/$', views.feedback_super),
     url(r'^supervisor/caretaker_id_know_more/(?P<caretaker_id>[0-9]+)/$', views.caretaker_id_know_more),
     url(r'^supervisor/caretaker_id_know_more/(?P<caretaker_id>[0-9]+)/complaint_reassign_super/(?P<iid>[0-9]+)/$', views.complaint_reassign_super, name = 'complaint_reassign_super'),
-    url(r'^supervisor/detail3/(?P<detailcomp_id1>[0-9]+)/$', views.detail3, name = 'detail3'),
-
-
+    url(r'^supervisor/detail3/(?P<detailcomp_id1>[0-9]+)/$', views.detail3, name = 'detail3'),  
 
-
-    # CRUD task
-    url(r'^caretaker/worker_id_know_more/(?P<work_id>[0-9]+)/removew/$', views.removew),
-    url(r'^caretaker/(?P<comp_id1>[0-9]+)/$', views.assign_worker,name='assign_worker'),
-    url(r'^caretaker/deletecomplaint/(?P<comp_id1>[0-9]+)/$', views.deletecomplaint),
-    # url(r'^caretaker/(?P<comp_id>[0-9]+)/$', views.assign_worker),
-    url(r'^caretaker/(?P<complaint_id>[0-9]+)/(?P<status>[0-9]+)/$', views.changestatus),
-
+    # api's for complaint system
     url(r'^api/',include('applications.complaint_system.api.urls'))
 
 ]