# SVN changeset patch # User jsalyrosas # Date 2013-07-08 19:48:56.427684 # Revision 210 - Ampliado el formulario de edicion para el parametro only_rx y funcionalidad verificada cuando graba los datos en la BD y cuando genera el archivo para su integracion con overjro. 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 209) +++ b/trunk/webapp/abscontrol/views.py (revision 210) @@ -267,11 +267,19 @@ txtTxUp = request.POST["txtTxUp"] txtRxUp = request.POST["txtRxUp"] txtUesUp = request.POST["txtUesUp"] + if "chkOnlyRxUp" in request.POST: + chkOnlyRxUp = request.POST["chkOnlyRxUp"] + else: + chkOnlyRxUp = 0 txtAntennaDown = request.POST["txtAntennaDown"] txtTxDown = request.POST["txtTxDown"] txtRxDown = request.POST["txtRxDown"] txtUesDown = request.POST["txtUesDown"] + if "chkOnlyRxDown" in request.POST: + chkOnlyRxDown = request.POST["chkOnlyRxDown"] + else: + chkOnlyRxDown = 0 mode = request.POST["mode"] @@ -288,8 +296,8 @@ 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) + newpattern.antennaup_set.create(value=txtAntennaUp,tx=txtTxUp,rx=txtRxUp,ues=txtUesUp,only_rx=chkOnlyRxUp) + newpattern.antennadown_set.create(value=txtAntennaDown,tx=txtTxDown,rx=txtRxDown,ues=txtUesDown,only_rx=chkOnlyRxDown) error = 0 else: error = 1 # Can not add more patterns @@ -305,6 +313,7 @@ objAntennaUp.tx = txtTxUp objAntennaUp.rx = txtRxUp objAntennaUp.ues = txtUesUp + objAntennaUp.only_rx = chkOnlyRxUp objAntennaUp.save() txtAntennaDownId = request.POST["txtAntennaDownId"] @@ -313,6 +322,7 @@ objAntennaDown.tx = txtTxDown objAntennaDown.rx = txtRxDown objAntennaDown.ues = txtUesDown + objAntennaDown.only_rx = chkOnlyRxDown objAntennaDown.save() if mode == "e": @@ -323,6 +333,8 @@ return redirect(newurl) def viewPattern(request, profile_id, pattern_id): + objProfileActive = None + objPatternActive = None profile_list = Profile.objects.filter(state=1) objProfile = Profile.objects.get(pk=profile_id) Index: trunk/webapp/static/css/style.css =================================================================== diff --git a/trunk/webapp/static/css/style.css b/trunk/webapp/static/css/style.css --- a/trunk/webapp/static/css/style.css (revision 209) +++ b/trunk/webapp/static/css/style.css (revision 210) @@ -13,7 +13,7 @@ header { width: 980px; - height: 50px; + height: 50px; text-align: center; line-height: 50px; border: 0px solid #fcc !important; } @@ -499,12 +499,34 @@ max-width: 240px; line-height: 22px; } */ + +.checkOnly, .divOnlyRx { + display: block; + line-height: 25px; + border: 0px solid #f00 !important; } + +.divOnlyRx { + width: 350px; + margin: 5px 10px; + padding: 0; + font-family: 'Roboto Condensed', sans-serif; } + .checkOnly { width: 120px; - float: left; - display: block; - line-height: 25px; - border: 0px solid #1cc !important; } + float: left; } + +.checkOnly input[type=checkbox], .divOnlyRx input[type=checkbox] { + width: 1em; + height: 1em; } + +.divOnlyRx input { + padding: 0px; + float: left; + margin: 5px 8px; } + +.divOnlyRx label { + line-height: 20px; + border: 0px solid #f00 !important; } .overJRO img { width: 400px; 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 209) +++ b/trunk/webapp/templates/abscontrol/editPattern.html (revision 210) @@ -125,6 +125,11 @@ +
+