up

app/applicationlayer/cms/form/serializers.py

@@ -122,6 +122,47 @@ class ChangeRequestFormHeaderSerializer(
         #     page.save()
 
         # return instance
+
+    # def update(self, instance, validated_data):
+    #     frm_approvers = validated_data.pop('frm_approvers')
+    #     instance.requested_to_template_name = validated_data.get("requested_to_template_name", instance.requested_to_template_name)
+    #     instance.requested_to_objective = validated_data.get("requested_to_objective", instance.requested_to_objective)
+    #     instance.requested_to_target_date = validated_data.get("requested_to_target_date", instance.requested_to_target_date)
+    #     instance.requested_to_priority = validated_data.get("requested_to_priority", instance.requested_to_priority)
+    #     instance.description = validated_data.get("description", instance.description)
+    #     instance.status = validated_data.get("status", instance.status)
+    #     instance.company_desc = validated_data.get("company_desc", instance.company_desc)
+    #     instance.department_desc = validated_data.get("department_desc", instance.department_desc)
+    #     instance.requested_desc = validated_data.get("requested_desc", instance.requested_desc)
+    #     instance.requested_to_template_id = validated_data.get("requested_to_template_id", instance.requested_to_template_id)
+    #     instance.requested_to_company = validated_data.get("requested_to_company", instance.requested_to_company)
+    #     instance.requested_to_department = validated_data.get("requested_to_department", instance.requested_to_department)
+    #     instance.requested_to_user = validated_data.get("requested_to_user", instance.requested_to_user)
+    #     instance.requested_by_user = validated_data.get("requested_by_user", instance.requested_by_user)
+    #     instance.requested_by_department = validated_data.get("requested_by_department", instance.requested_by_department)
+    #     instance.template_no = validated_data.get("template_no", instance.template_no)
+    #     instance.save()
+
+    #     print(instance.form_code)
+    #     keep_choices = []
+    #     for choice in frm_approvers:
+    #         if "id" in choice.keys():
+    #             if models.ChangeRequestFormApprovers.objects.filter(id=choice["id"]).exists():
+    #                 c = models.ChangeRequestFormApprovers.objects.get(id=choice["id"])
+    #                 c.text = choice.get('text', c.text)
+    #                 c.save()
+    #                 keep_choices.append(c.id)
+    #             else:
+    #                 continue
+    #         else:
+    #             c = models.ChangeRequestFormApprovers.objects.create(**choice)
+    #             keep_choices.append(c.id)
+
+        # for choice in instance.frm_approvers:
+        #     if choice.id not in keep_choices:
+        #         choice.delete()
+
+        # return instance
     
     def to_representation(self, instance):
         ret = super().to_representation(instance)

app/applicationlayer/cms/form/views.py

@@ -629,6 +629,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         
         # Create or update approver data that are in the request
         for frm_approver in frm_approvers:
+            print(frm_approver)
             if "id" in frm_approver:
                 print(frm_approver['id'])
                 models.ChangeRequestFormApprovers.objects.filter(
@@ -639,15 +640,19 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                                                   action=None,
                                                   action_date=None,
                                                   date_sent=None,
-                                                  user='USER-20190913-0000009',
+                                                  user=frm_approver['user'],
                                                   tmp_approver=frm_approver['tmp_approver'])
             else:
+
+                user_instance = models.User.objects.get(code=frm_approver['user'])
+                form_code_instance = models.ChangeRequestFormHeader.objects.get(code=form_code)
+
                 models.ChangeRequestFormApprovers.objects.create(
                                                   level=frm_approver['level'],
                                                   delegation=frm_approver['delegation'],
                                                   created=datetime.now(),
-                                                  user='USER-20190913-0000009',
-                                                  form_code=frm_approver['form_code'])
+                                                  user=user_instance,
+                                                  form_code=form_code_instance)
 
         return Response(serializer.data)