ABS/abscontrol Commit - r142:143 · Jicamarca Repository

- Actualiza el patron, junto a la configuracion de antena Up y Down.

jsalyrosas -

r142:143

parent child

Context file:

r142:143

Collapse all files

trunk/webapp/abscontrol/views.py +42 -16

              from django.shortcuts import render_to_response, redirect
-             from abscontrol.models import Profile, Pattern
+             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
              txtAntenna = "[[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                           "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
                                                                            })
              def savePattern(request, profile_id):
+                 pattern_id = 0
+                 method = "save"
+                 if 'pattern_id' in request.POST:
+                     pattern_id = request.POST["pattern_id"]
+                     method = "update"
                  maxValuePattern = 0
                  txtAntennaUp = request.POST["txtAntennaUp"]
                  txtTxUp = request.POST["txtTxUp"]
                  txtRxDown = request.POST["txtRxDown"]
                  txtUesDown = request.POST["txtUesDown"]
-                 objProfile = Profile.objects.get(pk=profile_id)
-                 lsPatterns = objProfile.pattern_set.all()
-                 for element in lsPatterns:
-                     if element.value > maxValuePattern:
-                         maxPattern = element.value
-                 if maxPattern < 10 :
-                     newValuePattern = maxPattern + 1
-                     newpattern = objProfile.pattern_set.create(value=newValuePattern)
-                     newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
-                     newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
-                     newurl = '/abscontrol/%d/view/%d' % (int(profile_id), newpattern.id)
+                 if method == "save":
+                     objProfile = Profile.objects.get(pk=profile_id)
+                     lsPatterns = objProfile.pattern_set.all()
+                     for element in lsPatterns:
+                         if element.value > maxValuePattern:
+                             maxPattern = element.value
+                     if maxPattern < 10 :
+                         newValuePattern = maxPattern + 1
+                         newpattern = objProfile.pattern_set.create(value=newValuePattern)
+                         newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp)
+                         newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown)
+                         newurl = '/abscontrol/%d/view/%d' % (int(profile_id), newpattern.id)
+                     else:
+                         newurl = '/abscontrol/edit/%d' % (int(profile_id))
                  else:
-                     newurl = '/abscontrol/edit/%d' % (int(profile_id))
+                     txtAntennaUpId = request.POST["txtAntennaUpId"]
+                     objAntennaUp = AntennaUp.objects.get(pk=txtAntennaUpId)
+                     objAntennaUp.value = txtAntennaUp
+                     objAntennaUp.tx = txtTxUp
+                     objAntennaUp.rx = txtRxUp
+                     objAntennaUp.ues = txtUesUp
+                     objAntennaUp.save()
+                     txtAntennaDownId = request.POST["txtAntennaDownId"]
+                     objAntennaDown = AntennaDown.objects.get(pk=txtAntennaDownId)
+                     objAntennaDown.value = txtAntennaDown
+                     objAntennaDown.tx = txtTxDown
+                     objAntennaDown.rx = txtRxDown
+                     objAntennaDown.ues = txtUesDown
+                     objAntennaDown.save()
+                     newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
                  return redirect(newurl)
              def viewPattern(request, profile_id, pattern_id):

trunk/webapp/templates/abscontrol/addPattern.html 0 -1

                          </div>
                      </fieldset>
                  </div>
-                     <input type="hidden" name="pattern_id" id="pattern_id" value="0" />
                      <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
                  </form>
              </div>

trunk/webapp/templates/abscontrol/editPattern.html +4 0

                      <label for="lblPatternValue">{{ patternChoosen.value }}</label>
                  </div>
                  {% endif %}
+                 <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post">
                  <div id="antennaUp">
                      <fieldset class="flsAntenna">
                          <legend>UP</legend>
                              <label for="lblUes">Ues:</label>
                              <input type="text" name="txtUesUp" value="{{ antennaUp.ues }}" />
                          </div>
+                         <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}" />
                      </fieldset>
                  </div>
                  <div id="antennaDown">
                              <label for="lblUes">Ues:</label>
                              <input type="text" name="txtUesDown" value="{{ antennaDown.ues }}" />
                          </div>
+                         <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}" />
                      </fieldset>
                  </div>
                  <input type="hidden" name="pattern_id" id="pattern_id" value="{{ patternChoosen.id }}" />
                  <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
+                 </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