radarsys Commit - r2:6a62ac45a3cd · Jicamarca Repository

Actualizacion de templates y modelos base #263...

Juan C. Espinoza -

r2:6a62ac45a3cd

parent child

Context file:

r2:6a62ac45a3cd

Collapse all files

apps/main/forms.py created 644 +21 0

@@ -0,0 +1,21
	1	from django import forms
	2	from .models import Device, Experiment, ExperimentTemplate
	3
	4	def add_empty_choice(choices, pos=0, label='-----'):
	5	if len(choices)>0:
	6	choices = list(choices)
	7	choices.insert(0, (0, label))
	8	return choices
	9	else:
	10	return [(0, label)]
	11
	12	class ExperimentForm(forms.ModelForm):
	13	class Meta:
	14	model = Experiment
	15	fields = ['name', 'alias', 'start_date', 'end_date']
	16
	17
	18	class TemplatesForm(forms.Form):
	19	template = forms.ChoiceField(choices=add_empty_choice(ExperimentTemplate.objects.all().values_list('id', 'experiment_detail__experiment__name')),
	20	required=False)
	21	No newline at end of file

apps/main/templates/new_experiment.html created 644 +22 0

@@ -0,0 +1,22
	1	{% extends "base.html" %}
	2	{% load bootstrap3 %}
	3	{% block exp-active %}active{% endblock %}
	4
	5	{% block content-title %}Experiments{% endblock %}
	6	{% block content-suptitle %}New{% endblock %}
	7
	8	{% block content %}
	9	<div class='col-md-8'>
	10	<form class="form" method="post" action="{% url 'new_experiment' %}">
	11	{% csrf_token %}
	12	{% bootstrap_form form layout='horizontal' size='medium' %}
	13	<div style="clear: both;"></div>
	14	<br>
	15	<button type="submit" class="btn btn-primary pull-right">Create</button>
	16	</form>
	17	</div>
	18
	19	{% endblock %}
	20
	21	{% block sidebar%}
	22	{% endblock %}

apps/accounts/templates/login.html +4 -2

             {% block content-suptitle %}Authetication{% endblock %}
             {% block content %}
-             <form class="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
+            <div class='col-md-8'>
+              <form class="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
               {% csrf_token %}
               {% bootstrap_form form %}
               <input type="hidden" name="next" value="{{ next }}" />
               {% buttons %}
                 <button type="submit" class="btn btn-primary">Login</button>
               {% endbuttons %}
-            </form>
+              </form>
+            </div>
             {% endblock %}
             {% block messages%}

apps/main/admin.py +8 0

@@ -1,3 +1,11
1	from django.contrib import admin	1	from django.contrib import admin
		2	from .models import Device, DeviceType, Experiment, ExperimentDetail, ExperimentTemplate, Configuration
2		3
3	# Register your models here.	4	# Register your models here.
		5
		6	admin.site.register(Experiment)
		7	admin.site.register(ExperimentDetail)
		8	admin.site.register(ExperimentTemplate)
		9	admin.site.register(Device)
		10	admin.site.register(Configuration)
		11	admin.site.register(DeviceType) No newline at end of file

apps/main/models.py +81 0

@@ -1,3 +1,84
1	from django.db import models	1	from django.db import models
2		2
		3	STATES = (
		4	(0, 'Inactive'),
		5	(1, 'Active'),
		6	)
		7
3	# Create your models here.	8	# Create your models here.
		9
		10	class DeviceType(models.Model):
		11
		12	name = models.CharField(max_length=40)
		13	alias = models.CharField(max_length=40)
		14	info = models.TextField(blank=True, null=True)
		15	status = models.PositiveSmallIntegerField(default=1, choices=STATES)
		16
		17	class Meta:
		18	db_table = 'device_types'
		19
		20	def __unicode__(self):
		21	return u'%s' % self.alias
		22
		23	class Device(models.Model):
		24
		25	device_type = models.ForeignKey(DeviceType)
		26	model = models.CharField(max_length=40, default='')
		27	serial = models.CharField(max_length=40, default='')
		28	ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
		29	status = models.PositiveSmallIntegerField(default=1, choices=STATES)
		30
		31	class Meta:
		32	db_table = 'devices'
		33
		34	def __unicode__(self):
		35	return u'%s-%s' % (self.device_type, self.ip_address)
		36
		37	class Experiment(models.Model):
		38
		39	name = models.CharField(max_length=40)
		40	alias = models.CharField(max_length=40)
		41	start_date = models.DateTimeField()
		42	end_date = models.DateTimeField()
		43	status = models.PositiveSmallIntegerField(default=1, choices=STATES)
		44
		45	class Meta:
		46	db_table = 'experiments'
		47
		48	def __unicode__(self):
		49	return u'%s: %s-%s' % (self.name, self.start_date, self.end_date)
		50
		51	class Configuration(models.Model):
		52
		53	device = models.ForeignKey(Device)
		54	parameters = models.TextField()
		55	status = models.PositiveSmallIntegerField(default=1, choices=STATES)
		56
		57	def __unicode__(self):
		58	return u'%s Conf' % self.device
		59	class Meta:
		60	db_table = 'configurations'
		61
		62	class ExperimentDetail(models.Model):
		63
		64	experiment = models.ForeignKey(Experiment)
		65	configurations = models.ManyToManyField(Configuration)
		66	status = models.PositiveSmallIntegerField(default=1, choices=STATES)
		67
		68	class Meta:
		69	db_table = 'experiments_detail'
		70
		71	def __unicode__(self):
		72	return u'%s Configuration' % self.experiment.name
		73
		74	class ExperimentTemplate(models.Model):
		75
		76	experiment_detail = models.ForeignKey(ExperimentDetail)
		77	status = models.PositiveSmallIntegerField(default=1, choices=STATES)
		78
		79	class Meta:
		80	db_table = 'templates'
		81
		82	def __unicode__(self):
		83	return u'%s Template' % (self.experiment_detail.experiment.name)
		84	No newline at end of file

