| @@ -195,8 +195,14 class Campaign(models.Model): | |||
|
|
195 | 195 | new_exp.dict_to_parms(parms['experiments'][parms_exp],CONF_MODELS) |
|
|
196 | 196 | new_exp.save() |
|
|
197 | 197 | |
|
|
198 | self.name = parms['campaign'] | |
|
|
199 | self.start_date = parms['start_date'] | |
|
|
200 | self.end_date = parms['end_date'] | |
|
|
201 | self.tags = parms['tags'] | |
|
|
198 | 202 | self.experiments.add(new_exp) |
|
|
199 |
self.save() |
|
|
|
203 | self.save() | |
|
|
204 | ||
|
|
205 | return self | |
|
|
200 | 206 | |
|
|
201 | 207 | def get_absolute_url(self): |
|
|
202 | 208 | return reverse('url_campaign', args=[str(self.id)]) |
| @@ -389,6 +395,15 class Experiment(models.Model): | |||
|
|
389 | 395 | ) |
|
|
390 | 396 | confcgs_form.dict_to_parms(parms['configurations']['cgs']) |
|
|
391 | 397 | confcgs_form.save() |
|
|
398 | ||
|
|
399 | location = Location.objects.get(name = parms['radar']) | |
|
|
400 | self.name = parms['experiment'] | |
|
|
401 | self.location = location | |
|
|
402 | self.start_time = parms['start_time'] | |
|
|
403 | self.end_time = parms['end_time'] | |
|
|
404 | self.save() | |
|
|
405 | ||
|
|
406 | return self | |
|
|
392 | 407 | |
|
|
393 | 408 | def get_absolute_url_edit(self): |
|
|
394 | 409 | return reverse('url_edit_experiment', args=[str(self.id)]) |
| @@ -444,23 +444,12 def campaign_import(request, id_camp): | |||
|
|
444 | 444 | if parms: |
|
|
445 | 445 | parms['name'] = parms['campaign'] |
|
|
446 | 446 | |
|
|
447 | campaign.dict_to_parms(parms, CONF_MODELS) | |
|
|
447 | new_camp = campaign.dict_to_parms(parms, CONF_MODELS) | |
|
|
448 | 448 | |
|
|
449 | 449 | messages.success(request, "Parameters imported from: '%s'." %request.FILES['file'].name) |
|
|
450 | 450 | |
|
|
451 | form = CampaignForm(initial=parms, instance=campaign) | |
|
|
452 |
|
|
|
|
453 | kwargs = {} | |
|
|
454 | kwargs['form'] = form | |
|
|
455 | kwargs['title'] = 'Campaign' | |
|
|
456 | kwargs['suptitle'] = 'Parameters imported' | |
|
|
457 | kwargs['button'] = 'Save' | |
|
|
458 | kwargs['action'] = campaign.get_absolute_url_edit() | |
|
|
459 | kwargs['previous'] = campaign.get_absolute_url() | |
|
|
460 | ||
|
|
461 | return render(request, 'campaign_edit.html', kwargs) | |
|
|
462 | ||
|
|
463 | ||
|
|
451 | return redirect(new_camp.get_absolute_url_edit()) | |
|
|
452 | ||
|
|
464 | 453 | messages.error(request, "Could not import parameters from file") |
|
|
465 | 454 | |
|
|
466 | 455 | kwargs = {} |
| @@ -634,35 +623,16 def experiment_import(request, id_exp): | |||
|
|
634 | 623 | parms = experiment.import_from_file(request.FILES['file']) |
|
|
635 | 624 | |
|
|
636 | 625 | if parms: |
|
|
637 | location = Location.objects.get(name = parms['radar']) | |
|
|
638 | parms['location'] = location.id | |
|
|
639 | parms['name'] = parms['experiment'] | |
|
|
640 | 626 | |
|
|
641 | experiment.dict_to_parms(parms, CONF_MODELS) | |
|
|
627 | new_exp = experiment.dict_to_parms(parms, CONF_MODELS) | |
|
|
642 | 628 | |
|
|
643 | 629 | messages.success(request, "Parameters imported from: '%s'." %request.FILES['file'].name) |
|
|
644 | 630 | |
|
|
645 | form = ExperimentForm(initial=parms, instance=experiment) | |
|
|
646 | ||
|
|
647 | kwargs = {} | |
|
|
648 | #kwargs['id_dev'] = conf.id | |
|
|
649 | kwargs['form'] = form | |
|
|
650 | kwargs['title'] = 'Experiment' | |
|
|
651 | kwargs['suptitle'] = 'Parameters imported' | |
|
|
652 | kwargs['button'] = 'Save' | |
|
|
653 | kwargs['action'] = experiment.get_absolute_url_edit() | |
|
|
654 | kwargs['previous'] = experiment.get_absolute_url() | |
|
|
655 | ||
|
|
656 | ###### SIDEBAR ###### | |
|
|
657 | #kwargs.update(sidebar(conf=conf)) | |
|
|
658 | kwargs.update(sidebar(experiment=experiment)) | |
|
|
659 | ||
|
|
660 | return render(request, 'experiment_edit.html', kwargs) | |
|
|
631 | return redirect(new_exp.get_absolute_url_edit()) | |
|
|
661 | 632 | |
|
|
662 | 633 | messages.error(request, "Could not import parameters from file") |
|
|
663 | 634 | |
|
|
664 | 635 | kwargs = {} |
|
|
665 | #kwargs['id_dev'] = conf.id | |
|
|
666 | 636 | kwargs['title'] = 'Experiment' |
|
|
667 | 637 | kwargs['form'] = file_form |
|
|
668 | 638 | kwargs['suptitle'] = 'Importing file' |
General Comments 0
You need to be logged in to leave comments.
Login now