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 +27 -1

             from django.shortcuts import render_to_response, redirect
             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
  No newline at end of file
-            from abscontrol.models import Profile, Pattern
  No newline at end of file
   No newline at end of file
             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]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
                          "[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]," \
                          "[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]," \
                          "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]]"
   No newline at end of file
             txtTxUp = "[[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]]"
   No newline at end of file
             txtTxDown = "[[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[1,1,1,1,0,0,0,0]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]," \
                         "[0,0,0,0,1,1,1,1]]"
   No newline at end of file
             txtRxUp = "[[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[0,0,0,0,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]," \
                       "[1,1,1,1,1,1,1,1]]"
   No newline at end of file
             txtRxDown = "[[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]," \
                         "[1,1,1,1,1,1,1,1]]"
   No newline at end of file
             txtUes = "[0.533333,0.00000,1.06667,0.00000]"
   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()
   No newline at end of file
                 return render_to_response('abscontrol/new.html', {'profile_list': profile_list,
                                                                   'txtAntenna' : txtAntenna,
                                                                   'txtUes' : txtUes, 'txtTxUp' : txtTxUp,
                                                                   'txtTxDown' : txtTxDown, 'txtRxUp' : txtRxUp,
                                                                   'txtRxDown' : txtRxDown,
                                                                   })
   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
   No newline at end of file
                 return redirect(newurl)
   No newline at end of file
             def view(request, profile_id):
                 nextPattern = 0
   No newline at end of file
                 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)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 if len(lsPatterns) > 1:
                     if pattern_value == 1:
                         nextValuePattern = pattern_value + 1
                         nextPattern = objProfile.pattern_set.get(value=nextValuePattern)
   No newline at end of file
   No newline at end of file
                 return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    'nextPattern' : nextPattern,
                                                                    })
   No newline at end of file
             def edit(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)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 return render_to_response('abscontrol/edit.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    })
   No newline at end of file
             def addPattern(request, profile_id):
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 return render_to_response('abscontrol/addPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                          'txtAntenna' : txtAntenna, 'txtUes' : txtUes,
                                                                          'txtTxUp' : txtTxUp, 'txtTxDown' : txtTxDown,
                                                                          'txtRxUp' : txtRxUp, 'txtRxDown' : txtRxDown,
                                                                          })
   No newline at end of file
             def editPattern(request, profile_id, pattern_id):
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = Pattern.objects.get(pk=pattern_id)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 return render_to_response('abscontrol/editPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
   No newline at end of file
             def savePattern(request, profile_id):
+                pattern_id = 0
              No newline at end of file
+                method = "save"
              No newline at end of file
              No newline at end of file
+                if 'pattern_id' in request.POST:
              No newline at end of file
+                    pattern_id = request.POST["pattern_id"]
              No newline at end of file
+                    method = "update"
              No newline at end of file
+  No newline at end of file
                 maxValuePattern = 0
                 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
+                if method == "save":
  No newline at end of file
                     objProfile = Profile.objects.get(pk=profile_id)
                     lsPatterns = objProfile.pattern_set.all()
                     for element in lsPatterns:
                         if element.value > maxValuePattern:
                             maxPattern = element.value
   No newline at end of file
                     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)
   No newline at end of file
                         newurl = '/abscontrol/%d/view/%d' % (int(profile_id), newpattern.id)
                     else:
                         newurl = '/abscontrol/edit/%d' % (int(profile_id))
+                else:
              No newline at end of file
+                    txtAntennaUpId = request.POST["txtAntennaUpId"]
              No newline at end of file
+                    objAntennaUp = AntennaUp.objects.get(pk=txtAntennaUpId)
              No newline at end of file
+                    objAntennaUp.value = txtAntennaUp
              No newline at end of file
+                    objAntennaUp.tx = txtTxUp
              No newline at end of file
+                    objAntennaUp.rx = txtRxUp
              No newline at end of file
+                    objAntennaUp.ues = txtUesUp
              No newline at end of file
+                    objAntennaUp.save()
              No newline at end of file
              No newline at end of file
+                    txtAntennaDownId = request.POST["txtAntennaDownId"]
              No newline at end of file
+                    objAntennaDown = AntennaDown.objects.get(pk=txtAntennaDownId)
              No newline at end of file
+                    objAntennaDown.value = txtAntennaDown
              No newline at end of file
+                    objAntennaDown.tx = txtTxDown
              No newline at end of file
+                    objAntennaDown.rx = txtRxDown
              No newline at end of file