apps/main/templates/base.html +35 -24

             <!DOCTYPE html>
-            {% load bootstrap3 %}
-            {% load url from future %}
             {% load static %}
             <html lang="en">
             <head>
                 <link href="{% static 'css/bootstrap-flatly.min.css' %}" media="screen" rel="stylesheet">
                 <style type="text/css">
                   body {padding-top: 60px}
-                  .logo {height: 45px}
+                  .logo {padding-top: 5px; height: 50px}
                 </style>
                 <!--[if lt IE 9]>
             	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="/" style="padding-top:1px"><img class="logo" alt="JRO" src="{% static "images/logo-jro-white-trans.png" %}"></a>
+                    <a class="navbar-brand" href="{% url 'index' %}" style="padding-top:1px"><img class="logo" alt="JRO" src="{% static "images/logo-jro-white-trans.png" %}"></a>
                   </div>
                   <div class="collapse navbar-collapse" id="navigationbar">
                     <ul class="nav navbar-nav">
-                    <li class="{% block mainactive %}{% endblock %}"><a href="{% url 'apps.main.views.index' %}">About</a></li>
+                      <li class=" dropdown {% block exp-active %}{% endblock %}"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Experiments<span class="caret"></span></a>
+                        <ul class="dropdown-menu" role="menu">
+                          <li><a href="{% url 'index' %}">Templates</a></li>
+                          <li><a href="#">Search</a></li>
+                          <li><a href="{% url 'new_experiment'%}">New</a></li>
+                         </ul>
+                      </li>
+                      <li class=" dropdown {% block dev-active %}{% endblock %}"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Devices<span class="caret"></span></a>
+                        <ul class="dropdown-menu" role="menu">
+                          <li><a href="#">Scan</a></li>
+                          <li><a href="#">Search</a></li>
+                          <li><a href="{% url 'new_device'%}">New</a></li>
+                         </ul>
+                      </li>
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                       <li class="nav-divider"></li>
             {% endblock %}
             <div class="container">
