Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

app/applicationlayer/cms/form/serializers.py

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

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(
@@ -486,6 +482,11 @@ class ChangeRequestTemplateHeader(BaseHeader):
         on_delete=models.DO_NOTHING,
         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,
@@ -587,7 +588,7 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
     archived_at = models.DateTimeField(
         blank=True,
         null=True)
-
+    
     class Meta:
         db_table = 'change_request_template_attachments'
 
@@ -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'),