Merge pull request #265 in RMS/api-main-service from red-develop to RMSv2

* commit 'a95c277c':
  alter fields on history

app/applicationlayer/cms/form/header/views.py

@@ -1117,11 +1117,34 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         ).values()
         list_his = []
         for data in history:
-            list_his.append(data['fromValue'])
-        # print(type(model_to_dict(history)))
-        # ser = ChangeRequestFormApproversSerializer(data=list_his, many=True)
-        # ser.is_valid(raise_exception=False)
-        # print(ser.data)
+            # list_his.append()
+            x = data['fromValue'].replace("'", '"').replace('None', '""')
+            convert = json.loads(x)
+            print(convert)
+            user_id = convert['user']
+            user_instance = models.User.objects.get(
+                code=str(user_id)
+            )
+
+            name = user_instance.name
+            department = user_instance.department.name
+            company = user_instance.department.company.name
+            date_sent = convert['action_date']
+            delegation = convert['delegation']
+            action = convert['action']
+            remarks = convert['remarks']
+
+            history_dict = {
+                "name": name,
+                "department" : department,
+                "company" : company,
+                "date_sent" : date_sent,
+                "delegation" : delegation,
+                "action" : action,
+                "remarks" : remarks,
+            }
+
+            list_his.append(history_dict)
         
 
         return Response(