# SVN changeset patch # User jsalyrosas # Date 2013-04-30 16:21:10.503784 # Revision 143 - Actualiza el patron, junto a la configuracion de antena Up y Down. Index: trunk/webapp/abscontrol/views.py =================================================================== diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py --- a/trunk/webapp/abscontrol/views.py (revision 142) +++ b/trunk/webapp/abscontrol/views.py (revision 143) @@ -1,5 +1,5 @@ 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]," \ @@ -159,6 +159,13 @@ }) 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"] @@ -170,22 +177,41 @@ 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): Index: trunk/webapp/templates/abscontrol/addPattern.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/addPattern.html b/trunk/webapp/templates/abscontrol/addPattern.html --- a/trunk/webapp/templates/abscontrol/addPattern.html (revision 142) +++ b/trunk/webapp/templates/abscontrol/addPattern.html (revision 143) @@ -58,7 +58,6 @@ - Index: trunk/webapp/templates/abscontrol/editPattern.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/editPattern.html b/trunk/webapp/templates/abscontrol/editPattern.html --- a/trunk/webapp/templates/abscontrol/editPattern.html (revision 142) +++ b/trunk/webapp/templates/abscontrol/editPattern.html (revision 143) @@ -19,6 +19,7 @@ {% endif %} +
UP @@ -39,6 +40,7 @@
+
@@ -61,9 +63,11 @@
+ +
{% endblock %}