ABS/abscontrol Commit - r120:121 · Jicamarca Repository

- Agrupando los modelos de la aplicacion en una sola clase.

jsalyrosas -

r120:121

parent child

Context file:

r120:121

Collapse all files

trunk/webapp/abs_webapp_dev/settings.py +6 -6

              # Django settings for abs_webapp_dev project.
              import os
              PROJECT_DIR = os.path.split(os.path.dirname(__file__))[0]
              DEBUG = True
              TEMPLATE_DEBUG = DEBUG
              ADMINS = (
                  # ('Your Name', 'your_email@example.com'),
              )
              MANAGERS = ADMINS
              DATABASES = {
                  'default': {
                      'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
                      'NAME': 'db_jrowebapp_dev',                      # Or path to database file if using sqlite3.
                      'USER': 'abscontrol',                      # Not used with sqlite3.
                      'PASSWORD': 'abscontrol',                  # Not used with sqlite3.
                      'HOST': 'localhost',                      # Set to empty string for localhost. Not used with sqlite3.
                      'PORT': '3306',                      # Set to empty string for default. Not used with sqlite3.
                  }
              }
              # Local time zone for this installation. Choices can be found here:
              # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
              # although not all choices may be available on all operating systems.
              # In a Windows environment this must be set to your system time zone.
              TIME_ZONE = 'America/Lima'
              # Language code for this installation. All choices can be found here:
              # http://www.i18nguy.com/unicode/language-identifiers.html
              LANGUAGE_CODE = 'en-us'
              SITE_ID = 1
              # If you set this to False, Django will make some optimizations so as not
              # to load the internationalization machinery.
              USE_I18N = True
              # If you set this to False, Django will not format dates, numbers and
              # calendars according to the current locale.
              USE_L10N = True
              # If you set this to False, Django will not use timezone-aware datetimes.
              USE_TZ = True
              # Absolute filesystem path to the directory that will hold user-uploaded files.
              # Example: "/home/media/media.lawrence.com/media/"
              MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media').replace('\\', '/')
              # URL that handles the media served from MEDIA_ROOT. Make sure to use a
              # trailing slash.
              # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
              MEDIA_URL = '/media/'
              # Absolute path to the directory static files should be collected to.
              # Don't put anything in this directory yourself; store your static files
              # in apps' "static/" subdirectories and in STATICFILES_DIRS.
              # Example: "/home/media/media.lawrence.com/static/"
-             STATIC_ROOT = os.path.join(PROJECT_DIR, 'static-serve').replace('\\', '/'),
+             #STATIC_ROOT = os.path.join(PROJECT_DIR, 'static-serve').replace('\\', '/'),
+             STATIC_ROOT = ''
              # URL prefix for static files.
              # Example: "http://media.lawrence.com/static/"
              STATIC_URL = '/static/'
              # Additional locations of static files
              STATICFILES_DIRS = (
                  # Put strings here, like "/home/html/static" or "C:/www/django/static".
                  # Always use forward slashes, even on Windows.
                  # Don't forget to use absolute paths, not relative paths.
-                 os.path.join(PROJECT_DIR, "static").replace('\\', '/'),
+                 #os.path.join(PROJECT_DIR, "static").replace('\\', '/'),
+                 ("static", os.path.join(PROJECT_DIR, "static").replace('\\', '/')),
              )
              # List of finder classes that know how to find static files in
              # various locations.
              STATICFILES_FINDERS = (
                  'django.contrib.staticfiles.finders.FileSystemFinder',
                  'django.contrib.staticfiles.finders.AppDirectoriesFinder',
              #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
              )
              # Make this unique, and don't share it with anybody.
              SECRET_KEY = '=^abu)gd=)7hf#rme_vw=tv!bdh7+tts*^&amp;)h(n=7@7(9#__@e'
              # List of callables that know how to import templates from various sources.
              TEMPLATE_LOADERS = (
                  'django.template.loaders.filesystem.Loader',
                  'django.template.loaders.app_directories.Loader',
              #     'django.template.loaders.eggs.Loader',
              )
              MIDDLEWARE_CLASSES = (
                  'django.middleware.common.CommonMiddleware',
                  'django.contrib.sessions.middleware.SessionMiddleware',
-                 'django.middleware.csrf.CsrfViewMiddleware',
+                 #'django.middleware.csrf.CsrfViewMiddleware',
                  'django.contrib.auth.middleware.AuthenticationMiddleware',
                  'django.contrib.messages.middleware.MessageMiddleware',
                  # Uncomment the next line for simple clickjacking protection:
                  # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
              )
              ROOT_URLCONF = 'abs_webapp_dev.urls'
              # Python dotted path to the WSGI application used by Django's runserver.
              WSGI_APPLICATION = 'abs_webapp_dev.wsgi.application'
              TEMPLATE_DIRS = (
                  # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
                  # Always use forward slashes, even on Windows.
                  # Don't forget to use absolute paths, not relative paths.
                  os.path.join(PROJECT_DIR, "templates").replace('\\', '/'),
              )
              INSTALLED_APPS = (
                  'django.contrib.auth',
                  'django.contrib.contenttypes',
                  'django.contrib.sessions',
                  'django.contrib.sites',
                  'django.contrib.messages',
                  'django.contrib.staticfiles',
                  # Uncomment the next line to enable the admin:
                  # 'django.contrib.admin',
                  # Uncomment the next line to enable admin documentation:
                  # 'django.contrib.admindocs',
-                 'components.antenna',
-                 'components.pattern_antenna',
-                 'components.profile_antenna',
+                 'abscontrol',
              )
              # A sample logging configuration. The only tangible logging
              # performed by this configuration is to send an email to
              # the site admins on every HTTP 500 error when DEBUG=False.
              # See http://docs.djangoproject.com/en/dev/topics/logging for
              # more details on how to customize your logging configuration.
              LOGGING = {
                  'version': 1,
                  'disable_existing_loggers': False,
                  'filters': {
                      'require_debug_false': {
                          '()': 'django.utils.log.RequireDebugFalse'
                      }
                  },
                  'handlers': {
                      'mail_admins': {
                          'level': 'ERROR',
                          'filters': ['require_debug_false'],
                          'class': 'django.utils.log.AdminEmailHandler'
                      }
                  },
                  'loggers': {
                      'django.request': {
                          'handlers': ['mail_admins'],
                          'level': 'ERROR',
                          'propagate': True,
                      },
                  }
              }

