# SVN changeset patch
# User jsalyrosas
# Date 2013-04-23 04:44:11.337817
# Revision 127

- Corregida la vista view para visualizar el perfil con el patron 1 por defecto.

Index: trunk/webapp/abscontrol/views.py
===================================================================
diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py
--- a/trunk/webapp/abscontrol/views.py	(revision 126)
+++ b/trunk/webapp/abscontrol/views.py	(revision 127)
@@ -49,17 +49,11 @@
     objProfile = Profile.objects.get(pk=profile_id)
     
     lsPatterns = objProfile.pattern_set.all()
-    patternChoosen = objProfile.pattern_set.filter(value=pattern_value)
-    #print patternChoosen.value
-    #objAntennaUp = patternChoosen.antennaup_set.all()[0]
-    #objAntennaDown = patternChoosen.antennadown_set.all()[0]
+    patternChoosen = objProfile.pattern_set.get(value=pattern_value)
+    objAntennaUp = patternChoosen.antennaup_set.get()
+    objAntennaDown = patternChoosen.antennadown_set.get()
     
-    #objAntennaUp = AntennaUp.objects.get(pattern=patternChoosen.id)
-    #objAntennaDown = AntennaDown.objects.get(pattern=patternChoosen.id)
-    '''
-    return render_to_response('abscontrol/view.html', {'nameProfile': objProfile.name, 'profile_list': profile_list,
+    return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                        'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
-                                                       'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,})
-    '''
-    return render_to_response('abscontrol/view.html', {'nameProfile': objProfile.name, 'profile_list': profile_list,
-                                                       'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,})
+                                                       'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
+                                                       })
Index: trunk/webapp/templates/abscontrol/index.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/index.html b/trunk/webapp/templates/abscontrol/index.html
--- a/trunk/webapp/templates/abscontrol/index.html	(revision 126)
+++ b/trunk/webapp/templates/abscontrol/index.html	(revision 127)
@@ -13,7 +13,15 @@
                 <select name="lsProfiles">
                     <option>Choose ...</option>
                 {% for entry in profile_list %}
+                	{% if objProfile %}
+                		{% if objProfile.id == entry.id %}
+                    <option value="{{ entry.id }}" selected>{{ entry.name }}</option>
+                    	{% else %}
                     <option value="{{ entry.id }}">{{ entry.name }}</option>
+                    	{% endif %}
+                    {% else %}
+                    <option value="{{ entry.id }}">{{ entry.name }}</option>
+                    {% endif %}
                 {% endfor %}
                 </select>
                 {% else %}
Index: trunk/webapp/templates/abscontrol/view.html
===================================================================
diff --git a/trunk/webapp/templates/abscontrol/view.html b/trunk/webapp/templates/abscontrol/view.html
--- a/trunk/webapp/templates/abscontrol/view.html	(revision 126)
+++ b/trunk/webapp/templates/abscontrol/view.html	(revision 127)
@@ -1,12 +1,12 @@
 {% extends "abscontrol/index.html" %}
-{% block title %}ABS CONTROL:::PROFILE:::{{ nameProfile }}{% endblock %}
+{% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
 
 {% block maincolumn%}
 <div id="maincolumn">
     <form action="/abscontrol/save/" method="post">
     <div id="divProfile">
         <label for="lblName">Profile:</label>
-        <label for="lblProfile">{{ nameProfile }}</label>
+        <label for="lblProfile">{{ objProfile.name }}</label>
     </div>
     <div id="divPattern">
         {% if patternChoosen %}
@@ -18,20 +18,20 @@
                 <legend>UP</legend>
                 <div class="divAntenna">
                     <label for="lblAntenna">Antenna</label>
-                    <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8"></textarea>  
+                    <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ antennaUp.value }}</textarea>  
                 </div>
                 <div class="divTx">
                     <label for="lblTx">Tx</label>
-                    <textarea name="txtTxUp" class="txtTR" cols="20" rows="8"></textarea>    
+                    <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>    
                 </div>
                 <div class="divTx">
                     <label for="lblRx">Rx</label>
-                    <textarea name="txtRxUp" class="txtTR" cols="20" rows="8"></textarea>    
+                    <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>    
                 </div>
                 <div class="cleardivs"></div>
                 <div class="divUes">
                     <label for="lblUes">Ues:</label>
-                    <input type="text" name="txtUesUp" value="" />
+                    <label for="lblAntennaUpUes">{{ antennaUp.ues }}</label>
                 </div>
             </fieldset>
         </div>
@@ -40,20 +40,20 @@
                 <legend>DOWN</legend>
                 <div class="divAntenna">
                     <label for="lblAntenna">Antenna</label>
-                    <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8"></textarea>    
+                    <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ antennaDown.value }}</textarea>    
                 </div>
                 <div class="divTx">
                     <label for="lblTx">Tx</label>
-                    <textarea name="txtTxDown" class="txtTR" cols="20" rows="8"></textarea>
+                    <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
                 </div>
                 <div class="divTx">
                     <label for="lblRx">Rx</label>
-                    <textarea name="txtRxDown" class="txtTR" cols="20" rows="8"></textarea>    
+                    <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>    
                 </div>
                 <div class="cleardivs"></div>
                 <div class="divUes">
                     <label for="lblUes">Ues:</label>
-                    <input type="text" name="txtUesDown" value="" />
+                    <label for="lblAntennaDownUes">{{ antennaDown.ues }}</label>
                 </div>
             </fieldset>
         </div>