-            	<div id="page" class="row" style="min-height:600px">
+                <div id="page" class="row" style="min-height:600px">
-            	  <div class="col-md-9 col-xs-12" role="main">
+            	   <div class="page-header">
-            	      <div class="page-header">
+                    <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
-            	          <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
+                   </div>
-            	      </div>
+            	   <div class="col-md-9 col-xs-12" role="main">
-            	      {% block content %}
+            	   {% block content %}
-            	      {% endblock %}
+            	   {% endblock %}
-            	      <br>
+            	   <br>
-            	      {% block messages %}
+            	   {% block messages %}
-            	      {% endblock %}
+            	   {% endblock %}
-            	  </div>
+            	   </div>
-            	  <div class="col-md-3 hidden-xs hidden-sm" role="complementary">
+            	   <div class="col-md-3 hidden-xs hidden-sm" role="complementary">
-            	    <div id="sidebar" >
+            	       <div id="sidebar">
-            	    {% block sidebar %}
+            	       {% block sidebar%}
-            	    {% endblock %}
+                       {% endblock %}
-            	    </div>
+            	       </div>
-            	  </div>
+            	   </div>
             	</div><!--/row-->
             </div> <!-- container -->
             {# bootstrap_javascript jquery=True #}
             <script src="{% static 'js/jquery.min.js' %}"></script>
             <script src="{% static 'js/bootstrap.min.js' %}"></script>
-            {% block js_extra %}
+            {% block extra-js %}
             {% endblock%}
             </body>
             </html>

apps/main/templates/index.html +52 -7

@@ -1,14 +1,59
1	{% extends "base.html" %}	1	{% extends "base.html" %}
2	{% block mainactive %}active{% endblock %}	2	{% load bootstrap3 %}
3		3	{% block exp-active %}active{% endblock %}
4	{% block content-title %}~~TITL~~E{% endblock %}	4	{% block content-title %}Experiments{% endblock %}
5	{% block content-suptitle %}~~Suptitle~~{% endblock %}	5	{% block content-suptitle %}{% endblock %}
6		6
7	{% block content %}	7	{% block content %}
8	<p class="text-justify">	8	<div class='col-md-8'>
9	{% lorem %}	9	{% bootstrap_form form size='medium' %}
10	</p>	10	</div>
		11	<div style="clear: both;"></div>
		12	<br>
		13	<table class="table">
		14	<tr>
		15	<th>Device</th>
		16	<th>IP Adress</th>
		17	<th>Model</th>
		18	<th>Status</th>
		19	</tr>
		20	{% for device in devices %}
		21	<tr>
		22	<td>{{device.device_type.name}}</td>
		23	<td>{{device.ip_address}}</td>
		24	<td>{{device.model}}</td>
		25	<td>{{device.status}}</td>
		26	</tr>
		27	{% endfor %}
		28	</table>
		29	<div style="clear: both;"></div>
		30	<br>
		31	<button class="btn btn-primary">Add Device</button>
11	{% endblock %}	32	{% endblock %}
12		33
13	{% block sidebar%}	34	{% block sidebar%}
		35	{% if devices %}
		36	<div class="panel panel-default">
		37	<div class="panel-heading">
		38	<h3 class="panel-title">Devices</h3>
		39	</div>
		40	{% block sidebar-content %}
		41	<div class="list-group">
		42	{% for device in devices %}
		43	<a href="#" class="list-group-item {{device.active}}">{{device.device_type.name}}</a>
		44	{% endfor %}
		45	</div>
		46	{% endblock %}
		47	</div>
		48	{% endif %}
14	{% endblock %}	49	{% endblock %}
		50
		51	{% block extra-js%}
		52	<script type="text/javascript">
		53	$('#id_template').change(function(){
		54	if($(this).val() != "0"){
		55	location.href="/main/experiment/"+$(this).val()+"/";
		56	}
		57	});
		58	</script>
		59	{% endblock %} No newline at end of file

apps/main/urls.py +5 -3

@@ -1,5 +1,7
1	from django.conf.urls import ~~patterns~~, url	1	from django.conf.urls import url
2		2
3	urlpatterns = patterns('apps.main.views',	3	urlpatterns = (
4	url(r'^$', 'index', name="index"),	4	url(r'^new/experiment/$', 'apps.main.views.new_experiment', name='new_experiment'),
		5	url(r'^new/device/$', 'apps.main.views.new_device', name='new_device'),
		6	url(r'^experiment/(?P<idtemplate>-?\d+)/$', 'apps.main.views.index', name='template'),
5	)	7	)

apps/main/views.py +28 -1

@@ -1,8 +1,35
1	from django.shortcuts import render,render_to_response	1	from django.shortcuts import render,render_to_response
2	from django.template import RequestContext	2	from django.template import RequestContext
		3	from .forms import ExperimentForm, TemplatesForm
3		4
		5	from .models import ExperimentTemplate, Device
4	# Create your views here.	6	# Create your views here.
5		7
6	def index(request):	8	def index(request, idtemplate=0):
7	kwargs = {}	9	kwargs = {}
		10	if idtemplate not in (0, "0"):
		11	form = TemplatesForm(initial={'template':idtemplate})
		12	template = ExperimentTemplate.objects.get(id=idtemplate)
		13	devices = Device.objects.filter(configuration__experimentdetail__experiment=template.experiment_detail.experiment)
		14	kwargs['devices'] = devices
		15	else:
		16	form = TemplatesForm()
		17	kwargs['form'] = form
8	return render_to_response("index.html", kwargs, context_instance=RequestContext(request))	18	return render_to_response("index.html", kwargs, context_instance=RequestContext(request))
		19
		20	def new_experiment(request):
		21	kwargs = {}
		22	if request.method == 'POST':
		23	form = ExperimentForm(request.POST)
		24	if form.is_valid():
		25	form.save()
		26	return render_to_response("index.html", kwargs, context_instance=RequestContext(request))
		27	else:
		28	form = ExperimentForm()
		29	kwargs['form'] = form
		30	return render_to_response("new_experiment.html", kwargs, context_instance=RequestContext(request))
		31
		32	def new_device(request):
		33	kwargs = {}
		34
		35	return render_to_response("new_device.html", kwargs, context_instance=RequestContext(request)) No newline at end of file

radarsys/settings.py +1 -1

             STATICFILES_FINDERS = (
                 'django.contrib.staticfiles.finders.FileSystemFinder',
                 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-            )
  No newline at end of file

radarsys/urls.py +2 -1

             from django.contrib import admin
             urlpatterns = [
+                url(r'^$', 'apps.main.views.index', name='index'),
                 url(r'^admin/', include(admin.site.urls)),
-                url(r'^$', include('apps.main.urls')),
+                url(r'^main/', include('apps.main.urls')),
                 url(r'^accounts/', include('apps.accounts.urls')),
                 url(r'^rc/', include('apps.rc.urls')),
                 url(r'^dds/', include('apps.dds.urls')),

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