ABS/abscontrol Commit - r126:127 · Jicamarca Repository

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

jsalyrosas -

r126:127

parent child

Context file:

r126:127

Collapse all files

trunk/webapp/abscontrol/views.py +6 -12

             from django.shortcuts import render_to_response, redirect
             from abscontrol.models import Profile, AntennaDown, AntennaUp
   No newline at end of file
             def index(request):
                 #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
                 profile_list = Profile.objects.all()
                 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
   No newline at end of file
             def new(request):
                 profile_list = Profile.objects.all()
                 return render_to_response('abscontrol/new.html', {'profile_list': profile_list})
   No newline at end of file
             def save(request):
   No newline at end of file
                 txtProfile = request.POST["txtProfile"]
   No newline at end of file
                 txtAntennaUp = request.POST["txtAntennaUp"]
                 txtTxUp = request.POST["txtTxUp"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
   No newline at end of file
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
   No newline at end of file
                 newprofile = Profile(name=txtProfile)
                 newprofile.save()
   No newline at end of file
                 newpattern = newprofile.pattern_set.create(value=1)
                 newpattern.antennaup_set.create(value=txtAntennaUp,
                                                 tx=txtTxUp,rx=txtRxUp,
                                                 ues=txtUesUp)
                 newpattern.antennadown_set.create(value=txtAntennaDown,
                                                   tx=txtTxDown,rx=txtRxDown,
                                                   ues=txtUesDown)
   No newline at end of file
                 newurl = '/abscontrol/view/%d' % newprofile.id
                 #return redirect('/abscontrol/')
                 return redirect(newurl)
   No newline at end of file
             def view(request, profile_id):
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
   No newline at end of file
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
-                patternChoosen = objProfile.pattern_set.filter(value=pattern_value)
+             No newline at end of file
                 objAntennaUp = patternChoosen.antennaup_set.get()
-                #print patternChoosen.value
+             No newline at end of file
                 objAntennaDown = patternChoosen.antennadown_set.get()
  No newline at end of file
-                #objAntennaUp = patternChoosen.antennaup_set.all()[0]
              No newline at end of file
-                #objAntennaDown = patternChoosen.antennadown_set.all()[0]
  No newline at end of file
                 return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
  No newline at end of file
-                #objAntennaUp = AntennaUp.objects.get(pattern=patternChoosen.id)
              No newline at end of file
-                #objAntennaDown = AntennaDown.objects.get(pattern=patternChoosen.id)
              No newline at end of file
-                '''
              No newline at end of file
-                return render_to_response('abscontrol/view.html', {'nameProfile': objProfile.name, 'profile_list': profile_list,
  No newline at end of file
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
-                                                                   'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,})
+             No newline at end of file
                                                                    })
  No newline at end of file
-                '''
              No newline at end of file
-                return render_to_response('abscontrol/view.html', {'nameProfile': objProfile.name, 'profile_list': profile_list,
              No newline at end of file
-                                                                   'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,})
  No newline at end of file

trunk/webapp/templates/abscontrol/index.html +8 0

             {% extends "base.html" %}
   No newline at end of file
             {% block title %}ABS CONTROL:::::{% endblock %}
   No newline at end of file
             {% block content %}
             <div id="content">
                 {% block leftcolumn %}
                 <div id="leftcolumn">
                     <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 %}
+                            	{% if objProfile %}
              No newline at end of file
+                            		{% if objProfile.id == entry.id %}
              No newline at end of file
+                                <option value="{{ entry.id }}" selected>{{ entry.name }}</option>
              No newline at end of file
+                                	{% else %}
  No newline at end of file
                                 <option value="{{ entry.id }}">{{ entry.name }}</option>
+                                	{% endif %}
              No newline at end of file
+                                {% else %}
              No newline at end of file
+                                <option value="{{ entry.id }}">{{ entry.name }}</option>
              No newline at end of file
+                                {% endif %}
  No newline at end of file
                             {% endfor %}
                             </select>
                             {% else %}
                             <label for="lblMessage" class="lblInfo">No profiles.</label>
                             {% endif %}
                         </div>
                     </div>
                     {% block mnu_profile %}
                     <nav>
                         <ul>
                             <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">
   No newline at end of file
                 </div>
                 {% endblock %}
                 <div class="cleardivs"></div>
             </div>
             {% endblock %}

trunk/webapp/templates/abscontrol/view.html +10 -10

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
  No newline at end of file
-            {% block title %}ABS CONTROL:::PROFILE:::{{ nameProfile }}{% endblock %}
  No newline at end of file
   No newline at end of file
             {% block maincolumn%}
             <div id="maincolumn">
                 <form action="/abscontrol/save/" method="post">
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <label for="lblProfile">{{ objProfile.name }}</label>
  No newline at end of file
-                    <label for="lblProfile">{{ nameProfile }}</label>
  No newline at end of file
                 </div>
                 <div id="divPattern">
                     {% if patternChoosen %}
                     <label for="lblValue">Pattern:</label>
                     <label for="lblPatternValue">{{ patternChoosen.value }}</label>
                     {% endif %}
                     <div id="antennaUp">
                         <fieldset class="flsAntenna">
                             <legend>UP</legend>
                             <div class="divAntenna">
                                 <label for="lblAntenna">Antenna</label>
                                 <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ antennaUp.value }}</textarea>  
  No newline at end of file
-                                <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8"></textarea>  
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>    
  No newline at end of file
-                                <textarea name="txtTxUp" class="txtTR" cols="20" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
                                 <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>    
  No newline at end of file
-                                <textarea name="txtRxUp" class="txtTR" cols="20" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <label for="lblAntennaUpUes">{{ antennaUp.ues }}</label>
  No newline at end of file
-                                <input type="text" name="txtUesUp" value="" />
  No newline at end of file
                             </div>
                         </fieldset>
                     </div>
                     <div id="antennaDown">
                         <fieldset class="flsAntenna">
                             <legend>DOWN</legend>
                             <div class="divAntenna">
                                 <label for="lblAntenna">Antenna</label>
                                 <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ antennaDown.value }}</textarea>    
  No newline at end of file
-                                <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
  No newline at end of file
-                                <textarea name="txtTxDown" class="txtTR" cols="20" rows="8"></textarea>
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
                                 <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>    
  No newline at end of file
-                                <textarea name="txtRxDown" class="txtTR" cols="20" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <label for="lblAntennaDownUes">{{ antennaDown.ues }}</label>
  No newline at end of file
-                                <input type="text" name="txtUesDown" value="" />
  No newline at end of file
                             </div>
                         </fieldset>
                     </div>
                 </div>
                 </form>
             </div>
             {% endblock %}

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