radarsys_met Commit - r358:7dca11c69628

experiment menu edition

amorales -

r358:7dca11c69628

parent child

Context file:

r358:7dca11c69628

Collapse all files

status.txt created 644 +4 0

@@ -0,0 +1,4
	1	On branch master
	2	Your branch is up to date with 'origin/master'.
	3
	4	nothing to commit, working tree clean

apps/main/forms.py +2 -2

                 def __init__(self, *args, **kwargs):
                     super(ExperimentForm, self).__init__(*args, **kwargs)
-                    self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
+                    #self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
-                    self.fields['end_time'].widget   = TimepickerWidget(self.fields['end_time'].widget.attrs)
+                    #self.fields['end_time'].widget   = TimepickerWidget(self.fields['end_time'].widget.attrs)
                 def save(self, *args, **kwargs):
                     exp      = super(ExperimentForm, self).save(*args, **kwargs)

apps/main/models.py +7 -7

             from apps.main.utils import Params
             DEV_PORTS = {
                             'pedestal'      : 80,
                             'pedestal_dev'  : 80,
             class Experiment(models.Model):
                 template   = models.BooleanField(default=False)
                 name       = models.CharField(max_length=40, default='', unique=True)
-                location   = models.ForeignKey('Location', null=False, blank=False, on_delete=models.CASCADE, default='')
+                location   = models.ForeignKey('Location', null=False, blank=False, on_delete=models.CASCADE, default=None)
                 #freq       = models.FloatField(verbose_name='Operating Freq. (MHz)', validators=[MinValueValidator(1), MaxValueValidator(10000)], default=49.9200)
-                start_time = models.TimeField(default='00:00:00')
+                #start_time = models.TimeField(default='00:00:00')
-                end_time   = models.TimeField(default='23:59:59')
+                #end_time   = models.TimeField(default='23:59:59')
+                pedestal   = models.ForeignKey('pedestal.PedestalConfiguration', null=False, blank=False, on_delete=models.CASCADE, default=None, related_name = "pedestal_conf")
                 task       = models.CharField(max_length=36, default='', blank=True, null=True)
                 status     = models.PositiveSmallIntegerField(default=4, choices=EXP_STATES)
                 author     = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
                         if field.name in ignored:
                             continue
                         data[field.name] = field.value_from_object(self)
                     data['start_time'] = data['start_time'].strftime('%H:%M:%S')
                     data['end_time']   = data['end_time'].strftime('%H:%M:%S')
                     data['location']   = self.location.name
                             )
                         conf.dict_to_parms(parms, id=id_conf)
                     location, created = Location.objects.get_or_create(name=exp_parms['location'])
                     self.name = '{}-{}'.format(exp_parms['name'], datetime.now().strftime('%y%m%d'))
                     self.location   = location

apps/main/templates/experiment.html +1 -3

                 <li><a>----------------</a></li>
                 <li><a href="{{ experiment.get_absolute_url_start}}"><span class="fa fa-play" aria-hidden="true"></span> Start</a></li>
                 <li><a href="{{ experiment.get_absolute_url_stop }}"><span class="fa fa-stop" aria-hidden="true"></span> Stop</a></li>
-                <li><a href="{% url 'url_mix_experiment' experiment.id %}"><span class="fa fa-random" aria-hidden="true"></span> Mix RC Configurations </a></li>
                 <li><a href="{% url 'url_add_dev_conf' experiment.id %}"><span class="fa fa-plus-circle" aria-hidden="true"></span> Add Configuration</a></li>
-                <li><a href="{% url 'url_sum_experiment' experiment.id %}"><span class="fa fa-list-alt" aria-hidden="true"></span> Summary</a></li>
               </ul>
             </span>
             {% endblock %}

apps/main/views.py +3 -5

                 form = FilterForm(initial=request.GET, extra_fields=fields)
-                kwargs['keys'] = ['name', 'radar_system',
+                kwargs['keys'] = ['name', 'radar_system', 'actions']
-                                  'start_time', 'end_time', 'actions']
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'List'
                 kwargs['no_sidebar'] = True
             def experiment(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 configurations = Configuration.objects.filter(
                     experiment=experiment, type=0)
                 kwargs = {}
-                kwargs['experiment_keys'] = ['template', 'radar_system',
+                kwargs['experiment_keys'] = ['template', 'radar_system', 'name']
-                                             'name', 'start_time', 'end_time']
                 kwargs['experiment'] = experiment
                 kwargs['configuration_keys'] = ['name', 'device__ip_address',
                                                 'device__port_address', 'device__status']

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages