ABS/abscontrol Commit - r189:190 · Jicamarca Repository

- Corregido el bug cuando se agrega el nuevo perfil y agregada nuevos filtros a la plantilla administrador de la aplicacion.

jsalyrosas -

r189:190

parent child

Context file:

r189:190

Collapse all files

trunk/webapp/abscontrol/admin.py +3 0

             from abscontrol.models import Profile, Pattern, AntennaUp, AntennaDown
             from django.contrib import admin
             class AntennaUpInline(admin.StackedInline):
                 model = AntennaUp
             class AntennaDownInline(admin.StackedInline):
                 model = AntennaDown
             class PatternAdmin(admin.ModelAdmin):
                 fieldsets = [
                     (None,               {'fields': ['value']}),
                     ('Date information', {'fields': ['date_create', 'date_modified'], 'classes': ['collapse']}),
                 ]
                 inlines = [AntennaUpInline]
                 inlines = [AntennaDownInline]
             class PatternInline(admin.StackedInline):
                 model = Pattern
                 readonly_fields = ['date_create', 'date_modified', 'hits']
                 fieldsets = [
                     (None,               {'fields': ['value']}),
                     ('Date information', {'fields': [('date_create', 'date_modified')], 'classes': ['collapse']}),
                     ('State',            {'fields': ['hits', 'state'], 'classes': ['collapse', 'wide', 'extrapretty']}),
                 ]
                 extra = 0
             class ProfileAdmin(admin.ModelAdmin):
+                list_display = ('name', 'date_create','hits','state')
+                list_filter = ['state','date_create','date_modified']
+                date_hierarchy = 'date_create'
                 readonly_fields = ['date_create', 'date_modified','hits']
                 fieldsets = [
                     (None,               {'fields': ['name']}),
                     ('Date information', {'fields': [('date_create', 'date_modified')], 'classes': ['collapse']}),
                     ('State',               {'fields': ['hits', 'state'], 'classes': ['collapse']}),
                 ]
                 inlines = [PatternInline]
             admin.site.register(Profile, ProfileAdmin)
             #admin.site.register(Pattern, PatternAdmin)
             #admin.site.register(AntennaUp)
             #admin.site.register(AntennaDown)

trunk/webapp/abscontrol/urls.py +1 0

             from django.conf.urls import patterns, url
             urlpatterns = patterns('abscontrol.views',
                 url(r'^$', 'index'),
                 url(r'^new/$', 'new'),
                 url(r'^save/$', 'save'),
                 url(r'^view/(?P<profile_id>\d+)/$', 'view'),
                 url(r'^edit/(?P<profile_id>\d+)/$', 'edit'),
                 url(r'^update/(?P<profile_id>\d+)/$', 'update'),
+                url(r'^upgrade/(?P<profile_id>\d+)/$', 'upgrade'),
                 url(r'^changeName/(?P<profile_id>\d+)/$', 'changeName'),
                 #url(r'^(?P<profile_id>\d+)/$', 'detail'),
                 url(r'^(?P<profile_id>\d+)/add/$', 'addPattern'),
                 url(r'^(?P<profile_id>\d+)/save/$', 'savePattern'),
                 url(r'^(?P<profile_id>\d+)/edit/(?P<pattern_id>\d+)/$', 'editPattern'),
                 url(r'^(?P<profile_id>\d+)/view/(?P<pattern_id>\d+)/$', 'viewPattern'),
                 url(r'^(?P<profile_id>\d+)/delete/(?P<pattern_id>\d+)/$', 'deletePattern'),
                 #url(r'^(?P<poll_id>\d+)/results/$', 'results'),
                 #url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
                 url(r'^import/$', 'importProfile'),
                 url(r'^upload/$', 'upload'),
                 #url(r'^saveImport/$', 'saveImport'),
                 url(r'^(?P<profile_id>\d+)/(?P<pattern_id>\d+)/overjro/(?P<antenna_id>\d+)/$', 'overJRO'),
                 url(r'^export/(?P<profile_id>\d+)/$', 'export'),
                 url(r'^send/(?P<profile_id>\d+)/$', 'send'),
             )