+                    objAntennaDown.ues = txtUesDown
              No newline at end of file
+                    objAntennaDown.save()
              No newline at end of file
              No newline at end of file
+                    newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
  No newline at end of file
   No newline at end of file
                 return redirect(newurl)
   No newline at end of file
             def viewPattern(request, profile_id, pattern_id):
   No newline at end of file
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 patternChoosen = Pattern.objects.get(pk=pattern_id)
   No newline at end of file
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 lsPatterns = objProfile.pattern_set.all()
   No newline at end of file
                 return render_to_response('abscontrol/viewPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
   No newline at end of file
             def deletePattern(request, profile_id, pattern_id):
                 newurl = '/abscontrol/edit/%d' % int(profile_id)
   No newline at end of file
                 return redirect(newurl)

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

             {% extends "abscontrol/edit.html" %}
   No newline at end of file
             {% block mnuPattern %}
             <div class="divMenu" id="divMnuPattern">
                 <nav class="MnuHorizontal">
                     <ul class="mnu" id="mnuPattern">
                         <li><a href="#" id="lnkSave">Save</a></li>
                         <li><a href="#" id="lnkCancel">Cancel</a></li>
                     </ul>
                 </nav>
             </div>
             <div class="cleardivs"></div>
             {% endblock %}
             {% block pattern %}
             <div id="infoPattern">
                 <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post">
                 <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">{{ txtAntenna }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblTx">Tx</label>
                             <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ txtTxUp }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblRx">Rx</label>
                             <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ txtRxUp }}</textarea>
                         </div>
                         <div class="cleardivs"></div>
                         <div class="divUes">
                             <label for="lblUes">Ues:</label>
                             <input type="text" name="txtUesUp" value="{{ txtUes }}" />
                         </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">{{ txtAntenna }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblTx">Tx</label>
                             <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ txtTxDown }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblRx">Rx</label>
                             <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ txtRxDown }}</textarea>
                         </div>
                         <div class="cleardivs"></div>
                         <div class="divUes">
                             <label for="lblUes">Ues:</label>
                             <input type="text" name="txtUesDown" value="{{ txtUes }}" />
                         </div>
                     </fieldset>
                 </div>
              No newline at end of file
-                    <input type="hidden" name="pattern_id" id="pattern_id" value="0" />
  No newline at end of file
                     <input type="hidden" name="profile_id" id="profile_id" value="{{ objProfile.id }}" />
                 </form>
             </div>
             {% endblock %}

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

             {% extends "abscontrol/edit.html" %}
   No newline at end of file
             {% block mnuPattern %}
             <div class="divMenu" id="divMnuPattern">
                 <nav class="MnuHorizontal">
                     <ul class="mnu" id="mnuPattern">
                         <li><a href="#" id="lnkSave">Save</a></li>
                         <li><a href="#" id="lnkCancel">Cancel</a></li>
                     </ul>
                 </nav>
             </div>
             <div class="cleardivs"></div>
             {% endblock %}
             {% block pattern %}
             <div id="infoPattern">
                 {% if patternChoosen %}
                 <div id="navPatterns">
                     <label for="lblValue">Pattern:</label>
                     <label for="lblPatternValue">{{ patternChoosen.value }}</label>
                 </div>
                 {% endif %}
+                <form action="/abscontrol/{{ objProfile.id }}/save/" id="frmPattern" method="post">
  No newline at end of file
                 <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>
                         </div>
                         <div class="divTx">
                             <label for="lblTx">Tx</label>
                             <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.tx }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblRx">Rx</label>
                             <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ antennaUp.rx }}</textarea>
                         </div>
                         <div class="cleardivs"></div>
                         <div class="divUes">
                             <label for="lblUes">Ues:</label>
                             <input type="text" name="txtUesUp" value="{{ antennaUp.ues }}" />
                         </div>
+                        <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}" />
  No newline at end of file
                     </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>
                         </div>
                         <div class="divTx">
                             <label for="lblTx">Tx</label>
                             <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.tx }}</textarea>
                         </div>
                         <div class="divTx">
                             <label for="lblRx">Rx</label>
                             <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ antennaDown.rx }}</textarea>
                         </div>
                         <div class="cleardivs"></div>
                         <div class="divUes">
                             <label for="lblUes">Ues:</label>
                             <input type="text" name="txtUesDown" value="{{ antennaDown.ues }}" />
                         </div>
+                        <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}" />
  No newline at end of file
                     </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>
  No newline at end of file
             </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