radarsys Commit - r22:08de53529b15 · Jicamarca Repository

models are passed as instances to templates (dictionaries are not used anymore)...

Miguel Urco -

r22:08de53529b15

parent child

Context file:

r22:08de53529b15

Collapse all files

apps/main/models.py +10 -7

             from itertools import chain
             from django.db import models
             from polymorphic import PolymorphicModel
             CONF_TYPES = (
                       (0, 'Active'),
                       (1, 'Historical'),
                      )
             DEV_STATES = (
                       (0, 'No connected'),
                       (1, 'Connected'),
                       (2, 'Configured'),
                       (3, 'Running'),
                      )
             DEV_TYPES = (
                 ('', 'Select a device type'),
                 ('rc', 'Radar Controller'),
                 ('dds', 'Direct Digital Synthesizer'),
-                ('jars', 'Jicamarca Radar System'),
+                ('jars', 'Jicamarca Radar Acquisition System'),
                 ('usrp', 'Universal Software Radio Peripheral'),
                 ('cgs', 'Clock Generator System'),
                 ('abs', 'Automatic Beam Switching'),
             )
             # Create your models here.
             class DeviceType(models.Model):
                 name = models.CharField(max_length = 10, choices = DEV_TYPES, default = 'rc')
                 description = models.TextField(blank=True, null=True)
             #     info = models.TextField(blank=True, null=True)
             #     status = models.PositiveSmallIntegerField(default=1, choices=STATES)
                 class Meta:
                     db_table = 'db_device_types'
                 def __unicode__(self):
-                    return u'%s' % self.name
+                    return u'%s' % self.get_name_display()
             class Device(models.Model):
                 device_type = models.ForeignKey(DeviceType)
                 name = models.CharField(max_length=40, default='')
                 ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
                 port_address = models.PositiveSmallIntegerField(default=2000)
                 description = models.TextField(blank=True, null=True)
                 status = models.PositiveSmallIntegerField(default=0, choices=DEV_STATES)
             #     serial_number = models.CharField(max_length=40, default='')
             #     mac_address = models.CharField(max_length = 20, null=True, blank=True)
                 class Meta:
                     db_table = 'db_devices'
                 def __unicode__(self):
-                    return u'[%s]: %s | %s' % (self.device_type.name, self.name, self.ip_address)
+                    return u'%s | %s' % (self.name, self.ip_address)
             class Campaign(models.Model):
                 name = models.CharField(max_length=40, unique=True)
                 start_date = models.DateTimeField(blank=True, null=True)
                 end_date = models.DateTimeField(blank=True, null=True)
                 tags = models.CharField(max_length=40)
                 description = models.TextField(blank=True, null=True)
                 template = models.BooleanField(default=False)
                 class Meta:
                     db_table = 'db_campaigns'
                 def __unicode__(self):
-                    return u'%s: %s - %s' % (self.name, self.start_date.date(), self.end_date.date())
+                    return u'%s' % (self.name)
             class Experiment(models.Model):
                 campaign = models.ForeignKey(Campaign)
                 name = models.CharField(max_length=40, default='')
                 start_time = models.TimeField(default='00:00:00')
                 end_time = models.TimeField(default='23:59:59')
                 class Meta:
                     db_table = 'db_experiments'
                 def __unicode__(self):
-                    return u'[%s]: %s: %s - %s' % (self.campaign.name, self.name, self.start_time, self.end_time)
+                    return u'[%s]: %s' % (self.campaign.name, self.name)
             class Configuration(PolymorphicModel):
                 experiment = models.ForeignKey(Experiment)
                 device = models.ForeignKey(Device)
                 type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
-                created = models.DateTimeField(auto_now_add=True, blank=True)
-            #     parameters = models.TextField(default='{}')
+                created_date = models.DateTimeField(auto_now_add=True)
+                programmed_date = models.DateTimeField(auto_now=True)
+                parameters = models.TextField(default='{}')
                 class Meta:
                     db_table = 'db_configurations'
                 def __unicode__(self):
                     return u'[%s - %s]: %s' % (self.experiment.campaign.name,
                                             self.experiment.name,
                                             self.device.name)
   No newline at end of file

