radarsys Commit - r89:d23e0226ad31 · Jicamarca Repository

Update views and templates of main app...

Juan C. Espinoza -

r89:d23e0226ad31

parent child

Context file:

r89:d23e0226ad31

Collapse all files

apps/main/templates/base_edit.html created 644 +35 0

@@ -0,0 +1,35
	1	{% extends "base.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5
	6	{% block content-title %}{{title}}{% endblock %}
	7	{% block content-suptitle %}{{suptitle}}{% endblock %}
	8
	9	{% block content %}
	10	{% if form.is_multipart %}
	11	<form class="form" enctype="multipart/form-data" method="post" action="{{action}}">
	12	{% else %}
	13	<form class="form" method="post" action="{{action}}">
	14	{% endif %}
	15	{% csrf_token %}
	16	{% bootstrap_form form layout='horizontal' size='medium' %}
	17	<div style="clear: both;"></div>
	18	<br>
	19	{% if extra_button %}
	20	<div class="pull-left">
	21	<button type="button" class="btn btn-primary" id="bt_{{extra_button}}">{{extra_button}}</button>
	22	</div>
	23	{% endif %}
	24	{% if button %}
	25	<div class="pull-right">
	26	<button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
	27	<button type="submit" class="btn btn-primary">{{button}}</button>
	28	</div>
	29	{% endif %}
	30	</form>
	31	{% endblock %}
	32
	33	{% block sidebar%}
	34	{% include "sidebar_devices.html" %}
	35	{% endblock %}

apps/main/forms.py +1 -1

                 class Meta:
                     model = Experiment
-                    exclude = ['']
+                    exclude = ['status']
             class LocationForm(forms.ModelForm):
                 class Meta:

apps/main/models.py +18 -2

                 def __unicode__(self):
                     return u'%s' % self.name
+                def get_absolute_url(self):
+                    return reverse('url_device', args=[str(self.id)])
             class DeviceType(models.Model):
                 name = models.CharField(max_length = 10, choices = DEV_TYPES, default = 'rc')
                 def __unicode__(self):
                     return u'%s | %s' % (self.name, self.ip_address)
                 def get_status(self):
                     return self.status
+                def get_absolute_url(self):
+                    return reverse('url_device', args=[str(self.id)])
             class Campaign(models.Model):
                 def __unicode__(self):
                     return u'%s' % (self.name)
+                def get_absolute_url(self):
+                    return reverse('url_campaign', args=[str(self.id)])
             class RunningExperiment(models.Model):
                 radar = models.OneToOneField('Location', on_delete=models.CASCADE)
                 def __unicode__(self):
                     return u'%s' % (self.name)
+                @property
+                def radar(self):
+                    return self.location
                 def clone(self, **kwargs):
                     confs = Configuration.objects.filter(experiment=self, type=0)
                     return color
+                def get_absolute_url(self):
+                    return reverse('url_experiment', args=[str(self.id)])
             class Configuration(PolymorphicModel):

apps/main/templates/campaign_edit.html +2 -22

@@ -1,32 +1,12
1	{% extends "base.html" %}	1	{% extends "base_edit.html" %}
2	{% load bootstrap3 %}	2	{% load bootstrap3 %}
3	{% load static %}	3	{% load static %}
4	{% load main_tags %}	4	{% load main_tags %}
		5
5	{% block extra-head %}	6	{% block extra-head %}
6	<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">	7	<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
7	{% endblock %}	8	{% endblock %}
8		9
9	{% block camp-active %}active{% endblock %}
10
11	{% block content-title %}{{title}}{% endblock %}
12	{% block content-suptitle %}{{suptitle}}{% endblock %}
13
14	{% block content %}
15	<form class="form" method="post" action="">
16	{% csrf_token %}
17	{% bootstrap_form form layout='horizontal' size='medium' %}
18	<div style="clear: both;"></div>
19	{% if button %}
20	<br>
21	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>
22	{% endif %}
23	</form>
24	{% endblock %}
25
26	{% block sidebar%}
27	{% include "sidebar_devices.html" %}
28	{% endblock %}
29
30	{% block extra-js%}	10	{% block extra-js%}
31	<script src="{% static 'js/moment.min.js' %}"></script>	11	<script src="{% static 'js/moment.min.js' %}"></script>
32	<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>	12	<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>

apps/main/templates/confirm.html +5 -9

             {% block content %}
             <form action="" method="post" class="form">{% csrf_token %}
-            {% if next %}
+            {% if delete %}
-              <input name="next" type="hidden" value="{{ next }}" />
-            {% endif %}
-            {% if delete_view %}
-              {% if object_name %}
-              <h3>Are you sure you wish to delete {{ object_name }} from {{ object }}?</h3>
-              {% else %}
               <h3>Are you sure you wish to delete: {{ object }}?</h3>
-              {% endif %}
             {% else %}
               <h4>Are you sure you wish to proceed?</h4>
             {% endif %}
-              {% if message %}<h4>{{ message }}</h4>{% endif %}
+              {% if message %}<p>{{ message }}</p>{% endif %}
               <br>
+              <div class="pull-right">
               <button class="btn btn-primary" type="submit">
                 <span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Yes
               </button>
               <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">
                 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> No
               </button>
+              </div>
             </form>
             {% endblock %}

apps/main/templates/device_edit.html +1 -29

@@ -1,29 +1,1
1	{% extends "base.html" %}	1	{% extends "base_edit.html" %} No newline at end of file
2	{% load bootstrap3 %}
3	{% load static %}
4	{% load main_tags %}
5	{% block extra-head %}
6	<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
7	{% endblock %}
8
9	{% block dev-active %}active{% endblock %}
10
11	{% block content-title %}{{title}}{% endblock %}
12	{% block content-suptitle %}{{suptitle}}{% endblock %}
13
14	{% block content %}
15	<form class="form" method="post" action="">
16	{% csrf_token %}
17	{% bootstrap_form form layout='horizontal' size='medium' %}
18	<div style="clear: both;"></div>
19	<br>
20	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>
21	</form>
22	{% endblock %}
23
24	{% block sidebar%}
25	{% include "sidebar_devices.html" %}
26	{% endblock %}
27
28	{% block extra-js%}
29	{% endblock %} No newline at end of file

apps/main/templates/experiment_edit.html 0 -34

@@ -17,40 +17,6
17	{% bootstrap_form form layout='horizontal' size='medium' %}	17	{% bootstrap_form form layout='horizontal' size='medium' %}
18	<div style="clear: both;"></div>	18	<div style="clear: both;"></div>
19	<br>	19	<br>
20	{% if configurations %}
21	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
22	<div class="panel panel-default">
23	<div class="panel-heading" role="tab" id="headingTwo">
24	<h4 class="panel-title">
25	<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseThree">
26	Device Configurations
27	</a>
28	</h4>
29	</div>
30	<div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
31	<div class="panel-body">
32	<table class="table table-hover">
33	<tr>
34	<th>#</th>
35	{% for key in configuration_keys %}
36	<th>{{ key\|title }}</th>
37	{% endfor%}
38	</tr>
39	{% for item in configurations %}
40	<tr class="clickable-row" data-href="{{item.get_absolute_url}}">
41	<td>{{ forloop.counter }}</td>
42	{% for key in configuration_keys %}
43	<td>{{ item\|value:key }}</td>
44	{% endfor %}
45	</tr>
46	{% endfor %}
47	</table>
48	</div>
49	</div>
50	</div>
51	</div>
52	{% endif %}
53
54	{% if button %}	20	{% if button %}
55	<br>	21	<br>
56	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>	22	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>

apps/main/views.py +65 -19

                 'usrp': USRPConfiguration,
             }
             def index(request):
                 kwargs = {}
                 return render(request, 'index.html', kwargs)
             def locations(request):
                 locations = Location.objects.all().order_by('name')
                 return render(request, 'locations.html', kwargs)
             def location(request, id_loc):
                 location = get_object_or_404(Location, pk=id_loc)
                 return render(request, 'location_edit.html', kwargs)
             def location_edit(request, id_loc):
                 location = get_object_or_404(Location, pk=id_loc)
                 return render(request, 'location_edit.html', kwargs)
             def location_delete(request, id_loc):
                 location = get_object_or_404(Location, pk=id_loc)
                         location.delete()
                         return redirect('url_locations')
