##// END OF EJS Templates
ABS » abscontrol
RSS
- Corregido el bug cuando se agrega el nuevo perfil y agregada nuevos filtros a la plantilla administrador de la aplicacion.
jsalyrosas -
r189:190
parent child
Show More
Show file before | Show file after | Hide comments
@@ -27,6 +27,9
27 27 extra = 0
28 28
29 29 class ProfileAdmin(admin.ModelAdmin):
30 list_display = ('name', 'date_create','hits','state')
31 list_filter = ['state','date_create','date_modified']
32 date_hierarchy = 'date_create'
30 33 readonly_fields = ['date_create', 'date_modified','hits']
31 34 fieldsets = [
32 35 (None, {'fields': ['name']}),
Show file before | Show file after | Hide comments
@@ -7,6 +7,7
7 7 url(r'^view/(?P<profile_id>\d+)/$', 'view'),
8 8 url(r'^edit/(?P<profile_id>\d+)/$', 'edit'),
9 9 url(r'^update/(?P<profile_id>\d+)/$', 'update'),
10 url(r'^upgrade/(?P<profile_id>\d+)/$', 'upgrade'),
10 11 url(r'^changeName/(?P<profile_id>\d+)/$', 'changeName'),
11 12 #url(r'^(?P<profile_id>\d+)/$', 'detail'),
12 13 url(r'^(?P<profile_id>\d+)/add/$', 'addPattern'),
Show file before | Show file after | Hide comments
@@ -107,6 +107,26
107 107
108 108 newurl = '/abscontrol/view/%d' % newprofile.id
109 109
110 return redirect(newurl)
111
112 # Update temporal experiment
113 def upgrade(request, profile_id):
114 txtAntennaUp = request.POST["txtAntennaUp"]
115 txtTxUp = request.POST["txtTxUp"]
116 txtRxUp = request.POST["txtRxUp"]
117 txtUesUp = request.POST["txtUesUp"]
118
119 txtAntennaDown = request.POST["txtAntennaDown"]
120 txtTxDown = request.POST["txtTxDown"]
121 txtRxDown = request.POST["txtRxDown"]
122 txtUesDown = request.POST["txtUesDown"]
123
124 objProfile = Profile.objects.get(pk=profile_id)
125 newpattern = objProfile.pattern_set.create(value=1)
126 newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
127 newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
128
129 newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), newpattern.id)
110 130 return redirect(newurl)
111 131
112 132 def update(request, profile_id):
Show file before | Show file after | Hide comments
@@ -190,7 +190,7
190 190 margin-left: 10px; }
191 191
192 192 .infoAntenna {
193 width: 480px;
193 width: 500px;
194 194 float: left;
195 195 border: 0px solid #f00 !important; }
196 196
Show file before | Show file after | Hide comments
@@ -14,7 +14,42
14 14 location.href = "/abscontrol/" + profile_id + "/add/";
15 15 });
16 16 $('#lnkSave').click(function() {
17 $('#frmPattern').submit();
17 $('#frmPattern').submit();
18 });
19 $('#lnkSavePattern').click(function() {
20 valueAntennaUp = "";
21 valueAntennaDown = "";
22 for(i=0; i<=7; i++){
23 if(i == 0){
24 valueAntennaUp += "[";
25 valueAntennaDown += "[";
26 }else{
27 valueAntennaUp += ",";
28 valueAntennaDown += ",";
29 }
30 for(j=0; j<=7; j++){
31 if(j == 0){
32 valueAntennaUp += "[";
33 valueAntennaDown += "[";
34 }
35 valueAntennaUp += $("input[id=txtUnitAntennaUp_"+i+"_"+j+"]").val();
36 valueAntennaDown += $("input[id=txtUnitAntennaDown_"+i+"_"+j+"]").val();
37 if(j != 7){
38 valueAntennaUp += ",";
39 valueAntennaDown += ",";
40 }else{
41 valueAntennaUp += "]";
42 valueAntennaDown += "]";
43 }
44 }
45 if(i == 7){
46 valueAntennaUp += "]";
47 valueAntennaDown += "]";
48 }
49 }
50 $('input[name=txtAntennaUp]').attr("value",valueAntennaUp);
51 $('input[name=txtAntennaDown]').attr("value",valueAntennaDown);
52 $('#frmPattern').submit();
18 53 });
19 54 $('#lnkCancel').click(function() {
20 55 if ($("#pattern_id").val() == 0){
Show file before | Show file after | Hide comments
@@ -5,7 +5,8
5 5 {% endblock %}
6 6 {% block maincolumn%}
7 7 <div id="maincolumn">
8 <form action="/abscontrol/{{ profile_id }}/save/" method="post" id="frmPattern">
8 <!-- <form action="/abscontrol/{{ profile_id }}/save/" method="post" id="frmPattern"> -->
9 <form action="/abscontrol/upgrade/{{ profile_id }}/" method="post" id="frmPattern">
9 10 <div id="divProfile">
10 11 <label for="lblName">Profile: {{ profile_name }}</label>
11 12 </div>
@@ -13,7 +14,7
13 14 <div class="divMenu" id="divMnuPattern">
14 15 <nav class="MnuHorizontal">
15 16 <ul class="mnu" id="mnuPattern">
16 <li><a href="#" id="lnkSave">Save</a></li>
17 <li><a href="#" id="lnkSavePattern">Save</a></li>
17 18 </ul>
18 19 </nav>
19 20 </div>
@@ -32,7 +33,7
32 33 <label for="lblSign" class="lblSign">[</label>
33 34 <div class="divValuesAntenna">
34 35 {% for j in range %}
35 <input type="text" name="txtUnitAntenna" class="txtUnitAntenna" value="0.5" />
36 <input type="text" name="txtUnitAntennaUp" class="txtUnitAntenna" id="txtUnitAntennaUp_{{ i }}_{{ j }}" value="0.5" />
36 37 {% if j != 7 %},{% endif %}
37 38 {% endfor %}
38 39 </div>
@@ -58,14 +59,30
58 59 <label for="lblOnlyRx">Only RX</label>
59 60 </div>
60 61 </fieldset>
62 <input type="hidden" name="txtAntennaUp" value="" />
61 63 </div>
62 64
63 65 <div id="antennaDown" class="NewAntenna">
64 66 <fieldset class="NewFlsAntenna">
65 67 <legend class="legendAntenna">DOWN</legend>
66 <div class="divAntenna">
67 <label for="lblAntenna">Antenna</label>
68 <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ txtAntenna }}</textarea>
68 <div class="NewDivAntenna">
69 <label for="lblAntenna" class="titleField">Antenna</label>
70 <div class="boxAntenna" id="divtxtAntenna">
71 {% for i in range %}
72 <div class="lineInputs">
73 {% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
74 <label for="lblSign" class="lblSign">[</label>
75 <div class="divValuesAntenna">
76 {% for j in range %}
77 <input type="text" name="txtUnitAntennaDown" class="txtUnitAntenna" id="txtUnitAntennaDown_{{ i }}_{{ j }}" value="0.5" />
78 {% if j != 7 %},{% endif %}
79 {% endfor %}
80 </div>
81 <label for="lblSign" class="lblSign">]</label>
82 {% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
83 </div>
84 {% endfor %}
85 </div>
69 86 </div>
70 87 <div class="divTx">
71 88 <label for="lblTx">Tx</label>
@@ -83,6 +100,7
83 100 <label for="lblOnlyRx">Only RX</label>
84 101 </div>
85 102 </fieldset>
103 <input type="hidden" name="txtAntennaDown" value="" />
86 104 </div>
87 105 </div>
88 106 <input type="hidden" name="mode" value="e">
General Comments 0
You need to be logged in to leave comments. Login now