trunk/webapp/abscontrol/views.py +20 0

             from django.shortcuts import render_to_response, redirect
             from django.http import HttpResponse
             from django.conf import settings
             from django.utils.encoding import smart_str
             from django.core.servers.basehttp import FileWrapper
             import mimetypes
             from datetime import datetime
             from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp
             from util.readABSFile import readABSFile
             from util.saveABSFile import saveABSFile
             from scripts.sendFile import sendFile
             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]]"
             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]]"
             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]]"
             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]]"
             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]]"
             txtUes = "[0.533333,0.00000,1.06667,0.00000]"
             def index(request):
                 #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
                 profile_list = Profile.objects.filter(state=1)
                 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
             def new(request):
                 profile_list = Profile.objects.filter(state=1)
                 txtProfile = datetime.now().strftime("%Y%m%d%H%M%S%f")
                 newprofile = Profile(name=txtProfile)
                 newprofile.save()
                 lsPatterns = None
                 return render_to_response('abscontrol/new.html', {'profile_list': profile_list,
                                                                   'txtAntenna' : txtAntenna,
                                                                   'profile_name' : newprofile.name,
                                                                   'profile_id' : newprofile.id,
                                                                   'lsPatterns' : lsPatterns,
                                                                   'txtUes' : txtUes, 'txtTxUp' : txtTxUp,
                                                                   'txtTxDown' : txtTxDown, 'txtRxUp' : txtRxUp,
                                                                   'txtRxDown' : txtRxDown,
                                                                   'range' : range(8),
                                                                   })
             def save(request):
                 txtProfile = request.POST["txtProfile"]
                 txtAntennaUp = request.POST["txtAntennaUp"]
                 txtTxUp = request.POST["txtTxUp"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
                 newprofile = Profile(name=txtProfile)
                 newprofile.save()
                 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)
                 newurl = '/abscontrol/view/%d' % newprofile.id