trunk/webapp/abscontrol/models.py +111 -1

		@@ -1,3 +1,113
1	1	from django.db import models
	2	from django.utils import timezone
2	3
3		# Create your models here.
	4	class profileAntenna(models.Model):
	5
	6	name = models.CharField(max_length=250)
	7	date_create = models.DateTimeField()
	8	date_modified = models.DateTimeField(null=True)
	9	hits = models.PositiveIntegerField()
	10	state = models.PositiveSmallIntegerField()
	11
	12	class Meta:
	13	db_table = "abs_profile_antenna"
	14	verbose_name = "Profile of Configuration"
	15	verbose_name_plural = "Profiles of Configuration"
	16
	17	def save(self):
	18	if self.pk is None:
	19	self.date_create = timezone.now()
	20	self.hits = 0
	21	self.state = 1
	22	else:
	23	self.date_modified = timezone.now()
	24	super(profileAntenna, self).save()
	25
	26	def __unicode__(self):
	27	return u'%s' % self.value
	28
	29	class patternAntenna(models.Model):
	30
	31	profile = models.ForeignKey(profileAntenna)
	32	date_create = models.DateTimeField()
	33	date_modified = models.DateTimeField(null=True)
	34	hits = models.PositiveIntegerField()
	35	state = models.PositiveSmallIntegerField()
	36
	37	class Meta:
	38	db_table = "abs_pattern_antenna"
	39	verbose_name = "Pattern of Antenna"
	40	verbose_name_plural = "List of Patterns of Antenna"
	41
	42	def save(self):
	43	if self.pk is None:
	44	self.date_create = timezone.now()
	45	self.hits = 0
	46	self.state = 1
	47	else:
	48	self.date_modified = timezone.now()
	49	super(patternAntenna, self).save()
	50
	51	'''
	52	def __unicode__(self):
	53	return u'%s' % self.value
	54	'''
	55
	56	class antennaUp(models.Model):
	57
	58	pattern = models.ForeignKey(patternAntenna)
	59	value = models.CharField(max_length=250)
	60	tx = models.CharField(max_length=250)
	61	rx = models.CharField(max_length=250)
	62	ues = models.CharField(max_length=80)
	63	date_create = models.DateTimeField()
	64	date_modified = models.DateTimeField(null=True)
	65	hits = models.PositiveIntegerField()
	66	state = models.PositiveSmallIntegerField()
	67
	68	class Meta:
	69	db_table = "abs_antenna_up"
	70	verbose_name = "Antenna Up"
	71	verbose_name_plural = "List of Antenna Up"
	72
	73	def save(self):
	74	if self.pk is None:
	75	self.date_create = timezone.now()
	76	self.hits = 0
	77	self.state = 1
	78	else:
	79	self.date_modified = timezone.now()
	80	super(antennaUp, self).save()
	81
	82	def __unicode__(self):
	83	return u'%s' % self.value
	84
	85
	86	class antennaDown(models.Model):
	87
	88	pattern = models.ForeignKey(patternAntenna)
	89	value = models.CharField(max_length=250)
	90	tx = models.CharField(max_length=250)
	91	rx = models.CharField(max_length=250)
	92	ues = models.CharField(max_length=80)
	93	date_create = models.DateTimeField()
	94	date_modified = models.DateTimeField(null=True)
	95	hits = models.PositiveIntegerField()
	96	state = models.PositiveSmallIntegerField()
	97
	98	class Meta:
	99	db_table = "abs_antenna_down"
	100	verbose_name = "Antenna Down"
	101	verbose_name_plural = "List of Antenna Down"
	102
	103	def save(self):
	104	if self.pk is None:
	105	self.date_create = timezone.now()
	106	self.hits = 0
	107	self.state = 1
	108	else:
	109	self.date_modified = timezone.now()
	110	super(antennaDown, self).save()
	111
	112	def __unicode__(self):
	113	return u'%s' % self.value