-                    return HttpResponse("Not enough permission to delete this object")
+                    messages.error(request, 'Not enough permission to delete this object')
+                    return redirect(location.get_absolute_url())
-                kwargs = {'object':location, 'loc_active':'active',
+                kwargs = {
-                          'url_cancel':'url_location', 'id_item':id_loc}
+                          'title': 'Delete',
+                          'suptitle': 'Location',
+                          'object': location,
+                          'previous': location.get_absolute_url(),
+                          'delete': True
+                          }
-                return render(request, 'item_delete.html', kwargs)
+                return render(request, 'confirm.html', kwargs)
             def devices(request):
                 return render(request, 'devices.html', kwargs)
             def device(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 return render(request, 'device.html', kwargs)
             def device_new(request):
                 if request.method == 'GET':
                 return render(request, 'device_edit.html', kwargs)
             def device_edit(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                     if form.is_valid():
                         form.save()
-                        return redirect('url_devices')
+                        return redirect(device.get_absolute_url())
                 kwargs = {}
                 kwargs['form'] = form
                 return render(request, 'device_edit.html', kwargs)
             def device_delete(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                         device.delete()
                         return redirect('url_devices')
-                    return HttpResponse("Not enough permission to delete this object")
+                    messages.error(request, 'Not enough permission to delete this object')
+                    return redirect(device.get_absolute_url())
-                kwargs = {'object':device, 'dev_active':'active',
+                kwargs = {
-                          'url_cancel':'url_device', 'id_item':id_dev}
+                          'title': 'Delete',
+                          'suptitle': 'Device',
+                          'object': device,
+                          'previous': device.get_absolute_url(),
+                          'delete': True
+                          }
-                return render(request, 'item_delete.html', kwargs)
+                return render(request, 'confirm.html', kwargs)
             def campaigns(request):
                 return render(request, 'campaigns.html', kwargs)
             def campaign(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 kwargs = {}
                 kwargs['campaign'] = campaign
-                kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
+                kwargs['campaign_keys'] = ['template', 'name', 'start_date', 'end_date', 'tags', 'description']
-                keys = ['id', 'name', 'start_time', 'end_time']
-                kwargs['experiment_keys'] = keys[1:]
+                kwargs['experiments'] = experiments
-                kwargs['experiments'] = experiments.values(*keys)
+                kwargs['experiment_keys'] = ['name', 'radar', 'start_time', 'end_time']
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Details'
                 return render(request, 'campaign.html', kwargs)
             def campaign_new(request):
                 kwargs = {}
                 return render(request, 'campaign_edit.html', kwargs)
             def campaign_edit(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 return render(request, 'campaign_edit.html', kwargs)
             def campaign_delete(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                         return redirect('url_campaigns')
-                    return HttpResponse("Not enough permission to delete this object")
+                    messages.error(request, 'Not enough permission to delete this object')
+                    return redirect(campaign.get_absolute_url())
-                kwargs = {'object':campaign, 'camp_active':'active',
+                kwargs = {
-                          'url_cancel':'url_campaign', 'id_item':id_camp}
+                          'title': 'Delete',
+                          'suptitle': 'Campaign',
+                          'object': campaign,
+                          'previous': campaign.get_absolute_url(),
+                          'delete': True
+                          }
-                return render(request, 'item_delete.html', kwargs)
+                return render(request, 'confirm.html', kwargs)
             def experiments(request):
                 return render(request, 'experiments.html', kwargs)
             def experiment(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 return render(request, 'experiment_edit.html', kwargs)
             def experiment_edit(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 return render(request, 'experiment_edit.html', kwargs)
             def experiment_delete(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 return render(request, 'item_delete.html', kwargs)
             def dev_confs(request):
                 configurations = Configuration.objects.all().order_by('type', 'device__device_type', 'experiment')
                 return render(request, 'dev_confs.html', kwargs)
             def dev_conf(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 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)
                 return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
             def dev_conf_start(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return redirect(conf.get_absolute_url())
             def dev_conf_stop(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return redirect(conf.get_absolute_url())
             def dev_conf_status(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return redirect(conf.get_absolute_url())
             def dev_conf_read(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
             def dev_conf_import(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return render(request, 'dev_conf_import.html', kwargs)
             def dev_conf_export(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return render(request, 'dev_conf_export.html', kwargs)
             def dev_conf_delete(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return render(request, 'operation.html', kwargs)
             def operation_search(request, id_camp=None):

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