Merge pull request #91 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit 'da549bf5':
  update
  update model

app/applicationlayer/cms/form/serializers.py

@@ -79,9 +79,9 @@ class ChangeRequestFormHeaderSerializer(
         try:
             # id_number = self.context.get('request').META.get('user')
             user = self.context['request'].user
-            print(user)
+            print(user.code)
             
-            # id_number = "USER-20190909-0000005"
+            id_number = user.code
             current_level = models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=ret['form_code']) &
                 Q(archived_at=None) &

app/applicationlayer/cms/form/views.py

@@ -47,10 +47,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
     lookup_field = 'form_code'
 
     def list(self, request, *args, **kwargs):
-        id_number = self.request.user
+        # id_number = self.request.user
+        id_number = 'USER-20190913-0000006'
         
         # print(id_number.code)
-        self.queryset = change_request.list_by_user(id_number.code)
+        # self.queryset = change_request.list_by_user(id_number)
         
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -81,11 +82,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             url_path='dashboard',
             name="Dashboard Summary")
     def dashboard_view(self, request):
-        id_number = self.request.user
+        # id_number = self.request.user
 
-        print(id_number)
+        # print(id_number)
         
-        self.queryset = change_request.list_by_user(id_number.code)
+        # self.queryset = change_request.list_by_user(id_number.code)
 
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -170,9 +171,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Status")
     def list_by_status_view(self, request):
 
-        id_number = self.request.user
+        # id_number = self.request.user
 
-        self.queryset = change_request.list_by_user(id_number.code)
+        # self.queryset = change_request.list_by_user(id_number.code)
 
         self.queryset = change_request.filter_status(
             self.queryset,
@@ -202,9 +203,9 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Overdue")
     def list_by_overdue_view(self, request):
 
-        id_number = self.request.user
+        # id_number = self.request.user
 
-        self.queryset = change_request.list_by_user(id_number.code)
+        # self.queryset = change_request.list_by_user(id_number.code)
 
         self.queryset = change_request.filter_overdue(self.queryset)
 
@@ -230,11 +231,11 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             name="Dashboard Summary Awaiting")
     def list_by_awaiting_view(self, request):
 
-        id_number = self.request.user
+        # id_number = self.request.user
 
-        self.queryset = change_request.list_by_user(id_number.code)
+        # self.queryset = change_request.list_by_user(id_number.code)
 
-        self.queryset = change_request.filter_awaiting(self.queryset, id_number.code)
+        # self.queryset = change_request.filter_awaiting(self.queryset, id_number.code)
 
         self.queryset = change_request.filter_base(
             self.queryset,
@@ -430,12 +431,12 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         form_code = kwargs['form_code']
         print(form_code)
         
-        models.ChangeRequestFormHeader.objects.filter(
-            form_code=form_code).update(status='Pending')
+        # models.ChangeRequestFormHeader.objects.filter(
+        #     form_code=form_code).update(status='Pending')
 
-        models.ChangeRequestFormApprovers.objects.filter(
-            form_code=form_code).update(action=None, remarks=None,
-                                        date_sent=None)
+        # models.ChangeRequestFormApprovers.objects.filter(
+        #     form_code=form_code).update(action=None, remarks=None,
+        #                                 date_sent=None)
         
         return Response(
             "Change request form successfully re routed",
@@ -835,7 +836,6 @@ class ChangeRequestFormPost(APIView):
                 'company_desc': form_header['company_desc'],
                 'department_desc': form_header['department_desc'],
                 'requested_desc': form_header['requested_desc'],
-                'old_form_code': form_header['old_form_code'],
                 'requested_by_department': form_header['requested_by_department'],
                 'requested_by_user': form_header['requested_by_user'],
                 'requested_to_company': form_header['requested_to_company'],

app/entities/migrations/0012_auto_20190913_1704.py

+# Generated by Django 2.2 on 2019-09-13 17:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0011_merge_20190913_1545'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequesttemplateheader',
+            name='requested_to_target_date',
+            field=models.CharField(blank=True, max_length=10, null=True),
+        ),
+    ]

app/entities/models.py

@@ -360,10 +360,6 @@ class BaseHeader(models.Model):
         blank=True,
         null=True)
 
-    requested_to_target_date = models.DateTimeField(
-        blank=True,
-        null=True)
-
     requested_to_priority = models.CharField(max_length=255)
 
     description = models.CharField(
@@ -487,6 +483,11 @@ class ChangeRequestTemplateHeader(BaseHeader):
         to_field='code',
         related_name='created_by_department')
     
+    requested_to_target_date = models.CharField(
+        max_length=10,
+        blank=True,
+        null=True)
+
     archived_at = models.DateTimeField(
         blank=True,
         null=True)
@@ -688,6 +689,10 @@ class ChangeRequestFormHeader(BaseHeader):
     requested_to_template_id = models.CharField(
         max_length=255)
 
+    requested_to_target_date = models.DateTimeField(
+        blank=True,
+        null=True)
+
     class Meta:
         db_table = 'change_request_form_headers'
     

config/urls.py

@@ -24,7 +24,7 @@ urlpatterns = [
     path('api-auth/', include('rest_framework.urls')),
     path('api/v1/auth/', include('app.accesslayer.urls')),
     path('api/v1/management/', include('app.applicationlayer.urls')),
-    path('api/v1/change-request/', include('app.applicationlayer.urls_cms')),
+    path('api/v1/change-request/', include('app.applicationlayer.cms.urls_cms')),
     path('api/v1/master/', include('app.applicationlayer.master.urls')),
     url(r'^chat/$', notifview.index, name='index'),
     url(r'^chat/(?P<room_name>[^/]+)/$', notifview.room, name='room'),