apps/main/templates/campaign.html 0 -1

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block camp-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             	<table class="table table-bordered">
             	{% for key in campaign_keys %}
             		<tr><th>{{key|title}}</th><td>{{campaign|attr:key}}</td></tr>
             	{% endfor %}
             	</table>
             	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_export">Export</button>
             	<button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
             	<br></br>
             	<br></br>
             	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
             	  <div class="panel panel-default">
             	    <div class="panel-heading" role="tab" id="headingTwo">
             	      <h4 class="panel-title">
             	        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
             	          Experiment List
             	        </a>
             	      </h4>
             	    </div>
             	    <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
             	      <div class="panel-body">
             	      <table class="table table-hover">
             			<tr>
             			  <th>#</th>
             			  {% for header in experiment_keys %}
             			  <th>{{ header|title }}</th>
             			  {% endfor%}
             			</tr>
             			{% for item in experiments %}
             			<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}">
             			  <td>{{ forloop.counter }}</td>
             			  {% for key in experiment_keys %}
             			  <td>{{ item|attr:key }}</td>
             			  {% endfor %}
             			</tr>
             			{% endfor %}
             		  </table>
             		  <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             	      </div>
             	    </div>
             	  </div>
             	</div>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% endblock %}
             {% block extra-js%}
             <script type="text/javascript">
-              $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
             	  });
               $("#bt_edit").click(function() {
             	    document.location = "{% url 'url_edit_campaign' campaign.id%}";
             	  });
               $("#bt_add").click(function() {
                 document.location = "{% url 'url_add_experiment' campaign.id%}";
               });
             </script>
             {% endblock %}