trunk/webapp/abscontrol/urls.py +1 0

              from django.conf.urls import patterns, url
              urlpatterns = patterns('abscontrol.views',
                  url(r'^$', 'index'),
                  url(r'^new/$', 'new'),
+                 url(r'^save/$', 'save'),
                  url(r'^(?P<profile_id>\d+)/$', 'detail'),
                  #url(r'^(?P<poll_id>\d+)/results/$', 'results'),
                  #url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
              )
  No newline at end of file

trunk/webapp/abscontrol/views.py +39 -1

		@@ -1,11 +1,49
1	1	from django.shortcuts import render_to_response
2		from components.profile_antenna.models import profileAntenna
	2	from django.http import HttpResponseRedirect
	3	from django.core.urlresolvers import reverse
	4	from django.template import RequestContext
	5
	6	from abscontrol.models import profileAntenna, patternAntenna, antennaUp, antennaDown
3	7
4	8	def index(request):
5	9	#latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
6	10	profile_list = profileAntenna.objects.all()
7	11	return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
8	12
9	13	def new(request):
10	14	#profile_list = profileAntenna.objects.all()
11	15	return render_to_response('abscontrol/new.html', {})
	16
	17	def save(request):
	18	try:
	19	txtProfile = request.POST["txtProfile"]
	20
	21	txtAntennaUp = request.POST["txtAntennaUp"]
	22	txtTxUp = request.POST["txtTxUp"]
	23	txtRxUp = request.POST["txtRxUp"]
	24	txtUesUp = request.POST["txtUesUp"]
	25
	26	txtAntennaDown = request.POST["txtAntennaDown"]
	27	txtTxDown = request.POST["txtTxDown"]
	28	txtRxDown = request.POST["txtRxDown"]
	29	txtUesDown = request.POST["txtUesDown"]
	30
	31	objProfile = profileAntenna(name=txtProfile)
	32	objProfile.save()
	33
	34	profile = profileAntenna.objects.get(pk=objProfile.id)
	35	print profile.id
	36	newpattern = profile.pattern_set.create()
	37	'''
	38	pattern = patternAntenna.objects.get(pk=newpattern.id)
	39	pattern.antennaUp_set.create(value=txtAntennaUp, tx=txtTxUp, rx=txtRxUp, ues=txtUesUp)
	40	pattern.antennaDown_set.create(value=txtAntennaDown, tx=txtTxDown, rx=txtRxDown, ues=txtUesDown)
	41	'''
	42	return HttpResponseRedirect(reverse('abscontrol.views.index'))
	43
	44	except:
	45	# Redisplay the form
	46	return render_to_response('abscontrol/new.html', {
	47	'error_message': "You didn't select a choice.",
	48	}, context_instance=RequestContext(request))
	49

trunk/webapp/static/css/style.css +34 -5

		@@ -1,6 +1,35
1		body {
2		font-size: 11px;
3		}
	1	body {font-size: 11px; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif}
