From d7a9dc407c1ed396417a95afa9d1dcee17c8ebbf 2016-04-20 15:36:47 From: Fiorella Quino Date: 2016-04-20 15:36:47 Subject: [PATCH] Export Campaign. parms_to_dict() (mmain.models) git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@124 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71 --- diff --git a/apps/main/models.py b/apps/main/models.py index 1517074..3650fb8 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -133,6 +133,7 @@ class Campaign(models.Model): def parms_to_dict(self): import json + from collections import OrderedDict parameters = {} exp_parameters = {} @@ -143,11 +144,13 @@ class Campaign(models.Model): exp_parameters['experiment-'+str(i)] = json.loads(experiment.parms_to_dict()) i += 1 - parameters['campaign'] = self.__unicode__() - parameters['start_date'] = self.start_date.strftime("%Y-%m-%d") - parameters['end_date'] = self.end_date.strftime("%Y-%m-%d") + parameters['experimets'] =exp_parameters - parameters = json.dumps(parameters, indent=2) + parameters['end_date'] = self.end_date.strftime("%Y-%m-%d") + parameters['start_date'] = self.start_date.strftime("%Y-%m-%d") + parameters['campaign'] = self.__unicode__() + + parameters = json.dumps(parameters, indent=2, sort_keys=False) return parameters