apps/main/templates/dev_confs.html +1 -1

             {% extends "base.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
             {% block conf-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
             <table class="table table-hover">
               <tr>
             	<th>#</th>
             	{% for key in configuration_keys %}
             	<th>{{ key|title }}</th>
             	{% endfor%}
               </tr>
               {% for item in configurations %}
-            	<tr class="clickable-row" data-href="/{{item.device__device_type__name}}/{{item.id}}/">
+            	<tr class="clickable-row" data-href="/{{item.device.device_type.name}}/{{item.id}}/">
             	  <td>{{ forloop.counter }}</td>
             	  {% for key in configuration_keys %}
             	  <td>{{ item|attr:key }}</td>
             	  {% endfor %}
             	</tr>
               {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
                {% include "sidebar_devices.html" %}
             {% endblock %}
             {% block extra-js%}
             <script type="text/javascript">
               $("#bt_add").click(function() {
                 document.location = "{% url 'url_add_dev_conf' 0%}";
               });
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
             	  });
             </script>
             {% endblock %}

apps/main/views.py +12 -9

             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm
             from apps.cgs.forms import CGSConfigurationForm
             from apps.jars.forms import JARSConfigurationForm
             from apps.usrp.forms import USRPConfigurationForm
             from apps.abs.forms import ABSConfigurationForm
             from apps.rc.forms import RCConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
             from .models import Campaign, Experiment, Device, Configuration
             from apps.cgs.models import CGSConfiguration
             from apps.jars.models import JARSConfiguration
             from apps.usrp.models import USRPConfiguration
             from apps.abs.models import ABSConfiguration
             from apps.rc.models import RCConfiguration
             from apps.dds.models import DDSConfiguration
             # Create your views here.
             CONF_FORMS = {
                 'rc': RCConfigurationForm,
                 'dds': DDSConfigurationForm,
                 'jars': JARSConfigurationForm,
                 'cgs': CGSConfigurationForm,
                 'abs': ABSConfigurationForm,
                 'usrp': USRPConfigurationForm,
             }
             CONF_MODELS = {
                 'rc': RCConfiguration,
                 'dds': DDSConfiguration,
                 'jars': JARSConfiguration,
                 'cgs': CGSConfiguration,
                 'abs': ABSConfiguration,
                 'usrp': USRPConfiguration,
             }
             def index(request):
                 kwargs = {}
                 return render(request, 'index.html', kwargs)
             def devices(request):
                 devices = Device.objects.all().order_by('device_type__name')
-                keys = ['id', 'device_type__name', 'name', 'ip_address']
+            #     keys = ['id', 'device_type__name', 'name', 'ip_address']
+                keys = ['id', 'name', 'ip_address', 'device_type']
                 kwargs = {}
                 kwargs['device_keys'] = keys[1:]
-                kwargs['devices'] = devices.values(*keys)
+                kwargs['devices'] = devices#.values(*keys)
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Device'
                 return render(request, 'devices.html', kwargs)
             def device(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 kwargs = {}
                 kwargs['device'] = device
                 kwargs['device_keys'] = ['device_type', 'name', 'ip_address', 'port_address', 'description']
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Add Device'
                 return render(request, 'device.html', kwargs)
             def device_new(request):
                 if request.method == 'GET':
                     form = DeviceForm()
                 if request.method == 'POST':
                     form = DeviceForm(request.POST)
                     if form.is_valid():
                         form.save()
                         return redirect('url_devices')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'device_edit.html', kwargs)
             def device_edit(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 if request.method=='GET':
                     form = DeviceForm(instance=device)
                 if request.method=='POST':
                     form = DeviceForm(request.POST, instance=device)
                     if form.is_valid():
                         form.save()
                         return redirect('url_devices')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'device_edit.html', kwargs)
             def device_delete(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 if request.method=='POST':
                     if request.user.is_staff:
                         device.delete()
                         return redirect('url_devices')
                     return HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':device, 'dev_active':'active',
                           'url_cancel':'url_device', 'id_item':id_dev}
                 return render(request, 'item_delete.html', kwargs)
             def campaigns(request):
                 campaigns = Campaign.objects.all().order_by('start_date')
                 keys = ['id', 'name', 'start_date', 'end_date']
                 kwargs = {}
                 kwargs['campaign_keys'] = keys[1:]
-                kwargs['campaigns'] = campaigns.values(*keys)
+                kwargs['campaigns'] = campaigns#.values(*keys)
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Campaign'
                 return render(request, 'campaigns.html', kwargs)
             def campaign(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 experiments = Experiment.objects.filter(campaign=campaign)
                 form = CampaignForm(instance=campaign)
                 kwargs = {}
                 kwargs['campaign'] = campaign
                 kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
                 keys = ['id', 'name', 'start_time', 'end_time']
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiments.values(*keys)
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Details'
                 kwargs['form'] = form
                 kwargs['button'] = 'Add Experiment'
                 return render(request, 'campaign.html', kwargs)
             def campaign_new(request):
                 if request.method == 'GET':
                     form = CampaignForm()
                 if request.method == 'POST':
                     form = CampaignForm(request.POST)
                     if form.is_valid():
                         campaign = form.save()
                         return redirect('url_campaign', id_camp=campaign.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'campaign_edit.html', kwargs)
             def campaign_edit(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 if request.method=='GET':
                     form = CampaignForm(instance=campaign)
                 if request.method=='POST':
                     form = CampaignForm(request.POST, instance=campaign)
                     if form.is_valid():
                         form.save()
                         return redirect('url_campaign', id_camp=id_camp)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'campaign_edit.html', kwargs)
             def campaign_delete(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 if request.method=='POST':
                     if request.user.is_staff:
                         campaign.delete()
                         return redirect('url_campaigns')
                     return HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':campaign, 'camp_active':'active',
                           'url_cancel':'url_campaign', 'id_item':id_camp}
                 return render(request, 'item_delete.html', kwargs)
             def experiments(request):
-                campaigns = Experiment.objects.all().order_by('start_time')
+                experiment_list = Experiment.objects.all().order_by('campaign')
-                keys = ['id', 'campaign__name', 'name', 'start_time', 'end_time']
+                keys = ['id', 'name', 'start_time', 'end_time', 'campaign']
                 kwargs = {}
                 kwargs['experiment_keys'] = keys[1:]
-                kwargs['experiments'] = campaigns.values(*keys)
+                kwargs['experiments'] = experiment_list#.values(*keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Experiment'
                 return render(request, 'experiments.html', kwargs)
             def experiment(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 experiments = Experiment.objects.filter(campaign=experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=experiment)
                 kwargs = {}
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
                 conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiment'] = experiment
                 kwargs['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_keys'] = conf_keys[1:]
                 kwargs['configurations'] = configurations.values(*conf_keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Add Device'
                 return render(request, 'experiment.html', kwargs)
             def experiment_new(request, id_camp=0):
                 if request.method == 'GET':
                     form = ExperimentForm(initial={'campaign':id_camp})
                 if request.method == 'POST':
                     form = ExperimentForm(request.POST, initial={'campaign':id_camp})
                     if form.is_valid():
                         experiment = form.save()
                         return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'experiment_edit.html', kwargs)
             def experiment_edit(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 if request.method == 'GET':
                     form = ExperimentForm(instance=experiment)
                 if request.method=='POST':
                     form = ExperimentForm(request.POST, instance=experiment)
                     if form.is_valid():
                         experiment = form.save()
                         return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'experiment_edit.html', kwargs)
             def experiment_delete(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 if request.method=='POST':
                     if request.user.is_staff:
                         id_camp = experiment.campaign.id
                         experiment.delete()
                         return redirect('url_campaign', id_camp=id_camp)
                     return HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':experiment, 'exp_active':'active',
                           'url_cancel':'url_experiment', 'id_item':id_exp}
                 return render(request, 'item_delete.html', kwargs)
             def dev_confs(request):
-                configurations = Configuration.objects.all().order_by('device__device_type')
+                configurations = Configuration.objects.all().order_by('experiment')
-                keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
+            #     keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
+                keys = ['id', 'device', 'experiment']
                 kwargs = {}
                 kwargs['configuration_keys'] = keys[1:]
-                kwargs['configurations'] = configurations.values(*keys)
+                kwargs['configurations'] = configurations#.values(*keys)
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Configuration'
                 return render(request, 'dev_confs.html', kwargs)
             def dev_conf(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 dev_conf = DevConfModel.objects.get(pk=id_conf)
                 kwargs = {}
                 kwargs['dev_conf'] = dev_conf
                 kwargs['dev_conf_keys'] = ['experiment', 'device']
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
                 experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=conf.experiment)
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
                 conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_keys'] = conf_keys[1:]
                 kwargs['configurations'] = configurations.values(*conf_keys)
                 return render(request, 'dev_conf.html', kwargs)
             def dev_conf_new(request, id_exp=0):
                 if request.method == 'GET':
                     form = ConfigurationForm(initial={'experiment':id_exp})
                 if request.method == 'POST':
                     form = ConfigurationForm(request.POST)
                     if form.is_valid():
                         experiment = Experiment.objects.get(pk=request.POST['experiment'])
                         device = Device.objects.get(pk=request.POST['device'])
                         exp_devices = Device.objects.filter(configuration__experiment=experiment)
                         if device.id not in exp_devices.values('id',):
                             DevConfModel = CONF_MODELS[device.device_type.name]
                             conf = DevConfModel(experiment=experiment, device=device)
                             conf.save()
                             return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'dev_conf_edit.html', kwargs)
             def dev_conf_edit(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                 dev_conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method=='GET':
                     form = DevConfForm(instance=dev_conf)
                 if request.method=='POST':
                     form = DevConfForm(request.POST, instance=dev_conf)
                     if form.is_valid():
                         form.save()
                         return redirect('url_dev_conf', id_conf=id_conf)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'dev_conf_edit.html', kwargs)
             def dev_conf_delete(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 if request.method=='POST':
                     if request.user.is_staff:
                         id_exp = conf.experiment.id
                         conf.delete()
                         return redirect('url_experiment', id_exp=id_exp)
                     return HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':conf, 'conf_active':'active',
                       'url_cancel':'url_dev_conf', 'id_item':id_conf}
                 return render(request, 'item_delete.html', kwargs)

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