ABS/abscontrol Commit - r209:210 · Jicamarca Repository

- 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.

jsalyrosas -

r209:210

parent child

Context file:

r209:210

Collapse all files

trunk/webapp/abscontrol/views.py +14 -2

                  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"]
                      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
                      objAntennaUp.tx = txtTxUp
                      objAntennaUp.rx = txtRxUp
                      objAntennaUp.ues = txtUesUp
+                     objAntennaUp.only_rx = chkOnlyRxUp
                      objAntennaUp.save()
                      txtAntennaDownId = request.POST["txtAntennaDownId"]
                      objAntennaDown.tx = txtTxDown
                      objAntennaDown.rx = txtRxDown
                      objAntennaDown.ues = txtUesDown
+                     objAntennaDown.only_rx = chkOnlyRxDown
                      objAntennaDown.save()
                      if mode == "e":
                  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)

trunk/webapp/static/css/style.css +27 -5

              header {
              	width: 980px;
-             	height: 50px;
+             	height: 50px;
              	text-align: center;
              	line-height: 50px;
              	border: 0px solid #fcc !important; }
              	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;

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

              					<label for="lblUes">]</label>
              				</div>
                          </div>
+                         <div class="cleardivs"></div>
+                         <div class="divOnlyRx">
+                         	<input type="checkbox" name="chkOnlyRxUp" value="1" {% if antennaUp.only_rx == 1 %}checked{% endif %} />
+                             <label for="lblOnlyRx" class="titleOnlyRx">Only Rx</label>
+                         </div>
                          <input type="hidden" name="txtAntennaUpId" value="{{ antennaUp.id }}" />
                      </fieldset>
                      <input type="hidden" name="txtAntennaUp" value="" />
              					<label for="lblUes">]</label>
                              </div>
                          </div>
+                         <div class="cleardivs"></div>
+                         <div class="divOnlyRx">
+                         	<input type="checkbox" name="chkOnlyRxDown" value="1" {% if antennaDown.only_rx == 1 %}checked{% endif %} />
+                             <label for="lblOnlyRx" class="titleOnlyRx">Only Rx</label>
+                         </div>
                          <input type="hidden" name="txtAntennaDownId" value="{{ antennaDown.id }}" />
                      </fieldset>
                      <input type="hidden" name="txtAntennaDown" value="" />

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