hide some fields

diff --git a/models.py b/models.py
index cf1fd415315fc425a665ddabed194726c56c5c81..966b49c279f1fba40caf3ba2e522b4519fc4463c 100644 (file)
--- a/models.py
+++ b/models.py
@@ -125,12 +125,19 @@ class Station(Model):
     professor         = ForeignKey('Professor', related_name='stations', verbose_name='professor')
     comment           = TextField(_('comment'))
     started           = BooleanField(_('started'))
-    datetime_start    = DateTimeField(_('datetime_start'), auto_now_add=True)
-    datetime_stop     = DateTimeField(_('datetime_stop'))
+    datetime_start    = DateTimeField(_('time_start'))
+    datetime_stop     = DateTimeField(_('time_stop'))
 
     class Meta:
         db_table = app_label + '_' + 'station'
     
+    def __str__(self):
+        return ' - '.join(self.description) + ' - ' + str(self.datetime_start) + ' > ' + str(self.datetime_stop)
+    
+    @property
+    def description(self):
+        return [self.organization.name, self.conference.department.name, self.conference.title, self.session.name, self.professor.name, self.comment]
+    
     def set_conf(self, conf):
         self.conf = conf
     
@@ -150,7 +157,6 @@ class Station(Model):
         self.ogg_quality = self.conf['media']['ogg_quality']
         self.format = self.conf['media']['format']
         self.channels = int(self.conf['media']['channels'])
-        self.description = [self.organization.name, self.conference.department.name, self.conference.title, self.session.name, self.professor.name, self.comment]
         self.server_name = [self.organization.name, self.conference.department.name, self.conference.title]
         self.ServerDescription = clean_string('-'.join(self.description))
         self.ServerName = clean_string('_-_'.join(self.server_name))

diff --git a/templates/telecaster/start.html b/templates/telecaster/start.html
index ee2ea4710b935fe6daf0347b5a83a391cbba5877..befd942b7bf9246408a5485ed3c9be5a0ddc0108 100644 (file)
--- a/templates/telecaster/start.html
+++ b/templates/telecaster/start.html
@@ -1,22 +1,26 @@
 {% extends "telecaster/base.html" %}
+{% load telecaster_utils %}
+{% load i18n %}
 
 {% block content %}
 
-<form enctype="multipart/form-data" id="_editItemForm" method="post" action="" name="formulaire">{% csrf_token %}   
+<form enctype="multipart/form-data" id="_startStationForm" method="post" action="" name="formulaire">{% csrf_token %}   
 <div class="main">
 
 <table class="form">
     <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
     {% for field in station %}
     <tr>
-        <tr><td class="error">{{ field.errors }}</td></tr>
-        <td>{{ field.label_tag }}:</td>
-        <td>{{ field }}</td>
+        {% if field.errors %}<tr><td class="error">{{ field.errors }}</td></tr>{% endif %}
+        {% if not field.html_name in hidden_fields %}
+         <td>{% trans field.label_tag %}:</td><td>{{ field }}</td>
+        {% else %}
+         <td>{{ field.label_tag.as_hidden }}</td><td>{{ field.as_hidden }}</td>
+        {% endif %}
     </tr>
     {% endfor %}
 </table>
 
-
 </div>
 </form>
 

diff --git a/templates/telecaster/stop.html b/templates/telecaster/stop.html
index 352200d5fe993dda5e1eff3abfda05b76ed74dda..a3f81abf97c4ab8efa701fc7b19a6adb3840206f 100644 (file)
--- a/templates/telecaster/stop.html
+++ b/templates/telecaster/stop.html
@@ -1,17 +1,19 @@
 {% extends "telecaster/base.html" %}
+{% load telecaster_utils %}
+{% load i18n %}
 
 {% block content %}
 
-<form enctype="multipart/form-data" id="_editItemForm" method="post" action="" name="formulaire">{% csrf_token %}   
+<form enctype="multipart/form-data" id="_stopStationForm" method="post" action="" name="formulaire">{% csrf_token %}   
 <div class="main">
 
 <table class="form">
-<TR><TH align="left">Organization</TH><TD> : </TD><TD>{{ station.organization }}</TD></TR>
-<TR><TH align="left">D&eacute;partement</TH><TD> : </TD><TD>{{ station.conference.department }}</TD></TR>
-<TR><TH align="left">Conference</TH><TD> : </TD><TD>{{ station.conference }}</TD></TR>
-<TR><TH align="left">Session</TH><TD> : </TD><TD>{{ station.session }}</TD></TR>
-<TR><TH align="left">Professeur</TH><TD> : </TD><TD>{{ station.professor }}</TD></TR>
-<TR><TH align="left">Commentaire</TH><TD> : </TD><TD>{{ station.comment }}</TD></TR>
+<TR><TH align="left">{% trans "Organization" %}</TH><TD> : </TD><TD>{{ station.organization }}</TD></TR>
+<TR><TH align="left">{% trans "Department" %}</TH><TD> : </TD><TD>{{ station.conference.department }}</TD></TR>
+<TR><TH align="left">{% trans "Conference" %}</TH><TD> : </TD><TD>{{ station.conference }}</TD></TR>
+<TR><TH align="left">{% trans "Session" %}</TH><TD> : </TD><TD>{{ station.session }}</TD></TR>
+<TR><TH align="left">{% trans "Professor" %}</TH><TD> : </TD><TD>{{ station.professor }}</TD></TR>
+<TR><TH align="left">{% trans "Comment" %}</TH><TD> : </TD><TD>{{ station.comment }}</TD></TR>
 </table>
 </div>
 

diff --git a/views.py b/views.py
index 434a72335853c96ecf8345066dfdd3540315c382..963f163a4969bb7838caaa36bb6b6571175d13c6 100644 (file)
--- a/views.py
+++ b/views.py
@@ -41,6 +41,7 @@ class WebView(object):
     interfaces = ['eth0', 'eth1', 'eth2', 'eth0-eth2','eth3']
     acpi_states = {0: 'battery', 1: 'AC', 2: 'AC'}
     acpi = acpi.Acpi()
+    hidden_fields = ['started', 'datetime_start', 'datetime_stop']
     
     def __init__(self, conf_file):
         self.uid = os.getuid()
@@ -89,7 +90,8 @@ class WebView(object):
             else:
                 station = StationForm()
                 
-        return render(request, template, {'station': station, 'status': status})
+        return render(request, template, {'station': station, 'status': status, 
+                                'hidden_fields': self.hidden_fields})
             
     def get_hosts(self):
         ip = ''