##// 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
@@ -1,65 +1,59
1 from django.shortcuts import render_to_response, redirect
1 from django.shortcuts import render_to_response, redirect
2 from abscontrol.models import Profile, AntennaDown, AntennaUp
2 from abscontrol.models import Profile, AntennaDown, AntennaUp
3
3
4 def index(request):
4 def index(request):
5 #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
5 #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
6 profile_list = Profile.objects.all()
6 profile_list = Profile.objects.all()
7 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
7 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
8
8
9 def new(request):
9 def new(request):
10 profile_list = Profile.objects.all()
10 profile_list = Profile.objects.all()
11 return render_to_response('abscontrol/new.html', {'profile_list': profile_list})
11 return render_to_response('abscontrol/new.html', {'profile_list': profile_list})
12
12
13 def save(request):
13 def save(request):
14
14
15 txtProfile = request.POST["txtProfile"]
15 txtProfile = request.POST["txtProfile"]
16
16
17 txtAntennaUp = request.POST["txtAntennaUp"]
17 txtAntennaUp = request.POST["txtAntennaUp"]
18 txtTxUp = request.POST["txtTxUp"]
18 txtTxUp = request.POST["txtTxUp"]
19 txtRxUp = request.POST["txtRxUp"]
19 txtRxUp = request.POST["txtRxUp"]
20 txtUesUp = request.POST["txtUesUp"]
20 txtUesUp = request.POST["txtUesUp"]
21
21
22 txtAntennaDown = request.POST["txtAntennaDown"]
22 txtAntennaDown = request.POST["txtAntennaDown"]
23 txtTxDown = request.POST["txtTxDown"]
23 txtTxDown = request.POST["txtTxDown"]
24 txtRxDown = request.POST["txtRxDown"]
24 txtRxDown = request.POST["txtRxDown"]
25 txtUesDown = request.POST["txtUesDown"]
25 txtUesDown = request.POST["txtUesDown"]
26
26
27 newprofile = Profile(name=txtProfile)
27 newprofile = Profile(name=txtProfile)
28 newprofile.save()
28 newprofile.save()
29
29
30 newpattern = newprofile.pattern_set.create(value=1)
30 newpattern = newprofile.pattern_set.create(value=1)
31 newpattern.antennaup_set.create(value=txtAntennaUp,
31 newpattern.antennaup_set.create(value=txtAntennaUp,
32 tx=txtTxUp,rx=txtRxUp,
32 tx=txtTxUp,rx=txtRxUp,
33 ues=txtUesUp)
33 ues=txtUesUp)
34 newpattern.antennadown_set.create(value=txtAntennaDown,
34 newpattern.antennadown_set.create(value=txtAntennaDown,
35 tx=txtTxDown,rx=txtRxDown,
35 tx=txtTxDown,rx=txtRxDown,
36 ues=txtUesDown)
36 ues=txtUesDown)
37
37
38 newurl = '/abscontrol/view/%d' % newprofile.id
38 newurl = '/abscontrol/view/%d' % newprofile.id
39 #return redirect('/abscontrol/')
39 #return redirect('/abscontrol/')
40 return redirect(newurl)
40 return redirect(newurl)
41
41
42 def view(request, profile_id):
42 def view(request, profile_id):
43 if request.method == 'GET' and 'pattern' in request.GET:
43 if request.method == 'GET' and 'pattern' in request.GET:
44 pattern_value = request.GET["pattern"]
44 pattern_value = request.GET["pattern"]
45 else:
45 else:
46 pattern_value = 1
46 pattern_value = 1
47
47
48 profile_list = Profile.objects.all()
48 profile_list = Profile.objects.all()
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
@@ -1,44 +1,52
1 {% extends "base.html" %}
1 {% extends "base.html" %}
2
2
3 {% block title %}ABS CONTROL:::::{% endblock %}
3 {% block title %}ABS CONTROL:::::{% endblock %}
4
4
5 {% block content %}
5 {% block content %}
6 <div id="content">
6 <div id="content">
7 {% block leftcolumn %}
7 {% block leftcolumn %}
8 <div id="leftcolumn">
8 <div id="leftcolumn">
9 <div id="lsProfiles">
9 <div id="lsProfiles">
10 <div id="infoProfiles">
10 <div id="infoProfiles">
11 <label for="lblProfile" class="lblInfo">Profiles:</label><br />
11 <label for="lblProfile" class="lblInfo">Profiles:</label><br />
12 {% if profile_list %}
12 {% if profile_list %}
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 %}
20 <label for="lblMessage" class="lblInfo">No profiles.</label>
28 <label for="lblMessage" class="lblInfo">No profiles.</label>
21 {% endif %}
29 {% endif %}
22 </div>
30 </div>
23 </div>
31 </div>
24 {% block mnu_profile %}
32 {% block mnu_profile %}
25 <nav>
33 <nav>
26 <ul>
34 <ul>
27 <li><a href="/abscontrol/new">New</a></li>
35 <li><a href="/abscontrol/new">New</a></li>
28 <li><a href="#">Save as</a></li>
36 <li><a href="#">Save as</a></li>
29 <li><a href="#">Import</a></li>
37 <li><a href="#">Import</a></li>
30 <li><a href="#">Export</a></li>
38 <li><a href="#">Export</a></li>
31 <li><a href="#">Apply</a></li>
39 <li><a href="#">Apply</a></li>
32 </ul>
40 </ul>
33 </nav>
41 </nav>
34 {% endblock %}
42 {% endblock %}
35 </div>
43 </div>
36 {% endblock %}
44 {% endblock %}
37 {% block maincolumn %}
45 {% block maincolumn %}
38 <div id="maincolumn">
46 <div id="maincolumn">
39
47
40 </div>
48 </div>
41 {% endblock %}
49 {% endblock %}
42 <div class="cleardivs"></div>
50 <div class="cleardivs"></div>
43 </div>
51 </div>
44 {% endblock %} No newline at end of file
52 {% endblock %}
Show file before | Show file after | Hide comments
@@ -1,63 +1,63
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 %}
13 <label for="lblValue">Pattern:</label>
13 <label for="lblValue">Pattern:</label>
14 <label for="lblPatternValue">{{ patternChoosen.value }}</label>
14 <label for="lblPatternValue">{{ patternChoosen.value }}</label>
15 {% endif %}
15 {% endif %}
16 <div id="antennaUp">
16 <div id="antennaUp">
17 <fieldset class="flsAntenna">
17 <fieldset class="flsAntenna">
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>
38 <div id="antennaDown">
38 <div id="antennaDown">
39 <fieldset class="flsAntenna">
39 <fieldset class="flsAntenna">
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>
60 </div>
60 </div>
61 </form>
61 </form>
62 </div>
62 </div>
63 {% endblock %}
63 {% endblock %}
General Comments 0
You need to be logged in to leave comments. Login now