4	2	article, aside, figure, footer, header, hgroup, nav, section { display:block; }
5		header{border: 1px solid #f00; font-size: 1.2em}
6		#schema{margin: 0 auto; width: 980px; border: 1px solid #f00;}
	3	header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
	4	#schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px}
	5	#content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
	6	#content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; font-family: Monaco;}
	7	#content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;}
	8	footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
	9
	10	.cleardivs {clear: both; border: 1px solid #400; height: 0px}
	11
	12
	13	/****************************************************************************************/
	14	/**** MENU DE NAVEGACION DE PERFILES ********************************/
	15	/****************************************************************************************/
	16	#content #infoProfiles {border: 1px solid #d00; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px}
	17	.lblInfo {padding-left: 12px; line-height: 20px;}
	18	#content nav {border: 1px solid #c55; width: 140px; margin: 0px; font-family: Monaco; font-size: 1.2em;}
	19	#content nav ul{list-style: none; list-style-type: none; margin: 15px 15px 15px 15px; padding-left: 20px; border: 0px solid #eee}
	20	#content nav ul li{line-height: 20px}
	21
	22	/****************************************************************************************/
	23	/****** FORMULARIO DE PERFILES ***********************************/
	24	/****************************************************************************************/
	25	#divProfile {border: 0px solid #dff; margin: 10px 0px; padding: 10px 10px; width: 500px}
	26	.flsAntenna {margin: 10px 0px; width: 750px; padding: 10px 10px}
	27	#divPattern textarea,input[type=text],label {font-family: Monaco; font-size: inherit;}
	28	#divPattern input[type=text] {width: 200px}
	29	#divPattern textarea {resize: none; overflow: hidden}
	30	.divAntenna {float: left; margin: 10px; height: 150px}
	31	.divAntenna label {display: block}
	32	.divTx {display: block; float: left; margin: 10px; height: 150px}
	33	.divTx label {display: block}
	34	.divUes {display: block; margin: 10px}
	35	.txtAntenna {max-width: 200px; max-height: 120px}

trunk/webapp/templates/abscontrol/index.html +20 -13

              {% extends "base.html" %}
              {% block title %}ABS CONTROL:::::{% endblock %}
              {% block content %}
+             <div id="content">
+                 {% block leftcolumn %}
                  <div id="leftcolumn">
-                     <div>
-                         {% if profile_list %}
-                         <ul>
-                             <li><a href="#">Choose ...</</a></li>
-                         {% for entry in profile_list %}
-                             <li><a href="/view/{{ entry.id }}">{{ entry.name }}</a></li>
-                         {% endfor %}
-                         </ul>
-                         {% else %}
-                         <p>No profiles are available.</p>
-                         {% endif %}
+                     <div id="lsProfiles">
+                         <div id="infoProfiles">
+                             <label for="lblProfile" class="lblInfo">Profiles:</label><br />
+                             {% if profile_list %}
+                             <select name="lsProfiles">
+                                 <option>Choose ...</option>
+                             {% for entry in profile_list %}
+                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
+                             {% endfor %}
+                             </select>
+                             {% else %}
+                             <label for="lblMessage" class="lblInfo">No profiles.</label>
+                             {% endif %}
+                         </div>
                      </div>
                      {% block mnu_profile %}
                      <nav>
                          <ul>
-                             <li><a href="new">New</a></li>
-                             <li><a href="#">Save</a></li>
+                             <li><a href="/abscontrol/new">New</a></li>
                              <li><a href="#">Save as</a></li>
                              <li><a href="#">Import</a></li>
                              <li><a href="#">Export</a></li>
                              <li><a href="#">Apply</a></li>
                          </ul>
                      </nav>
                      {% endblock %}
                  </div>
+                 {% endblock %}
                  {% block maincolumn %}
                  <div id="maincolumn">
                  </div>
                  {% endblock %}
+                 <div class="cleardivs"></div>
+             </div>
              {% endblock %}
  No newline at end of file

trunk/webapp/templates/abscontrol/new.html +52 -5

		@@ -1,13 +1,60
1	1	{% extends "abscontrol/index.html" %}
2	2	{% block title %}ABS CONTROL:::::NEW PROFILE{% endblock %}
3	3
4	4	{% block maincolumn%}
5	5	<div id="maincolumn">
6		<form action="/save/" method="post">
7		{% csrf_token %}
8		<label for="lblName">Profile:</label><br />
9		<input type="text" name="profile" id="" value="" />
10		<input type="submit" value="Save" />
	6	<form action="/abscontrol/save/" method="post">
	7	<div id="divProfile">
	8	<label for="lblName">Profile:</label>
	9	<input type="text" name="txtProfile" id="" value="" />
	10	<input type="submit" value="Save" />
	11	</div>
	12	<div id="divPattern">
	13	<div id="antennaUp">
	14	<fieldset class="flsAntenna">
	15	<legend>UP</legend>
	16	<div class="divAntenna">
	17	<label for="lblAntenna">Antenna</label>
	18	<textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8"></textarea>
	19	</div>
	20	<div class="divTx">
	21	<label for="lblTx">Tx</label>
	22	<textarea name="txtTxUp" class="txtTR" cols="20" rows="8"></textarea>
	23	</div>
	24	<div class="divTx">
	25	<label for="lblRx">Rx</label>
	26	<textarea name="txtRxUp" class="txtTR" cols="20" rows="8"></textarea>
	27	</div>
	28	<div class="cleardivs"></div>
	29	<div class="divUes">
	30	<label for="lblUes">Ues:</label>
	31	<input type="text" name="txtUesUp" value="" />
	32	</div>
	33	</fieldset>
	34	</div>
	35	<div id="antennaDown">
	36	<fieldset class="flsAntenna">
	37	<legend>DOWN</legend>
	38	<div class="divAntenna">
	39	<label for="lblAntenna">Antenna</label>
	40	<textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8"></textarea>
	41	</div>
	42	<div class="divTx">
	43	<label for="lblTx">Tx</label>
	44	<textarea name="txtTxDown" class="txtTR" cols="20" rows="8"></textarea>
	45	</div>
	46	<div class="divTx">
	47	<label for="lblRx">Rx</label>
	48	<textarea name="txtRxDown" class="txtTR" cols="20" rows="8"></textarea>
	49	</div>
	50	<div class="cleardivs"></div>
	51	<div class="divUes">
	52	<label for="lblUes">Ues:</label>
	53	<input type="text" name="txtUesDown" value="" />
	54	</div>
	55	</fieldset>
	56	</div>
	57	</div>
11	58	</form>
12	59	</div>
13	60	{% endblock %}

trunk/webapp/templates/base.html +9 -14

+             {% load static %}
              <!DOCTYPE html>
              <html lang="en">
                  <head>
                      <meta charset="utf-8" />
                      {% comment %}
                      <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
                      Remove this if you use the .htaccess -->
                      <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
                      {% endcomment %}
-                     <link rel="stylesheet" href="{{ STATIC_URL }}style.css" type="text/css" />
+                     <link rel="stylesheet" href="{% static 'static/css/style.css' %}" type="text/css" />
                      <title>{% block title %}JRO WEB APPS::::{% endblock %}</title>
                      <meta name="description" content="JRO WEB APPLICATIONS" />
                      <meta name="author" content="Jose Antonio Sal y Rosas Celi" />
                      {# <meta name="viewport" content="width=device-width; initial-scale=1.0" /> #}
                      {% comment %}
                      <!-- Replace favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
                      <link rel="shortcut icon" href="/favicon.ico" />
                      <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
                      {% endcomment %}
                  </head>
                  <body>
                      <div id="schema">
                          <header>
                              {% block header %}
                              <nav>
                                <a href="/abscontrol">ABS</a> |
                                <a href="#">CR</a> |
                                <a href="#">DDS</a> |
                                <a href="#">JARS</a>
                              </nav>
                              {% endblock %}
                          </header>
+                         {% block content %}
                          <div id="content">
-                         {% block content %}
-                         <nav>
-                             <p>
-                                 <a href="/">Home</a>
-                             </p>
-                             <p>
-                                 <a href="/contact">Contact</a>
-                             </p>
-                         </nav>
+                             <nav>
+                                 <p><a href="/">Home</a></p>
+                                 <p><a href="/contact">Contact</a></p>
+                             </nav>
+                         </div>
                          {% endblock %}
-                         </div>
                          <footer>
                              {% block footer %}
-                             <p>
-                                 &copy; Copyright by Jicamarca Radio Observatory
-                             </p>
+                             <p>&copy; Copyright by Jicamarca Radio Observatory</p>
                              {% endblock %}
                          </footer>
                      </div>
                  </body>
              </html>

trunk/webapp/abscontrol/static removed 0 0

NO CONTENT: file was removed

trunk/webapp/abscontrol/templates removed 0 0

NO CONTENT: file was removed

trunk/webapp/components removed 0 0

NO CONTENT: file was removed

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