##// END OF EJS Templates
ABS » abscontrol
RSS
- Corregida la vista view para visualizar el perfil con el patron 1 por defecto.
jsalyrosas -
r126:127
parent child
Show More
Show file before | Show file after | Hide comments
@@ -49,17 +49,11
49 objProfile = Profile.objects.get(pk=profile_id)
49 objProfile = Profile.objects.get(pk=profile_id)
50
50
51 lsPatterns = objProfile.pattern_set.all()
51 lsPatterns = objProfile.pattern_set.all()
52 patternChoosen = objProfile.pattern_set.filter(value=pattern_value)
52 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
53 #print patternChoosen.value
53 objAntennaUp = patternChoosen.antennaup_set.get()
54 #objAntennaUp = patternChoosen.antennaup_set.all()[0]
54 objAntennaDown = patternChoosen.antennadown_set.get()
55 #objAntennaDown = patternChoosen.antennadown_set.all()[0]
56
55
57 #objAntennaUp = AntennaUp.objects.get(pattern=patternChoosen.id)
56 return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
58 #objAntennaDown = AntennaDown.objects.get(pattern=patternChoosen.id)
59 '''
60 return render_to_response('abscontrol/view.html', {'nameProfile': objProfile.name, 'profile_list': profile_list,
61 'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
57 'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
62 'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,})
58 'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
63 '''
59 })
64 return render_to_response('abscontrol/view.html', {'nameProfile': objProfile.name, 'profile_list': profile_list,
65 'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,})
Show file before | Show file after | Hide comments
@@ -13,7 +13,15
13 <select name="lsProfiles">
13 <select name="lsProfiles">
14 <option>Choose ...</option>
14 <option>Choose ...</option>
15 {% for entry in profile_list %}
15 {% for entry in profile_list %}
16 {% if objProfile %}
17 {% if objProfile.id == entry.id %}
18 <option value="{{ entry.id }}" selected>{{ entry.name }}</option>
19 {% else %}
16 <option value="{{ entry.id }}">{{ entry.name }}</option>
20 <option value="{{ entry.id }}">{{ entry.name }}</option>
21 {% endif %}
22 {% else %}
23 <option value="{{ entry.id }}">{{ entry.name }}</option>
24 {% endif %}
17 {% endfor %}
25 {% endfor %}
18 </select>
26 </select>
19 {% else %}
27 {% else %}
Show file before | Show file after | Hide comments
@@ -1,12 +1,12
1 {% extends "abscontrol/index.html" %}
1 {% extends "abscontrol/index.html" %}
2 {% block title %}ABS CONTROL:::PROFILE:::{{ nameProfile }}{% endblock %}
2 {% block title %}ABS CONTROL:::PROFILE:::{{ objProfile.name }}{% endblock %}
3
3
4 {% block maincolumn%}
4 {% block maincolumn%}
5 <div id="maincolumn">
5 <div id="maincolumn">
6 <form action="/abscontrol/save/" method="post">
6 <form action="/abscontrol/save/" method="post">
7 <div id="divProfile">
7 <div id="divProfile">
8 <label for="lblName">Profile:</label>
8 <label for="lblName">Profile:</label>
9 <label for="lblProfile">{{ nameProfile }}</label>
9 <label for="lblProfile">{{ objProfile.name }}</label>
10 </div>
10 </div>
11 <div id="divPattern">
11 <div id="divPattern">
12 {% if patternChoosen %}
12 {% if patternChoosen %}
@@ -18,20 +18,20
18 <legend>UP</legend>
18 <legend>UP</legend>
19 <div class="divAntenna">
19 <div class="divAntenna">
20 <label for="lblAntenna">Antenna</label>
20 <label for="lblAntenna">Antenna</label>
21 <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8"></textarea>
21 <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ antennaUp.value }}</textarea>
22 </div>
22 </div>
23 <div class="divTx">
23 <div class="divTx">
24 <label for="lblTx">Tx</label>
24 <label for="lblTx">Tx</label>
25 <textarea name="txtTxUp" class="txtTR" cols="20" rows="8"></textarea>
25 <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>
26 </div>
26 </div>
27 <div class="divTx">
27 <div class="divTx">
28 <label for="lblRx">Rx</label>
28 <label for="lblRx">Rx</label>
29 <textarea name="txtRxUp" class="txtTR" cols="20" rows="8"></textarea>
29 <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>
30 </div>
30 </div>
31 <div class="cleardivs"></div>
31 <div class="cleardivs"></div>
32 <div class="divUes">
32 <div class="divUes">
33 <label for="lblUes">Ues:</label>
33 <label for="lblUes">Ues:</label>
34 <input type="text" name="txtUesUp" value="" />
34 <label for="lblAntennaUpUes">{{ antennaUp.ues }}</label>
35 </div>
35 </div>
36 </fieldset>
36 </fieldset>
37 </div>
37 </div>
@@ -40,20 +40,20
40 <legend>DOWN</legend>
40 <legend>DOWN</legend>
41 <div class="divAntenna">
41 <div class="divAntenna">
42 <label for="lblAntenna">Antenna</label>
42 <label for="lblAntenna">Antenna</label>
43 <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8"></textarea>
43 <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ antennaDown.value }}</textarea>
44 </div>
44 </div>
45 <div class="divTx">
45 <div class="divTx">
46 <label for="lblTx">Tx</label>
46 <label for="lblTx">Tx</label>
47 <textarea name="txtTxDown" class="txtTR" cols="20" rows="8"></textarea>
47 <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
48 </div>
48 </div>
49 <div class="divTx">
49 <div class="divTx">
50 <label for="lblRx">Rx</label>
50 <label for="lblRx">Rx</label>
51 <textarea name="txtRxDown" class="txtTR" cols="20" rows="8"></textarea>
51 <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>
52 </div>
52 </div>
53 <div class="cleardivs"></div>
53 <div class="cleardivs"></div>
54 <div class="divUes">
54 <div class="divUes">
55 <label for="lblUes">Ues:</label>
55 <label for="lblUes">Ues:</label>
56 <input type="text" name="txtUesDown" value="" />
56 <label for="lblAntennaDownUes">{{ antennaDown.ues }}</label>
57 </div>
57 </div>
58 </fieldset>
58 </fieldset>
59 </div>
59 </div>
General Comments 0
You need to be logged in to leave comments. Login now