+                return redirect(newurl)
+            # Update temporal experiment
+            def upgrade(request, profile_id):
+                txtAntennaUp = request.POST["txtAntennaUp"]
+                txtTxUp = request.POST["txtTxUp"]
+                txtRxUp = request.POST["txtRxUp"]
+                txtUesUp = request.POST["txtUesUp"]
+                txtAntennaDown = request.POST["txtAntennaDown"]
+                txtTxDown = request.POST["txtTxDown"]
+                txtRxDown = request.POST["txtRxDown"]
+                txtUesDown = request.POST["txtUesDown"]
+                objProfile = Profile.objects.get(pk=profile_id)
+                newpattern = objProfile.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)
+                newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), newpattern.id)
                 return redirect(newurl)
             def update(request, profile_id):
                 txtProfile = request.POST["txtProfile"]
                 objProfile = Profile.objects.get(pk=profile_id)
                 objProfile.name = txtProfile
                 objProfile.state = 1
                 objProfile.save()
                 newurl = '/abscontrol/view/%d' % objProfile.id
                 return redirect(newurl)
             def changeName(request, profile_id):
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 return render_to_response('abscontrol/changeName.html', {'profile_list': profile_list,
                                                                          'objProfile': objProfile,
                                                                          'lsPatterns' : lsPatterns,
                                                                          })
             def view(request, profile_id):
                 nextPattern = 0
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
                 if len(lsPatterns) > 1:
                     if pattern_value == 1:
                         nextValuePattern = pattern_value + 1
                         nextPattern = objProfile.pattern_set.get(value=nextValuePattern)
                 return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    'nextPattern' : nextPattern,
                                                                    })
             def edit(request, profile_id):
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
                 return render_to_response('abscontrol/edit.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    })
             def addPattern(request, profile_id):
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 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,
                                                                          })
             def editPattern(request, profile_id, pattern_id):
                 profile_list = Profile.objects.filter(state=1)
                 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()
                 return render_to_response('abscontrol/editPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
             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"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
                 mode = request.POST["mode"]
                 if method == "save":
                     objProfile = Profile.objects.get(pk=profile_id)
                     lsPatterns = objProfile.pattern_set.all()
                     if len(lsPatterns) > 0:
                         for element in lsPatterns:
                             if element.value > maxValuePattern:
                                 maxPattern = element.value
                     else:
                         maxPattern = 0
                     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)
                         error = 0
                     else:
                         error = 1 # Can not add more patterns
                     if mode == "e":
                         newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), newpattern.id)
                     else:
                         newurl = '/abscontrol/%d/view/%d' % (int(profile_id), newpattern.id)
                 else:
                     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()
                     if mode == "e":
                         newurl = '/abscontrol/%d/edit/%d' % (int(profile_id), int(pattern_id))
                     else:
                         newurl = '/abscontrol/%d/view/%d' % (int(profile_id), int(pattern_id))
                 return redirect(newurl)
             def viewPattern(request, profile_id, pattern_id):
                 profile_list = Profile.objects.filter(state=1)
                 objProfile = Profile.objects.get(pk=profile_id)
                 patternChoosen = Pattern.objects.get(pk=pattern_id)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
                 lsPatterns = objProfile.pattern_set.all()
                 return render_to_response('abscontrol/viewPattern.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                           'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                           'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                           })
             def deletePattern(request, profile_id, pattern_id):
                 newurl = '/abscontrol/edit/%d' % int(profile_id)
                 return redirect(newurl)
             def importProfile(request):
                 profile_list = Profile.objects.filter(state=1)
                 return render_to_response('abscontrol/import.html', {'profile_list': profile_list,})
             def upload(request):
                 profile_list = Profile.objects.filter(state=1)
                 if request.method == 'POST':
                     txtFilename = request.FILES['txtFile']
                     if txtFilename:
                         destination = open('/tmp/'+txtFilename.name, 'wb+')
                         for chunk in txtFilename.chunks():
                             destination.write(chunk)
                         destination.close()
                         filename = '/tmp/'+txtFilename.name
                         readFile = readABSFile(filename)
                         expName, num_patterns, patterns = readFile.getMetadata()
                         if expName != "" and num_patterns > 0:
                             newprofile = Profile(name=expName)
                             newprofile.save()
                             newprofile.state = 1
                             for element in patterns:
                                 newpattern = newprofile.pattern_set.create(value=element["number"])
                                 newpattern.antennaup_set.create(value=element["up"])
                                 newpattern.antennadown_set.create(value=element["down"])
                             newprofile.save()
                             newurl = '/abscontrol/edit/%d' % int(newprofile.id)
                             return redirect(newurl)
                         else:
                             txtError = "Experiment's name not found or the number of patterns is 0."
                             return render_to_response('abscontrol/error.html', {'profile_list': profile_list,
                                                                                 'txtError' : txtError, })
                 else:
                     txtError = "No file."
                     return render_to_response('abscontrol/error.html', {'profile_list': profile_list, 'txtError' : txtError, })
             def overJRO(request, profile_id, pattern_id, antenna_id):
                 if request.GET["beam"] == "Up":
                     objAntenna = AntennaUp.objects.get(pk=antenna_id)
                 else:
                     objAntenna = AntennaDown.objects.get(pk=antenna_id)
                 objProfile = Profile.objects.get(pk=profile_id)
                 exp_name = objProfile.name
                 phase_tx = objAntenna.value
                 gain_tx = objAntenna.tx
                 gain_rx = objAntenna.rx
                 ues_tx = objAntenna.ues
                 only_rx = objAntenna.only_rx
                 return exp_name, phase_tx, gain_tx, gain_rx, ues_tx, only_rx
             def export(request, profile_id):
                 listPatterns = []
                 objProfile = Profile.objects.get(pk=profile_id)
                 exp_name = objProfile.name
                 lsPatterns = objProfile.pattern_set.all()
                 for element in lsPatterns:
                     objAntennaUp = element.antennaup_set.get()
                     objAntennaDown = element.antennadown_set.get()
                     dicPatterns = {"number" : element.value, "up" : objAntennaUp.value, "down" : objAntennaDown.value}
                     listPatterns.append(dicPatterns)
                 absFile = saveABSFile()
                 absFile.setParameters(settings.MEDIA_ROOT, exp_name, listPatterns)
                 filename, filesize = absFile.save()
                 wrapper = FileWrapper( open( filename, "r" ) )
                 content_type = mimetypes.guess_type( filename )[0]
                 response = HttpResponse(wrapper, content_type = content_type)
                 response['Content-Description'] = 'File Transfer'
                 response['Content-Disposition'] = 'attachment; filename=%s' % smart_str(filename)
                 response['Content-Transfer-Encoding'] = 'binary'
                 response['Expires'] = '0'
                 response['Cache-Control'] = 'must-revalidate'
                 response['Pragma'] = 'public'
                 response['Content-Length'] = '%s' % str(filesize)
                 response['X-Sendfile'] = '%s' % smart_str(filename)
                 return response
             def send(request, profile_id):
                 listPatterns = []
                 objProfile = Profile.objects.get(pk=profile_id)
                 exp_name = objProfile.name
                 lsPatterns = objProfile.pattern_set.all()
                 for element in lsPatterns:
                     objAntennaUp = element.antennaup_set.get()
                     objAntennaDown = element.antennadown_set.get()
                     dicPatterns = {"number" : element.value, "up" : objAntennaUp.value, "down" : objAntennaDown.value}
                     listPatterns.append(dicPatterns)
                 absFile = saveABSFile()
                 absFile.setParameters(settings.MEDIA_ROOT, exp_name, listPatterns)
                 filename, filesize = absFile.save()
                 apiclient = sendFile()
                 apiclient.execute(filename)
                 output = apiclient.getOutput()
                 if output == "OK":
                     message = "File sent successfully."
                     objProfile.hits += 1
                     objProfile.save()
                 else:
                     message = "Error sending file."
                 profile_list = Profile.objects.all()
                 return render_to_response('abscontrol/sendFile.html', {'message': message, "profile_list" : profile_list,
                                                                        'objProfile': objProfile,
                                                                        })

trunk/webapp/static/css/style.css +1 -1

             /*
              * font-family: 'Droid Sans', sans-serif;
              * font-family: 'Ubuntu', sans-serif;
              * font-family: 'Open Sans', sans-serif;
              * font-family: 'Open Sans Condensed', sans-serif;
              * font-family: 'Roboto Condensed', sans-serif;
              */
             body {
             	padding: 0;
             	margin: 0;
             	font-size: 12px; }
             header {
             	width: 980px;
             	height: 50px;
             	text-align: center;
             	line-height: 50px;
             	border: 0px solid #fcc !important; }
             #schema {
             	margin: 0 auto;
             	width: 980px;
             	padding: 10px 10px;
             	border: 0px solid #f00 !important; }
             #content {
             	margin: 5px 0px;
             	border: 0px solid #1cc; }
             #topcolumn {
             	float: left;
             	width: 980px;
             	height: 40px;
             	line-height: 35px;
             	margin: 2px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #888; }
             #maincolumn {
             	float: left;
             	width: 980px;
             	margin: 2px 0px;
             	padding: 0px 0px;
             	border: 1px solid #ddd !important;
             	box-shadow: 2px 2px 5px #666; }
             footer {
             	height: 30px;
             	line-height: 30px;
             	text-align: center;
             	margin: 0px 0px;
             	border: 0px solid #200 !important;
             	box-shadow: 2px 2px 5px #888; }
             .cleardivs {
             	clear: both;
             	border: 0px solid #400;
             	height: 0px; }
             textarea {
             	resize: none;
             	overflow: hidden; }
             /****************************************************************************************/
             /******                     ESTILOS GENERALES                           *****************/
             /****************************************************************************************/
             .mnu {
             	height: 22px;
             	border: 0px solid #c55 !important; }
             .mnu li {
             	display:inline; }
             .MnuVertical, .MnuHorizontal {
             	font-family: 'Droid Sans', sans-serif;
             	font-size: inherit;
             	font-style: normal;
             	text-shadow: 2px 2px #eee; }
             .MnuHorizontal ul {
             	list-style: none;
             	list-style-type: none;
             	margin: 0; }
             /*.MnuHorizontal{
             	display: -webkit-box;
             	-webkit-box-orient:horizontal; }
             .MnuHorizontal a{
             	display:block;
             	padding:10px;
             	-webkit-box-flex:1;
             	text-align:center; }*/
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PERFILES 						*************/
             /****************************************************************************************/
             #infoProfiles {
             	float: left;
             	width: 300px;
             	margin: 0px;
             	padding: 2px 0px;
             	border: 0px solid #1cc !important; }
             #infoProfiles label {
             	padding: 10px 10px 10px 12px;
             	margin: 10px 0; }
             #infoProfiles select {
             	padding: 4px 0px; margin: 0;
             	font-family: 'Droid Sans', sans-serif;
             	font-size: 12px;
             	letter-spacing: 0.029em;
             	width: 200px; }
             #mnuProfiles {
             	margin: 0;
             	float: right;
             	padding: 2px 10px;
             	border: 0px solid #1494F6 !important; }
             #mnuProfiles ul {
             	list-style: none;
             	list-style-type: none;
             	margin: 0;
             	padding-left: 20px;
             	border: 0px solid #f00 !important; }
             #mnuProfiles li {
             	width: 80px;
             	float: left;
             	padding: 2px;
             	border: 0px solid #c55 !important; }
             #mnuProfiles a {
             	font-weight: normal;
             	color: #1494F6;
             	display: block;
             	text-align: center;
             	border-bottom: 1px solid #1494F6 !important;
             	text-decoration: none;
             	padding: 0px 4px;
             	line-height: 18px;
             	margin: 6px; }
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile {
             	margin: 10px 0px;
             	padding: 10px 10px;
             	width: 500px;
             	border: 0px solid #dff !important; }
             #divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit] {
             	font-family: 'Open Sans', sans-serif;
             	font-size: inherit; }
             .antenna, .NewAntenna {
             	box-shadow: 1px 1px 2px #666;
             	padding: 5px;
             	margin: 10px auto;
             	width: 520px;
             	display: block;
             	border: 0px solid #fee !important; }
             .antenna {
             	width: 520px; }
             .NewAntenna {
             	width: 620px; }
             .flsAntenna, .NewFlsAntenna {
             	margin: 0;
             	padding: 0px;
             	border: 1px solid #fee !important;
             	width: 510px; }
             .flsAntenna {
             	width: 510px; }
             .NewFlsAntenna {
             	width: 610px; }
             .legendAntenna {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: inherit;
             	text-align: center;
             	margin-left: 10px; }
             .infoAntenna {
-            	width: 480px;
+            	width: 500px;
             	float: left;
             	border: 0px solid #f00 !important; }
             .overJRO {
             	width: 250px;
             	float: left;
             	margin: 0px 5px;
             	border: 0px solid #1cc !important; }
             .divAntenna {
             	width: 220px;
             	float: left;
             	margin: 10px;
             	border: 0px solid #fcc !important; }
             .NewDivAntenna {
             	width: 290px;
             	float: left;
             	margin: 10px;
             	border: 0px solid #fcc !important; }
             .titleField {
             	display: block;
             	text-align: center; }
             .txtAntenna, .view-textAntenna {
             	width: 175px;
             	max-width: 180px;
             	height: 160px;
             	max-height: 165px;
             	background: #fdfdfb;
             	border: 2px solid #eee !important;
                 text-align: justify;
                 margin: 0 auto;
                 line-height: 20px; }
             .txtAntenna {
             	padding: 4px;
             }
             .view-textAntenna {
             	padding: 2px;
             	font-family: "Ubuntu";
             	font-size: inherit; }
             .boxAntenna {
             	width: 280px;
             	border: 2px solid #eee !important;
             	text-align: center;
             	display: block;
             	float: left;
             	margin: 0;
             	padding: 0; }
             .lineInputs {
             	width: 262px;
             	text-align: center;
             	line-height: 18px;
             	padding: 0;
             	height: 20px;
             	margin: 0 auto;
             	display: block;
             	border: 0px solid #1cc !important; }
             .lineInputs label {
             	float: left;
             	margin: 0px 2px;
             	border: 0px solid #bbb !important; }
             .divValuesAntenna {
             	width: 230px;
             	border: 0px solid #bbb !important;
             	float: left;
             	display: block;
             	margin: 0 auto; }
             .divValuesAntenna input[type=text] {
             	width: 18px;
             	border: 0px;
             	border-bottom: 1px solid #666 !important;
             	line-height: 20px; }
             .lblSign {
             	width: 8px;
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: 1.1em;
             	color: #666; }
             #lblSignLeft, #lblSignRight {
             	margin: 0;
             	line-height: 18px;
             	height: 20px;
             	float: left;
             	padding: 0; }
             .divTx {
             	display: block;
             	float: left;
             	margin: 10px;
             	border: 0px solid #f00 !important; }
             .divTx label {
             	display: block; }
             .divTx textarea {
             	width: 100px;
             	max-width: 100px;
             	height: 160px;
             	max-height: 165px;
             	text-align: justify;
             	border: 2px solid #eee !important;
             	font-family: "Ubuntu";
             	font-size: inherit;
             	line-height: 20px; }
             .divTx p {
             	width: 100px;
             	max-width: 105px;
             	height: 160px;
             	max-height: 165px;
             	background: #fdfdfb;
             	padding: 2px;
             	border: 1px solid #eee !important;
             	font-family: 'Ubuntu', sans-serif;
             	font-size: inherit;
             	text-align: justify;
             	margin: 0 auto;
             	line-height: 20px; }
             .divUes {
             	display: block;
             	margin: 10px; }
             .divUes input[type=text] {
             	width: 240px;
             	max-width: 240px;
             	font-family: 'Ubuntu', sans-serif;
             	font-size: inherit; }
             .overJRO img {
             	width: 400px;
             	height: 200px;
             	text-align: center;
             	vertical-align: middle;
             	margin: 40px 5px 5px 5px;
             	display: block;
             	background: #fdfdfb;
             	border: 1px solid #eee !important; }
             .overJRO a {
             	text-align: center;
             	margin: 0 auto;
             	display: block; }
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PATRONES **********************************/
             /****************************************************************************************/
             #divMnuPattern {
             	width: 280px;
             	height: 25px;
             	display: block;
             	float: right;
             	margin: 5px 40px 5px 0px;
             	border: 0px solid #1cc !important; }
             #divMnuPattern li {
             	float: right;
             	display: block;
             	width: 60px;
             	border: 0px solid #2cc !important; }
             #divMnuPattern a {
             	display: block;
             	line-height: 22px;
             	text-decoration: none;
             	padding: 0px 5px;
             	margin: 0px 2px;
             	text-align: center;
             	color: #1494F6;
             	border-bottom: 1px solid #1494F6 !important; }
             #infoPattern {
             	display: block;
             	margin: 0px 25px;
             	border: 0px solid #1494f6 !important; }
             #navPatterns {
             	margin: 0 auto;
             	width: 700px;
             	height: 30px;
             	border: 0px solid #d00 !important;
             	font-family: 'Ubuntu', sans-serif;
             	font-size: 14px;
             	padding: 5px 0px; }
             #navPatternList {
             	margin: 0 auto;
             	border: 0px solid #ecc !important; }
             #navPatternList ul {
             	list-style: none;
             	list-style-type: none;
             	margin: 0; }
             #navPatternList ul li {
             	float: left;
             	width: 50px;
             	border: 1px solid #eee !important; }
             #navPatternList a {
             	width: 50px;
             	display: block;
             	text-align: center;
             	line-height: 30px;
             	padding: 1px 0px;
             	border: 0px solid #1cc !important; }
             .lnkPattern {
             	background-color: #ccc !important;
             	color: #eee; }
             .lnkPatternSelected {
             	background-color: #2cc !important;
             	color: #fff; }
             .divListofPatterns {
             	width: 650px;
             	display: block;
             	border: 1px solid #1cc !important;
             	margin: 0 auto; }
             .divPattern {
             	width: 600px;
             	display: block;
             	border: 1px solid #f00 !important;
             	margin: 2px auto; }
             /****************************************************************************************/
             /******                 			HEADER 									*************/
             /****************************************************************************************/
             header nav {
             	width: 960px;
             	margin: 0 auto;
             	height: 100%;
             	border: 0px solid #1cc !important; }
             header nav a {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: 1.98em;
             	text-transform: uppercase;
             	width: 232px;
             	padding: 2px;
             	text-align: center;
             	border: 1px solid #ddd !important;
             	box-shadow: 1px 1px 2px #ddd;
             	display: block;
             	float: left;
             	height: 45px;
             	text-decoration: none;
             	background: #eee;
             	line-height: 45px;
             	color: #15425d;
             	margin: 0px 1px; }
             header nav a.selected {
             	background: #666;
             	color: #fff; }
             /****************************************************************************************/
             /******                 			FOOTER 									*************/
             /****************************************************************************************/
             footer p {
             	font-family: 'Roboto Condensed', sans-serif;
             	font-size: 0.98em; }

trunk/webapp/static/js/patterns.js +36 -1

             /**
              * @author Jose Antonio Sal y Rosas Celi
              * @contact: jose.salyrosas@jro.igp.gob.pe, arturo.jasyrc@gmail.com
              */
             $(document).on('ready',function(){
                 $('#listProfiles').change(function() {
                     if($(this).val() != -1){
                         location.href = "/abscontrol/view/" + $(this).val();
                     }
                 });
                 $('#lnkAdd').click(function() {
                 	profile_id = $("#profile_id").val();
                     location.href = "/abscontrol/" + profile_id + "/add/";
                 });
                 $('#lnkSave').click(function() {
-                   $('#frmPattern').submit();
+                    $('#frmPattern').submit();
+                 });
+                $('#lnkSavePattern').click(function() {
+                	valueAntennaUp = "";
+                	valueAntennaDown = "";
+                	for(i=0; i<=7; i++){
+                		if(i == 0){
+                			valueAntennaUp += "[";
+                			valueAntennaDown += "[";
+            			}else{
+            				valueAntennaUp += ",";
+            				valueAntennaDown += ",";
+            			}
+                		for(j=0; j<=7; j++){
+                			if(j == 0){
+                				valueAntennaUp += "[";
+                				valueAntennaDown += "[";
+                			}
+                			valueAntennaUp += $("input[id=txtUnitAntennaUp_"+i+"_"+j+"]").val();
+                			valueAntennaDown += $("input[id=txtUnitAntennaDown_"+i+"_"+j+"]").val();
+                			if(j != 7){
+                				valueAntennaUp += ",";
+                				valueAntennaDown += ",";
+                			}else{
+                				valueAntennaUp += "]";
+                				valueAntennaDown += "]";
+                			}
+                		}
+                		if(i == 7){
+                			valueAntennaUp += "]";
+                			valueAntennaDown += "]";
+            			}
+                	}
+                	$('input[name=txtAntennaUp]').attr("value",valueAntennaUp);
+                	$('input[name=txtAntennaDown]').attr("value",valueAntennaDown);
+                	$('#frmPattern').submit();
                 });
                 $('#lnkCancel').click(function() {
                     if ($("#pattern_id").val() == 0){
                         location.href = "/abscontrol/edit/" + $("#profile_id").val();
                     }else{
                         //location.href="/abscontrol/" + $("#profile_id").val() + "/view/" + $("#pattern_id").val();
                     	location.href = "/abscontrol/edit/" + $("#profile_id").val();
                     }
                 });
                 $('#lnkExport').click(function(){
                     profile_id = $(this).attr("alt");
                     location.href = "/abscontrol/export/" + profile_id + "/";
                 });
                 $('#lnkSendFile').click(function(){
                     profile_id = $(this).attr("alt");
                     location.href = "/abscontrol/send/" + profile_id + "/";
                 });
                 $('#lnkUpdateProfile').click(function(){
                 	$('#frmProfile').submit();
                 });
             });

trunk/webapp/templates/abscontrol/new.html +24 -6

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::::NEW PROFILE{% endblock %}
             {% block scripting %}
                 <script src="/static/static/js/patterns.js"></script>
             {% endblock %}
             {% block maincolumn%}
             <div id="maincolumn">
-                <form action="/abscontrol/{{ profile_id }}/save/" method="post" id="frmPattern">
+                <!-- <form action="/abscontrol/{{ profile_id }}/save/" method="post" id="frmPattern"> -->
+                <form action="/abscontrol/upgrade/{{ profile_id }}/" method="post" id="frmPattern">
                 <div id="divProfile">
                     <label for="lblName">Profile: {{ profile_name }}</label>
                 </div>
                 {% 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="lnkSavePattern">Save</a></li>
                         </ul>
                     </nav>
                 </div>
                 <div class="cleardivs"></div>
                 {% endblock %}
                 <div id="divPattern">
                     <div id="antennaUp" class="NewAntenna">
                         <fieldset class="NewFlsAntenna">
                             <legend class="legendAntenna">UP</legend>
                             <div class="NewDivAntenna">
                                 <label for="lblAntenna" class="titleField">Antenna</label>
                                 <div class="boxAntenna" id="divtxtAntenna">
                                 {% for i in range %}
                                 	<div class="lineInputs">
                                 	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
                                 		<label for="lblSign" class="lblSign">[</label>
                                 		<div class="divValuesAntenna">
                                 		{% for j in range %}
-                                			<input type="text" name="txtUnitAntenna" class="txtUnitAntenna" value="0.5" />
+                                			<input type="text" name="txtUnitAntennaUp" class="txtUnitAntenna" id="txtUnitAntennaUp_{{ i }}_{{ j }}" value="0.5" />
                                 			{% if j != 7 %},{% endif %}
                                 		{% endfor %}
                                 		</div>
                                 		<label for="lblSign" class="lblSign">]</label>
                                 		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
                                 	</div>
                                 {% endfor %}
                                 </div>
                             </div>
                             <div class="divTx">
                                 <label for="lblTx" class="titleField">Tx</label>
                                 <textarea name="txtTxUp" class="txtTR" cols="18" rows="8">{{ txtTxUp }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblRx" class="titleField"	>Rx</label>
                                 <textarea name="txtRxUp" class="txtTR" cols="18" rows="8">{{ txtRxUp }}</textarea>
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <input type="text" name="txtUesUp" value="{{ txtUes }}" />
                                 <input type="checkbox" name="chkOnlyRxUp" value="" />
                                 <label for="lblOnlyRx">Only RX</label>
                             </div>
                         </fieldset>
+                        <input type="hidden" name="txtAntennaUp" value="" />
                     </div>
                     <div id="antennaDown" class="NewAntenna">
                         <fieldset class="NewFlsAntenna">
                             <legend class="legendAntenna">DOWN</legend>
-                            <div class="divAntenna">
+                            <div class="NewDivAntenna">
-                                <label for="lblAntenna">Antenna</label>
+                                <label for="lblAntenna" class="titleField">Antenna</label>
-                                <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ txtAntenna }}</textarea>
+                                <div class="boxAntenna" id="divtxtAntenna">
+                                {% for i in range %}
+                                	<div class="lineInputs">
+                                	{% if i == 0 %}<label for="lblSignLeft" class="lblSign" id="lblSignLeft">[</label>{% endif %}
+                                		<label for="lblSign" class="lblSign">[</label>
+                                		<div class="divValuesAntenna">
+                                		{% for j in range %}
+                                			<input type="text" name="txtUnitAntennaDown" class="txtUnitAntenna" id="txtUnitAntennaDown_{{ i }}_{{ j }}" value="0.5" />
+                                			{% if j != 7 %},{% endif %}
+                                		{% endfor %}
+                                		</div>
+                                		<label for="lblSign" class="lblSign">]</label>
+                                		{% if i == 7 %}<label for="lblSignRight" class="lblSign" id="lblSignRight">]</label>{% endif %}
+                                	</div>
+                                {% endfor %}
+                                </div>
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <textarea name="txtTxDown" class="txtTR" cols="15" rows="8">{{ txtTxDown }}</textarea>
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
                                 <textarea name="txtRxDown" class="txtTR" cols="15" rows="8">{{ txtRxDown }}</textarea>
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <input type="text" name="txtUesDown" value="{{ txtUes }}" />
                                 <input type="checkbox" name="chkOnlyRxDown" value="" />
                                 <label for="lblOnlyRx">Only RX</label>
                             </div>
                         </fieldset>
+                        <input type="hidden" name="txtAntennaDown" value="" />
                     </div>
                 </div>
                 	<input type="hidden" name="mode" value="e">
                 </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